triggerable 0.1.7 → 0.1.8

data/spec/integration/actions_spec.rb

@@ -2,18 +2,20 @@ require 'spec_helper'
 
 describe 'Actions' do
   before(:each) do
-    Engine.clear
+    Triggerable::Engine.clear
     TestTask.destroy_all
   end
 
-  class CreateFollowUp < Triggerable::Action
-    def run_for! trigger_name, task
+  class CreateFollowUp < Triggerable::Actions::Action
+    def run_for! task, rule_name
       TestTask.create kind: 'follow up'
     end
   end
 
   it 'custom action' do
-    TestTask.trigger on: :after_update, if: {status: 'solved'}, do: :create_follow_up
+    TestTask.trigger on: :after_update,
+                     if: { status: 'solved' },
+                     do: :create_follow_up
 
     task = TestTask.create
     expect(TestTask.count).to eq(1)
@@ -24,7 +26,9 @@ describe 'Actions' do
   end
 
   it 'custom action chain' do
-    TestTask.trigger on: :after_update, if: {status: 'solved'}, do: [:create_follow_up, :create_follow_up]
+    TestTask.trigger on: :after_update,
+                     if: { status: 'solved' },
+                     do: [:create_follow_up, :create_follow_up]
 
     task = TestTask.create
     expect(TestTask.count).to eq(1)

data/spec/integration/automations_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Automations' do
   before(:each) do
-    Engine.clear
+    Triggerable::Engine.clear
     TestTask.destroy_all
   end
 
@@ -19,11 +19,11 @@ describe 'Automations' do
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 20, 00
-    Engine.run_automations(1.hour)
+    Triggerable::Engine.run_automations(1.hour)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 2, 12, 00
-    Engine.run_automations(1.hour)
+    Triggerable::Engine.run_automations(1.hour)
 
     expect(TestTask.count).to eq(2)
     expect(TestTask.all.last.kind).to eq('follow up')
@@ -42,11 +42,11 @@ describe 'Automations' do
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 15, 00
-    Engine.run_automations(1.hour)
+    Triggerable::Engine.run_automations(1.hour)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 18, 00
-    Engine.run_automations(1.hour)
+    Triggerable::Engine.run_automations(1.hour)
     expect(TestTask.count).to eq(2)
     expect(TestTask.all.last.kind).to eq('follow up')
   end
@@ -64,11 +64,11 @@ describe 'Automations' do
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 12, 29
-    Engine.run_automations(30.minutes)
+    Triggerable::Engine.run_automations(30.minutes)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 12, 30
-    Engine.run_automations(30.minutes)
+    Triggerable::Engine.run_automations(30.minutes)
 
     expect(TestTask.count).to eq(2)
     expect(TestTask.all.last.kind).to eq('follow up')
@@ -86,11 +86,11 @@ describe 'Automations' do
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 14, 31
-    Engine.run_automations(30.minutes)
+    Triggerable::Engine.run_automations(30.minutes)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 15, 03
-    Engine.run_automations(30.minutes)
+    Triggerable::Engine.run_automations(30.minutes)
     expect(TestTask.count).to eq(2)
     expect(TestTask.all.last.kind).to eq('follow up')
   end
@@ -108,11 +108,11 @@ describe 'Automations' do
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 12, 00
-    Engine.run_automations(4.hours)
+    Triggerable::Engine.run_automations(4.hours)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 16, 00
-    Engine.run_automations(4.hours)
+    Triggerable::Engine.run_automations(4.hours)
 
     expect(TestTask.count).to eq(2)
     expect(TestTask.all.last.kind).to eq('follow up')
@@ -130,11 +130,11 @@ describe 'Automations' do
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 04, 05
-    Engine.run_automations(2.hour)
+    Triggerable::Engine.run_automations(2.hour)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 10, 01
-    Engine.run_automations(2.hour)
+    Triggerable::Engine.run_automations(2.hour)
     expect(TestTask.count).to eq(2)
     expect(TestTask.all.last.kind).to eq('follow up')
   end
@@ -152,21 +152,21 @@ describe 'Automations' do
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 11, 46
-    Engine.run_automations(15.minutes)
+    Triggerable::Engine.run_automations(15.minutes)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 13, 46
-    Engine.run_automations(15.minutes)
+    Triggerable::Engine.run_automations(15.minutes)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 14, 02
-    Engine.run_automations(15.minutes)
+    Triggerable::Engine.run_automations(15.minutes)
 
     expect(TestTask.count).to eq(2)
     expect(TestTask.all.last.kind).to eq('follow up')
 
     constantize_time_now Time.utc 2012, 9, 1, 14, 17
-    Engine.run_automations(15.minutes)
+    Triggerable::Engine.run_automations(15.minutes)
     expect(TestTask.count).to eq(2)
   end
 
@@ -182,16 +182,16 @@ describe 'Automations' do
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 10, 05
-    Engine.run_automations(15.minutes)
+    Triggerable::Engine.run_automations(15.minutes)
     expect(TestTask.count).to eq(1)
 
     constantize_time_now Time.utc 2012, 9, 1, 13, 30
-    Engine.run_automations(15.minutes)
+    Triggerable::Engine.run_automations(15.minutes)
     expect(TestTask.count).to eq(2)
     expect(TestTask.all.last.kind).to eq('follow up')
 
     constantize_time_now Time.utc 2012, 9, 1, 15, 32
-    Engine.run_automations(15.minutes)
+    Triggerable::Engine.run_automations(15.minutes)
     expect(TestTask.count).to eq(2)
   end
 end

