class-action 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cac0bed41739811988bfd6fed1bd3adcca10f1db
-  data.tar.gz: ed39124aa5d0a234220a02a9b44d76e052b9c12c
+  metadata.gz: 67491f2d4f05fd11241fe72316be24fa55fc9518
+  data.tar.gz: 98af8db4cebf73ad4574a043fa2ef8cb4bb968e3
 SHA512:
-  metadata.gz: 1653aa273f91adaefc456584189389502597b421900f9c3c5aca8801beb1a1dd5ef43d9534f9e9bbbde683e5e9b65f228aaaaf94805bd440b9e967ab5c7e9fda
-  data.tar.gz: 7abea12a52f5531ac874becf208c0487f4177ca8f85904b7523d169149f56a5bb220fcc4901c4c23fe79f4582c57440b10000717de4dc9db53802a3d5852bbb0
+  metadata.gz: 7f0e565aaecce1dc7cf0c70a0c5bef3fcecca5cddb4f60659bc0c9eb758861453aa04fdf86da08bf2b31dc82a4b370831fdf7f9a808516f8a243126efcd1f2f4
+  data.tar.gz: a7441cf402af025f1130e092199f74f2403aba1e66b2773b52c67c665d72e636ae896c7a3c9c35052c5cf2ea96a70d05cfe6dc3d2cb61ba39db4d9d66b4099fa

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.0 ##
+
+*   Rename default actions class names to be suffixed with 'Action'.
+
 ## 1.1.0 ##
 
 *   Early class action resolution

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    class-action (1.2.1)
+    class-action (1.3.0)
       activesupport
 
 GEM

data/lib/class_action/version.rb

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

data/lib/class_action.rb

@@ -24,7 +24,7 @@ module ClassAction
 
     def class_action(*actions, klass: nil)
       actions.each do |action|
-        action_class = klass || const_get(action.to_s.camelize)
+        action_class = klass || const_get("#{action.to_s.camelize}Action")
         raise ArgumentError, "ClassAction does not support anonymous classes" if action_class.name.nil?
 
         class_eval <<-RUBY, __FILE__, __LINE__+1

data/spec/class_action/rspec/have_class_action_matcher_spec.rb

@@ -4,7 +4,11 @@ require 'class_action/rspec'
 describe ClassAction::RSpec::HaveClassActionMatcher do
 
   class ClassActionTestController < ActionController::Base
-    class Index < ClassAction::Action
+    class IndexAction < ClassAction::Action
+    end
+    class Index2Action < ClassAction::Action
+    end
+    class OtherIndex2Action < ClassAction::Action
     end
   end
 
@@ -52,16 +56,13 @@ describe ClassAction::RSpec::HaveClassActionMatcher do
 
     it "should fail if the controller's index action uses a different class" do
       ClassActionTestController.class_eval do
-        class Index2 < ClassAction::Action
-        end
-
-        class_action :index2, Index2
+        class_action :index2, klass: ClassActionTestController::OtherIndex2Action
       end
 
-      expect { expect(controller).to have_class_action(:index2).using_class(ClassActionTestController::Index) }.to \
+      expect { expect(controller).to have_class_action(:index2).using_class(ClassActionTestController::Index2Action) }.to \
         raise_error(
           RSpec::Expectations::ExpectationNotMetError,
-          "expected action ClassActionTestController#index2 to use class ClassActionTestController::Index, but it used Index2"
+          "expected action ClassActionTestController#index2 to use class ClassActionTestController::Index2Action, but it used ClassActionTestController::OtherIndex2Action"
         )
     end
   end

data/spec/class_action_spec.rb

@@ -14,10 +14,10 @@ describe ClassAction do
         @logger ||= Logger.new(STDOUT)
       end
 
-      class Show < ClassAction::Action
+      class ShowAction < ClassAction::Action
       end
 
-      class OtherShow < ClassAction::Action
+      class OtherShowAction < ClassAction::Action
       end
     end
   end
@@ -43,9 +43,9 @@ describe ClassAction do
 
     context "when executing the action" do
       let(:action) { action = double(:action, :_execute => nil) }
-      before { expect(ClassActionTestController::Show).to receive(:new).with(controller).and_return(action) }
+      before { expect(ClassActionTestController::ShowAction).to receive(:new).with(controller).and_return(action) }
 
-      it "should try to instantiate TestController::Show and execute it" do
+      it "should try to instantiate TestController::ShowAction and execute it" do
         expect(action).to receive(:_execute)
         controller.show
       end
@@ -71,13 +71,13 @@ describe ClassAction do
     context "giving another action class" do
       before do
         ClassActionTestController.class_eval do
-          class_action :show, klass: ClassActionTestController::OtherShow
+          class_action :show, klass: ClassActionTestController::OtherShowAction
         end
       end
 
       it "should try to instantiate the given action class when executed" do
-        action = ClassActionTestController::OtherShow.new(controller)
-        expect(ClassActionTestController::OtherShow).to receive(:new).with(controller).and_return(action)
+        action = ClassActionTestController::OtherShowAction.new(controller)
+        expect(ClassActionTestController::OtherShowAction).to receive(:new).with(controller).and_return(action)
         controller.show
 
         expect(controller.class_action).to be(action)
@@ -89,7 +89,7 @@ describe ClassAction do
   describe "respond mime injection" do
 
     before do
-      ClassActionTestController::Show.class_eval do
+      ClassActionTestController::ShowAction.class_eval do
         respond_to :html
       end
     end
@@ -160,7 +160,7 @@ describe ClassAction do
     end
 
     it "should leave everything alone if the class action has no responders" do
-      allow(ClassActionTestController::Show).to receive(:_responders).and_return({})
+      allow(ClassActionTestController::ShowAction).to receive(:_responders).and_return({})
 
       ClassActionTestController.class_eval do
         respond_to :json
@@ -173,7 +173,7 @@ describe ClassAction do
     end
 
     it "should leave everything alone if the class action has an 'any' responder" do
-      ClassActionTestController::Show.class_eval do
+      ClassActionTestController::ShowAction.class_eval do
         respond_to_any
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: class-action
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Joost Lubach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport