json_logic_ruby 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7359af03a31d1bcf8fd6674e36e246bf37ab3bb7f43318c46cc5508c61ecf2b6
-  data.tar.gz: b6cc1cfe85ff696ba67712cc858f84042882e879b35aba964c8c8324469ecb16
+  metadata.gz: c7c2e3086fde610813f6f857c8ce69fc592395f426d9dd4e9815b825675906a3
+  data.tar.gz: f59c1206313359a7bb1f79f1f3913c5d05a51b1797374de9db7e8fb5071779d9
 SHA512:
-  metadata.gz: 83bb07087a9fd29e1c756321d6de5b2c06e133a0677217b8f1654e5fef4c559c9f890d051c5a55c141f632667e78d9031845ee39fe4852c05e55a9e580eebe87
-  data.tar.gz: 4fc21d649a8b76a24ff07fd14b509180b181981995b675920f27d0d5e79ebb3d3743d7e2adeb6ee98b55486def40cb6b90b4d8b95e492ba77148e6a846d36052
+  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
@@ -96,7 +96,7 @@ module JsonLogic
       end
 
       if rules.is_a?(Hash)
-        rules.each { |_, rule| fetch_var_values(rule, var_name, values) }
+        rules.each_value { |rule| fetch_var_values(rule, var_name, values) }
         return values
       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.
@@ -134,23 +132,7 @@ module JsonLogic
       rescue TypeError
         data = data[key.to_i]
       end
-      data || default_value
-    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
+      data.nil? ? default_value : data
     end
 
     def missing(data, *args)

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.1'
+  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.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Volodymyr Stashchenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-23 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,7 +27,9 @@ dependencies:
         version: '7.0'
 description: Build complex rules, serialize them as JSON, and execute them in ruby.
   See https://jsonlogic.com
-email: 
+email:
+- stashchenko@ukr.net
+- savka.ai2015@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -39,7 +41,7 @@ files:
 - lib/json_logic/rule.rb
 - lib/json_logic/validator.rb
 - lib/json_logic/version.rb
-homepage: https://github.com/useful-libs/json_logic
+homepage: https://github.com/useful-libs/json_logic_ruby
 licenses:
 - MIT
 metadata: