hash_conditions 0.1.15 → 0.1.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODY4ZjJlNjdkMTcwMDkyNmQwNTVkYmM4OTBmYzVhMmE1OWVlZDFjNg==
+    OTY2ZDFkZWU4YWE1ZGRjMzU3M2EzODhkMzQ1ZWE4MGVkMTI2OWY4Ng==
   data.tar.gz: !binary |-
-    ZGUxZjlhMjI5NWNlOWRlZTZmMjg0ZTRmYzE3NzU3ZGU3YTI0ZTQ5Mw==
+    NDhhNzVkZDE2ZTEzZjQyZDRmMTQyZGMwYWUxYmQwOTM0MmFkMjUwZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTlmZDNlNWNmMGI0NDBkYjY5ZGQ0MDU2YzhmMDIwNjQ5NDhiMGQwMGFlZTdm
-    Y2M0MjUxMWRiZjJmMzgyZGYwMmJjZTRkOTUwZmZkODQ2MjY5NDZhMDU2NTQ0
-    MjM0ZDQ2M2M3YjNiM2NmZmJlOTliZTVlMjc5NmNhZGJkYTcyODM=
+    MTQ0NmMzMTc4NzMyNzQwODVkNDQ3ODQxNTY3ZjcwMGQyODk0NGU0NWVjMmQ2
+    MmRlODA1YmVlMjk2YzQ2OGFjMzgwZDk0ZjQ5ODVjYWZhYTNjNjZkOTI2MjQ3
+    N2Y1YWFhYzMzMDcwYzU1YWE3ZDE4YjQwMTlhZTkzNzUxNGMzNzk=
   data.tar.gz: !binary |-
-    MGY1NWE3NmQ3YjhmYWNhYWZkZjJkNDVhN2UwMzBlNjkxY2I1OGY3N2IzMWM2
-    Mjc5NTM4OWRjYjUwMjY2MDcwM2U4YjVmZWMyZDFkMTY1ZDY4OWZiZTRkMzM3
-    NTA4NDY4OTNkYjNmNjRjZTJkZDc0OGZmZGY1MmNlY2Y1NDA5NzE=
+    NjZmN2ZjOTBjMGRmZjNlZDk0NjdhODg4OGJkZWYxM2JhZmM4ODI1YmQxN2E5
+    ZDc2N2JkMGI4ZDViMGQ1NTRkOWNkNDllNjEzZmRhNjgzOWZlOGM0M2RjYjgy
+    MjI2OGQxZGE4MjY5Y2NmNGRkMTdiNDMwZTc5YWVmNzc2OTNiNmM=

data/hash_conditions.gemspec

@@ -30,5 +30,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency 'byebug'
 end

data/lib/hash_conditions/matcher.rb

@@ -54,16 +54,17 @@ module HashConditions
       end
     end
 
-    def self.get_key hash, key, options = {}
+    def self.eval_operand hash, key, options = {}
       __get_values = lambda do | values |
-        values.map{ |x| get_key hash, x, options }
+        values.map{ |x| eval_operand hash, x, options }
       end
       case key
         when String, Symbol
           if key.to_s == '$now'
             options[:current_time] || Time.now
           else
-            re_type hash[key]
+            val = options[:is_key] ? hash[key] : key
+            re_type val
           end
         when Hash
           op, values = key.to_a.first
@@ -80,12 +81,14 @@ module HashConditions
               separator = values.shift
               __get_values.call( values ).join( separator )
           end
+        else
+          key
       end
     end
 
     def self.match_single hash, expression, options
-      hash_value = get_key hash, expression[:key], options
-      comparisson_value = expression[ :value ]
+      hash_value = eval_operand hash, expression[:key], options.merge(is_key: true)
+      comparisson_value = eval_operand hash, expression[ :value ], options
 
       case expression[:operator]
         when :==
@@ -127,12 +130,12 @@ module HashConditions
         map{ | e |
           case e[:operator]
             when :<, :<=, :>, :>= then
-              diff = get_diff( e[:value], get_key( hash, e[:key] )) + 1
+              diff = 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( e[:value], get_key(hash, e[:key]) )
+              diff = get_diff( eval_operand( hash, e[:value] ), eval_operand(hash, e[:key]) )
             when :between
-              diff = get_diff( e[:value][0], get_key(hash, e[:key]) )
-              diff = get_diff( e[:value][1], get_key(hash, e[:key]) ) if Time.now + diff < Time.now
+              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
           end
 
           Time.now + diff
@@ -158,16 +161,18 @@ module HashConditions
     end
 
     def self.uses_now? expression
-      key_uses_now? expression[:key]
+      operand_uses_now? expression[:key]  or operand_uses_now? expression[:value]
     end
 
-    def self.key_uses_now? key
+    def self.operand_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?
+          values.map{ |v| operand_uses_now? v }.any?
+        else
+          false
       end
     end
   end

data/lib/hash_conditions/version.rb

@@ -1,3 +1,3 @@
 module HashConditions
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_conditions
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Giancarlo Palavicini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ! ' Ability to parse and match hashes against Mongo-like querys '
 email:
 - kasthor@gmail.com