hash_conditions 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGY2YzgxMmQ0ZTIzOTIyOGM1NGI0MDlkOGI4ZjIyNDQ2NmY5ZTFlZQ==
+    YTIwY2E0OGRlZGU5NzE1YTI2MmFjZDI1OGMxZTFlZDhmOTYzZTExOA==
   data.tar.gz: !binary |-
-    OTE5ZTk3M2VjMjhmODIwNjJlNGQ1ZDZkYWU0M2IzMWYwMTMwYzUyMg==
+    NmU2NDQ4M2E3ZmFlNGRkNDZiMjdmNzgyZTYwNzE4ODMxNjM2ODRkMA==
 SHA512:
   metadata.gz: !binary |-
-    OWU3YWQxNDZiMzI5Yjk1ODg4NWM5N2EzODQwYjM1OTRkZTBkY2YzMzY2ZTc3
-    OTAxMzFiZTRhMzU4ZmNhYzUzZmUxYzJiODhmZDg0NzYxMTQ5Y2MzZTk5NTUx
-    MTdlOGFmZjRjNjkwNWUwOGVhODVlODAyODA5YTdmMTMxNWJlZWQ=
+    ZDQxNWRkOTNiNTNkZDFkMzZhNzIwZTkyYjI3YWZhNzE3NTA1OTUyMDZkOTk4
+    ZjQ0Zjc2NTI5YjRkMGY2Zjk5MjQyNjdjNmMwYzFlOTg4NzhmODg4NDJhZDJi
+    ZjRjZWM2NjJlYTkzMzc2NDE4NDlkNDQ1N2I4MGM3YmQwYjdkOGY=
   data.tar.gz: !binary |-
-    MjUxMTY0NzcxNjkzNTFkOGIwZDA0OGMyMzA4MmM2NmE4ZTJkZDRmNThhOTBk
-    ODRjNWU1NmMxODQwYWM2NTI3ODI1MjkxMTdhNzJjMDYxMzcyNTg5NWZmMDJi
-    ZTcxNTM2MjI3ZGExY2MwZTUxNDA4MDJkNGJmYzM3OWY4NTI4YjE=
+    N2NmMWE0YjdjNTYwZGMxYTU0ZDBhY2E1OGZhOTRhNjY4YmZkMTQ1MTZiNDRk
+    NjgxZmEwYjhiNDA3OTFlODFkZmI1MjFiMWZjNDVjMmMyNmE3YWJmOWZiMjU1
+    ZTVmMWJkNjZhMDUyMWEzMjdlOTRjMmMzNGM4YWZlMmNmYmE3MWU=

data/lib/hash_conditions/core.rb

@@ -1,4 +1,8 @@
 module HashConditions
+  class KeyNotFound < Exception; end
+  class UnexpectedExpression < Exception; end
+  class InvalidExpression < Exception; end
+
   module Core
     # Modular Matchers
     DEBUG=false
@@ -143,6 +147,19 @@ module HashConditions
       end
     end
 
+    def get_key hash, key
+      if hash.has_key? key
+        hash[ key ]
+      else
+        key_type = key.class
+        key.to_s.split('.').inject(hash) do |ret, k|
+          typed_key = key_type == Symbol ? k.to_sym : k
+          raise KeyNotFound, "key #{key} not found" unless ret.has_key? typed_key
+          ret = ret[ typed_key ]
+        end
+      end
+    end
+
     def eval_operand hash, key, options = {}
       __get_values = lambda do | values |
         values.map{ |x| eval_operand hash, x, options }
@@ -152,7 +169,7 @@ module HashConditions
           if key.to_s == '$now'
             options[:current_time] || Time.now
           else
-            val = options[:is_key] ? hash[key] : key
+            val = options[:is_key] ? get_key( hash, key ) : key
             re_type val
           end
         when Array

data/lib/hash_conditions/version.rb

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

metadata

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