activesupport 3.0.1 → 3.0.2

data/CHANGELOG

@@ -1,6 +1,12 @@
+*Rails 3.0.2 (November 15, 2010)*
+
+* Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
+
+
 *Rails 3.0.1 (October 15, 2010)*
 
-* No Changes, just a version bump.
+* No changes.
+
 
 *Rails 3.0.0 (August 29, 2010)*
 

data/lib/active_support.rb

@@ -35,6 +35,7 @@ module ActiveSupport
 end
 
 require "active_support/dependencies/autoload"
+require "active_support/version"
 
 module ActiveSupport
   extend ActiveSupport::Autoload

data/lib/active_support/cache.rb

@@ -61,8 +61,8 @@ module ActiveSupport
         store_class =
           begin
             require "active_support/cache/#{store}"
-          rescue LoadError
-            raise "Could not find cache store adapter for #{store} (#{$!})"
+          rescue LoadError => e
+            raise "Could not find cache store adapter for #{store} (#{e})"
           else
             ActiveSupport::Cache.const_get(store_class_name)
           end

data/lib/active_support/cache/file_store.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/file/atomic'
 require 'active_support/core_ext/string/conversions'
+require 'rack/utils'
 
 module ActiveSupport
   module Cache
@@ -11,8 +12,6 @@ module ActiveSupport
       attr_reader :cache_path
 
       DIR_FORMATTER = "%03X"
-      ESCAPE_FILENAME_CHARS = /[^a-z0-9_.-]/i
-      UNESCAPE_FILENAME_CHARS = /%[0-9A-F]{2}/
 
       def initialize(cache_path, options = nil)
         super(options)
@@ -136,7 +135,7 @@ module ActiveSupport
 
         # Translate a key into a file path.
         def key_file_path(key)
-          fname = key.to_s.gsub(ESCAPE_FILENAME_CHARS){|match| "%#{match.ord.to_s(16).upcase}"}
+          fname = Rack::Utils.escape(key)
           hash = Zlib.adler32(fname)
           hash, dir_1 = hash.divmod(0x1000)
           dir_2 = hash.modulo(0x1000)
@@ -156,7 +155,7 @@ module ActiveSupport
         # Translate a file path into a key.
         def file_path_key(path)
           fname = path[cache_path.size, path.size].split(File::SEPARATOR, 4).last
-          fname.gsub(UNESCAPE_FILENAME_CHARS){|match| $1.ord.to_s(16)}
+          Rack::Utils.unescape(fname)
         end
 
         # Delete empty directories in the cache.

data/lib/active_support/cache/mem_cache_store.rb

@@ -1,7 +1,7 @@
 begin
   require 'memcache'
 rescue LoadError => e
-  $stderr.puts "You don't have memcache installed in your application. Please add it to your Gemfile and run bundle install"
+  $stderr.puts "You don't have memcache-client installed in your application. Please add it to your Gemfile and run bundle install"
   raise e
 end
 require 'digest/md5'

data/lib/active_support/callbacks.rb

@@ -487,7 +487,7 @@ module ActiveSupport
             chain.delete_if {|c| c.matches?(type, filter) }
           end
 
-          options[:prepend] ? chain.unshift(*mapped) : chain.push(*mapped)
+          options[:prepend] ? chain.unshift(*(mapped.reverse)) : chain.push(*mapped)
         end
       end
 

data/lib/active_support/core_ext/module/delegation.rb

@@ -113,7 +113,7 @@ class Module
       raise ArgumentError, "Can only automatically set the delegation prefix when delegating to a method."
     end
 
-    prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_"
+    prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_" || ''
 
     file, line = caller.first.split(':', 2)
     line = line.to_i

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

@@ -60,7 +60,7 @@ class Numeric
   alias :fortnight :fortnights
 
   # Reads best without arguments:  10.minutes.ago
-  def ago(time = ::Time.now)
+  def ago(time = ::Time.current)
     time - self
   end
 
@@ -68,7 +68,7 @@ class Numeric
   alias :until :ago
 
   # Reads best with argument:  10.minutes.since(time)
-  def since(time = ::Time.now)
+  def since(time = ::Time.current)
     time + self
   end
 

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

