activesupport 3.0.20 → 3.1.0

data/lib/active_support/testing/setup_and_teardown.rb

@@ -31,14 +31,14 @@ module ActiveSupport
         def run(runner)
           result = '.'
           begin
-            _run_setup_callbacks do
+            run_callbacks :setup do
               result = super
             end
           rescue Exception => e
             result = runner.puke(self.class, method_name, e)
           ensure
             begin
-              _run_teardown_callbacks
+              run_callbacks :teardown
             rescue Exception => e
               result = runner.puke(self.class, method_name, e)
             end
@@ -56,13 +56,13 @@ module ActiveSupport
         def run(result)
           return if @method_name.to_s == "default_test"
 
-          mocha_counter = retrieve_mocha_counter(self, result)
+          mocha_counter = retrieve_mocha_counter(result)
           yield(Test::Unit::TestCase::STARTED, name)
           @_result = result
 
           begin
             begin
-              _run_setup_callbacks do
+              run_callbacks :setup do
                 setup
                 __send__(@method_name)
                 mocha_verify(mocha_counter) if mocha_counter
@@ -77,9 +77,7 @@ module ActiveSupport
             ensure
               begin
                 teardown
-                _run_teardown_callbacks
-              rescue Mocha::ExpectationError => e
-                add_failure(e.message, e.backtrace)
+                run_callbacks :teardown
               rescue Test::Unit::AssertionFailedError => e
                 add_failure(e.message, e.backtrace)
               rescue Exception => e
@@ -97,18 +95,17 @@ module ActiveSupport
 
         protected
 
-        def retrieve_mocha_counter(test_case, result) #:nodoc:
+        def retrieve_mocha_counter(result) #:nodoc:
           if respond_to?(:mocha_verify) # using mocha
             if defined?(Mocha::TestCaseAdapter::AssertionCounter)
               Mocha::TestCaseAdapter::AssertionCounter.new(result)
-            elsif defined?(Mocha::Integration::TestUnit::AssertionCounter)
-              Mocha::Integration::TestUnit::AssertionCounter.new(result)
             else
-              Mocha::Integration::AssertionCounter.new(test_case)
+              Mocha::Integration::TestUnit::AssertionCounter.new(result)
             end
           end
         end
       end
+
     end
   end
 end

data/lib/active_support/time_with_zone.rb

@@ -1,5 +1,6 @@
 require "active_support/values/time_zone"
 require 'active_support/core_ext/object/acts_like'
+require 'active_support/core_ext/object/inclusion'
 
 module ActiveSupport
   # A Time-like class that can represent a time in any time zone. Necessary because standard Ruby Time instances are
@@ -32,6 +33,7 @@ module ActiveSupport
   #   t > Time.utc(1999)                    # => true
   #   t.is_a?(Time)                         # => true
   #   t.is_a?(ActiveSupport::TimeWithZone)  # => true
+  #
   class TimeWithZone
     def self.name
       'Time' # Report class name as 'Time' to thwart type checking
@@ -127,6 +129,7 @@ module ActiveSupport
     #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
     #   Time.utc(2005,2,1,15,15,10).in_time_zone.to_json
     #   # => "2005/02/01 15:15:10 +0000"
+    #
     def as_json(options = nil)
       if ActiveSupport::JSON::Encoding.use_standard_json_time_format
         xmlschema
@@ -279,7 +282,7 @@ module ActiveSupport
 
     # A TimeWithZone acts like a Time, so just return +self+.
     def to_time
-      self
+      utc
     end
 
     def to_datetime
@@ -307,7 +310,7 @@ module ActiveSupport
     end
 
     def marshal_load(variables)
-      initialize(variables[0].utc, ::Time.__send__(:get_zone, variables[1]), variables[2].utc)
+      initialize(variables[0].utc, ::Time.find_zone(variables[1]), variables[2].utc)
     end
 
     # Ensure proxy class responds to all methods that underlying time instance responds to.
@@ -342,7 +345,7 @@ module ActiveSupport
       end
 
       def duration_of_variable_length?(obj)
-        ActiveSupport::Duration === obj && obj.parts.any? {|p| [:years, :months, :days].include? p[0] }
+        ActiveSupport::Duration === obj && obj.parts.any? {|p| p[0].in?([:years, :months, :days]) }
       end
   end
 end

data/lib/active_support/values/time_zone.rb

@@ -195,12 +195,8 @@ module ActiveSupport
     # (GMT). Seconds were chosen as the offset unit because that is the unit that
     # Ruby uses to represent time zone offsets (see Time#utc_offset).
     def initialize(name, utc_offset = nil, tzinfo = nil)
