json_logic 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 677b105ac790d969a647b1244272dec1d489ce8f
-  data.tar.gz: 2c2541c2edc2616d65e408084cb069350551dfa4
+  metadata.gz: e640de58f90a24c07975b01b93b5235ef902c321
+  data.tar.gz: c1b524a74b39da1f2ace7ea288a42a7d14cd4a66
 SHA512:
-  metadata.gz: 061f7d199adc1ddd4482aa446e10ea3cfadaeca343e4f4ec1de6629eab3db944828065ef4d123ac5153dcf16d8860a5767ec4f30767c411c4a0055233f5d4a45
-  data.tar.gz: 8451f7ac97031790f913c6b223d243ec476ddf71e1205f19b1f604c6a182960aa860bbffee0117aa98e1d245e6ffd38ad0bf74ed5d69ff139d4c8f213ec7a3b0
+  metadata.gz: e3172a26349b36c7979f74ce161fa29bc5b8cb51ddd8935f2767bd402cb13812b35e5a0d262a28a7a85347395154cc6a516506225bcc59d7e86c937817f80253
+  data.tar.gz: ff0f4ecf016e9fb90a27e01d1442e70154b0b2bec139bad29a21108953d9c8424b3861315af5449b6e177c2e4c1d2c08db73408964186f2322efb09dcc433563

data/lib/core_ext/deep_fetch.rb

@@ -1,13 +1,15 @@
 class Hash
   def deep_fetch(key, default = nil)
     keys = key.to_s.split('.')
-    dig(*keys) || default rescue default
+    value = dig(*keys) rescue default
+    value.nil? ? default : value  # value can be false (Boolean)
   end
 end
 
 class Array
   def deep_fetch(index, default = nil)
     indexes = index.to_s.split('.').map(&:to_i)
-    dig(*indexes) || default rescue default
+    value = dig(*indexes) rescue default
+    value.nil? ? default : value  # value can be false (Boolean)
   end
 end

data/lib/json_logic/operation.rb

@@ -79,17 +79,18 @@ module JSONLogic
         result.nil? ? v.last : result
       },
       '?:'    => ->(v, d) { LAMBDAS['if'].call(v, d) },
-      '>'     => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i > j } },
-      '>='    => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i >= j } },
-      '<'     => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i < j } },
-      '<='    => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i <= j } },
-      'max'   => ->(v, d) { v.map(&:to_i).max },
-      'min'   => ->(v, d) { v.map(&:to_i).min },
-      '+'     => ->(v, d) { v.map(&:to_i).reduce(:+) },
-      '-'     => ->(v, d) { v.map!(&:to_i); v.size == 1 ? -v.first : v.reduce(:-) },
-      '*'     => ->(v, d) { v.map(&:to_i).reduce(:*) },
+      '>'     => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i > j } },
+      '>='    => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i >= j } },
+      '<'     => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i < j } },
+      '<='    => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i <= j } },
+      'max'   => ->(v, d) { v.map(&:to_f).max },
+      'min'   => ->(v, d) { v.map(&:to_f).min },
+      '+'     => ->(v, d) { v.map(&:to_f).reduce(:+) },
+      '-'     => ->(v, d) { v.map!(&:to_f); v.size == 1 ? -v.first : v.reduce(:-) },
+      '*'     => ->(v, d) { v.map(&:to_f).reduce(:*) },
       '/'     => ->(v, d) { v.map(&:to_f).reduce(:/) },
       '%'     => ->(v, d) { v.map(&:to_i).reduce(:%) },
+      '^'     => ->(v, d) { v.map(&:to_f).reduce(:**) },
       'merge' => ->(v, d) { v.flatten },
       'in'    => ->(v, d) { v[1].include? v[0] },
       'cat'   => ->(v, d) { v.map(&:to_s).join },

data/lib/json_logic/truthy.rb

@@ -35,6 +35,12 @@ class Integer
   end
 end
 
+class Float
+  def falsy?
+    zero?
+  end
+end
+
 class Array
   def falsy?
     empty?

data/lib/json_logic/version.rb

@@ -1,3 +1,3 @@
 module JSONLogic
-  VERSION = '0.4.1'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_logic
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler