activesupport 3.1.1.rc2 → 3.1.1.rc3

data/CHANGELOG

@@ -1,5 +1,13 @@
 *Rails 3.1.1 (unreleased)*
 
+* ruby193: String#prepend is also unsafe [Akira Matsuda]
+
+* Fix obviously breakage of Time.=== for Time subclasses [jeremyevans]
+
+* Added fix so that file store does not raise an exception when cache dir does
+not exist yet. This can happen if a delete_matched is called before anything
+is saved in the cache. [Philippe Huibonhoa]
+
 * Fixed performance issue where TimeZone lookups would require tzinfo each time [Tim Lucas]
 
 * ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! [Prem Sichanugrist]

data/lib/active_support/cache/file_store.rb

@@ -173,6 +173,7 @@ module ActiveSupport
         end
 
         def search_dir(dir, &callback)
+          return if !File.exist?(dir)
           Dir.foreach(dir) do |d|
             next if d == "." || d == ".."
             name = File.join(dir, d)

data/lib/active_support/core_ext/object/try.rb

@@ -28,8 +28,6 @@ class Object
   def try(*a, &b)
     if a.empty? && block_given?
       yield self
-    elsif !a.empty? && !respond_to?(a.first)
-      nil
     else
       __send__(*a, &b)
     end

data/lib/active_support/core_ext/string/output_safety.rb

@@ -75,7 +75,7 @@ end
 
 module ActiveSupport #:nodoc:
   class SafeBuffer < String
-    UNSAFE_STRING_METHODS = ["capitalize", "chomp", "chop", "delete", "downcase", "gsub", "lstrip", "next", "reverse", "rstrip", "slice", "squeeze", "strip", "sub", "succ", "swapcase", "tr", "tr_s", "upcase"].freeze
+    UNSAFE_STRING_METHODS = ["capitalize", "chomp", "chop", "delete", "downcase", "gsub", "lstrip", "next", "reverse", "rstrip", "slice", "squeeze", "strip", "sub", "succ", "swapcase", "tr", "tr_s", "upcase", "prepend"].freeze
 
     alias_method :original_concat, :concat
     private :original_concat
@@ -136,16 +136,18 @@ module ActiveSupport #:nodoc:
     end
 
     for unsafe_method in UNSAFE_STRING_METHODS
-      class_eval <<-EOT, __FILE__, __LINE__ + 1
-        def #{unsafe_method}(*args)
-          super.to_str
-        end
-
-        def #{unsafe_method}!(*args)
-          @dirty = true
-          super
-        end
-      EOT
+      if 'String'.respond_to?(unsafe_method)
+        class_eval <<-EOT, __FILE__, __LINE__ + 1
+          def #{unsafe_method}(*args)
+            super.to_str
+          end
+
+          def #{unsafe_method}!(*args)
+            @dirty = true
+            super
+          end
+        EOT
+      end
     end
 
     protected

data/lib/active_support/core_ext/time/calculations.rb

@@ -9,7 +9,7 @@ class Time
   class << self
     # Overriding case equality method so that it returns true for ActiveSupport::TimeWithZone instances
     def ===(other)
-      other.is_a?(::Time)
+      super || (self == Time && other.is_a?(ActiveSupport::TimeWithZone))
     end
 
     # Return the number of days in the given month.

data/lib/active_support/version.rb

@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 1
     TINY  = 1
-    PRE   = "rc2"
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  hash: 977940595
+  hash: 977940592
   prerelease: true
   segments: 
   - 3
   - 1
   - 1
-  - rc2
-  version: 3.1.1.rc2
+  - rc3
+  version: 3.1.1.rc3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 -03:00
+date: 2011-10-05 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency