triggerable 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50059bb341314ac2546438f420f9162ec1661715
-  data.tar.gz: 3d523b78004b5820f2a27a08e5736c2efb49abfb
+  metadata.gz: 9689f441a8bf248c604c1a93480e52ae104c3770
+  data.tar.gz: b4642f6342c5e5c30b1fac31b707ead0162c2b41
 SHA512:
-  metadata.gz: ed94209ac03b2fb05b95c4a11e087493c6017c6f015bf3a3e6013516c8c273e453d0ff1250287fc8da95bf4a52347720095e44be15d716e587484fd263b5b76e
-  data.tar.gz: 408aca735a06cdd505ab0280d175b815586245d46df7e4fe6033042fbb3e37bcbc022ba81e6e0b88e5941cfe9fdebf7de900fe47c2b355f07a666924a8cafafc
+  metadata.gz: a1e76b55c3810ab112eaf7a2148227f0525333608c8c7064c827bd650b4fdf87db4bfd763c1206beded0d19f8b3b85cf80523cbe71eef3cf86f36066d6ddc167
+  data.tar.gz: cf4d50158a00bc4f9291b3d03fa19d44b7818176516ff010d19533b6b203517ed67c00f38a9c45aea478ca65661013b800a48749f05425b6da51b3e95c93a300

data/lib/triggerable/conditions/schedule/after.rb

@@ -14,14 +14,20 @@ module Conditions
     end
 
     private
-    def condition
-      return super if @math_condition.blank?
 
-      case @math_condition
-      when :greater_than
-        LessThanOrEqualTo.new(@field, from)
-      when :less_than
-        GreaterThanOrEqualTo.new(@field, from)
+    def condition
+      if @math_condition.blank?
+        And.new [
+          GreaterThan.new(@field, from),
+          LessThanOrEqualTo.new(@field, to)
+        ]
+      else
+        case @math_condition
+        when :greater_than
+          LessThanOrEqualTo.new(@field, from)
+        when :less_than
+          GreaterThanOrEqualTo.new(@field, from)
+        end
       end
     end
   end

data/lib/triggerable/conditions/schedule/before.rb

@@ -22,13 +22,18 @@ module Conditions
 
     private
     def condition
-      return super if @math_condition.blank?
-
-      case @math_condition
-      when :greater_than
-        And.new([GreaterThanOrEqualTo.new(@field, from), LessThan.new(@field, to)])
-      when :less_than
-        GreaterThanOrEqualTo.new(@field, from)
+      if @math_condition.blank?
+        And.new [
+          GreaterThanOrEqualTo.new(@field, from),
+          LessThan.new(@field, to)
+        ]
+      else
+        case @math_condition
+        when :greater_than
+          And.new([GreaterThanOrEqualTo.new(@field, from), LessThan.new(@field, to)])
+        when :less_than
+          GreaterThanOrEqualTo.new(@field, from)
+        end
       end
     end
   end

data/lib/triggerable/conditions/schedule/schedule_condition.rb

@@ -22,12 +22,5 @@ module Conditions
       i = Engine.interval
       Time.at((Time.now.to_i / i) * i).utc
     end
-
-    def condition
-      And.new [
-        GreaterThanOrEqualTo.new(@field, from),
-        LessThan.new(@field, to)
-      ]
-    end
   end
 end

data/lib/triggerable/rules/automation.rb

@@ -4,7 +4,7 @@ module Rules
       table = Arel::Table.new(model.table_name)
       scope = @condition.scope(table)
       query = table.where(scope).project(Arel.sql('id')).to_sql
-      ids = ParentModel.connection.execute(query).map { |r| r['id'] }
+      ids = ActiveRecord::Base.connection.execute(query).map { |r| r['id'] }
       models = model.where(id: ids)
 
       models.each {|object| actions.each {|a| a.run_for!(object, name)} }

data/lib/triggerable/version.rb

@@ -1,3 +1,3 @@
 module Triggerable
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/integration/automations_spec.rb

@@ -22,7 +22,7 @@ describe 'Automations' do
     Engine.run_automations(1.hour)
     expect(TestTask.count).to eq(1)
 
-    constantize_time_now Time.utc 2012, 9, 2, 13, 00
+    constantize_time_now Time.utc 2012, 9, 2, 12, 00
     Engine.run_automations(1.hour)
 
     expect(TestTask.count).to eq(2)
@@ -52,7 +52,7 @@ describe 'Automations' do
   end
 
   it 'after 30 mins with 30 mins interval' do
-    constantize_time_now Time.utc 2012, 9, 1, 11, 55
+    constantize_time_now Time.utc 2012, 9, 1, 12, 00
 
     TestTask.automation if: {and: [{updated_at: {after: 30.minutes}}, {status: {is: :solved}}, {kind: {is: :service}}]} do
       TestTask.create kind: 'follow up'
@@ -63,11 +63,11 @@ describe 'Automations' do
     task.update_attributes status: 'solved', kind: 'service'
     expect(TestTask.count).to eq(1)
 
-    constantize_time_now Time.utc 2012, 9, 1, 12, 12
+    constantize_time_now Time.utc 2012, 9, 1, 12, 29
     Engine.run_automations(30.minutes)
     expect(TestTask.count).to eq(1)
 
-    constantize_time_now Time.utc 2012, 9, 1, 12, 50
+    constantize_time_now Time.utc 2012, 9, 1, 12, 30
     Engine.run_automations(30.minutes)
 
     expect(TestTask.count).to eq(2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triggerable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - DmitryTsepelev