triggerable 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9689f441a8bf248c604c1a93480e52ae104c3770
-  data.tar.gz: b4642f6342c5e5c30b1fac31b707ead0162c2b41
+  metadata.gz: cd600c99b81640a4f19345bb5fc2699449d18553
+  data.tar.gz: 97968a4541609b339a6fb840a69fd35a0ba1cc9c
 SHA512:
-  metadata.gz: a1e76b55c3810ab112eaf7a2148227f0525333608c8c7064c827bd650b4fdf87db4bfd763c1206beded0d19f8b3b85cf80523cbe71eef3cf86f36066d6ddc167
-  data.tar.gz: cf4d50158a00bc4f9291b3d03fa19d44b7818176516ff010d19533b6b203517ed67c00f38a9c45aea478ca65661013b800a48749f05425b6da51b3e95c93a300
+  metadata.gz: cc8771acac90d02ea3fbea7dec517746d64f79865c6b7ba09165dde484ec73c134b6047fa725f5fa0c04bce18bc7561455b25571bb2a830ce517859ad37c9cda
+  data.tar.gz: 89dfb2ded39f4bec57136f221883d35c5e9f39e50f08a14432b9db9f6e98950e4eea32b3137b77402b40b801fcd4bfec611deacbbd3e5a18162da762a9b5e1cc

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

@@ -1,12 +1,7 @@
 module Conditions
   class After < ScheduleCondition
     def from
-      case @math_condition
-      when :greater_than, :less_than
-        Time.now - @value
-      when nil
-        automation_time - @value - Engine.interval
-      end
+      automation_time - @value - Engine.interval
     end
 
     def to
@@ -16,19 +11,10 @@ module Conditions
     private
 
     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
+      And.new [
+        GreaterThan.new(@field, from),
+        LessThanOrEqualTo.new(@field, to)
+      ]
     end
   end
 end

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

@@ -1,40 +1,20 @@
 module Conditions
   class Before < ScheduleCondition
     def from
-      case @math_condition
-      when :greater_than
-        Time.now
-      when :less_than
-        Time.now + @value
-      when nil
-        automation_time + @value
-      end
+      automation_time + @value
     end
 
     def to
-      case @math_condition
-      when :greater_than
-        Time.now + @value
-      when nil
-        automation_time + @value + Engine.interval
-      end
+      automation_time + @value + Engine.interval
     end
 
     private
+
     def condition
-      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
+      And.new [
+        GreaterThanOrEqualTo.new(@field, from),
+        LessThan.new(@field, to)
+      ]
     end
   end
 end

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

@@ -1,11 +1,8 @@
 module Conditions
   class ScheduleCondition < FieldCondition
     def initialize field, value
+      @value = value.values.first if value.is_a?(Hash)
       super
-      if value.is_a?(Hash)
-        @math_condition = value.keys.first
-        @value = value.values.first
-      end
     end
 
     def true_for? object
@@ -17,6 +14,7 @@ module Conditions
     end
 
     protected
+
     # automation_time is Time.now rounded by Engine.interval
     def automation_time
       i = Engine.interval

data/lib/triggerable/version.rb

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

data/spec/integration/automations_spec.rb

@@ -194,160 +194,4 @@ describe 'Automations' do
     Engine.run_automations(15.minutes)
     expect(TestTask.count).to eq(2)
   end
-
-  it 'after greater than 2 hours' do
-    constantize_time_now Time.utc 2012, 9, 1, 11, 55
-
-    TestTask.automation if: {and: [{updated_at: {after: {greater_than: 2.hours}}}, {status: {is: :solved}}, {kind: {is: :service}}]} do
-      TestTask.create kind: 'follow up'
-    end
-
-    task = TestTask.create
-    expect(TestTask.count).to eq(1)
-    task.update_attributes status: 'solved', kind: 'service'
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 12, 10
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 12, 25
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 13, 55
-    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, 10
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(3)
-
-    constantize_time_now Time.utc 2012, 9, 1, 14, 25
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(4)
-  end
-
-  it 'after less than 2 hours' do
-    constantize_time_now Time.utc 2012, 9, 1, 11, 55
-
-    TestTask.automation if: {and: [{updated_at: {after: {less_than: 2.hours}}}, {status: {is: :solved}}, {kind: {is: :service}}]} do
-      TestTask.create kind: 'follow up'
-    end
-
-    task = TestTask.create
-    expect(TestTask.count).to eq(1)
-    task.update_attributes status: 'solved', kind: 'service'
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 12, 10
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(2)
-
-    constantize_time_now Time.utc 2012, 9, 1, 12, 25
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(3)
-
-    constantize_time_now Time.utc 2012, 9, 1, 13, 55
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(4)
-    expect(TestTask.all.last.kind).to eq('follow up')
-
-    constantize_time_now Time.utc 2012, 9, 1, 14, 10
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(4)
-
-    constantize_time_now Time.utc 2012, 9, 1, 14, 25
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(4)
-  end
-
-  it 'before greater than 2 hours' do
-    constantize_time_now Time.utc 2012, 9, 1, 11, 55
-
-    TestTask.automation if: {and: [{scheduled_at: {before: {greater_than: 2.hours}}}, {status: {is: :solved}}, {kind: {is: :service}}]} do
-      TestTask.create kind: 'follow up'
-    end
-
-    task = TestTask.create scheduled_at: Time.utc(2012, 9, 1, 20, 00)
-    expect(TestTask.count).to eq(1)
-    task.update_attributes status: 'solved', kind: 'service'
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 12, 10
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 12, 25
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 17, 55
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 18, 00
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 18, 30
-    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, 19, 55
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(3)
-
-    constantize_time_now Time.utc 2012, 9, 1, 20, 00
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(4)
-
-    constantize_time_now Time.utc 2012, 9, 1, 20, 05
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(4)
-
-    constantize_time_now Time.utc 2012, 9, 1, 20, 10
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(4)
-  end
-
-  it 'before less than 2 hours' do
-    constantize_time_now Time.utc 2012, 9, 1, 11, 55
-
-    TestTask.automation if: {and: [{scheduled_at: {before: {less_than: 2.hours}}}, {status: {is: :solved}}, {kind: {is: :service}}]} do
-      TestTask.create kind: 'follow up'
-    end
-
-    task = TestTask.create scheduled_at: Time.utc(2012, 9, 1, 20, 00)
-    expect(TestTask.count).to eq(1)
-    task.update_attributes status: 'solved', kind: 'service'
-    expect(TestTask.count).to eq(1)
-
-    constantize_time_now Time.utc 2012, 9, 1, 12, 10
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(2)
-
-    constantize_time_now Time.utc 2012, 9, 1, 12, 25
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(3)
-
-    constantize_time_now Time.utc 2012, 9, 1, 17, 55
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(4)
-
-    constantize_time_now Time.utc 2012, 9, 1, 18, 00
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(5)
-    expect(TestTask.all.last.kind).to eq('follow up')
-
-    constantize_time_now Time.utc 2012, 9, 1, 18, 30
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(5)
-
-    constantize_time_now Time.utc 2012, 9, 1, 18, 40
-    Engine.run_automations(15.minutes)
-    expect(TestTask.count).to eq(5)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triggerable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler