json-logic-rb 0.1.1.beta2 → 0.1.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6eafce983f8ec5d721d323a038d0e2c739d9e616069ec703847cd9a010bae2a
-  data.tar.gz: 1a57bc686fab6a2cee116c072b62eb07a6856faa19f04b1ee1f3eb8b66ceaa8e
+  metadata.gz: 49483cded1408b390afa16c3b95a5c6ef8bc54052f3295ec8c9bc6ff80ae1c48
+  data.tar.gz: 3e98022c63ae218d3410696ab664bc71da00e282c04c8c63535d03c819bfe831
 SHA512:
-  metadata.gz: a4afb877d45472c538008605048a0ba09800cb14f2c85336ffb4ee31093a7e8a08a5df7770091b58913009eb77bd88abf8a127621654e841b2eb3af47883333b
-  data.tar.gz: 16650f3a7ec8cbcce5dc64e7fb634c269b4c95361ead60dfaa07efda47332704bf0ac0a660b6f7d4acfe2a0078955dff18367cb1958173a9643c6043bb14b063
+  metadata.gz: c0451ee54551025d9c56d0b92e3211f2135fdcf248714915278f4f9087f8bf862db657f5467902d6b26ea12497d5055c4390fac1dc668f0cc34f660a9db044f1
+  data.tar.gz: ce9bea35b50f696dc41b57dd100ea686104094c850114d7b0a2658900dfa56c1a9b34fa5e2a9672cccc25f6f3d6a22db456de8c023aa46d3f099a22a3d5e45b8

data/lib/json_logic/operations/all.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::All < JsonLogic::EnumerableOperation
   def self.op_name = "all"
 
@@ -8,7 +10,7 @@ class JsonLogic::Operations::All < JsonLogic::EnumerableOperation
     return false if items.empty?
 
     items.all? do |item|
-      truthy?(JsonLogic.apply(rule_applied_to_each_item, item))
+      !!JsonLogic.apply(rule_applied_to_each_item, item)
     end
   end
 end

data/lib/json_logic/operations/and.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::And < JsonLogic::LazyOperation
   def self.op_name = "and"
 
@@ -7,7 +9,7 @@ class JsonLogic::Operations::And < JsonLogic::LazyOperation
     last = nil
     args.each do |a|
       last = JsonLogic.apply(a, data)
-      return last unless truthy?(last)
+      return last unless !!last
     end
     last
   end

data/lib/json_logic/operations/bool_cast.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
 class JsonLogic::Operations::BoolCast < JsonLogic::Operation
   def self.op_name = "!!"
 
   def call((a), _data)
-    truthy?(a)
+    !!a
   end
 end

data/lib/json_logic/operations/filter.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::Filter < JsonLogic::EnumerableOperation
   def self.op_name = "filter"
 
@@ -7,7 +9,7 @@ class JsonLogic::Operations::Filter < JsonLogic::EnumerableOperation
     items, rule_applied_to_each_item = resolve_items_and_per_item_rule(args, data)
 
     items.filter do |item|
-      truthy?(JsonLogic.apply(rule_applied_to_each_item, item))
+      !!JsonLogic.apply(rule_applied_to_each_item, item)
     end
   end
 end

data/lib/json_logic/operations/if.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::If < JsonLogic::LazyOperation
   def self.op_name = "if"
 
   def call(args, data)
     i = 0
     while i < args.size - 1
-      return JsonLogic.apply(args[i + 1], data) if truthy?(JsonLogic.apply(args[i], data))
+      return JsonLogic.apply(args[i + 1], data) if !!(JsonLogic.apply(args[i], data))
       i += 2
     end
     return JsonLogic.apply(args[-1], data) if args.size.odd?

data/lib/json_logic/operations/none.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::None < JsonLogic::EnumerableOperation
   def self.op_name = "none"
 
   def call(args, data)
     items, rule_applied_to_each_item = resolve_items_and_per_item_rule(args, data)
     items.none? do |item|
-      truthy?(JsonLogic.apply(rule_applied_to_each_item, item))
+      !!(JsonLogic.apply(rule_applied_to_each_item, item))
     end
   end
 end

data/lib/json_logic/operations/not.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::Not < JsonLogic::Operation
   def self.op_name = "!";
 
-  def call((a), _data) = !truthy?(a)
+  def call((a), _data) = !a
 end

data/lib/json_logic/operations/or.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
+
+using JsonLogic::Semantics
 class JsonLogic::Operations::Or < JsonLogic::LazyOperation
   def self.op_name = "or"
 
   def call(args, data)
     args.each do |a|
       v = JsonLogic.apply(a, data)
-      return v if truthy?(v)
+      return v if !!v
     end
 
     args.empty? ? nil : JsonLogic.apply(args.last, data)

data/lib/json_logic/operations/some.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: tru
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::Some < JsonLogic::EnumerableOperation
   def self.op_name = "some"
 
@@ -8,7 +10,7 @@ class JsonLogic::Operations::Some < JsonLogic::EnumerableOperation
     return false if items.empty?
 
     items.any? do |item|
-      truthy?(JsonLogic.apply(rule_applied_to_each_item, item))
+      !!JsonLogic.apply(rule_applied_to_each_item, item)
     end
   end
 end

data/lib/json_logic/operations/strict_not_equal.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::StrictNotEqual < JsonLogic::Operation
   def self.op_name = "!=="
 

data/lib/json_logic/operations/ternary.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+using JsonLogic::Semantics
+
 class JsonLogic::Operations::Ternary < JsonLogic::LazyOperation
   def self.op_name = "?:"
 
   def call((cond_rule, then_rule, else_rule), data)
-    if truthy?(JsonLogic.apply(cond_rule, data))
+    if !!JsonLogic.apply(cond_rule, data)
       JsonLogic.apply(then_rule, data)
     else
       JsonLogic.apply(else_rule, data)

data/lib/json_logic/semantics.rb

@@ -6,11 +6,18 @@ module JsonLogic
 
     def truthy?(v)
       case v
-      when nil then false
-      when TrueClass, FalseClass then v
-      when Numeric then !v.zero?
-      when String, Array then !v.empty?
-      else true
+      when nil
+        false
+      when TrueClass, FalseClass
+        v
+      when Numeric
+        v.zero? ? false : true
+      when String
+        v.empty? ? false : true
+      when Array
+        v.empty? ? false : true
+      else
+        true
       end
     end
 
@@ -24,7 +31,11 @@ module JsonLogic
       when String
         s = v.strip
         return 0.0 if s.empty?
-        Float(s) rescue Float::NAN
+        begin
+          Float(s)
+        rescue ArgumentError
+          Float::NAN
+        end
       else
         Float::NAN
       end
@@ -32,11 +43,15 @@ module JsonLogic
 
     def eq(a, b)
       if a.class == b.class
-        return false if a.is_a?(Numeric) && (a.to_f.nan? || b.to_f.nan?)
-        return a.is_a?(Numeric) ? (a.to_f == b.to_f) : a.eql?(b)
+        if a.is_a?(Numeric)
+          return false if a.to_f.nan? || b.to_f.nan?
+          return a.to_f == b.to_f
+        else
+          return a.eql?(b)
+        end
       end
 
-      if a == true || a == false || b == true || b == false
+      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
@@ -61,29 +76,29 @@ module JsonLogic
       end
     end
 
-    [String, Integer, TrueClass, FalseClass, NilClass, Array].each do |klass|
-      refine klass do
-        def ==(other) = JsonLogic::Semantics.eq(self, other)
-
-        def >(other)
-          c = JsonLogic::Semantics.cmp(self, other)
-          c && c == 1
-        end
+    refine Object do
+      def !@
+        JsonLogic::Semantics.truthy?(self) ? false : true
+      end
 
-        def >=(other)
-          c = JsonLogic::Semantics.cmp(self, other)
-          c && (c == 1 || c == 0)
-        end
+      def to_bool
+        JsonLogic::Semantics.truthy?(self)
+      end
+    end
 
-        def <(other)
-          c = JsonLogic::Semantics.cmp(self, other)
-          c && c == -1
-        end
+    [String, Integer, Float].each do |klass|
+      refine klass do
+        def ==(other) = JsonLogic::Semantics.eq(self, other)
+        def >(other)  = (c = JsonLogic::Semantics.cmp(self, other)) && c == 1
+        def >=(other) = (c = JsonLogic::Semantics.cmp(self, other)) && (c == 1 || c == 0)
+        def <(other)  = (c = JsonLogic::Semantics.cmp(self, other)) && c == -1
+        def <=(other) = (c = JsonLogic::Semantics.cmp(self, other)) && (c == -1 || c == 0)
+      end
+    end
 
-        def <=(other)
-          c = JsonLogic::Semantics.cmp(self, other)
-          c && (c == -1 || c == 0)
-        end
+    [Array, TrueClass, FalseClass, NilClass].each do |klass|
+      refine klass do
+        def ==(other) = JsonLogic::Semantics.eq(self, other)
       end
     end
   end

data/lib/json_logic/version.rb

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

metadata

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