-      begin
-        require 'tzinfo'
-      rescue LoadError => e
-        $stderr.puts "You don't have tzinfo installed in your application. Please add it to your Gemfile and run bundle install"
-        raise e
-      end
+      self.class.send(:require_tzinfo)
+
       @name = name
       @utc_offset = utc_offset
       @tzinfo = tzinfo || TimeZone.find_tzinfo(name)
@@ -339,7 +335,12 @@ module ActiveSupport
       end
 
       def zones_map
-        @zones_map ||= Hash[MAPPING.map { |place, _| [place, create(place)] }]
+        @zones_map ||= begin
+          new_zones_names = MAPPING.keys - lazy_zones_map.keys
+          new_zones       = Hash[new_zones_names.map { |place| [place, create(place)] }]
+
+          lazy_zones_map.merge(new_zones)
+        end
       end
 
       # Locate a specific time zone object. If the argument is a string, it
@@ -351,7 +352,7 @@ module ActiveSupport
         case arg
           when String
           begin
-            zones_map[arg] ||= lookup(arg).tap { |tz| tz.utc_offset }
+            lazy_zones_map[arg] ||= lookup(arg).tap { |tz| tz.utc_offset }
           rescue TZInfo::InvalidTimezoneIdentifier
             nil
           end
@@ -369,11 +370,28 @@ module ActiveSupport
         @us_zones ||= all.find_all { |z| z.name =~ /US|Arizona|Indiana|Hawaii|Alaska/ }
       end
 
+      protected
+
+        def require_tzinfo
+          require 'tzinfo'
+        rescue LoadError
+          $stderr.puts "You don't have tzinfo installed in your application. Please add it to your Gemfile and run bundle install"
+          raise
+        end
+
       private
 
         def lookup(name)
           (tzinfo = find_tzinfo(name)) && create(tzinfo.name.freeze)
         end
+
+        def lazy_zones_map
+          require_tzinfo
+
+          @lazy_zones_map ||= Hash.new do |hash, place|
+            hash[place] = create(place) if MAPPING.has_key?(place)
+          end
+        end
     end
   end
 end

data/lib/active_support/version.rb

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

data/lib/active_support/whiny_nil.rb

@@ -41,7 +41,7 @@ class NilClass
   end
 
   private
-    def method_missing(method, *args, &block)
+    def method_missing(method, *args)
       if klass = METHOD_CLASS_MAP[method]
         raise_nil_warning_for klass, method, caller
       else

data/lib/active_support/xml_mini/jdom.rb

@@ -58,7 +58,7 @@ module ActiveSupport
       merge!(hash, element.tag_name, collapse(element))
     end
 
-    def delete_empty(hash)
+    def delete_empty(hash) 
       hash.delete(CONTENT_KEY) if hash[CONTENT_KEY] == ''
     end
 

data/lib/active_support/xml_mini/libxml.rb

@@ -1,5 +1,6 @@
 require 'libxml'
 require 'active_support/core_ext/object/blank'
+require 'stringio'
 
 # = XmlMini LibXML implementation
 module ActiveSupport

data/lib/active_support/xml_mini/libxmlsax.rb

@@ -1,5 +1,6 @@
 require 'libxml'
 require 'active_support/core_ext/object/blank'
+require 'stringio'
 
 # = XmlMini LibXML implementation using a SAX-based parser
 module ActiveSupport
@@ -82,4 +83,4 @@ module ActiveSupport
       end
     end
   end
-end
+end

data/lib/active_support/xml_mini/nokogiri.rb

@@ -5,6 +5,7 @@ rescue LoadError => e
   raise e
 end
 require 'active_support/core_ext/object/blank'
+require 'stringio'
 
 # = XmlMini Nokogiri implementation
 module ActiveSupport

data/lib/active_support/xml_mini/nokogirisax.rb

@@ -5,6 +5,7 @@ rescue LoadError => e
   raise e
 end
 require 'active_support/core_ext/object/blank'
+require 'stringio'
 
 # = XmlMini Nokogiri implementation using a SAX-based parser
 module ActiveSupport

data/lib/active_support/xml_mini/rexml.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/object/blank'
+require 'stringio'
 
 # = XmlMini ReXML implementation
 module ActiveSupport

data/lib/active_support/xml_mini.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/string/inflections'
 
 module ActiveSupport
   # = XmlMini
@@ -126,9 +127,11 @@ module ActiveSupport
     end
 
     def rename_key(key, options = {})
-      camelize  = options.has_key?(:camelize) && options[:camelize]
+      camelize  = options[:camelize]
       dasherize = !options.has_key?(:dasherize) || options[:dasherize]
-      key = key.camelize  if camelize
+      if camelize
+        key = true == camelize ? key.camelize : key.camelize(camelize)
+      end
       key = _dasherize(key) if dasherize
       key
     end
