json_logic_ruby 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 331a993f35775659005673c1627c25e9a6a9fba1b6ae457d56643c0dd19ea3ce
-  data.tar.gz: 429fa17806f595566ec659c8209c60ed1cc74d7cdecafeaa10865a385ebb6b58
+  metadata.gz: c7c2e3086fde610813f6f857c8ce69fc592395f426d9dd4e9815b825675906a3
+  data.tar.gz: f59c1206313359a7bb1f79f1f3913c5d05a51b1797374de9db7e8fb5071779d9
 SHA512:
-  metadata.gz: 5fb1dbd4b674963ff19754b60814e7a4ccf37db4bdb31b6d7a664ae0c48fc4244e7b4e2d87f3145a57b3d05d1f86b93ddc5feecd904b63b1efa8df4f4bd1a2b4
-  data.tar.gz: 5f8560cf10d8a22a86905913a111533a5b11d73d8e473525c33e624ee9fba99ecc36c1b06496547eaeec187557ec6eb9b30e6796da66c4463ec2f06410c5e5d8
+  metadata.gz: 2ed81d16120716c5c24ebfda1b9b8b53ebb7125af6a72fdcee7f6885810c442c767447d2515a7277c493c9d89b3092e4060c74016e10309fb6e56f2036fb896a
+  data.tar.gz: 748f0f643b065edcd85920b5001ff8f426fb0e30bcb903c2bc6da7d24c9d6d535563862286b08669dbad95c5f5a5e1a5b25d06e06328b18d64e37da3dba043ca

data/lib/json_logic/concerns/trackable.rb

@@ -2,6 +2,8 @@
 
 module JsonLogic
   module Trackable
+    COMPLEX_OPERATORS = %w[and or if ! !! ?:].freeze
+
     attr_reader :tracker
 
     def init_tracker(operator)
@@ -12,15 +14,34 @@ module JsonLogic
       end
     end
 
-    def commit_rule_result!(var_name, operator, data, rules, result)
+    def commit_rule_result!(operator, data, rules, result)
       if COMPLEX_OPERATORS.include?(operator)
         # change operand to parent & save result
         @tracker.result = result
         @tracker        = @tracker.parent unless @tracker.parent.nil?
         return result
       end
+      var_name = get_var_name(operator, rules)
       @tracker.add_data_point(var_name, operator, rules, data, result)
       result
     end
+
+    private
+
+    # This method retrieves the variable name from a hash of rules based on the given operator.
+    #   { "<=" : [ 25, { "var": "age" }, 75] }
+    #   { "<=" : [ { "var" : "age" }, 20 ] }
+    #
+    # @param operator [String] The operator for which to retrieve the variable name.
+    # @param rules [Hash] A hash containing rule data.
+    # @return [String, nil] The variable name if found, otherwise nil.
+
+    def get_var_name(operator, rules)
+      args = rules[operator]
+      index = COMPLEX_OPERATORS.exclude?(operator) && args.length == 3 ? 1 : 0
+      args.dig(index, 'var')
+    rescue TypeError
+      nil
+    end
   end
 end

data/lib/json_logic/evaluator.rb

@@ -5,12 +5,12 @@ module JsonLogic
     include Trackable
 
     def apply(rules, data = {})
+      return rules.map { |val| apply(val, data) } if rules.is_a?(Array)
       return rules unless rules.is_a?(Hash)
 
       operator = rules.keys[0]
       init_tracker(operator)
-
-      values = operator == 'map' ? [] : Array(rules[operator]).map { |rule| apply(rule, data) }
+      values = operator == 'map' ? [] :  apply(rules[operator], data)
 
       operators(operator, values, rules, data)
     end
@@ -117,9 +117,7 @@ module JsonLogic
 
     def execute_operation(operator, rules, data, *)
       result = OPERATIONS[operator].call(*)
-      var_name = get_var_name(operator, rules)
-
-      commit_rule_result!(var_name, operator, data, rules, result)
+      commit_rule_result!(operator, data, rules, result)
     end
 
     # This method retrieves the value of a variable with a given name from the data structure.
@@ -137,22 +135,6 @@ module JsonLogic
       data.nil? ? default_value : data
     end
 
-    # This method retrieves the variable name from a hash of rules based on the given operator.
-    #   { "<=" : [ 25, { "var": "age" }, 75] }
-    #   { "<=" : [ { "var" : "age" }, 20 ] }
-    #
-    # @param operator [String] The operator for which to retrieve the variable name.
-    # @param rules [Hash] A hash containing rule data.
-    # @return [String, nil] The variable name if found, otherwise nil.
-
-    def get_var_name(operator, rules)
-      args = rules[operator]
-      index = COMPLEX_OPERATORS.exclude?(operator) && args.length == 3 ? 1 : 0
-      args.dig(index, 'var')
-    rescue TypeError
-      nil
-    end
-
     def missing(data, *args)
       args.select { |arg| get_var_value(data, arg).nil? }
     end

data/lib/json_logic/operations.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 module JsonLogic
-  COMPLEX_OPERATORS = %w[and or if].freeze
-
   OPERATIONS = {
     '==' => ->(a, b) { a == b },
     '!=' => ->(a, b) { a != b },

data/lib/json_logic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonLogic
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_logic_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Volodymyr Stashchenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-07 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport