triggerable 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49133136262b0acdb06a687a60c018db263d8a04
-  data.tar.gz: 4385cdecc97b3520259cd1c59f60228e00a8fd87
+  metadata.gz: fe45d698af8f0bf86b0d304e31016a41a8fdd89f
+  data.tar.gz: 472fe481cc00e294f9c52663a004635ffd7a4252
 SHA512:
-  metadata.gz: 1b8e5ab08307ff8886086dab858e95b9a3df770fa59ea8296a331d16b6397cf18643231a2351b987787aedc61961a7a44db3628811d4f40968150fad7fd5a8ab
-  data.tar.gz: bd7b0953dba3f5e765b13a4d3460e4612c33075748417bfe89ab602b9fa3a639b0e2d579992fe7190ad6f2e06c16c3e61fba92454feca21ba3702e6289def0c3
+  metadata.gz: d23f611c146cb4917f40ba009521071b9bd71993836fe71f797488b03005540eed7824999eeef1c28af23a6dd344d9a3420b528bddc458ca7f253486a07bd173
+  data.tar.gz: d7ca5ca5abfe73fcddb25faf05b010a15c56defeb0f41f2466236991cae2538ea1752a5c075c98cb41b3250128bb53cf0dc6b74a6865812fa6f1cc7b9ccf11f9

data/README.md

@@ -66,11 +66,11 @@ trigger on: :after_update, if: -> { orders.any? } do
 end
 ```
 
-If you need to share logic between triggers/automations bodies you can move it into separate class. It should be inherited from `Triggerable::Action` and implement a single method `run_for!(obj)` where obj is a triggered object. Then you can pass a name of your action class instead of do block.
+If you need to share logic between triggers/automations bodies you can move it into separate class. It should be inherited from `Triggerable::Action` and implement a single method `run_for!(trigger_name, obj)` where trigger_name is a string passed to rule in :name option and obj is a triggered object. Then you can pass a name of your action class instead of do block.
 
 ```ruby
 class SendWelcomeSms < Triggerable::Action
-  def run_for! object
+  def run_for! trigger_name, object
     SmsGateway.send_to object.phone, welcome_text
   end
 end

data/lib/triggerable/actions.rb

@@ -11,7 +11,7 @@ module Triggerable
       end
     end
 
-    def run_for!(object); end
+    def run_for!(trigger_name, object); end
   end
 
   class LambdaAction < Action
@@ -19,9 +19,9 @@ module Triggerable
       @block = block
     end
 
-    def run_for! object
+    def run_for! object, trigger_name
       proc = @block
-      object.instance_eval { instance_exec(&proc) }
+      object.instance_eval { instance_exec(trigger_name, &proc) }
     end
   end
 end

data/lib/triggerable/rules/automation.rb

@@ -7,7 +7,7 @@ module Rules
       ids = ParentModel.connection.execute(query).map { |r| r['id'] }
       models = model.where(id: ids)
 
-      models.each {|o| actions.each {|a| a.run_for!(o)} }
+      models.each {|object| actions.each {|a| a.run_for!(object, name)} }
     end
   end
 end

data/lib/triggerable/rules/rule.rb

@@ -1,10 +1,11 @@
 module Rules
   class Rule
-    attr_accessor :model, :condition, :actions
+    attr_accessor :name, :model, :condition, :actions
 
     def initialize model, options, block
       @model     = model
       @condition = Conditions::Condition.build(options[:if])
+      @name      = options[:name]
       @actions   = Triggerable::Action.build(block || options[:do])
     end
   end

data/lib/triggerable/rules/trigger.rb

@@ -8,7 +8,7 @@ module Rules
     end
 
     def execute! object
-      actions.each {|a| a.run_for!(object)} if condition.true_for?(object)
+      actions.each {|a| a.run_for!(object, name)} if condition.true_for?(object)
     end
   end
 end

data/lib/triggerable/version.rb

@@ -1,3 +1,3 @@
 module Triggerable
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/integration/actions_spec.rb

@@ -7,7 +7,7 @@ describe 'Actions' do
   end
 
   class CreateFollowUp < Triggerable::Action
-    def run_for! task
+    def run_for! trigger_name, task
       TestTask.create kind: 'follow up'
     end
   end

data/spec/names_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Naming' do
+  before(:each) do
+    Engine.clear
+    TestTask.destroy_all
+  end
+
+  it 'trigger name is available in body' do
+    name = 'Create followup'
+    TestTask.trigger name: name, on: :before_update, if: { status: { is: 'solved' } } do |trigger_name|
+      self.kind = trigger_name
+    end
+
+    task = TestTask.create
+    task.update_attributes status: 'solved'
+    expect(task.kind).to eq(name)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triggerable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,7 @@ files:
 - spec/integration/conditions_spec.rb
 - spec/integration/short_syntax_spec.rb
 - spec/models.rb
+- spec/names_spec.rb
 - spec/schema.rb
 - spec/scopes_spec.rb
 - spec/spec_helper.rb
@@ -186,6 +187,7 @@ test_files:
 - spec/integration/conditions_spec.rb
 - spec/integration/short_syntax_spec.rb
 - spec/models.rb
+- spec/names_spec.rb
 - spec/schema.rb
 - spec/scopes_spec.rb
 - spec/spec_helper.rb