activesupport 3.0.20 → 3.1.0.beta1

data/lib/active_support/test_case.rb

@@ -5,16 +5,9 @@ require 'active_support/testing/deprecation'
 require 'active_support/testing/declarative'
 require 'active_support/testing/pending'
 require 'active_support/testing/isolation'
+require 'active_support/testing/mochaing'
 require 'active_support/core_ext/kernel/reporting'
 
-begin
-  silence_warnings { require 'mocha/setup' }
-rescue LoadError
-  # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
-  Object.const_set :Mocha, Module.new
-  Mocha.const_set :ExpectationError, Class.new(StandardError)
-end
-
 module ActiveSupport
   class TestCase < ::Test::Unit::TestCase
     if defined? MiniTest
@@ -24,8 +17,7 @@ module ActiveSupport
     else
       Assertion = Test::Unit::AssertionFailedError
 
-      require 'active_support/testing/default'
-      include ActiveSupport::Testing::Default
+      undef :default_test
     end
 
     $tags = {}

data/lib/active_support/testing/assertions.rb

@@ -29,22 +29,33 @@ module ActiveSupport
       #     post :create, :article => {...}
       #   end
       #
+      # A lambda or a list of lambdas can be passed in and evaluated:
+      #
+      #   assert_difference lambda { Article.count }, 2 do
+      #     post :create, :article => {...}
+      #   end
+      #
+      #   assert_difference [->{ Article.count }, ->{ Post.count }], 2 do
+      #     post :create, :article => {...}
+      #   end
+      #
       # A error message can be specified.
       #
       #   assert_difference 'Article.count', -1, "An Article should be destroyed" do
       #     post :delete, :id => ...
       #   end
       def assert_difference(expression, difference = 1, message = nil, &block)
-        b = block.send(:binding)
-        exps = Array.wrap(expression)
-        before = exps.map { |e| eval(e, b) }
+        exps = Array.wrap(expression).map { |e|
+          e.respond_to?(:call) ? e : lambda { eval(e, block.binding) }
+        }
+        before = exps.map { |e| e.call }
 
         yield
 
         exps.each_with_index do |e, i|
-          error = "#{e.inspect} didn't change by #{difference}"
-          error = "#{message}.\n#{error}" if message
-          assert_equal(before[i] + difference, eval(e, b), error)
+          error  = "#{e.inspect} didn't change by #{difference}"
+          error  = "#{message}.\n#{error}" if message
+          assert_equal(before[i] + difference, e.call, error)
         end
       end
 

data/lib/active_support/testing/mochaing.rb

@@ -0,0 +1,7 @@
+begin
+  silence_warnings { require 'mocha' }
+rescue LoadError
+  # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
+  Object.const_set :Mocha, Module.new
+  Mocha.const_set :ExpectationError, Class.new(StandardError)
+end

data/lib/active_support/testing/pending.rb

@@ -1,5 +1,5 @@
 # Some code from jeremymcanally's "pending"
-# http://github.com/jeremymcanally/pending/tree/master
+# https://github.com/jeremymcanally/pending/tree/master
 
 module ActiveSupport
   module Testing
@@ -11,32 +11,36 @@ module ActiveSupport
         @@at_exit = false
 
         def pending(description = "", &block)
-          if description.is_a?(Symbol)
-            is_pending = $tags[description]
-            return block.call unless is_pending
-          end
+          if defined?(::MiniTest)
+            skip(description.blank? ? nil : description)
+          else
+            if description.is_a?(Symbol)
+              is_pending = $tags[description]
+              return block.call unless is_pending
+            end
 
-          if block_given?
-            failed = false
+            if block_given?
+              failed = false
 
-            begin
-              block.call
-            rescue Exception
-              failed = true
-            end
+              begin
+                block.call
+              rescue Exception
+                failed = true
+              end
 
-            flunk("<#{description}> did not fail.") unless failed
-          end
+              flunk("<#{description}> did not fail.") unless failed
+            end
 
