hash_conditions 0.1.5 → 0.1.6

data/lib/hash_conditions/core.rb

@@ -37,7 +37,7 @@ module HashConditions
               when '$and' then iterator(value, options.merge( glue: :and ))
               when '$or' then iterator(value, options.merge( glue: :or))
               when '$eval' then results_from_expression( eval_expression( value ), options )
-              when _ext_match( value, options ) then _ext_parse( key, value, options )
+              when _ext_match( value, options ) then _ext_parse( extract_expression(key, value) , options )
               else results_from_expression( extract_expression( key, value ), options )
             end
           end
@@ -88,7 +88,15 @@ module HashConditions
           end
       end
 
-      re_type result
+      result[:value] = re_type result[:value]
+
+      result
+    end
+
+    def get_condition_from_expression expression
+      {}.tap do | condition |
+        condition[ expression[:operator] ] = expression[:value]
+      end
     end
 
     def get_op key
@@ -102,30 +110,31 @@ module HashConditions
         when '$between' then :between
         when '$in' then :in
         when '$contains' then :contains
-        else 
-          raise "No operator for '#{ op }"
+        else key
       end
     end
 
     def re_type data
-      if data[:value].is_a? String
-        data[:value] = case data[:value]
-          when /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z/ then DateTime.parse( data[:value] )
-          else data[:value]
+      if data.is_a? String
+        case data
+          when /\d{4}-\d{2}-\d{2}[\sT]\d{2}:\d{2}:\d{2}(\.\d{3})?Z?/ then DateTime.parse( data ).to_time
+          else data
         end  
+      else
+        data
       end
-
-      data
     end
 
     def _ext_match condition, options
       ->(key) { _ext_get_module( key, condition, options ) != nil }
     end
 
-    def _ext_parse key, condition, options
+    def _ext_parse expression, options
+      key, op, value = expression.values_at :key, :operator, :value
+      condition = get_condition_from_expression expression
+
       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)

data/lib/hash_conditions/matcher.rb

@@ -48,7 +48,7 @@ module HashConditions
           if key.to_s == '$now'
             Time.now
           else
-            hash[key]
+            re_type hash[key]
           end
         when Hash
           op, values = key.to_a.first

data/lib/hash_conditions/version.rb

@@ -1,3 +1,3 @@
 module HashConditions
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

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