hash_conditions 0.1.16 → 0.1.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTY2ZDFkZWU4YWE1ZGRjMzU3M2EzODhkMzQ1ZWE4MGVkMTI2OWY4Ng==
+    MjYwN2RmYmExMWMzYzEyOTEyMTkyMmU2NDhiMWI1MWM0ZTVjZGI4Mw==
   data.tar.gz: !binary |-
-    NDhhNzVkZDE2ZTEzZjQyZDRmMTQyZGMwYWUxYmQwOTM0MmFkMjUwZQ==
+    NzcwYTRhM2Q5ZTkzMmI5OWE4Y2JjMWJiNTViYmJjN2E4MDUwMDM1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MTQ0NmMzMTc4NzMyNzQwODVkNDQ3ODQxNTY3ZjcwMGQyODk0NGU0NWVjMmQ2
-    MmRlODA1YmVlMjk2YzQ2OGFjMzgwZDk0ZjQ5ODVjYWZhYTNjNjZkOTI2MjQ3
-    N2Y1YWFhYzMzMDcwYzU1YWE3ZDE4YjQwMTlhZTkzNzUxNGMzNzk=
+    NTA3Y2I1Njg3MmQ1NmIzYmYzM2ViZWEzMmNlNmQzMDY2YzE2OTY2YWZmNTk5
+    MzI0N2VmZWUzZTI3MDc4ODRkOWU2ZjI2MjJlZjk4ZDhkZDc3NjgzY2FhOTgx
+    Njc3MzllNDJlMTQwNGRkNWRmMjZkODU0N2VkMDg1NThmZmUxMDI=
   data.tar.gz: !binary |-
-    NjZmN2ZjOTBjMGRmZjNlZDk0NjdhODg4OGJkZWYxM2JhZmM4ODI1YmQxN2E5
-    ZDc2N2JkMGI4ZDViMGQ1NTRkOWNkNDllNjEzZmRhNjgzOWZlOGM0M2RjYjgy
-    MjI2OGQxZGE4MjY5Y2NmNGRkMTdiNDMwZTc5YWVmNzc2OTNiNmM=
+    MTJhZGE4NWFhYjJkNmNiNTUzYjkzNjJhMGFmOGNkN2JlMzdlMjYzYTVkOGVm
+    NGM5YWM0ZDcwZjA1MDBhZDdiZjE1NTQ5MTFlM2FmYmFlMTBjYjk1NGRkMmYz
+    OGY1YWQwNTIyZTU0MmYwNTNkNmI0YjliMDZjZDcwMDVhNWY0NjI=

data/lib/hash_conditions/core.rb

@@ -1,6 +1,13 @@
 module HashConditions
   module Core
     # Modular Matchers
+    ARITMETIC_OPERATORS = {
+      '$add' => :+,
+      '$substract' => :-,
+      '$multiply' => :*,
+      '$divide' => :/,
+    }
+
     def modules
       @@modules ||= []
     end
@@ -134,6 +141,38 @@ module HashConditions
       end
     end
 
+    def eval_operand hash, key, options = {}
+      __get_values = lambda do | values |
+        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
+            val = options[:is_key] ? hash[key] : key
+            re_type val
+          end
+        when Hash
+          op, values = key.to_a.first
+
+          case op.to_s
+            when *ARITMETIC_OPERATORS.keys
+              #TODO: Test feature: when applying aritmetics it forces that the values are floats
+              __get_values.call( values ).each{ |v| v.to_f }.inject( ARITMETIC_OPERATORS[ op ] )
+            when '$ifNull'
+              __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
+        else
+          key
+      end
+    end
+
     def _ext_match condition, options
       ->(key) { _ext_get_module( key, condition, options ) != nil }
     end

data/lib/hash_conditions/matcher.rb

@@ -1,12 +1,6 @@
 module HashConditions
   class Matcher
     extend Core
-    ARITMETIC_OPERATORS = {
-      '$add' => :+,
-      '$substract' => :-,
-      '$multiply' => :*,
-      '$divide' => :/,
-    }
 
     def self.fix_for_aritmetics *values
       class_precedence = [ Float, Integer, String ]
@@ -54,38 +48,6 @@ module HashConditions
       end
     end
 
-    def self.eval_operand hash, key, options = {}
-      __get_values = lambda do | values |
-        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
-            val = options[:is_key] ? hash[key] : key
-            re_type val
-          end
-        when Hash
-          op, values = key.to_a.first
-
-          case op.to_s
-            when *ARITMETIC_OPERATORS.keys
-              #TODO: Test feature: when applying aritmetics it forces that the values are floats
-              __get_values.call( values ).each{ |v| v.to_f }.inject( ARITMETIC_OPERATORS[ op ] )
-            when '$ifNull'
-              __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
-        else
-          key
-      end
-    end
-
     def self.match_single hash, expression, options
       hash_value = eval_operand hash, expression[:key], options.merge(is_key: true)
       comparisson_value = eval_operand hash, expression[ :value ], options
@@ -112,8 +74,8 @@ module HashConditions
           values = fix_for_aritmetics hash_value, comparisson_value
           values[0].send( expression[:operator], values[1] )
       end
-      rescue
-        raise "The expression: #{ expression } has an error"
+      # rescue
+        # raise "The expression: #{ expression } has an error"
     end
 
     def self.when hash, query

data/lib/hash_conditions/parser.rb

@@ -35,7 +35,7 @@ module HashConditions
         when :contains
           "LIKE #{ _parse_value(expression[:value], '%', '%') }"
         when :between
-          "BETWEEN #{ _parse_value expression[:value].shift } AND #{ _parse_value expression[:value].shift }"
+          "BETWEEN #{ _parse_value expression[:value][0] } AND #{ _parse_value expression[:value][1] }"
       end
 
       "#{expression[:key]} #{comparisson}"
@@ -46,6 +46,7 @@ module HashConditions
         when String then "'#{prepend}#{value}#{append}'"
         when DateTime, Date, Time then "'#{value.strftime("%Y-%m-%d %H:%M")}'"
         when Integer, Float then "#{value}"
+        when Hash then _parse_value( eval_operand( {}, value ) , prepend, append )
       end
     end
   end

data/lib/hash_conditions/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_conditions
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Giancarlo Palavicini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler