hash_conditions 0.1.3 → 0.1.4

data/lib/hash_conditions/core.rb

@@ -114,9 +114,11 @@ module HashConditions
     def _ext_parse key, condition, options
       mod = _ext_get_module key,condition, options
       parser = mod.replacement
+      op, value = condition.to_a.first
 
       case parser 
         when String then options[:result].call(extract_expression( parser, condition ), options)
+        when Hash   then _ext_read_module( { '$eval' => [ parser, op, value ] }, options )
         when Proc   then _ext_read_module( parser.call( key, condition ), options )
       end 
     end

data/lib/hash_conditions/matcher.rb

@@ -40,6 +40,9 @@ module HashConditions
     }
 
     def self.get_key hash, key
+      __get_values = lambda do | values |
+        values.map{ |x| get_key hash, x }
+      end
       case key
         when String, Symbol
           if key.to_s == '$now'
@@ -50,14 +53,16 @@ module HashConditions
         when Hash
           op, values = key.to_a.first
 
-          values = values.map{ |x| get_key hash, x }
-
           case op.to_s
             when *ARITMETIC_OPERATORS.keys
-              values.inject( ARITMETIC_OPERATORS[ op ] )
+              __get_values.call( values ).inject( ARITMETIC_OPERATORS[ op ] )
             when '$ifNull'
-              val = values.shift
-              val.nil? ? values.shift : val
+              __get_values.call( values ).drop_while{ |n| n.nil? }.shift
+            when '$concat'
+              __get_values.call( values ).join('')
+            when '$concatWithSeparator'
+              separator = values.shift
+              __get_values.call( values ).join( separator )
           end
       end
     end

data/lib/hash_conditions/version.rb

@@ -1,3 +1,3 @@
 module HashConditions
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_conditions
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2284979545467229792
+      hash: 2658515704527149634
 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: -2284979545467229792
+      hash: 2658515704527149634
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23