Update to ActiveSupport 3.2.13.

.gitignore

@@ -25,3 +25,5 @@ activesupport-2.3.8.gem
 /activesupport-3.2.11.gem
 /activesupport-3.2.12-tests.tgz
 /activesupport-3.2.12.gem
+/activesupport-3.2.13-tests.tgz
+/activesupport-3.2.13.gem

activesupport-4.0.0-Make-the-tests-pass-with-minitest-4.2.patch

@@ -1,27 +0,0 @@
-From ae6d2efd844cc6cf6822fe424d8e09c510153c90 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
- <rafaelmfranca@gmail.com>
-Date: Mon, 5 Nov 2012 15:12:09 -0200
-Subject: [PATCH] Make the tests pass with minitest 4.2
-
----
- activesupport/test/test_case_test.rb | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
-index c02bfa8..64426d0 100644
---- a/activesupport/test/test_case_test.rb
-+++ b/activesupport/test/test_case_test.rb
-@@ -16,6 +16,9 @@ module ActiveSupport
-       def options
-         nil
-       end
-+
-+      def record(*args)
-+      end
-     end
- 
-     if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
--- 
-1.8.0.1
-

activesupport-add-bigdecimal-dependency.patch

@@ -1,19 +1,19 @@
---- a/specifications/activesupport-3.2.12.gemspec.orig	2012-07-18 14:52:50.000000000 +0200
+--- a/specifications/activesupport-3.2.13.gemspec.orig	2012-07-18 14:52:50.000000000 +0200
-+++ b/specifications/activesupport-3.2.12.gemspec	2012-07-18 14:56:49.367668024 +0200
++++ b/specifications/activesupport-3.2.13.gemspec	2012-07-18 14:56:49.367668024 +0200
 @@ -20,13 +20,16 @@
      s.specification_version = 4
  
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
 +      s.add_runtime_dependency(%q<bigdecimal>, [">= 0"])
-       s.add_runtime_dependency(%q<i18n>, ["~> 0.6"])
+       s.add_runtime_dependency(%q<i18n>, ["= 0.6.1"])
        s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
      else
 +      s.add_dependency(%q<bigdecimal>, [">= 0"])
-       s.add_dependency(%q<i18n>, ["~> 0.6"])
+       s.add_dependency(%q<i18n>, ["= 0.6.1"])
        s.add_dependency(%q<multi_json>, ["~> 1.0"])
      end
    else
 +    s.add_dependency(%q<bigdecimal>, [">= 0"])
-     s.add_dependency(%q<i18n>, ["~> 0.6"])
+     s.add_dependency(%q<i18n>, ["= 0.6.1"])
      s.add_dependency(%q<multi_json>, ["~> 1.0"])
    end

rubygem-activesupport-3.2.13-search-private-and-protected-methods-for-convert_key.patch

@@ -1,61 +0,0 @@
-From 7cc26fd15e27c4a13705a844538bebfdd0461729 Mon Sep 17 00:00:00 2001
-From: Aaron Patterson <aaron.patterson@gmail.com>
-Date: Tue, 20 Mar 2012 09:58:42 -0700
-Subject: [PATCH] search private and protected methods for convert_key
-
----
- activesupport/lib/active_support/core_ext/hash/indifferent_access.rb | 1 -
- activesupport/lib/active_support/core_ext/hash/slice.rb              | 4 ++--
- activesupport/lib/active_support/hash_with_indifferent_access.rb     | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
-index 7d54c9f..e5042c6 100644
---- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
-+++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
-@@ -1,7 +1,6 @@
- require 'active_support/hash_with_indifferent_access'
- 
- class Hash
--
-   # Returns an <tt>ActiveSupport::HashWithIndifferentAccess</tt> out of its receiver:
-   #
-   #   {:a => 1}.with_indifferent_access["a"] # => 1
-diff --git a/activesupport/lib/active_support/core_ext/hash/slice.rb b/activesupport/lib/active_support/core_ext/hash/slice.rb
-index 0484d8e..a983cae 100644
---- a/activesupport/lib/active_support/core_ext/hash/slice.rb
-+++ b/activesupport/lib/active_support/core_ext/hash/slice.rb
-@@ -13,7 +13,7 @@ class Hash
-   #   valid_keys = [:mass, :velocity, :time]
-   #   search(options.slice(*valid_keys))
-   def slice(*keys)
--    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
-+    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
-     hash = self.class.new
-     keys.each { |k| hash[k] = self[k] if has_key?(k) }
-     hash
-@@ -23,7 +23,7 @@ class Hash
-   # Returns a hash contained the removed key/value pairs
-   #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d => 4}
-   def slice!(*keys)
--    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
-+    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
-     omit = slice(*self.keys - keys)
-     hash = slice(*keys)
-     replace(hash)
-diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
-index 9e7cb76..9dc93de 100644
---- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
-+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
-@@ -6,7 +6,7 @@ require 'active_support/core_ext/hash/keys'
- 
- module ActiveSupport
-   class HashWithIndifferentAccess < Hash
--    
-+
-     # Always returns true, so that <tt>Array#extract_options!</tt> finds members of this class.
-     def extractable_options?
-       true
--- 
-1.8.1.2
-

