json_logic 0.4.1 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 677b105ac790d969a647b1244272dec1d489ce8f
-  data.tar.gz: 2c2541c2edc2616d65e408084cb069350551dfa4
+SHA256:
+  metadata.gz: c8af2db5872f3fe1ff4ebf64aa0ca0b617f3238b6536c750a85f80e000e84881
+  data.tar.gz: b80fa16f7e15ee2025cdba337af89bafe6c777882763a8dfecc4427997ebc90c
 SHA512:
-  metadata.gz: 061f7d199adc1ddd4482aa446e10ea3cfadaeca343e4f4ec1de6629eab3db944828065ef4d123ac5153dcf16d8860a5767ec4f30767c411c4a0055233f5d4a45
-  data.tar.gz: 8451f7ac97031790f913c6b223d243ec476ddf71e1205f19b1f604c6a182960aa860bbffee0117aa98e1d245e6ffd38ad0bf74ed5d69ff139d4c8f213ec7a3b0
+  metadata.gz: dc13699694479c8c33c582278bbf9e81d78292fa2665d477590c2bcf95f959711f635120174e040375009a0c55ac3ca3dd7ec627fc9ac17292ea93c037f7aea9
+  data.tar.gz: af2eec900330d7f48392ee7498dfce496a7a297ae4bf8dd75c64e78136d9f7b9ecee097d52e43d573bdad3e07be8b081d9fb6a961522b7a78e68b37631033988

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.13.3
+  - 2.5.0
+before_install: gem install bundler -v 2.0.1

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Kenneth Geerts
+Copyright (c) 2016 Kenneth Geerts, Jordan Prince
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/json_logic.gemspec

@@ -18,9 +18,12 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.2'
 
-  spec.add_development_dependency 'bundler',  '~> 1.13'
-  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')
 end

data/lib/core_ext/deep_fetch.rb

@@ -1,13 +1,17 @@
+require 'backport_dig' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
+
 class Hash
   def deep_fetch(key, default = nil)
     keys = key.to_s.split('.')
-    dig(*keys) || default rescue default
+    value = dig(*keys) rescue default
+    value.nil? ? default : value  # value can be false (Boolean)
   end
 end
 
 class Array
   def deep_fetch(index, default = nil)
     indexes = index.to_s.split('.').map(&:to_i)
-    dig(*indexes) || default rescue default
+    value = dig(*indexes) rescue default
+    value.nil? ? default : value  # value can be false (Boolean)
   end
 end

data/lib/json_logic.rb

@@ -5,15 +5,55 @@ require 'json_logic/operation'
 module JSONLogic
   def self.apply(logic, data)
     if logic.is_a?(Array)
-      return logic.map { |val| apply(val, data) }
+      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 ||= {}
+
+      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 = []
+
+    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 logic unless logic.is_a?(Hash)                  # pass-thru
+    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
 
-    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]
   end
 
   def self.filter(logic, data)

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,11 +24,15 @@ 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
       end,
       'filter' => -> (v,d) do
+        return [] unless v[0].is_a?(Array)
+
         v[0].select do |val|
           interpolated_block(v[1], val).truthy?
         end
@@ -79,19 +96,20 @@ module JSONLogic
         result.nil? ? v.last : result
       },
       '?:'    => ->(v, d) { LAMBDAS['if'].call(v, d) },
-      '>'     => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i > j } },
-      '>='    => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i >= j } },
-      '<'     => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i < j } },
-      '<='    => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i <= j } },
-      'max'   => ->(v, d) { v.map(&:to_i).max },
-      'min'   => ->(v, d) { v.map(&:to_i).min },
-      '+'     => ->(v, d) { v.map(&:to_i).reduce(:+) },
-      '-'     => ->(v, d) { v.map!(&:to_i); v.size == 1 ? -v.first : v.reduce(:-) },
-      '*'     => ->(v, d) { v.map(&:to_i).reduce(:*) },
+      '>'     => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i > j } },
+      '>='    => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i >= j } },
+      '<'     => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i < j } },
+      '<='    => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i <= j } },
+      'max'   => ->(v, d) { v.map(&:to_f).max },
+      'min'   => ->(v, d) { v.map(&:to_f).min },
+      '+'     => ->(v, d) { v.map(&:to_f).reduce(:+) },
+      '-'     => ->(v, d) { v.map!(&:to_f); v.size == 1 ? -v.first : v.reduce(:-) },
+      '*'     => ->(v, d) { v.map(&:to_f).reduce(:*) },
       '/'     => ->(v, d) { v.map(&:to_f).reduce(:/) },
       '%'     => ->(v, d) { v.map(&:to_i).reduce(:%) },
+      '^'     => ->(v, d) { v.map(&:to_f).reduce(:**) },
       'merge' => ->(v, d) { v.flatten },
-      'in'    => ->(v, d) { v[1].include? v[0] },
+      'in'    => ->(v, d) { interpolated_block(v[1], d).include? v[0] },
       'cat'   => ->(v, d) { v.map(&:to_s).join },
       'log'   => ->(v, d) { puts v }
     }

data/lib/json_logic/truthy.rb

@@ -35,6 +35,12 @@ class Integer
   end
 end
 
+class Float
+  def falsy?
+    zero?
+  end
+end
+
 class Array
   def falsy?
     empty?

data/lib/json_logic/version.rb

@@ -1,3 +1,3 @@
 module JSONLogic
-  VERSION = '0.4.1'
+  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.1
+  version: 0.4.7
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,50 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 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: '1.13'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        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
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Build complex rules, serialize them as JSON, and execute them in ruby.
   See http://jsonlogic.com
 email:
@@ -90,15 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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