hash_conditions 1.1.20 → 1.1.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDMwYWRhYWIzOGNhZDFkOWUzZTgyOWQxYTczMzJlZGY3M2FmOGQ1OA==
+    Yjc5NmRlYmZmOGUyNjVlMzFhNTIyMmYwOTA3YjUwYTlhNTMyOGExOQ==
   data.tar.gz: !binary |-
-    OTU2YzNjM2QxOTg3YzlhMjk2M2FlNjAyOTAyMmVjYTQ4ZjBmNGQwNg==
+    MWJiZDgyNDE3NjU3ZGIwZDUzZDgwMzRkYmI3MjJjMDRkZjYzNGU3NA==
 SHA512:
   metadata.gz: !binary |-
-    NDAzZTY3NTkzMDA5OGMwYmFlNDc4MmZhMTE1MmFlNDhmNTM1OGEyNzdmY2M0
-    ZjJkZjY1MjIwZDFhMDcyYTVkNzA3NDgyMDJkODcyYjgyNjdhNWM4YzM2ZTg2
-    MjM1NjkyM2YxYjk4NDUyNmE4YTNiNzU3YWMwYzMzOTUxYjg1YWI=
+    Y2ZjNjliMWJkNGY4ZjFmYjZlY2ZmZjQzNTQ5YTgwOWYzZDg2OTJlOTAyZWU1
+    NzljN2IyYjM4ZDAxZjU5ZDRhMWZhM2Y4YjYzYjMxYTU5ZTc2YWRjNDk1MzVj
+    NmFmOWYzMjA4NGYyMzVhMGQ2YTU3N2RlMzFhMGFlNzFlNzNkYWM=
   data.tar.gz: !binary |-
-    NGM0NDFkNDhiZjQ1ZThjOGQyZDIzNDRjZjMzNWRlMzkyMDQyNTQ4MWM5MTQy
-    MzkwZjQ3NWE1NTY5ZjFjZWY5NmYzNDk4OTg5Nzg1OTg1ZTc5OTUyM2NkZGE4
-    MDgxYjkzN2M5YTZiMzRiNmQyY2EyMjU5YzJhYzk1M2E5ZTU3MWQ=
+    NGFjNzk0YTczYjUwMGQ1ZDg4NjM5YjdiMDcyZmVkNjE1ZTkwYzA5ZmIxZjc4
+    MGNkMGFiMWM5OGY1MjEzMmUyMGIyOGM5MGZlMGViYWZiMjk5MGYzODM3YjBk
+    OTkxZmZlNjA4ODBlNmFkMWQ1YWU0YTM0YTlhNDNmMGZiZTQ2Zjk=

data/lib/hash_conditions/matcher.rb

@@ -94,14 +94,15 @@ module HashConditions
     def self.critical_times hash, expressions
       expressions.
         map{ | e |
+          inverter = operand_uses_now?(e[:value])? -1: 1
           case e[:operator]
             when :<, :<=, :>, :>= then
-              diff = get_diff( eval_operand( hash, e[:value] ), eval_operand( hash, e[:key], is_key: true )) + 1
+              diff = inverter * get_diff( eval_operand( hash, e[:value] ), eval_operand( hash, e[:key], is_key: true )) + 1
             when :==, :!= then Time.now + s[:diff]
-              diff = get_diff( eval_operand( hash, e[:value] ), eval_operand(hash, e[:key]) )
+              diff = inverter * get_diff( eval_operand( hash, e[:value] ), eval_operand(hash, e[:key]) )
             when :between
-              diff = get_diff( eval_operand( hash, e[:value][0] ), eval_operand(hash, e[:key], is_key: true ) )
-              diff = get_diff( eval_operand( hash, e[:value][1] ), eval_operand(hash, e[:key], is_key: true ) ) if Time.now + diff < Time.now
+              diff = inverter * get_diff( eval_operand( hash, e[:value][0] ), eval_operand(hash, e[:key], is_key: true ) )
+              diff = inverter * get_diff( eval_operand( hash, e[:value][1] ), eval_operand(hash, e[:key], is_key: true ) ) if Time.now + diff < Time.now
           end
 
           Time.now + diff

data/lib/hash_conditions/version.rb

@@ -1,3 +1,3 @@
 module HashConditions
-  VERSION = "1.1.20"
+  VERSION = "1.1.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_conditions
 version: !ruby/object:Gem::Version
-  version: 1.1.20
+  version: 1.1.21
 platform: ruby
 authors:
 - Giancarlo Palavicini