Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8433

Show
Ignore:
Timestamp:
12/18/07 21:14:07 (1 year ago)
Author:
bitsweat
Message:

Ruby 1.9 compat: move from the deprecated Base64 module to ActiveSupport::Base64. Closes #10554.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller/http_authentication.rb

    r8009 r8433  
    1 require 'base64' 
    2  
    31module ActionController 
    42  module HttpAuthentication 
    …… 
    111109     
    112110      def decode_credentials(request) 
    113         Base64.decode64(authorization(request).split.last || '') 
     111        ActiveSupport::Base64.decode64(authorization(request).split.last || '') 
    114112      end 
    115113 
    116114      def encode_credentials(user_name, password) 
    117         "Basic #{Base64.encode64("#{user_name}:#{password}")}" 
     115        "Basic #{ActiveSupport::Base64.encode64("#{user_name}:#{password}")}" 
    118116      end 
    119117 

  • trunk/actionpack/lib/action_controller/session/active_record_store.rb

    r7438 r8433  
    22require 'cgi/session' 
    33require 'digest/md5' 
    4 require 'base64' 
    54 
    65class CGI 
    …… 
    8180          end 
    8281 
    83           def marshal(data)   Base64.encode64(Marshal.dump(data)) if data end 
    84           def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end 
     82          def marshal(data)   ActiveSupport::Base64.encode64(Marshal.dump(data)) if data end 
     83          def unmarshal(data) Marshal.load(ActiveSupport::Base64.decode64(data)) if data end 
    8584 
    8685          def create_table! 
    …… 
    156155      # are configurable class attributes.  Marshaling and unmarshaling 
    157156      # are implemented as class methods that you may override.  By default, 
    158       # marshaling data is +Base64.encode64(Marshal.dump(data))+ and 
    159       # unmarshaling data is +Marshal.load(Base64.decode64(data))+. 
     157      # marshaling data is +ActiveSupport::Base64.encode64(Marshal.dump(data))+ and 
     158      # unmarshaling data is +Marshal.load(ActiveSupport::Base64.decode64(data))+. 
    160159      # 
    161160      # This marshaling behavior is intended to store the widest range of 
    …… 
    191190          end 
    192191 
    193           def marshal(data)   Base64.encode64(Marshal.dump(data)) if data end 
    194           def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end 
     192          def marshal(data)   ActiveSupport::Base64.encode64(Marshal.dump(data)) if data end 
     193          def unmarshal(data) Marshal.load(ActiveSupport::Base64.decode64(data)) if data end 
    195194 
    196195          def create_table! 

  • trunk/actionpack/lib/action_controller/session/cookie_store.rb

    r8423 r8433  
    11require 'cgi' 
    22require 'cgi/session' 
    3 require 'base64'        # to convert Marshal.dump to ASCII 
    43require 'openssl'       # to generate the HMAC message digest 
    54 
    …… 
    131130    # Marshal a session hash into safe cookie data. Include an integrity hash. 
    132131    def marshal(session) 
    133       data = Base64.encode64(Marshal.dump(session)).chop 
     132      data = ActiveSupport::Base64.encode64(Marshal.dump(session)).chop 
    134133      CGI.escape "#{data}--#{generate_digest(data)}" 
    135134    end 
    …… 
    143142          raise TamperedWithCookie 
    144143        end 
    145         Marshal.load(Base64.decode64(data)) 
     144        Marshal.load(ActiveSupport::Base64.decode64(data)) 
    146145      end 
    147146    end 

  • trunk/actionpack/test/activerecord/active_record_store_test.rb

    r7666 r8433  
    6767  def test_save_unloaded_session 
    6868    c = session_class.connection 
    69     bogus_class = c.quote(Base64.encode64("\004\010o:\vBlammo\000")) 
     69    bogus_class = c.quote(ActiveSupport::Base64.encode64("\004\010o:\vBlammo\000")) 
    7070    c.insert("INSERT INTO #{session_class.table_name} ('#{session_id_column}', 'data') VALUES ('abcdefghijklmnop', #{bogus_class})") 
    7171 

  • trunk/actionpack/test/controller/request_test.rb

    r8425 r8433  
    790790class XmlParamsParsingTest < Test::Unit::TestCase 
    791791  def test_single_file 
    792     person = parse_body("<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{Base64.encode64('ABC')}</avatar></person>") 
     792    person = parse_body("<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></person>") 
    793793 
    794794    assert_equal "image/jpg", person['person']['avatar'].content_type 
    …… 
    802802        <name>David</name> 
    803803        <avatars> 
    804           <avatar type='file' name='me.jpg' content_type='image/jpg'>#{Base64.encode64('ABC')}</avatar> 
    805           <avatar type='file' name='you.gif' content_type='image/gif'>#{Base64.encode64('DEF')}</avatar> 
     804          <avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar> 
     805          <avatar type='file' name='you.gif' content_type='image/gif'>#{ActiveSupport::Base64.encode64('DEF')}</avatar> 
    806806        </avatars> 
    807807      </person> 

  • trunk/activerecord/lib/active_record/base.rb

    r8381 r8433  
    1 require 'base64' 
    21require 'yaml' 
    32require 'set' 

  • trunk/activeresource/test/authorization_test.rb

    r7719 r8433  
    11require "#{File.dirname(__FILE__)}/abstract_unit" 
    2 require 'base64' 
    32 
    43class AuthorizationTest < Test::Unit::TestCase 
    …… 
    2625     
    2726    assert_equal "Basic", authorization[0] 
    28     assert_equal ["david", "test123"], Base64.decode64(authorization[1]).split(":")[0..1] 
     27    assert_equal ["david", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1] 
    2928  end 
    3029   
    …… 
    3534     
    3635    assert_equal "Basic", authorization[0] 
    37     assert_equal ["david"], Base64.decode64(authorization[1]).split(":")[0..1] 
     36    assert_equal ["david"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1] 
    3837  end 
    3938   
    …… 
    4443     
    4544    assert_equal "Basic", authorization[0] 
    46     assert_equal ["", "test123"], Base64.decode64(authorization[1]).split(":")[0..1] 
     45    assert_equal ["", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1] 
    4746  end 
    4847   

  • trunk/activeresource/test/connection_test.rb

    r8390 r8433  
    11require "#{File.dirname(__FILE__)}/abstract_unit" 
    2 require 'base64' 
    32 
    43class ConnectionTest < Test::Unit::TestCase 

  • trunk/activesupport/CHANGELOG

    r8413 r8433  
    11*SVN* 
    22 
    3 * Ruby 1.9 compatibility.  #1689, #10466, #10468 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper] 
     3* Ruby 1.9 compatibility.  #1689, #10466, #10468, #10554 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink] 
    44 
    55* TimeZone#to_s uses UTC rather than GMT.  #1689 [Cheah Chu Yeow] 

  • trunk/activesupport/lib/active_support.rb

    r8022 r8433  
    4646require 'active_support/multibyte' 
    4747 
     48require 'active_support/base64' 
     49 
    4850require 'active_support/testing' 
    4951 

  • trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb

    r8343 r8433  
    11require 'date' 
    22require 'cgi' 
    3 require 'base64' 
    43require 'builder' 
    54require 'xmlsimple' 
    …… 
    4746          "date"     => Proc.new { |date| date.to_s(:db) }, 
    4847          "datetime" => Proc.new { |time| time.xmlschema }, 
    49           "binary"   => Proc.new { |binary| Base64.encode64(binary) }, 
     48          "binary"   => Proc.new { |binary| ActiveSupport::Base64.encode64(binary) }, 
    5049          "yaml"     => Proc.new { |yaml| yaml.to_yaml } 
    5150        } unless defined?(XML_FORMATTING)