hash_conditions 0.1.7 → 0.1.8

data/lib/hash_conditions/core.rb

@@ -146,7 +146,7 @@ module HashConditions
       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 )
+        when Proc   then _ext_read_module( parser.call( key, condition, options ), options )
       end 
     end
 

data/lib/hash_conditions/parser.rb

@@ -3,7 +3,7 @@ module HashConditions
     extend Core
 
     def self.get_conditions conditions, options = {}
-      result = iterator conditions,
+      options = options.merge \
         operation: :parse,
         result: lambda{ | expression, options |
           _parse_key_value_condition expression
@@ -12,6 +12,8 @@ module HashConditions
           "( #{ array.join( " #{ options[:glue].upcase } " ) } )"
         }
 
+      result = iterator conditions, options
+
       result.
         gsub!(/^\( /, '').
         gsub!(/ \)$/, '')
@@ -40,7 +42,7 @@ module HashConditions
     def self._parse_value value, prepend = '', append = ''
       case value
         when String then "'#{prepend}#{value}#{append}'"
-        when DateTime, Date, Time then "'#{value.strftime("%Y-%m-%d %I:%M%p")}'"
+        when DateTime, Date, Time then "'#{value.strftime("%Y-%m-%d %H:%M")}'"
         when Integer, Float then "#{value}"
       end
     end

data/lib/hash_conditions/version.rb

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

metadata

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