class-action 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7c4f6566ad04e2d10d0cfcc3e107302afb367d
-  data.tar.gz: 1fc331ef010a59d7723ca3faa206dd72b4322b17
+  metadata.gz: efcb015c47c36ad6a97afb3d09c8a24f92e2d78b
+  data.tar.gz: 7563322db21411006066a429815da428275e15bc
 SHA512:
-  metadata.gz: 2ae15f473e25cdf638d5aaa51daf9239f61d4ee157544ce55d5184019405795584a8538eb693d0377730117dca662de16fcfdd96e3cbb96e3b3ebcc7c434f83b
-  data.tar.gz: 16c0a85b1a3798f913171cecc68830cb5f046d6689a33ddeb316458b85d9168ea019d174fcc2049c6a6358ff3684b722f2c398824d6b4391d59cd9014e6af00b
+  metadata.gz: f47f51e9bf362cea79e40eb5b06dec063b9c250fc82cb06b11d89141d921e35d0ad8ab3556331749b78a8dc9aa5e4f46c37afaf99c7518c0d6cf9aa3f1da71d0
+  data.tar.gz: 911bc61ae935e384088ad33b8f47e6fac421e634f8e8b5ff68b7562ac964318701f17e4ab4e866bfb0dad5b229fc37e120458b139940fa814ccf3a6ea2898c53

data/.travis.yml

@@ -1,6 +1,8 @@
 script: bundle exec rake
 rvm:
   - 2.0.0
+gemfile:
+  - gemfiles/4.0.x.gemfile
 branches:
   only:
     - master

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in class-action.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,62 +1,60 @@
 PATH
   remote: .
   specs:
-    class-action (1.1.0)
-      activesupport (~> 3.2)
+    class-action (1.2.0)
+      activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activesupport (3.2.14)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    builder (3.0.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.15)
+    builder (3.1.4)
     diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
-    hike (1.2.3)
     i18n (0.6.9)
-    journey (1.0.4)
-    multi_json (1.8.2)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
+    minitest (4.7.5)
+    multi_json (1.9.0)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.0)
+    rake (10.1.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.4.1)
+    rspec-mocks (2.14.6)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.2)
+  actionpack
   bundler (~> 1.3)
   class-action!
   rake
   rspec (~> 2.14)
+  simplecov

data/README.md

@@ -9,6 +9,8 @@ Additional benefits include:
 * Action-specific helper methods
 * Support for responders (future support)
 
+[<img src="https://secure.travis-ci.org/yoazt/class-action.png?branch=master" alt="Build Status" />](http://travis-ci.org/yoazt/class-action)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1 +1,7 @@
-require "bundler/gem_tasks"
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/class-action.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport', '~> 3.2'
+  spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.14"
-  spec.add_development_dependency "simplecov", "~> 2.14"
-  spec.add_development_dependency "actionpack", "~> 3.2"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "actionpack"
 end

data/gemfiles/4.0.x.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 4.0"
+
+# Specify your gem's dependencies in class-action.gemspec
+gemspec path: '../'

data/lib/class_action.rb

@@ -102,7 +102,7 @@ module ClassAction
 end
 
 if defined?(AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES)
-  AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES << '@_class_action'
+  AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES << :@_class_action
 end
 
 require 'class_action/version'

data/lib/class_action/action.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/hash/reverse_merge'
 
 module ClassAction
 
@@ -167,7 +168,7 @@ module ClassAction
 
         def _responses
           @_responses ||= {}.tap do |responses|
-            responses.reverse_merge! superclass._responses if superclass.respond_to?(:_responses)
+            responses.reverse_update superclass._responses if superclass.respond_to?(:_responses)
           end
 
           # Keep the hash in such an order that the 'nil' condition is always *last*.
@@ -177,7 +178,7 @@ module ClassAction
 
         def _responders
           @_responders ||= {}.tap do |responders|
-            responders.reverse_merge! superclass._responders if superclass.respond_to?(:_responders)
+            responders.reverse_update superclass._responders if superclass.respond_to?(:_responders)
           end
 
           # Keep the hash in such an order that the 'nil' conditions are always *last*.

data/lib/class_action/version.rb

@@ -1,3 +1,3 @@
 module ClassAction
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: class-action
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Joost Lubach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,30 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 description: Allows you to write controller actions as classes, rather than methods.
 email:
 - joost@yoazt.com
@@ -110,6 +110,7 @@ files:
 - README.md
 - Rakefile
 - class-action.gemspec
+- gemfiles/4.0.x.gemfile
 - lib/class-action.rb
 - lib/class-action/rspec.rb
 - lib/class_action.rb
@@ -157,4 +158,3 @@ test_files:
 - spec/class_action/rspec/respond_with_matcher_spec.rb
 - spec/class_action_spec.rb
 - spec/spec_helper.rb
-has_rdoc: