hash_conditions 0.1.14 → 0.1.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTU3ZGFjMDhhZWI3NDZhYTExYmMyNjhlNTVjMWI5MmI3MWFjYzg1MA==
+    ODY4ZjJlNjdkMTcwMDkyNmQwNTVkYmM4OTBmYzVhMmE1OWVlZDFjNg==
   data.tar.gz: !binary |-
-    OTAyNmQzYjVkYmNhM2MxNmUwZTBmOGRjY2ZmNTA3MjhiYjAwYTU4ZA==
+    ZGUxZjlhMjI5NWNlOWRlZTZmMjg0ZTRmYzE3NzU3ZGU3YTI0ZTQ5Mw==
 SHA512:
   metadata.gz: !binary |-
-    NmM4ZGJiYjExYjZlZjg2NWU4MzlhYTVmMGJmMDhiMGY3YTNhOWY5NjliZTIz
-    ODE2MWZiNDMzN2M0OTBkYTY5NWJkMDUyZmNmZWJlODhhMWU4ZTI3MjM0MWYx
-    NWI1OGQwYzY5ODg4NjYyZTllZTAzMzkwYWJhYmMzYmUzOWNlNjU=
+    ZTlmZDNlNWNmMGI0NDBkYjY5ZGQ0MDU2YzhmMDIwNjQ5NDhiMGQwMGFlZTdm
+    Y2M0MjUxMWRiZjJmMzgyZGYwMmJjZTRkOTUwZmZkODQ2MjY5NDZhMDU2NTQ0
+    MjM0ZDQ2M2M3YjNiM2NmZmJlOTliZTVlMjc5NmNhZGJkYTcyODM=
   data.tar.gz: !binary |-
-    MTUyMzQxY2ViYzkwZTU2YWYzNmIyYzVkZTkwYTZkNzllMTBiM2NlNWRkZjE3
-    MjZiZGNhMmE4MjQxMzc4YjYyNjU4MDM3NjcxZjQzM2FhMzUwNTEzMDJkYzM2
-    N2Y1MmIzMTZjMTQ3ODk5MmM0MzVmZTY1MGMwNWU0ZWEyZjgzMzA=
+    MGY1NWE3NmQ3YjhmYWNhYWZkZjJkNDVhN2UwMzBlNjkxY2I1OGY3N2IzMWM2
+    Mjc5NTM4OWRjYjUwMjY2MDcwM2U4YjVmZWMyZDFkMTY1ZDY4OWZiZTRkMzM3
+    NTA4NDY4OTNkYjNmNjRjZTJkZDc0OGZmZGY1MmNlY2Y1NDA5NzE=

data/hash_conditions.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'byebug'
 end

data/lib/hash_conditions/matcher.rb

@@ -1,6 +1,25 @@
 module HashConditions
   class Matcher
     extend Core
+    ARITMETIC_OPERATORS = {
+      '$add' => :+,
+      '$substract' => :-,
+      '$multiply' => :*,
+      '$divide' => :/,
+    }
+
+    def self.fix_for_aritmetics *values
+      class_precedence = [ Float, Integer, String ]
+
+      klass = class_precedence.find{ |k| values.any?{ |v| v.is_a? k } } || NilClass
+
+      values = case klass.name
+        when "Integer" then values.map(&:to_i)
+        when "Float"   then values.map(&:to_f)
+        when "String"  then values.map(&:to_s)
+        else values
+      end
+    end
 
     def self.configurations
       @@configurations ||= {}
@@ -35,13 +54,6 @@ module HashConditions
       end
     end
 
-    ARITMETIC_OPERATORS = {
-      '$add' => :+,
-      '$substract' => :-,
-      '$multiply' => :*,
-      '$divide' => :/,
-    }
-
     def self.get_key hash, key, options = {}
       __get_values = lambda do | values |
         values.map{ |x| get_key hash, x, options }
@@ -94,16 +106,11 @@ module HashConditions
         when :contains
           !! %r{#{comparisson_value}}.match( hash_value )
         else
-          #TODO: test this!!
-          comparisson_value = case hash_value
-            when Integer then comparisson_value.to_i
-            when Float then comparisson_value.to_f
-            when String then comparisson_value.to_s
-            else comparisson_value
-          end
-
-          hash_value.send( expression[:operator], comparisson_value )
+          values = fix_for_aritmetics hash_value, comparisson_value
+          values[0].send( expression[:operator], values[1] )
       end
+      rescue
+        raise "The expression: #{ expression } has an error"
     end
 
     def self.when hash, query
@@ -120,18 +127,22 @@ module HashConditions
         map{ | e |
           case e[:operator]
             when :<, :<=, :>, :>= then
-              diff = e[:value] - get_key(hash, e[:key]) + 1
+              diff = get_diff( e[:value], get_key( hash, e[:key] )) + 1
             when :==, :!= then Time.now + s[:diff]
-              diff = e[:value] - get_key(hash, e[:key])
+              diff = get_diff( e[:value], get_key(hash, e[:key]) )
             when :between
-              diff = e[:value][0] - get_key(hash, e[:key])
-              diff = e[:value][1] - get_key(hash, e[:key]) if Time.now + diff < Time.now
+              diff = get_diff( e[:value][0], get_key(hash, e[:key]) )
+              diff = get_diff( e[:value][1], get_key(hash, e[:key]) ) if Time.now + diff < Time.now
           end
 
           Time.now + diff
         }
     end
 
+    def self.get_diff *values
+      fix_for_aritmetics(*values).inject(&:-)
+    end
+
     def self.time_expressions conditions
       expressions = []
       iterator conditions,

data/lib/hash_conditions/version.rb

@@ -1,3 +1,3 @@
 module HashConditions
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_conditions
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Giancarlo Palavicini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! ' Ability to parse and match hashes against Mongo-like querys '
 email:
 - kasthor@gmail.com