data/spec/integration/conditions_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Conditions do
+describe Triggerable::Conditions do
   before(:each) do
-    Engine.clear
+    Triggerable::Engine.clear
     TestTask.destroy_all
   end
 

data/spec/integration/short_syntax_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Short syntax' do
   before(:each) do
-    Engine.clear
+    Triggerable::Engine.clear
     TestTask.destroy_all
   end
 

data/spec/scopes_spec.rb

@@ -19,37 +19,37 @@ describe 'Scopes' do
     end
 
     it 'is' do
-      ids = model_ids_for(Conditions::Is, 1)
+      ids = model_ids_for(Triggerable::Conditions::Is, 1)
       expect(ids).to eq([@m1.id, @m3.id])
     end
 
     it 'greater than' do
-      ids = model_ids_for(Conditions::GreaterThan, 1)
+      ids = model_ids_for(Triggerable::Conditions::GreaterThan, 1)
       expect(ids).to eq([@m2.id])
     end
 
     it 'less than' do
-      ids = model_ids_for(Conditions::LessThan, 2)
+      ids = model_ids_for(Triggerable::Conditions::LessThan, 2)
       expect(ids).to eq([@m1.id, @m3.id])
     end
 
     it 'is not' do
-      ids = model_ids_for(Conditions::IsNot, 2)
+      ids = model_ids_for(Triggerable::Conditions::IsNot, 2)
       expect(ids).to eq([@m1.id, @m3.id])
     end
 
     it 'greater than or equal' do
-      ids = model_ids_for(Conditions::LessThanOrEqualTo, 2)
+      ids = model_ids_for(Triggerable::Conditions::LessThanOrEqualTo, 2)
       expect(ids).to eq([@m1.id, @m2.id, @m3.id])
     end
 
     it 'less than or equal' do
-      ids = model_ids_for(Conditions::GreaterThanOrEqualTo, 1)
+      ids = model_ids_for(Triggerable::Conditions::GreaterThanOrEqualTo, 1)
       expect(ids).to eq([@m1.id, @m2.id, @m3.id])
     end
 
     it 'in' do
-      ids = model_ids_for(Conditions::In, [1, 2])
+      ids = model_ids_for(Triggerable::Conditions::In, [1, 2])
       expect(ids).to eq([@m1.id, @m2.id, @m3.id])
     end
   end
@@ -57,7 +57,7 @@ describe 'Scopes' do
   context 'predicates' do
     def model_ids_for condition_class, conditions
       and_condition = condition_class.new([])
-      and_condition.conditions = [Conditions::Is.new(:integer_field, 1), Conditions::Is.new(:string_field, 'c')]
+      and_condition.conditions = [Triggerable::Conditions::Is.new(:integer_field, 1), Triggerable::Conditions::Is.new(:string_field, 'c')]
 
       table = Arel::Table.new(:parent_models)
       query = table.where(and_condition.scope(table)).project(Arel.sql('id')).to_sql
@@ -66,12 +66,12 @@ describe 'Scopes' do
     end
 
     it 'and' do
-      ids = model_ids_for Conditions::And, [Conditions::Is.new(:integer_field, 1), Conditions::Is.new(:string_field, 'c')]
+      ids = model_ids_for Triggerable::Conditions::And, [Triggerable::Conditions::Is.new(:integer_field, 1), Triggerable::Conditions::Is.new(:string_field, 'c')]
       expect(ids).to eq([@m3.id])
     end
 
     it 'or' do
-      ids = model_ids_for Conditions::Or, [Conditions::Is.new(:integer_field, 1), Conditions::Is.new(:string_field, 'c')]
+      ids = model_ids_for Triggerable::Conditions::Or, [Triggerable::Conditions::Is.new(:integer_field, 1), Triggerable::Conditions::Is.new(:string_field, 'c')]
       expect(ids).to eq([@m1.id, @m3.id])
     end
   end

data/triggerable.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = Dir['spec/**/*.rb']
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triggerable
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,7 +124,8 @@ files:
 - Rakefile
 - lib/.DS_Store
 - lib/triggerable.rb
-- lib/triggerable/actions.rb
+- lib/triggerable/actions/action.rb
+- lib/triggerable/actions/lambda_action.rb
 - lib/triggerable/conditions/condition.rb
 - lib/triggerable/conditions/field/exists.rb
 - lib/triggerable/conditions/field/field_condition.rb

data/lib/triggerable/actions.rb

@@ -1,41 +0,0 @@
-module Triggerable
-  class Action
-    def self.build source
-      if source.is_a?(Proc)
-        [LambdaAction.new(source)]
-      else
-        Array(source).map do |source|
-          descendant = descendants.find { |d| d == source.to_s.camelize.constantize }
-          descendant.new if descendant.present?
-        end.compact
-      end
-    end
-
-    def run_for!(trigger_name, object); end
-  end
-
-  class LambdaAction < Action
-    def initialize block
-      @block = block
-    end
-
-    def run_for! object, trigger_name
-      proc = @block
-      object.instance_eval do
-        change_whodunnit = trigger_name.present? && defined?(PaperTrail)
-        old_whodunnit = nil
-
-        if change_whodunnit
-          old_whodunnit = PaperTrail.whodunnit
-          PaperTrail.whodunnit = trigger_name
-        end
-
-        begin
-          instance_exec(&proc)
-        ensure
-          PaperTrail.whodunnit = old_whodunnit if change_whodunnit
-        end
-      end
-    end
-  end
-end