rubygem-activesupport.spec

@@ -5,8 +5,8 @@
 Summary: Support and utility classes used by the Rails framework
 Name: rubygem-%{gem_name}
 Epoch: 1
-Version: 3.2.12
+Version: 3.2.13
-Release: 2%{?dist}
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -17,8 +17,8 @@ Source0: http://rubygems.org/downloads/activesupport-%{version}.gem
 # Rails rpms, you may check it out like so
 # git clone http://github.com/rails/rails.git
 # cd rails/activesupport/
-# git checkout v3.2.12
+# git checkout v3.2.13
-# tar czvf activesupport-3.2.12-tests.tgz test/
+# tar czvf activesupport-3.2.13-tests.tgz test/
 Source2: activesupport-%{version}-tests.tgz
 
 # Removes code which breaks the test suite due to a
@@ -29,19 +29,11 @@ Patch1: activesupport-tests-fix.patch
 # is in Fedora http://bugzilla.redhat.com/show_bug.cgi?id=668822
 Patch2: activesupport-remove-memcache-build-dep.patch
 
-# Rails 3.2 does not work with Minitest 4.2 yet.
-# https://github.com/rails/rails/commit/ae6d2efd844cc6cf6822fe424d8e09c510153c90
-Patch3: activesupport-4.0.0-Make-the-tests-pass-with-minitest-4.2.patch
-
 # We need to add the bigdecimal dependency to gemspec, otherwise it won't be
 # loaded. The reason for this is unbundling it from ruby libdir and moving
 # it under %%{gem_dir} (therefore if not in Gemfile, it won't be found).
 Patch4: activesupport-add-bigdecimal-dependency.patch
 
-# Fixes Ruby 2.0.0 issues. Should be in next release it seems.
-# https://github.com/rails/rails/commit/7cc26fd15e27c4a13705a844538bebfdd0461729
-Patch5: rubygem-activesupport-3.2.13-search-private-and-protected-methods-for-convert_key.patch
-
 Requires: ruby(rubygems)
 Requires: ruby(release)
 # Let's keep Requires and BuildRequires sorted alphabeticaly
@@ -80,8 +72,6 @@ tar xzvf %{SOURCE2} -C .%{gem_instdir}
 pushd .%{gem_instdir}
 %patch1 -p0
 %patch2 -p0
-%patch3 -p2
-%patch5 -p2
 popd
 
 pushd .%{gem_dir}
@@ -113,6 +103,9 @@ popd
 
 
 %changelog
+* Tue Mar 19 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.13-1
+- Update to ActiveSupport 3.2.13.
+
 * Fri Mar 01 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.12-2
 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
 

sources

@@ -1,2 +1,2 @@
-fac18872ff5f658e169d05825a0d9c4d  activesupport-3.2.12-tests.tgz
+e7fc72c75ce5be6c90ae8cbf92fabb99  activesupport-3.2.13-tests.tgz
-fa8e783fe5fba9712c290f2a10f78c7e  activesupport-3.2.12.gem
+ccd7f45b436d5703f1d0e99dfa6aa5e9  activesupport-3.2.13.gem