@@ -136,7 +139,9 @@ module ActiveSupport
     protected
 
     def _dasherize(key)
-      key.gsub(/(?!^[_]*)_(?![_]*$)/, '-')
+      # $2 must be a non-greedy regex for this to work
+      left, middle, right = /\A(_*)(.*?)(_*)\Z/.match(key.strip)[1,3]
+      "#{left}#{middle.tr('_ ', '--')}#{right}"
     end
 
 	  # TODO: Add support for other encodings

data/lib/active_support.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005 David Heinemeier Hansson
+# Copyright (c) 2005-2011 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,6 +21,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+require 'securerandom'
+
 module ActiveSupport
   class << self
     attr_accessor :load_all_hooks
@@ -30,7 +32,7 @@ module ActiveSupport
   self.load_all_hooks = []
 
   on_load_all do
-    [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom]
+    [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte]
   end
 end
 

metadata

@@ -1,23 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: activesupport
-version: !ruby/object:Gem::Version
-  version: 3.0.20
+version: !ruby/object:Gem::Version 
+  hash: 3
+  prerelease: 
+  segments: 
+  - 3
+  - 1
+  - 0
+  version: 3.1.0
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
-dependencies: []
-description: A toolkit of support libraries and Ruby core extensions extracted from
-  the Rails framework. Rich support for multibyte strings, internationalization, time
-  zones, and testing.
+
+date: 2011-08-31 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
+description: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.
 email: david@loudthinking.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG
 - README.rdoc
 - lib/active_support/all.rb
@@ -48,8 +71,6 @@ files:
 - lib/active_support/core_ext/benchmark.rb
 - lib/active_support/core_ext/big_decimal/conversions.rb
 - lib/active_support/core_ext/big_decimal.rb
-- lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
-- lib/active_support/core_ext/cgi.rb
 - lib/active_support/core_ext/class/attribute.rb
 - lib/active_support/core_ext/class/attribute_accessors.rb
 - lib/active_support/core_ext/class/delegating_attributes.rb
@@ -73,6 +94,7 @@ files:
 - lib/active_support/core_ext/float/rounding.rb
 - lib/active_support/core_ext/float.rb
 - lib/active_support/core_ext/hash/conversions.rb
+- lib/active_support/core_ext/hash/deep_dup.rb
 - lib/active_support/core_ext/hash/deep_merge.rb
 - lib/active_support/core_ext/hash/diff.rb
 - lib/active_support/core_ext/hash/except.rb
@@ -114,8 +136,8 @@ files:
 - lib/active_support/core_ext/object/blank.rb
 - lib/active_support/core_ext/object/conversions.rb
 - lib/active_support/core_ext/object/duplicable.rb
+- lib/active_support/core_ext/object/inclusion.rb
 - lib/active_support/core_ext/object/instance_variables.rb
-- lib/active_support/core_ext/object/returning.rb
 - lib/active_support/core_ext/object/to_json.rb
 - lib/active_support/core_ext/object/to_param.rb
 - lib/active_support/core_ext/object/to_query.rb
@@ -127,6 +149,7 @@ files:
 - lib/active_support/core_ext/process.rb
 - lib/active_support/core_ext/range/blockless_step.rb
 - lib/active_support/core_ext/range/conversions.rb
+- lib/active_support/core_ext/range/cover.rb
 - lib/active_support/core_ext/range/include_range.rb
 - lib/active_support/core_ext/range/overlaps.rb
 - lib/active_support/core_ext/range.rb
@@ -139,6 +162,7 @@ files:
 - lib/active_support/core_ext/string/exclude.rb
 - lib/active_support/core_ext/string/filters.rb
 - lib/active_support/core_ext/string/inflections.rb
+- lib/active_support/core_ext/string/inquiry.rb
 - lib/active_support/core_ext/string/interpolation.rb
 - lib/active_support/core_ext/string/multibyte.rb
 - lib/active_support/core_ext/string/output_safety.rb
@@ -164,6 +188,7 @@ files:
 - lib/active_support/descendants_tracker.rb
 - lib/active_support/duration.rb
 - lib/active_support/file_update_checker.rb
+- lib/active_support/file_watcher.rb
 - lib/active_support/gzip.rb
 - lib/active_support/hash_with_indifferent_access.rb
 - lib/active_support/i18n.rb
@@ -173,10 +198,6 @@ files:
 - lib/active_support/inflector/methods.rb
 - lib/active_support/inflector/transliterate.rb
 - lib/active_support/inflector.rb
-- lib/active_support/json/backends/jsongem.rb
-- lib/active_support/json/backends/okjson.rb
-- lib/active_support/json/backends/yajl.rb
-- lib/active_support/json/backends/yaml.rb
 - lib/active_support/json/decoding.rb
 - lib/active_support/json/encoding.rb
 - lib/active_support/json/variable.rb
@@ -207,10 +228,15 @@ files:
 - lib/active_support/test_case.rb
 - lib/active_support/testing/assertions.rb
 - lib/active_support/testing/declarative.rb
-- lib/active_support/testing/default.rb
 - lib/active_support/testing/deprecation.rb
 - lib/active_support/testing/isolation.rb
+- lib/active_support/testing/mochaing.rb
 - lib/active_support/testing/pending.rb
+- lib/active_support/testing/performance/jruby.rb
+- lib/active_support/testing/performance/rubinius.rb
+- lib/active_support/testing/performance/ruby/mri.rb
+- lib/active_support/testing/performance/ruby/yarv.rb
+- lib/active_support/testing/performance/ruby.rb
 - lib/active_support/testing/performance.rb
 - lib/active_support/testing/setup_and_teardown.rb
 - lib/active_support/time/autoload.rb
@@ -230,26 +256,38 @@ files:
 - lib/active_support.rb
 homepage: http://www.rubyonrails.org
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: activesupport
-rubygems_version: 2.0.0.preview3.1
+
+rubyforge_project: 
+rubygems_version: 1.8.8
 signing_key: 
-specification_version: 4
-summary: A toolkit of support libraries and Ruby core extensions extracted from the
-  Rails framework.
+specification_version: 3
+summary: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5b10c504f7e89e31840146dc035f18db58ec6781
-  data.tar.gz: 174429c89cdc72aca932d18d7d89c64abc1f5ee8
-SHA512:
-  metadata.gz: 6a1c10cce67fafe77efc20d56aa8039c873d457a63958b6c27a946dbe7414b6e7d745f2f4813a70d5b720454b5fb7ffc40658337a501a18a352813a7604fec38
-  data.tar.gz: a3b25fac82589dfb772fc9efd3ac4b8f4ec906c25e24145c1cf261208761d1b30e38e8763d66583be1ec4e6398e9aabce4e0d609a1fe995515f715488a5b7095

data/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb

@@ -1,19 +0,0 @@
-require 'cgi'
-
-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

data/lib/active_support/core_ext/cgi.rb

@@ -1 +0,0 @@
-require 'active_support/core_ext/cgi/escape_skipping_slashes'

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

@@ -1,43 +0,0 @@
-class Object
-  # Returns +value+ after yielding +value+ to the block. This simplifies the
-  # process of constructing an object, performing work on the object, and then
-  # returning the object from a method. It is a Ruby-ized realization of the K
-  # combinator, courtesy of Mikael Brockman.
-  #
-  # ==== Examples
-  #
-  #  # Without returning
-  #  def foo
-  #    values = []
-  #    values << "bar"
-  #    values << "baz"
-  #    return values
-  #  end
-  #
-  #  foo # => ['bar', 'baz']
-  #
-  #  # returning with a local variable
-  #  def foo
-  #    returning values = [] do
-  #      values << 'bar'
-  #      values << 'baz'
-  #    end
-  #  end
-  #
-  #  foo # => ['bar', 'baz']
-  #
-  #  # returning with a block argument
-  #  def foo
-  #    returning [] do |values|
-  #      values << 'bar'
-  #      values << 'baz'
-  #    end
-  #  end
-  #
-  #  foo # => ['bar', 'baz']
-  def returning(value)
-    ActiveSupport::Deprecation.warn('Object#returning has been deprecated in favor of Object#tap.', caller)
-    yield(value)
-    value
-  end
-end

data/lib/active_support/json/backends/jsongem.rb

@@ -1,47 +0,0 @@
-require 'json' unless defined?(JSON)
-
-module ActiveSupport
-  module JSON
-    module Backends
-      module JSONGem
-        ParseError = ::JSON::ParserError
-        extend self
-
-        # Parses a JSON string or IO and convert it into an object
-        def decode(json)
-          if json.respond_to?(:read)
-            json = json.read
-          end
-          data = ::JSON.parse(json)
-          if ActiveSupport.parse_json_times
-            convert_dates_from(data)
-          else
-            data
-          end
-        end
-
-      private
-        def convert_dates_from(data)
-          case data
-          when nil
-            nil
-          when DATE_REGEX
-            begin
-              DateTime.parse(data)
-            rescue ArgumentError
-              data
-            end
-          when Array
-            data.map! { |d| convert_dates_from(d) }
-          when Hash
-            data.each do |key, value|
-              data[key] = convert_dates_from(value)
-            end
-          else
-            data
-          end
-        end
-      end
-    end
-  end
-end