json-logic-rb 0.1.0.beta1 → 0.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f6841b0bb7968ba96acb42d78d167b14c9757b66f7e76a87b474a6af22958e5
-  data.tar.gz: 1c6a5520ce8de25ad8191542e2e0aeb3ce57846ef40d8bcd66ed0a061a5ed407
+  metadata.gz: 353191c500d952bd851cd63744323aabee9df0ed7ba838496902097e37741ded
+  data.tar.gz: a38434d883bffd18579ead8ef04bb0a75ccfae121b441d4270233dd8451ade00
 SHA512:
-  metadata.gz: 6c988634418f03c386e0c53ccd5323b2566bf13679d81b15c7f22538b7179b3d6a49f9998520d5155fd36e249d0b809951cc164a11d0ae425a9e09e67cf56b2d
-  data.tar.gz: 5e8e604fd9cc6cd1c927d071478db8cc4c00d6ca5bced126fba001d481998df551c766312d91aed49800495633220df85391cad88b0e6e98c235c8a9e0dc13c3
+  metadata.gz: a80d3d73a45fccb17750f75ca1875c8e85897c4b5e81ecbabeb6e961f78e0eeb0fb69fb3cf3f9da2ff8bb70f53685b1a80a554b5daa718f4740654e6d3ef9310
+  data.tar.gz: b79782b7923300af9ac3f24a816f91e29c5b4126d511f0fcbd9f1bb8eda1b859ca796aece57520e401d776fbfee7111f48c1778262de87b3b60d6baaf24dc17c

data/README.md

@@ -43,7 +43,7 @@ gem install json-logic-rb
 ## Quick start
 
 ```ruby
-require "json-logic-rb"
+require 'json_logic'
 
 rule = { "+" => [1, 2, 3] }
 

data/lib/json_logic/semantics.rb

@@ -2,6 +2,8 @@
 
 module JsonLogic
   module Semantics
+    NUMERIC_RE = /\A[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?\z/.freeze
+
     module_function
 
     def truthy?(v)
@@ -18,8 +20,16 @@ module JsonLogic
     def falsy?(v) = !truthy?(v)
 
     def to_number(v)
-      return v.to_f if v.is_a?(Numeric) || v.is_a?(String)
-      v.to_s.to_f
+      case v
+      when Integer then v
+      when Numeric then v.to_f
+      when String
+        s = v.strip
+        return nil unless NUMERIC_RE.match?(s)
+        s =~ /[.eE]/ ? s.to_f : s.to_i
+      else
+        nil
+      end
     end
 
     def strict_equal(a,b)
@@ -30,12 +40,13 @@ module JsonLogic
       end
     end
 
-    def loose_equal(a,b)
-      if (a.is_a?(Numeric)||a.is_a?(String)) && (b.is_a?(Numeric)||b.is_a?(String))
-        to_number(a) == to_number(b)
-      else
-        a == b
+    def loose_equal(a, b)
+      if (a.is_a?(Numeric) || a.is_a?(String)) && (b.is_a?(Numeric) || b.is_a?(String))
+        na = to_number(a)
+        nb = to_number(b)
+        return na == nb unless na.nil? || nb.nil?
       end
+      a == b
     end
   end
 end

data/lib/json_logic/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-module JsonLogic; VERSION = '0.1.0.beta1'; end
+module JsonLogic; VERSION = '0.1.0.beta2'; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-logic-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.1.0.beta2
 platform: ruby
 authors:
 - Tavrel Kate