* Introduce ActiveSupport.core_ext Integer, %w(conversions time etc)

* Convert some extension modules to simply reopening the class
* Remove deprecated Float time extensions
* Fold Base64 extension into ActiveSupport::Base64 since stdlib Base64 is gone

1 files changed, 14 insertions, 20 deletions

diff --git a/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb b/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
index 1edb3771a2..1c3ef05526 100644
--- a/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
+++ b/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
@@ -1,23 +1,17 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module CGI #:nodoc:
-      module EscapeSkippingSlashes #:nodoc:
-        if RUBY_VERSION >= '1.9'
-          def escape_skipping_slashes(str)
-            str = str.join('/') if str.respond_to? :join
-            str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do
-              "%#{$1.unpack('H2' * $1.bytesize).join('%').upcase}"
-            end.tr(' ', '+')
-          end
-        else
-          def escape_skipping_slashes(str)
-            str = str.join('/') if str.respond_to? :join
-            str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do
-              "%#{$1.unpack('H2').first.upcase}"
-            end.tr(' ', '+')
-          end
-        end
-      end
+class CGI #:nodoc:
+  if RUBY_VERSION >= '1.9'
+    def self.escape_skipping_slashes(str)
+      str = str.join('/') if str.respond_to? :join
+      str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do
+        "%#{$1.unpack('H2' * $1.bytesize).join('%').upcase}"
+      end.tr(' ', '+')
+    end
+  else
+    def self.escape_skipping_slashes(str)
+      str = str.join('/') if str.respond_to? :join
+      str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do
+        "%#{$1.unpack('H2').first.upcase}"
+      end.tr(' ', '+')
     end
   end
 end