json_logic 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 02d27d74f30407c0f44426ca5c69a5c32b781fa4
-  data.tar.gz: fefdbb2e9d6f74f7bf06c789bbc812a2d64213bd
+SHA256:
+  metadata.gz: c8af2db5872f3fe1ff4ebf64aa0ca0b617f3238b6536c750a85f80e000e84881
+  data.tar.gz: b80fa16f7e15ee2025cdba337af89bafe6c777882763a8dfecc4427997ebc90c
 SHA512:
-  metadata.gz: 88a67e9def1c338e4c720f3e485c8441ec71704debff13fb149c144540f114b80679a6077854b184b3429faa03075ca0eb890949184be11ae45e83a0aba03565
-  data.tar.gz: 99f44c676014e61dc7cbf5fda8d40bda9a946489938c44f55bdaa20a308a25f555c1ce951da355d18ff4096c5a0ca07558879c62ce37392b02591fe9289b6aee
+  metadata.gz: dc13699694479c8c33c582278bbf9e81d78292fa2665d477590c2bcf95f959711f635120174e040375009a0c55ac3ca3dd7ec627fc9ac17292ea93c037f7aea9
+  data.tar.gz: af2eec900330d7f48392ee7498dfce496a7a297ae4bf8dd75c64e78136d9f7b9ecee097d52e43d573bdad3e07be8b081d9fb6a961522b7a78e68b37631033988

data/json_logic.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2'
 
-  spec.add_development_dependency 'bundler',  '~> 2.0.1'
-  spec.add_development_dependency 'rake',     '~> 10.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'bundler',  '>= 2.0.1'
+  spec.add_development_dependency 'rake',     '>= 10.0'
+  spec.add_development_dependency 'minitest', '>= 5.0'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'pry'
   spec.add_runtime_dependency 'backport_dig' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')

data/lib/json_logic.rb

@@ -5,33 +5,57 @@ require 'json_logic/operation'
 module JSONLogic
   def self.apply(logic, data)
     if logic.is_a?(Array)
-      return logic.map { |val| apply(val, data) }
-    end
-
-    return logic unless logic.is_a?(Hash)                  # pass-thru
+      logic.map do |val|
+        apply(val, data)
+      end
+    elsif !logic.is_a?(Hash)
+      # Pass-thru
+      logic
+    else
+      if data.is_a?(Hash)
+        data = data.stringify_keys
+      end
+      data ||= {}
 
-    data = data.stringify_keys if data.is_a?(Hash)         # Stringify keys to keep out problems with symbol/string mismatch
-    operator, values = logic.first                         # unwrap single-key hash
-    values = [values] unless values.is_a?(Array)           # syntactic sugar
-    Operation.perform(operator, values, data || {})
+      operator, values = operator_and_values_from_logic(logic)
+      Operation.perform(operator, values, data)
+    end
   end
 
+  # Return a list of the non-literal data used. Eg, if the logic contains a {'var' => 'bananas'} operation, the result of
+  # uses_data on this logic will be a collection containing 'bananas'
   def self.uses_data(logic)
     collection = []
 
-    operator, values = logic.first
-    values = [values] unless values.is_a?(Array)
-    if operator == 'var'
-      collection << values[0]
-    else
-      values.each { |val|
-        collection.concat(uses_data(val))
-      }
+    if logic.kind_of?(Hash) || logic.kind_of?(Array) # If we are still dealing with logic, keep going. Else it's a value.
+      operator, values = operator_and_values_from_logic(logic)
+
+      if operator == 'var' # TODO: It may be that non-var operators use data so we may want a flag or collection that indicates data use.
+        if values[0] != JSONLogic::ITERABLE_KEY
+          collection << values[0]
+        end
+      else
+        values.each do |val|
+          collection.concat(uses_data(val))
+        end
+      end
     end
 
     return collection.uniq
   end
 
+  def self.operator_and_values_from_logic(logic)
+    # Unwrap single-key hash
+    operator, values = logic.first
+
+    # Ensure values is an array
+    if !values.is_a?(Array)
+      values = [values]
+    end
+
+    [operator, values]
+  end
+
   def self.filter(logic, data)
     data.select { |d| apply(logic, d) }
   end

data/lib/json_logic/operation.rb

@@ -1,9 +1,22 @@
 module JSONLogic
+  ITERABLE_KEY = "".freeze
+
   class Operation
     LAMBDAS = {
       'var' => ->(v, d) do
-        return d unless d.is_a?(Hash) or d.is_a?(Array)
-        return v == [""] ? (d.is_a?(Array) ? d : d[""]) : d.deep_fetch(*v)
+        if !(d.is_a?(Hash) || d.is_a?(Array))
+          d
+        else
+          if v == [JSONLogic::ITERABLE_KEY]
+            if d.is_a?(Array)
+              d
+            else
+              d[JSONLogic::ITERABLE_KEY]
+            end
+          else
+            d.deep_fetch(*v)
+          end
+        end
       end,
       'missing' => ->(v, d) { v.select { |val| d.deep_fetch(val).nil? } },
       'missing_some' => ->(v, d) {
@@ -11,6 +24,8 @@ module JSONLogic
         present.size >= v[0] ? [] : LAMBDAS['missing'].call(v[1], d)
       },
       'some' => -> (v,d) do
+        return false unless v[0].is_a?(Array)
+
         v[0].any? do |val|
           interpolated_block(v[1], val).truthy?
         end

data/lib/json_logic/version.rb

@@ -1,3 +1,3 @@
 module JSONLogic
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_logic
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -125,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Build complex rules, serialize them as JSON, and execute them in ruby