activesupport 3.1.10 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: dfe441c4607cf0124b6907a018677eabf8f7da0e
-  data.tar.gz: fa5d6c4679fa80e414d424061d71e6ba5a4e23a3
-!binary "U0hBNTEy":
-  metadata.gz: c23a883d0813511ede2b93c40dd887ae49366f3f9654ff6a98b33a914a23e62b2f84e485437afdf79c475ee3c5f125d777c83f4f4b83b00232e930fb6d981ce5
-  data.tar.gz: 24e6ce2cd809ac20552a548d88ec3d4f921128cb457415474824e6cdebeb666818fe55114a98cd486e24e00bfebac895b46096bafa55d8270b2d58c03b8b72f9
+SHA1:
+  metadata.gz: 4dac25906a10b75cc62cf82236d25296a7bc7a79
+  data.tar.gz: 56baa5ef571d3ed1dc4934f52387ff2cde014773
+SHA512:
+  metadata.gz: b216c1240faf48fbd806ac2325bb8106b186a767b755af0c7131eba0405c83edd235bdcd182d8377a1604c36d05629b6b29a0bf05efd92880879f58a3d3ad088
+  data.tar.gz: 907b90ccaaca327444620b0e07b6b8beae4e33852ac40095795a31cf83d3811ca2a4769e868cd0489fbd2902b6992052958e2cbf789d805f5db0bedb664fc264

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Rails 3.1.11 (unreleased) ##
+
+*   Allow `multi_json` version `>= 1.3`, relaxing back to semantic versioning 2.0.0 (revert of #5861)
+    Backport of #5896
+
+    *Alex Riedler*
+
 ## Rails 3.1.10 (Jan 8, 2012) ##
 
 *   Hash.from_xml raises when it encounters type="symbol" or type="yaml".
@@ -7,17 +14,19 @@
 
     *Jeremy Kemper*
 
-## Rails 3.1.9
+## Rails 3.1.9 (Jan 2, 2013) ##
+
+*   No changes.
 
-## Rails 3.1.8 (Aug 9, 2012)
+## Rails 3.1.8 (Aug 9, 2012) ##
 
 *   ERB::Util.html_escape now escapes single quotes. *Santiago Pastorino*
 
-## Rails 3.1.7 (Jul 26, 2012)
+## Rails 3.1.7 (Jul 26, 2012) ##
 
 *   No changes.
 
-## Rails 3.1.6 (Jun 12, 2012)
+## Rails 3.1.6 (Jun 12, 2012) ##
 
 *   No changes.
 

data/lib/active_support/json/decoding.rb

@@ -9,7 +9,13 @@ module ActiveSupport
   module JSON
     class << self
       def decode(json, options ={})
-        data = MultiJson.decode(json, options)
+        # Can't reliably detect whether MultiJson responds to load, since it's
+        # a reserved word. Use adapter as a proxy for new features.
+        data = if MultiJson.respond_to?(:adapter)
+          MultiJson.load(json, options)
+        else
+          MultiJson.decode(json, options)
+        end
         if ActiveSupport.parse_json_times
           convert_dates_from(data)
         else
@@ -18,12 +24,20 @@ module ActiveSupport
       end
 
       def engine
-        MultiJson.engine
+        if MultiJson.respond_to?(:adapter)
+          MultiJson.adapter
+        else
+          MultiJson.engine
+        end
       end
       alias :backend :engine
 
       def engine=(name)
-        MultiJson.engine = name
+        if MultiJson.respond_to?(:use)
+          MultiJson.use name
+        else
+          MultiJson.engine = name
+        end
       end
       alias :backend= :engine=
 

data/lib/active_support/testing/mochaing.rb

@@ -1,7 +1,7 @@
 begin
-  silence_warnings { require 'mocha' }
+  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
+end

data/lib/active_support/testing/setup_and_teardown.rb

@@ -61,7 +61,7 @@ module ActiveSupport
         def run(result)
           return if @method_name.to_s == "default_test"
 
-          mocha_counter = retrieve_mocha_counter(result)
+          mocha_counter = retrieve_mocha_counter(self, result)
           yield(Test::Unit::TestCase::STARTED, name)
           @_result = result
 
@@ -83,6 +83,8 @@ module ActiveSupport
               begin
                 teardown
                 run_callbacks :teardown
+              rescue Mocha::ExpectationError => e
+                add_failure(e.message, e.backtrace)
               rescue Test::Unit::AssertionFailedError => e
                 add_failure(e.message, e.backtrace)
               rescue Exception => e
@@ -100,17 +102,18 @@ module ActiveSupport
 
         protected
 
-        def retrieve_mocha_counter(result) #:nodoc:
+        def retrieve_mocha_counter(test_case, result) #:nodoc:
           if respond_to?(:mocha_verify) # using mocha
             if defined?(Mocha::TestCaseAdapter::AssertionCounter)
               Mocha::TestCaseAdapter::AssertionCounter.new(result)
-            else
+            elsif defined?(Mocha::Integration::TestUnit::AssertionCounter)
               Mocha::Integration::TestUnit::AssertionCounter.new(result)
+            else
+              Mocha::Integration::AssertionCounter.new(test_case)
             end
           end
         end
       end
-
     end
   end
 end

data/lib/active_support/version.rb

@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 10
+    TINY  = 11
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 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.
@@ -273,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.preview3
+rubygems_version: 2.0.0.rc.2
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the