0
@@ -1,3 +1,8 @@
0
+begin
0
+  require 'base64'
0
+rescue LoadError
0
+end
0
+
0
 module ActiveSupport
0
   if defined? ::Base64
0
     Base64 = ::Base64

0
@@ -1,7 +1,4 @@
0
-require 'base64'
0
-
0
+require 'active_support/base64'
0
 require 'active_support/core_ext/base64/encoding'
0
 
0
-module Base64#:nodoc:
0
-  extend ActiveSupport::CoreExtensions::Base64::Encoding
0
-end
0
+ActiveSupport::Base64.extend ActiveSupport::CoreExtensions::Base64::Encoding

0
@@ -5,9 +5,9 @@ module ActiveSupport #:nodoc:
0
         # Encodes the value as base64 without the newline breaks. This makes the base64 encoding readily usable as URL parameters 
0
         # or memcache keys without further processing.
0
         def encode64s(value)
0
-          ::Base64.encode64(value).gsub(/\n/, '')
0
+          encode64(value).gsub(/\n/, '')
0
         end
0
       end
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -77,9 +77,9 @@ module ActiveSupport #:nodoc:
0
             "boolean"      => Proc.new  { |boolean| %w(1 true).include?(boolean.strip) },
0
             "string"       => Proc.new  { |string|  string.to_s },
0
             "yaml"         => Proc.new  { |yaml|    YAML::load(yaml) rescue yaml },
0
-            "base64Binary" => Proc.new  { |bin|     Base64.decode64(bin) },
0
+            "base64Binary" => Proc.new  { |bin|     ActiveSupport::Base64.decode64(bin) },
0
             "file"         => Proc.new do |file, entity|
0
-              f = StringIO.new(Base64.decode64(file))
0
+              f = StringIO.new(ActiveSupport::Base64.decode64(file))
0
               f.extend(FileLike)
0
               f.original_filename = entity['name']
0
               f.content_type = entity['content_type']

0
@@ -2,7 +2,7 @@ require 'abstract_unit'
0
 
0
 class Base64Test < Test::Unit::TestCase
0
   def test_no_newline_in_encoded_value
0
-    assert_match /\n/,    Base64.encode64("oneverylongstringthatwouldnormallybesplitupbynewlinesbytheregularbase64")
0
-    assert_no_match /\n/, Base64.encode64s("oneverylongstringthatwouldnormallybesplitupbynewlinesbytheregularbase64")
0
+    assert_match(/\n/,    ActiveSupport::Base64.encode64("oneverylongstringthatwouldnormallybesplitupbynewlinesbytheregularbase64"))
0
+    assert_no_match(/\n/, ActiveSupport::Base64.encode64s("oneverylongstringthatwouldnormallybesplitupbynewlinesbytheregularbase64"))
0
   end
0
 end