@@ -35,7 +35,8 @@ end
 
 class Hash
   # Converts a hash into a string suitable for use as a URL query string. An optional <tt>namespace</tt> can be
-  # passed to enclose the param names (see example below).
+  # passed to enclose the param names (see example below). The string pairs "key=value" that conform the query
+  # string are sorted lexicographically in ascending order.
   #
   # ==== Examples
   #   { :name => 'David', :nationality => 'Danish' }.to_param # => "name=David&nationality=Danish"
@@ -44,6 +45,6 @@ class Hash
   def to_param(namespace = nil)
     collect do |key, value|
       value.to_query(namespace ? "#{namespace}[#{key}]" : key)
-    end * '&'
+    end.sort * '&'
   end
 end

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/try'
+
 class String
   # Strips indentation in heredocs.
   #
@@ -18,7 +20,7 @@ class String
   # Technically, it looks for the least indented line in the whole string, and removes
   # that amount of leading whitespace.
   def strip_heredoc
-    indent = chomp.scan(/^\s*/).min.size
-    gsub(/^\s{#{indent}}/, '')
+    indent = scan(/^[ \t]*(?=\S)/).min.try(:size) || 0
+    gsub(/^[ \t]{#{indent}}/, '')
   end
-end
+end

data/lib/active_support/dependencies.rb

@@ -511,7 +511,12 @@ module ActiveSupport #:nodoc:
     end
 
     # Remove the constants that have been autoloaded, and those that have been
-    # marked for unloading.
+    # marked for unloading. Before each constant is removed a callback is sent
+    # to its class/module if it implements +before_remove_const+.
+    #
+    # The callback implementation should be restricted to cleaning up caches, etc.
+    # as the enviroment will be in an inconsistent state, e.g. other constants
+    # may have already been unloaded and not accessible.
     def remove_unloadable_constants!
       autoloaded_constants.each { |const| remove_constant const }
       autoloaded_constants.clear
@@ -636,6 +641,7 @@ module ActiveSupport #:nodoc:
       parent = Inflector.constantize(names * '::')
 
       log "removing constant #{const}"
+      constantize(const).before_remove_const if constantize(const).respond_to?(:before_remove_const)
       parent.instance_eval { remove_const to_remove }
 
       return true

data/lib/active_support/duration.rb

@@ -99,7 +99,7 @@ module ActiveSupport
     private
 
       def method_missing(method, *args, &block) #:nodoc:
-        value.send(method, *args)
+        value.send(method, *args, &block)
       end
   end
 end

data/lib/active_support/hash_with_indifferent_access.rb

@@ -45,6 +45,8 @@ module ActiveSupport
       regular_writer(convert_key(key), convert_value(value))
     end
 
+    alias_method :store, :[]=
+
     # Updates the instantized hash with values from the second:
     #
     #   hash_1 = HashWithIndifferentAccess.new

data/lib/active_support/i18n.rb

@@ -1,5 +1,6 @@
 begin
   require 'i18n'
+  require 'active_support/lazy_load_hooks'
 rescue LoadError => e
   $stderr.puts "You don't have i18n installed in your application. Please add it to your Gemfile and run bundle install"
   raise e

data/lib/active_support/inflector/transliterate.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'active_support/core_ext/string/multibyte'
+require 'active_support/i18n'
 
 module ActiveSupport
   module Inflector

data/lib/active_support/json/encoding.rb

@@ -41,9 +41,26 @@ module ActiveSupport
           @seen = []
         end
 
-        def encode(value)
+        def encode(value, use_options = true)
           check_for_circular_references(value) do
-            value.as_json(options).encode_json(self)
+            jsonified = use_options ? value.as_json(options_for(value)) : value.as_json
+            jsonified.encode_json(self)
+          end
+        end
+
+        # like encode, but only calls as_json, without encoding to string
+        def as_json(value)
+          check_for_circular_references(value) do
+            value.as_json(options_for(value))
+          end
+        end
+
+        def options_for(value)
+          if value.is_a?(Array) || value.is_a?(Hash)
+            # hashes and arrays need to get encoder in the options, so that they can detect circular references
+            (options || {}).merge(:encoder => self)
+          else
+            options
           end
         end
 
@@ -186,13 +203,22 @@ module Enumerable
 end
 
 class Array
-  def as_json(options = nil) self end #:nodoc:
-  def encode_json(encoder) "[#{map { |v| encoder.encode(v) } * ','}]" end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    # use encoder as a proxy to call as_json on all elements, to protect from circular references
+    encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
+    map { |v| encoder.as_json(v) }
+  end
+
+  def encode_json(encoder) #:nodoc:
+    # we assume here that the encoder has already run as_json on self and the elements, so we run encode_json directly
+    "[#{map { |v| v.encode_json(encoder) } * ','}]"
+  end
 end
 
 class Hash
   def as_json(options = nil) #:nodoc:
-    if options
+    # create a subset of the hash by applying :only or :except
+    subset = if options
       if attrs = options[:only]
         slice(*Array.wrap(attrs))
       elsif attrs = options[:except]
@@ -203,10 +229,22 @@ class Hash
     else
       self
     end
+
+    # use encoder as a proxy to call as_json on all values in the subset, to protect from circular references
+    encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
+    pairs = subset.map { |k, v| [k.to_s, encoder.as_json(v)] }
+    result = self.is_a?(ActiveSupport::OrderedHash) ? ActiveSupport::OrderedHash.new : Hash.new
+    pairs.inject(result) { |hash, pair| hash[pair.first] = pair.last; hash }
   end
 
   def encode_json(encoder)
-    "{#{map { |k,v| "#{encoder.encode(k.to_s)}:#{encoder.encode(v)}" } * ','}}"
+    # values are encoded with use_options = false, because we don't want hash representations from ActiveModel to be
+    # processed once again with as_json with options, as this could cause unexpected results (i.e. missing fields);
+
+    # on the other hand, we need to run as_json on the elements, because the model representation may contain fields
+    # like Time/Date in their original (not jsonified) form, etc.
+
+    "{#{map { |k,v| "#{encoder.encode(k.to_s)}:#{encoder.encode(v, false)}" } * ','}}"
   end
 end
 

data/lib/active_support/memoizable.rb

@@ -95,6 +95,8 @@ module ActiveSupport
                                                                                    #
           if private_method_defined?(#{original_method.inspect})                   # if private_method_defined?(:_unmemoized_mime_type)
             private #{symbol.inspect}                                              #   private :mime_type
+          elsif protected_method_defined?(#{original_method.inspect})              # elsif protected_method_defined?(:_unmemoized_mime_type)
+            protected #{symbol.inspect}                                            #   protected :mime_type
           end                                                                      # end
         EOS
       end

data/lib/active_support/testing/performance.rb

@@ -58,16 +58,16 @@ begin
           metric.send(mode) { __send__ @method_name }
         rescue ::Test::Unit::AssertionFailedError => e
           add_failure(e.message, e.backtrace)
-        rescue StandardError, ScriptError
-          add_error($!)
+        rescue StandardError, ScriptError => e
+          add_error(e)
         ensure
           begin
             teardown
             run_callbacks :teardown, :enumerator => :reverse_each
           rescue ::Test::Unit::AssertionFailedError => e
             add_failure(e.message, e.backtrace)
-          rescue StandardError, ScriptError
-            add_error($!)
+          rescue StandardError, ScriptError => e
+            add_error(e)
           end
         end
 

data/lib/active_support/time_with_zone.rb

@@ -72,7 +72,7 @@ module ActiveSupport
 
     # Returns a <tt>Time.local()</tt> instance of the simultaneous time in your system's <tt>ENV['TZ']</tt> zone
     def localtime
-      utc.getlocal
+      utc.respond_to?(:getlocal) ? utc.getlocal : utc.to_time.getlocal
     end
     alias_method :getlocal, :localtime
 

data/lib/active_support/version.rb

@@ -2,8 +2,8 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 1
-
+    TINY  = 2
+        
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/lib/active_support/xml_mini.rb

@@ -25,7 +25,7 @@ module ActiveSupport
 
     DEFAULT_ENCODINGS = {
       "binary" => "base64"
-    } unless defined?(TYPE_NAMES)
+    } unless defined?(DEFAULT_ENCODINGS)
 
     TYPE_NAMES = {
       "Symbol"     => "symbol",

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +13:00
+date: 2010-11-15 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -246,25 +247,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: activesupport
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.