batch_actions 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e68fc1158fbe9d59d7e11c037f3cc580d855e314
-  data.tar.gz: 203625073e57c12ae947b3016283e0eb044339af
+  metadata.gz: 55c9b7fa8c2b242f9b5390326e0452610e3077f4
+  data.tar.gz: a70cdebc35ad2a3d59d43681521fae8a542d7eba
 SHA512:
-  metadata.gz: b397f3158bfc0e7e9f0d5a4072922804c2c197f51eeaa52604b4589a73324497dafc6c5a5f0d4d0aeb476ecd6e3aef6cb8d100f91bbbde4e0274108cd8f207f6
-  data.tar.gz: e1db247358fb5e19eccb1322217de7f0a73ee49b79645555fc3f978ec577e5a606a8bea5a3ff1c1b3a0eb089fbb306ddd7d9ed48f7d60eb66444d8abe5659e7d
+  metadata.gz: 74ae8d1efa6459edafbaedc32869e3c921d8b249184778b4cb487e8eddf433b4e50ed5556df2a14e353189998a050ce33cd89854f26571f705ec7feb8f760c4c
+  data.tar.gz: b7da68362cb4e6d5f6c7902693238bba991c04bdc0f3efa9e297ec4b7ff38c74d4f821ddec74e08e550822c16667ea6aef0f6815deb04334855a68267f192ad6

data/Gemfile

@@ -6,4 +6,4 @@ gemspec
 gem 'rspec'
 gem 'rake'
 gem 'simplecov'
-
+gem 'actionpack', '>= 3'

data/lib/batch_actions.rb

@@ -17,12 +17,16 @@ module BatchActions
     allowed
   end
 
-  def batch_action
-    action = params[:name]
+  def dispatch_batch
+    name = params[:batch_action]
 
-    raise "action is not allowed" unless batch_actions.include? action.to_sym
+    allowed = batch_actions.detect { |action| action.to_s == name.to_s }
+    unless allowed
+      raise ActionController::RoutingError.new('batch action is not allowed')
+    end
 
-    send(:"batch_#{action}")
+    self.status, headers, self.response_body = self.class.action(:"batch_#{name}").call(env)
+    self.headers.merge! headers
   end
 
   def self.included(base)

data/lib/batch_actions/class_methods.rb

@@ -18,42 +18,42 @@ module BatchActions
       if block_given?
         apply = block
       else
-        apply = ->(objects) do
-          objects.each do |object|
-            object.send(keyword)
-          end
-        end
+        raise ArgumentError, "block must be specified"
       end
 
       if opts.include? :scope
         scope = opts[:scope]
       else
-        scope = ->(model) do
-          model.where(:id => params[:ids])
+        scope = ->(ids) do
+          model.where(:id => ids)
         end
       end
 
       if opts.include? :if
         condition = opts[:if]
       else
-        condition = ->() do
-          if self.respond_to? :can?
-            can? keyword, model
-          else
-            true
-          end
-        end
+        condition = ->() { true }
       end
 
       @batch_actions[keyword] = condition
 
+      raise ArgumentError, "unexpected number of arguments for scope" if scope.arity < 1 || scope.arity > 2
+
       define_method(:"batch_#{keyword}") do
         result = instance_exec(&condition)
 
-        raise "action is not allowed" unless result
+        raise ActionController::RoutingError.new('batch action is not allowed') unless result
+
+        case scope.arity
+        when 1
+          objects = instance_exec(params[:ids], &scope)
+
+        when 2
+          objects = instance_exec(params[:ids], model.where(:id => params[:ids]), &scope)
+          
+        end
 
-        objects = instance_exec(model, &scope)
-        apply.call(objects)
+        instance_exec(objects, &apply)
       end
     end
   end

data/lib/batch_actions/version.rb

@@ -1,3 +1,3 @@
 module BatchActions
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/batch_actions_spec.rb

@@ -6,7 +6,9 @@ describe BatchActions do
       :ids => [ 1, 2 ]
     ) do
       batch_model TestModel
-      batch_action :test1
+      batch_action :test1 do |list|
+        list.each &:test1
+      end
     end
 
     times = 0
@@ -22,6 +24,18 @@ describe BatchActions do
   it "requires a model to be specified" do
     expect do
       mock_controller do
+        batch_action :test1 do |list|
+          list.each &:test1
+        end
+      end
+    end.to raise_error(ArgumentError)
+  end
+
+  it "requires a block to be specified" do
+    expect do
+      mock_controller do
+        batch_model TestModel
+
         batch_action :test1
       end
     end.to raise_error(ArgumentError)
@@ -33,8 +47,12 @@ describe BatchActions do
     ) do
       batch_model TestModel
 