-          caller[0] =~ (/(.*):(.*):in `(.*)'/)
-          @@pending_cases << "#{$3} at #{$1}, line #{$2}"
-          print "P"
+            caller[0] =~ (/(.*):(.*):in `(.*)'/)
+            @@pending_cases << "#{$3} at #{$1}, line #{$2}"
+            print "P"
 
-          @@at_exit ||= begin
-            at_exit do
-              puts "\nPending Cases:"
-              @@pending_cases.each do |test_case|
-                puts test_case
+            @@at_exit ||= begin
+              at_exit do
+                puts "\nPending Cases:"
+                @@pending_cases.each do |test_case|
+                  puts test_case
+                end
               end
             end
           end
@@ -45,4 +49,4 @@ module ActiveSupport
 
     end
   end
-end
+end

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/version.rb

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

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.rb

@@ -126,9 +126,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

data/lib/active_support/xml_mini/jdom.rb

@@ -5,12 +5,12 @@ include Java
 
 require 'active_support/core_ext/object/blank'
 
-java_import javax.xml.parsers.DocumentBuilder unless defined? DocumentBuilder
-java_import javax.xml.parsers.DocumentBuilderFactory unless defined? DocumentBuilderFactory
-java_import java.io.StringReader unless defined? StringReader
-java_import org.xml.sax.InputSource unless defined? InputSource
-java_import org.xml.sax.Attributes unless defined? Attributes
-java_import org.w3c.dom.Node unless defined? Node
+import javax.xml.parsers.DocumentBuilder unless defined? DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory unless defined? DocumentBuilderFactory
+import java.io.StringReader unless defined? StringReader
+import org.xml.sax.InputSource unless defined? InputSource
+import org.xml.sax.Attributes unless defined? Attributes
+import org.w3c.dom.Node unless defined? Node
 
 # = XmlMini JRuby JDOM implementation
 module ActiveSupport
@@ -41,7 +41,7 @@ module ActiveSupport
         xml_string_reader = StringReader.new(data)
         xml_input_source = InputSource.new(xml_string_reader)
         doc = @dbf.new_document_builder.parse(xml_input_source)
-        merge_element!({CONTENT_KEY => ''}, doc.document_element)
+        merge_element!({}, doc.document_element)
       end
     end
 
@@ -54,14 +54,9 @@ module ActiveSupport
     # element::
     #   XML element to merge into hash
     def merge_element!(hash, element)
-      delete_empty(hash)
       merge!(hash, element.tag_name, collapse(element))
     end
 
-    def delete_empty(hash)
-      hash.delete(CONTENT_KEY) if hash[CONTENT_KEY] == ''
-    end
-
     # Actually converts an XML document element into a data structure.
     #
     # element::
@@ -89,7 +84,6 @@ module ActiveSupport
     # element::
     #   XML element whose texts are to me merged into the hash
     def merge_texts!(hash, element)
-      delete_empty(hash)
       text_children = texts(element)
       if text_children.join.empty?
         hash
@@ -134,9 +128,8 @@ module ActiveSupport
       attribute_hash = {}
       attributes = element.attributes
       for i in 0...attributes.length
-        attribute_hash[CONTENT_KEY] ||= ''
-        attribute_hash[attributes.item(i).name] =  attributes.item(i).value
-      end
+         attribute_hash[attributes.item(i).name] =  attributes.item(i).value
+       end
       attribute_hash
     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

metadata

@@ -1,23 +1,38 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: activesupport
-version: !ruby/object:Gem::Version
-  version: 3.0.20
+version: !ruby/object:Gem::Version 
+  prerelease: 6
+  version: 3.1.0.beta1
 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-05-04 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        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 +63,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 +86,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 +128,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 +141,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 +154,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 +180,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 +190,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,9 +220,9 @@ 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.rb
 - lib/active_support/testing/setup_and_teardown.rb
@@ -228,28 +241,33 @@ files:
 - lib/active_support/xml_mini/rexml.rb
 - lib/active_support/xml_mini.rb
 - lib/active_support.rb
+has_rdoc: true
 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 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: activesupport
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 1.6.2
 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: []
+