hash_conditions 1.1.23 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjc3OTg4MjlkZDkzZmI4MTc1YjI2OGRjMzUzZmUzOWYwZmI3OGM2Mg==
+    MGY2YzgxMmQ0ZTIzOTIyOGM1NGI0MDlkOGI4ZjIyNDQ2NmY5ZTFlZQ==
   data.tar.gz: !binary |-
-    ZWUwMmVlMTJjMGNlNGI1NDhjYTMyYjI4ZWVmYjg2MGJkMTYwYTZjNg==
+    OTE5ZTk3M2VjMjhmODIwNjJlNGQ1ZDZkYWU0M2IzMWYwMTMwYzUyMg==
 SHA512:
   metadata.gz: !binary |-
-    ZGFiYjQ1NTFiOTk3ZjU1NzQ3OTc0MjIwNTA0ZDBlNWQyNWI2NzE3YmRhOTQ2
-    YTIyY2NjZjUyYWZiMDcyMjJjY2Q5NDA2NGNkMTFjMzZmY2ExYTI1YTY2ZGU5
-    ZTJjNzZmMDkyYjg2ZGFlZmYwNTQwYTgxMmJjNDY1NjA0ODM3OGM=
+    OWU3YWQxNDZiMzI5Yjk1ODg4NWM5N2EzODQwYjM1OTRkZTBkY2YzMzY2ZTc3
+    OTAxMzFiZTRhMzU4ZmNhYzUzZmUxYzJiODhmZDg0NzYxMTQ5Y2MzZTk5NTUx
+    MTdlOGFmZjRjNjkwNWUwOGVhODVlODAyODA5YTdmMTMxNWJlZWQ=
   data.tar.gz: !binary |-
-    ZTFmYzZhODQ3ODMyYjI1YzQ0OTcwMGE3ZjQ3MGVkNGQ3NzBmZmNjZGVhYTJk
-    Zjk0ZGUzZjg2YTgxNzRmNjQyMGNkY2ExZTFjMzlkNzE2M2Y1ZDllZTZmOGYz
-    MWE3MGFiYjIzNWJjYTFiMDQwNTY3ZWJjZjdlOWJlNmU0M2FmZTk=
+    MjUxMTY0NzcxNjkzNTFkOGIwZDA0OGMyMzA4MmM2NmE4ZTJkZDRmNThhOTBk
+    ODRjNWU1NmMxODQwYWM2NTI3ODI1MjkxMTdhNzJjMDYxMzcyNTg5NWZmMDJi
+    ZTcxNTM2MjI3ZGExY2MwZTUxNDA4MDJkNGJmYzM3OWY4NTI4YjE=

data/lib/hash_conditions/core.rb

@@ -2,6 +2,7 @@ module HashConditions
   module Core
     # Modular Matchers
     DEBUG=false
+    PRECISION=5
     ARITMETIC_OPERATORS = {
       '$add' => :+,
       '$substract' => :-,
@@ -210,7 +211,7 @@ module HashConditions
     end
 
     def log *args
-      puts *args if(DEBUG)
+      puts args.map(&:to_s).join(" ") if(DEBUG)
     end
   end
 end

data/lib/hash_conditions/matcher.rb

@@ -9,7 +9,7 @@ module HashConditions
 
       values = case klass.name
         when "Integer" then values.map(&:to_i)
-        when "Float"   then values.map(&:to_f)
+        when "Float"   then values.map(&:to_f).map{|x|x.round(3)}
         when "String"  then values.map(&:to_s)
         else values
       end
@@ -71,7 +71,8 @@ module HashConditions
 
           comparisson_value.include? hash_value
         when :between
-          hash_value > comparisson_value[0] and hash_value < comparisson_value[1]
+          values = fix_for_aritmetics hash_value, *comparisson_value
+          values[0] >= values[1] and values[0] < values[2]
         when :contains
           !! %r{#{comparisson_value}}.match( hash_value )
         else
@@ -82,31 +83,39 @@ module HashConditions
         # raise "The expression: #{ expression } has an error"
     end
 
-    def self.when hash, query
-      now_result = match hash, query
-      test_times = critical_times( hash, time_expressions( query ) )
+    def self.when hash, query, options = {}
+      current_time = options[:current_time] ||= Time.now
+      now_result = match hash, query, options
+      test_times = critical_times( hash, time_expressions( query ), options )
       test_times.
        sort.
-       drop_while{ |t| t < Time.now }.
-       find{ |t| now_result != match( hash, query, current_time: t ) }
+       drop_while{ |t| t < current_time }.
+       find{ |t| now_result != match( hash, query, options.merge(current_time: t) ) }.
+       tap{ |t| log 'Critical Times:', t }
     end
 
-    def self.critical_times hash, expressions
+    def self.critical_times hash, expressions, options = {}
+      current_time = options[:current_time] ||= Time.now
       expressions.
-        map{ | e |
+        map do | e |
           inverter = operand_uses_now?(e[:value])? -1: 1
           case e[:operator]
             when :<, :<=, :>, :>= then
-              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 = inverter * get_diff( eval_operand( hash, e[:value] ), eval_operand(hash, e[:key]) )
+              diff = inverter * get_diff( eval_operand( hash, e[:value], options ),
+                                          eval_operand( hash, e[:key], options.merge(is_key: true) )) + 0.001
+            when :==, :!= then
+              # TODO: test this functionality
+              diff = inverter * get_diff( eval_operand( hash, e[:value], options ),
+                                          eval_operand(hash, e[:key], options.merge(is_key: true) ) )
             when :between
-              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
+              diff = inverter * get_diff( eval_operand( hash, e[:value][0], options ),
+                                          eval_operand(hash, e[:key], options.merge(is_key: true) ) )
+              diff = inverter * get_diff( eval_operand( hash, e[:value][1], options ),
+                                          eval_operand(hash, e[:key], options.merge(is_key: true) ) ) if current_time + diff < current_time
           end
 
-          Time.now + diff
-        }
+          current_time + diff
+        end
     end
 
     def self.get_diff *values

data/lib/hash_conditions/version.rb

@@ -1,3 +1,3 @@
 module HashConditions
-  VERSION = "1.1.23"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_conditions
 version: !ruby/object:Gem::Version
-  version: 1.1.23
+  version: 1.2.0
 platform: ruby
 authors:
 - Giancarlo Palavicini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler