json-logic-rb 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d726f7f3bf1bd6cb21653d3764b60bb78d1d1e098f0f0f42cc821dbf3f5da9b1
-  data.tar.gz: 3a3816024e8d4ae47bced0a6a04abd92bdab15bd8f134c616d2f8333759f8f27
+  metadata.gz: e78d982fcb2d524f9cf465fe79b6248a4b0db63b188059e712ec2eaeac4f92fe
+  data.tar.gz: d3088cd8e398155b9d94e5c9c34435b4af1fcd0c7ba71f6aedb7333802372218
 SHA512:
-  metadata.gz: 9a83a929d74d39baf96a5721206e1d4935c5b432876d734a3b6d83e912224b60a5e1e2051242522cdfa25014c11138f3b7dbff9c13c7c01e26d6be11127da679
-  data.tar.gz: 4dd0db70c83bf78025d2c44c96f4e1cdbb1a3f9884b7f3e8f5031e1393d7cc3b2575979894393a37e15f804dfdec0e6dc5b3c1e7822d94681de61bbdedba88c2
+  metadata.gz: c960976bb1311c6ff7528464a62a7e655702bca7565c9594fa11a1b103c84f3beb045934c387adde643d9f21fbf4daeaf4c46f6e55a96e5866f95b5b86163da3
+  data.tar.gz: f623b9be9b861890f73d7284050b8fd26debfc4d928495ed5ef406ccc0d4abbc7cec93ddf23485bcd199f0b85f7cec37cba0232ffa8589db429d80c28c5d6ae8

data/lib/json_logic/semantics.rb

@@ -21,13 +21,20 @@ module JsonLogic
       end
     end
 
+    def to_primitive(v)
+      case v
+      when Array then v.join(',')
+      else v
+      end
+    end
+
     def num(v)
       case v
       when Numeric    then v.to_f
       when TrueClass  then 1.0
       when FalseClass then 0.0
       when NilClass   then 0.0
-      when Array      then num(v.join(','))
+      when Array      then num(to_primitive(v))
       when String
         s = v.strip
         return 0.0 if s.empty?
@@ -44,23 +51,36 @@ module JsonLogic
     def eq(a, b)
       if a.class == b.class
         if a.is_a?(Numeric)
-          return false if a.to_f.nan? || b.to_f.nan?
-          return a.to_f == b.to_f
+          ax = a.to_f; bx = b.to_f
+          return false if ax.nan? || bx.nan?
+          return ax == bx
         else
           return a.eql?(b)
         end
       end
 
-      if a.is_a?(TrueClass) || a.is_a?(FalseClass) || b.is_a?(TrueClass) || b.is_a?(FalseClass)
-        na = num(a); nb = num(b)
-        return false if na.nan? || nb.nan?
-        return na == nb
+      if a.nil? && b.nil?
+        return true
+      elsif a.nil? || b.nil?
+        return false
+      end
+
+      if a.is_a?(TrueClass) || a.is_a?(FalseClass)
+        return eq(num(a), b)
+      end
+      if b.is_a?(TrueClass) || b.is_a?(FalseClass)
+        return eq(a, num(b))
       end
 
       if (a.is_a?(String) && b.is_a?(Numeric)) || (a.is_a?(Numeric) && b.is_a?(String))
-        na = num(a); nb = num(b)
-        return false if na.nan? || nb.nan?
-        return na == nb
+        ax = num(a); bx = num(b)
+        return false if ax.nan? || bx.nan?
+        return ax == bx
+      end
+
+      if (a.is_a?(Array) && (b.is_a?(String) || b.is_a?(Numeric))) ||
+         (b.is_a?(Array) && (a.is_a?(String) || a.is_a?(Numeric)))
+        return eq(to_primitive(a), to_primitive(b))
       end
 
       false
@@ -86,7 +106,7 @@ module JsonLogic
       end
     end
 
-    [String, Integer, Float].each do |klass|
+    [String, Integer, Float, NilClass, Array, TrueClass, FalseClass].each do |klass|
       refine klass do
         def ==(other) = JsonLogic::Semantics.eq(self, other)
         def >(other)  = (c = JsonLogic::Semantics.cmp(self, other)) && c == 1
@@ -95,11 +115,5 @@ module JsonLogic
         def <=(other) = (c = JsonLogic::Semantics.cmp(self, other)) && (c == -1 || c == 0)
       end
     end
-
-    [Array, TrueClass, FalseClass, NilClass].each do |klass|
-      refine klass do
-        def ==(other) = JsonLogic::Semantics.eq(self, other)
-      end
-    end
   end
 end

data/lib/json_logic/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-module JsonLogic; VERSION = '0.1.2'; end
+module JsonLogic; VERSION = '0.1.4'; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-logic-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Tavrel Kate
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-31 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies: []
 description: Ruby implementation of JsonLogic. JsonLogic rules are JSON trees. The
   engine walks that tree and returns a Ruby value. Ships with a compliance runner