-      batch_action :test1
-      batch_action :test2, :model => TestModel2
+      batch_action :test1 do |list|
+        list.each &:test1
+      end
+      batch_action :test2, :model => TestModel2 do |list|
+        list.each &:test2
+      end
     end
 
     TestModel.should_receive(:where).with({ :id => [ 1 ]}).and_call_original
@@ -51,42 +69,38 @@ describe BatchActions do
     scope_called = false
 
     instance = TestModel.new
-    instance.should_receive(:test1).and_return(nil)
+    instance.should_receive(:test1).exactly(2).times.and_return(nil)
 
     ctrl = mock_controller(
       :ids => [ 1 ]
     ) do
       batch_model TestModel
 
-      batch_action :test1, :scope => ->(model) do
+      batch_action(:test1, :scope => ->(ids) do
         scope_called = true
 
         [ instance ]
+      end) do |list|
+        list.each &:test1
       end
-    end
-
-    ctrl.batch_test1
-
-    scope_called.should be_true
-  end
 
-  it "allows to override default apply" do
-    block_called = nil
-
-    ctrl = mock_controller(
-      :ids => [ 1 ]
-    ) do
-      batch_model TestModel
+      batch_action(:test2, :scope => ->(ids, scope) do
+        scope_called = true
 
-      batch_action(:test1) do |objects|
-        block_called = objects
+        [ instance ]
+      end) do |list|
+        list.each &:test1
       end
     end
 
     ctrl.batch_test1
+    scope_called.should be_true
+
+    scope_called = false
+    ctrl.batch_test2
+    scope_called.should be_true
+
 
-    block_called.should_not be_nil
-    block_called.length.should == 1
   end
 
   it "supports :if" do
@@ -95,7 +109,9 @@ describe BatchActions do
     ) do
       batch_model TestModel
 
-      batch_action :test, :if => ->() { false }
+      batch_action(:test, :if => ->() { false }) do |list|
+        list.each &:test
+      end
     end
 
     expect { ctrl.batch_test1 }.to raise_error
@@ -106,9 +122,15 @@ describe BatchActions do
     ctrl = mock_controller do
       batch_model TestModel
 
-      batch_action :test1
-      batch_action :test2
-      batch_action :test3, :if => ->() { false }
+      batch_action :test1 do |list|
+        list.each &:test1
+      end
+      batch_action :test2 do |list|
+        list.each &:test2
+      end
+      batch_action(:test3, :if => ->() { false }) do |list|
+        list.each &:test3
+      end
     end
 
     ctrl.batch_actions.should == [ :test1, :test2 ]
@@ -117,39 +139,41 @@ describe BatchActions do
   it "supports InheritedResources" do
     expect do
       mock_controller(:parent => InheritedResources::Base) do
-        batch_action :test1
+        batch_action(:test1) do |list|
+          list.each &:test1
+        end
       end
     end.to_not raise_error
   end
 
-  it "supports CanCan" do
-    ctrl = mock_controller do
-      batch_model TestModel
-
-      batch_action :test1
-      batch_action :test2
-
-      def can?(keyword, model)
-        keyword == :test1
-      end
-    end
-
-    ctrl.batch_actions.should == [ :test1 ]
-  end
-
-  it "implements batch_action" do
+  it "implements dispatch_batch" do
     [ "test1", "test2" ].each do |action|
       ctrl = mock_controller(
         :ids => [ 1 ],
-        :name => action
+        :batch_action => action
       ) do
         batch_model TestModel
-        batch_action :test1
-        batch_action :test2
+        batch_action :test1 do |list|
+          list.each &:test1
+        end
+        batch_action :test2 do |list|
+          list.each &:test2
+        end
       end
 
       TestModel.any_instance.should_receive(action.to_sym).and_return(nil)
-      ctrl.batch_action
+      ctrl.dispatch_batch
     end
   end
+
+  it "throws on disallowed action in dispatch_batch" do
+    ctrl = mock_controller(
+      :batch_action => :test
+    ) do
+    end
+
+    expect do
+      ctrl.dispatch_batch
+    end.to raise_error(ActionController::RoutingError)
+  end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'simplecov'
 SimpleCov.start
 
 require 'batch_actions'
+require 'action_controller'
 
 class TestModel
   def self.where(query)
@@ -24,7 +25,7 @@ module InheritedResources
 end
 
 def mock_controller(params = {}, &block)
-  parent = params.delete(:parent) || Object
+  parent = params.delete(:parent) || ActionController::Metal
 
   mock_class = Class.new(parent) do
     include BatchActions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_actions
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sergey Gridasov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Batch action support for Rails.