hash_conditions 0.1.8 → 0.1.10

data/lib/hash_conditions/core.rb

@@ -160,6 +160,7 @@ module HashConditions
       case parser_output
         when Hash   then iterator(parser_output, options)
         when NilClass then nil
+        when String then parser_output # this should be removed, since the matcher will not support it
         else raise "return data of type #{ parser_output.class } not supported"
       end
     end

data/lib/hash_conditions/matcher.rb

@@ -14,15 +14,18 @@ module HashConditions
       configurations[key]
     end
 
-    def self.match hash, conditions
-      iterator conditions, 
+    def self.match hash, conditions, options = {}
+      options = {
         operation: :match,
         result: lambda{ | expression, options |
-          match_single hash, expression
+          match_single hash, expression, options
         },
         finalize: lambda{ | array, options |
           finalize hash, array, options 
         }
+      }.merge options
+
+      iterator conditions, options
     end
    
     def self.finalize hash, array, options
@@ -39,14 +42,14 @@ module HashConditions
       '$divide' => :/,
     }
 
-    def self.get_key hash, key
+    def self.get_key hash, key, options = {}
       __get_values = lambda do | values |
-        values.map{ |x| get_key hash, x }
+        values.map{ |x| get_key hash, x, options }
       end
       case key
         when String, Symbol
           if key.to_s == '$now'
-            Time.now
+            options[:current_time] || Time.now
           else
             re_type hash[key]
           end
@@ -67,8 +70,8 @@ module HashConditions
       end
     end
     
-    def self.match_single hash, expression
-      hash_value = get_key hash, expression[:key]
+    def self.match_single hash, expression, options
+      hash_value = get_key hash, expression[:key], options
       comparisson_value = expression[ :value ]
 
       case expression[:operator]
@@ -86,12 +89,66 @@ module HashConditions
   
           comparisson_value.include? hash_value
         when :between
-          hash_value > comparisson_value.shift and hash_value < comparisson_value.shift
+          hash_value > comparisson_value[0] and hash_value < comparisson_value[1]
         when :contains
           !! %r{#{comparisson_value}}.match( hash_value )
         else
           hash_value.send( expression[:operator], comparisson_value )
       end
     end
+
+    def self.when hash, query
+      now_result = match hash, query
+      test_times = critical_times( hash, time_expressions( query ) ) 
+      test_times.
+       sort.
+       drop_while{ |t| t < Time.now }.
+       find{ |t| now_result != match( hash, query, current_time: t ) }
+    end
+
+    def self.critical_times hash, expressions
+      expressions.
+        map{ | e | 
+          case e[:operator]
+            when :<, :<=, :>, :>= then 
+              diff = e[:value] - get_key(hash, e[:key]) + 1
+            when :==, :!= then Time.now + s[:diff]
+              diff = e[:value] - get_key(hash, e[:key])
+            when :between
+              diff = e[:value][0] - get_key(hash, e[:key])
+              diff = e[:value][1] - get_key(hash, e[:key]) if Time.now + diff < Time.now
+          end
+
+          Time.now + diff
+        }
+    end
+
+    def self.time_expressions conditions
+      expressions = [] 
+      iterator conditions, 
+        operation: :match,
+        result: lambda{ | expression, options |
+          expressions << expression if uses_now? expression
+        },
+        finalize: lambda{ | array, options |
+          expressions
+        }
+
+      expressions
+    end
+
+    def self.uses_now? expression
+      key_uses_now? expression[:key]
+    end
+
+    def self.key_uses_now? key
+      case key
+        when String, Symbol
+          key.to_s == '$now'
+        when Hash
+          op, values = key.to_a.first
+          values.map{ |v| key_uses_now? v }.any?
+      end
+    end
   end
 end

data/lib/hash_conditions/version.rb

@@ -1,3 +1,3 @@
 module HashConditions
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_conditions
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1535850409122845806
+      hash: -314695273958895407
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1535850409122845806
+      hash: -314695273958895407
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23