Ticket #1689: core_ext_1.9_compat.diff

test/core_ext/string_ext_test.rb

@@ -143 +143 @@
-    assert_equal %w(hello), hash.keys
-  end
-
-
+_alias
-    s = "hello"
-    assert s.starts_with?('h')
-    assert s.starts_with?('hel')
-    assert !s.starts_with?('el')
-
+    assert s.start_with?('h')
+    assert s.start_with?('hel')
+    assert !s.start_with?('el')
+
-    assert s.ends_with?('o')
-    assert s.ends_with?('lo')
-    assert !s.ends_with?('el')
+
+    assert s.end_with?('o')
+    assert s.end_with?('lo')
+    assert !s.end_with?('el')
-  end
-
-  # FIXME: Ruby 1.9

lib/active_support/core_ext/range/conversions.rb

@@ -1 +1 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Range #:nodoc:
-dat
+rang
-      module Conversions
-DAT
+RANG
-          :db => Proc.new { |start, stop| "BETWEEN '#{start.to_s(:db)}' AND '#{stop.to_s(:db)}'" }
-        }
-
@@ -15 +15 @@
-        end
-
-        def to_formatted_s(format = :default)
-DATE_FORMATS[format] ? DAT
+RANGE_FORMATS[format] ? RANG
-        end
-      end
-    end

lib/active_support/core_ext/string.rb

@@ -10 +10 @@
-  include ActiveSupport::CoreExtensions::String::Access
-  include ActiveSupport::CoreExtensions::String::Conversions
-  include ActiveSupport::CoreExtensions::String::Inflections
-
+
+
+
+
+
+
-  if defined? ActiveSupport::CoreExtensions::String::Iterators
-    include ActiveSupport::CoreExtensions::String::Iterators
-  end

lib/active_support/core_ext/integer/even_odd.rb

@@ -10 +10 @@
-        def multiple_of?(number)
-          self % number == 0
-        end
-
+
-        def even?
-          multiple_of? 2
-
-
+ if RUBY_VERSION < '1.9'
+
-        def odd?
-          !even?
-
+ if RUBY_VERSION < '1.9'
-      end
-    end
-  end

lib/active_support/core_ext/string/starts_ends_with.rb

@@ -3 +3 @@
-    module String #:nodoc:
-      # Additional string tests.
-      module StartsEndsWith
+        def self.included(base)
+          base.class_eval do
+            alias_method :start_with?, :starts_with?
+            alias_method :end_with?, :ends_with?
+          end
+        end
+
-        # Does the string start with the specified +prefix+?
-        def starts_with?(prefix)
-          prefix = prefix.to_s