class-action 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67491f2d4f05fd11241fe72316be24fa55fc9518
-  data.tar.gz: 98af8db4cebf73ad4574a043fa2ef8cb4bb968e3
+  metadata.gz: d42f5e13fe369f5658137e5442ad8074827a6093
+  data.tar.gz: 1ffcc823623757e1cc509831f7bb834c436112ac
 SHA512:
-  metadata.gz: 7f0e565aaecce1dc7cf0c70a0c5bef3fcecca5cddb4f60659bc0c9eb758861453aa04fdf86da08bf2b31dc82a4b370831fdf7f9a808516f8a243126efcd1f2f4
-  data.tar.gz: a7441cf402af025f1130e092199f74f2403aba1e66b2773b52c67c665d72e636ae896c7a3c9c35052c5cf2ea96a70d05cfe6dc3d2cb61ba39db4d9d66b4099fa
+  metadata.gz: ab77feaaaf6fad427084fdcb666d25b409fd4aa6e54b46a4552f6d0999a5eac3255e1d08fee98a6f9172134c37ec080c754be7e481e4324554eb3d454ad61251
+  data.tar.gz: 12656d677d4f7c26dfc045d167826a20474b5bc2abb9171092aa4fbf48b100c82394020e6248c6bb1514c4a144d7cf2f21d5d23f0bfd006c8550fd42c2493d52

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.1 ##
+
+*   Upgrade to Rails 4.1 and RSpec 3.1
+
 ## 1.3.0 ##
 
 *   Rename default actions class names to be suffixed with 'Action'.

data/Gemfile.lock

@@ -7,54 +7,61 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.6)
+      actionview (= 4.1.6)
+      activesupport (= 4.1.6)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.15)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     erubis (2.7.0)
-    i18n (0.6.9)
-    minitest (4.7.5)
-    multi_json (1.9.0)
+    i18n (0.6.11)
+    json (1.8.1)
+    minitest (5.4.2)
+    multi_json (1.10.1)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 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.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    simplecov (0.8.2)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.6)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
-    tzinfo (0.3.39)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack
+  actionpack (~> 4.1)
   bundler (~> 1.3)
   class-action!
   rake
-  rspec (~> 2.14)
+  rspec (~> 3.1)
   simplecov

data/class-action.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "actionpack"
+  spec.add_development_dependency "actionpack", "~> 4.1"
 end

data/lib/class_action/action.rb

@@ -20,11 +20,11 @@ module ClassAction
       def controller
         @_controller
       end
+      protected :controller
 
       def available?
         true
       end
-      protected :controller, :available?
 
     ######
     # Controller method exposure
@@ -67,7 +67,7 @@ module ClassAction
 
         def _action_methods
           methods  = public_instance_methods
-          methods -= [ :_execute ]
+          methods -= [ :_execute, :available? ]
           methods -= Object.public_instance_methods
           methods
         end

data/lib/class_action/rspec/have_class_action_matcher.rb

@@ -34,7 +34,7 @@ module ClassAction
         end
       end
 
-      def failure_message_for_should
+      def failure_message
         case @reason
         when :unsupported
           "expected controller of class #{@controller.class} to have class action :#{@action_name}, but it does not support class actions"
@@ -47,7 +47,7 @@ module ClassAction
         end
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         if @klass
           "expected #{@controller.class}##{@action_name} not to be a class action using class #{@klass}"
         else

data/lib/class_action/rspec/respond_to_format_matcher.rb

@@ -41,7 +41,7 @@ module ClassAction
         end
       end
 
-      def failure_message_for_should
+      def failure_message
         if @condition
           "expected action of class #{@action.class} to respond to format :#{@format} on :#{@condition}"
         else
@@ -49,7 +49,7 @@ module ClassAction
         end
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         if @condition
           "expected action of class #{@action.class} not to respond to format :#{@format} on :#{@condition}"
         else

data/lib/class_action/rspec/respond_with_matcher.rb

@@ -26,7 +26,7 @@ module ClassAction
         end
       end
 
-      def failure_message_for_should
+      def failure_message
         suffix = if @actual
           ", but it responds with :#{@actual}"
         else
@@ -40,7 +40,7 @@ module ClassAction
         end
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         if @condition
           "expected action of class #{@action.class} not to respond with :#{@expected} on :#{@condition}"
         else

data/lib/class_action/version.rb

@@ -1,3 +1,3 @@
 module ClassAction
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/class_action.rb

@@ -109,6 +109,10 @@ module ClassAction
     view_context
   end
 
+  def _protected_ivars # :nodoc:
+    super + %i(@_class_action)
+  end
+
   private
 
   def _class_action
@@ -117,9 +121,5 @@ module ClassAction
 
 end
 
-if defined?(AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES)
-  AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES << :@_class_action
-end
-
 require 'class_action/version'
 require 'class_action/action'

data/spec/class_action/action_spec.rb

@@ -69,7 +69,7 @@ describe ClassAction::Action do
 
     it "should make the action respond to :load_post, but protectedly" do
       expect(action).not_to respond_to(:load_post)
-      expect(action.respond_to?(:load_post, true)).to be_true # matcher doesn't work with second argument
+      expect(action.respond_to?(:load_post, true)).to be_truthy # matcher doesn't work with second argument
     end
 
     it "should pass the method :load_post on to the controller" do
@@ -427,9 +427,7 @@ describe ClassAction::Action do
       end
 
       action_subclass = Class.new(action_class)
-      expect(action_subclass).to have(1)._response
-      expect(action_subclass._responses.keys[0]).to be_nil
-      expect(action_subclass._responses.values[0]).to be(:post)
+      expect(action_subclass._responses).to match({nil => :post})
     end
 
   end

data/spec/class_action/rspec/respond_to_format_matcher_spec.rb

@@ -40,7 +40,7 @@ describe ClassAction::RSpec::RespondToFormatMatcher do
       expect(action).to respond_to_format(:json) do
         called = true
       end
-      expect(called).to be_true
+      expect(called).to be_truthy
     end
 
     it "should first execute the response block for a given format" do
@@ -50,7 +50,7 @@ describe ClassAction::RSpec::RespondToFormatMatcher do
       expect(action).to respond_to_format(:html) do
         response_block_called = controller.instance_variable_get('@responded_to_html')
       end
-      expect(response_block_called).to be_true
+      expect(response_block_called).to be_truthy
     end
 
   end

data/spec/class_action_spec.rb

@@ -96,7 +96,7 @@ describe ClassAction do
 
     it "should create mimes with :only => 'show' for nonexisting mimes" do
       ClassActionTestController.class_eval { class_action :show }
-      ClassActionTestController.mimes_for_respond_to.should eql(
+      expect(ClassActionTestController.mimes_for_respond_to).to eql(
         :html => {:only => %w[show]}
       )
     end
@@ -107,7 +107,7 @@ describe ClassAction do
         class_action :show
       end
 
-      ClassActionTestController.mimes_for_respond_to.should eql(
+      expect(ClassActionTestController.mimes_for_respond_to).to eql(
         :html => {:only => %w[index show]}
       )
     end
@@ -118,7 +118,7 @@ describe ClassAction do
         class_action :show
       end
 
-      ClassActionTestController.mimes_for_respond_to.should eql(
+      expect(ClassActionTestController.mimes_for_respond_to).to eql(
         :html => {}
       )
     end
@@ -129,7 +129,7 @@ describe ClassAction do
         class_action :show
       end
 
-      ClassActionTestController.mimes_for_respond_to.should eql(
+      expect(ClassActionTestController.mimes_for_respond_to).to eql(
         :html => { :only => %w[show] }
       )
     end
@@ -142,7 +142,7 @@ describe ClassAction do
         class_action :show
       end
 
-      ClassActionTestController.mimes_for_respond_to.should eql(
+      expect(ClassActionTestController.mimes_for_respond_to).to eql(
         :html => { :except => %w[show] }
       )
     end
@@ -153,7 +153,7 @@ describe ClassAction do
         class_action :show
       end
 
-      ClassActionTestController.mimes_for_respond_to.should eql(
+      expect(ClassActionTestController.mimes_for_respond_to).to eql(
         :html => { :only => %w[show] },
         :json => { :except => %w[show] }
       )
@@ -167,7 +167,7 @@ describe ClassAction do
         class_action :show
       end
 
-      ClassActionTestController.mimes_for_respond_to.should eql(
+      expect(ClassActionTestController.mimes_for_respond_to).to eql(
         :json => {}
       )
     end
@@ -182,7 +182,7 @@ describe ClassAction do
         class_action :show
       end
 
-      ClassActionTestController.mimes_for_respond_to.should eql(
+      expect(ClassActionTestController.mimes_for_respond_to).to eql(
         :json => {}
       )
     end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ end
 
 require 'action_controller'
 require 'class-action'
-require 'rspec/autorun'
 
 RSpec.configure do |config|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: class-action
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Joost Lubach
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 description: Allows you to write controller actions as classes, rather than methods.
 email:
 - joost@yoazt.com