shiny_json_logic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df28d5d017bd1ab98a68a0a52e4405fea97b552dba04f5994f0f5cdc047b13e6
-  data.tar.gz: f2cae8902b0451e53e1a0e73ec6e4f675de0d8e95f432f64273d8e920faea5cc
+  metadata.gz: 1c4b549a75d02aacd916417297fcdfc3b3a208ed1327bb176522aaa396155f70
+  data.tar.gz: fc868171df7caee20cae4c04f60ecb2e7db1a85b23e2ac4a4dfc097085e15fa5
 SHA512:
-  metadata.gz: 2d92cc98618b3fad9881fd45694b6f8e18b83467bf77904495f9398940a45fefebb93da0617ff2491afd9f53c53769499360dad9fb2d81db3bf88f9393fa0818
-  data.tar.gz: 93694b232429c9dab07352cad06c498ccfc9aa899f51a61046a087c80a5835a4fa6ab8647931b81cc13dfe9ea82f51182ca2fbf5483903f2c5b724246b2e9dd0
+  metadata.gz: dcbf8a820eea98dc973874e500670a60d41366053103bf4ef6030500d7e9aa9fb6e4963b2730ea40122b8e96530ff5706b055ddd5fc42722b01f11c0f5b50c8f
+  data.tar.gz: '038d39b60d79d5f691f50ac326de84560181c16518bda086d12c4a32950156ad08a80db6097cb3e856caf24152e1e7b0c58f272a664905f01007f30a86132e8d'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shiny_json_logic (0.1.0)
+    shiny_json_logic (0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -32,7 +32,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler
   byebug
   pry
   rake (~> 10.0)

data/README.md

@@ -82,7 +82,7 @@ The goal is full JSON Logic coverage. Currently supported:
 
 #### Data access
 
-`var, missing, missing_some`
+`var, missing, missing_some, val, exists`
 
 #### Math
 
@@ -95,7 +95,7 @@ The goal is full JSON Logic coverage. Currently supported:
 
 #### Arrays
 
-`merge, in`
+`merge, in, ?? (Coalesce operator)`
 
 #### Iterable operations
 `map, reduce, filter, some, all, none`

data/lib/shiny_json_logic/engine.rb

@@ -0,0 +1,134 @@
+require "core_ext/array"
+require "core_ext/hash"
+Dir[File.join(__dir__, "operations/**/*.rb")].each do |file|
+  require file
+end
+
+module ShinyJsonLogic
+  class Engine
+    def initialize(rule, data = {})
+      @rule = rule
+      @data = data
+    end
+
+    def call(rule = self.rule, data = self.data)
+      stack   = [[rule, data, :enter]]
+      results = []
+
+      while stack.any?
+        node, ctx, state = stack.pop
+
+        if state == :exit
+          # Already evaluated children, we solve
+          if node.is_a?(Hash)
+            op, raw_args = node.to_a.first
+
+            if collection_solvers.key?(op)
+              results << collection_solvers.fetch(op).new(raw_args, ctx).call
+            else
+              if raw_args.is_a?(Array)
+                argc = raw_args.size
+                args = results.pop(argc)
+                results << solvers.fetch(op).new(args, ctx).call
+              else
+                child = results.pop
+
+                args =
+                  if child.nil?
+                    []
+                  elsif child.is_a?(Array)
+                    child
+                  else
+                    [child]
+                  end
+
+                results << solvers.fetch(op).new(args, ctx).call
+              end
+            end
+
+          elsif node.is_a?(Array)
+            results << results.pop(node.size)
+          end
+
+          next
+        end
+
+        # ENTER phase
+        case node
+        when Hash
+          op, raw_args = node.to_a.first
+
+          stack << [node, ctx, :exit]
+
+          unless collection_solvers.key?(op)
+            if raw_args.is_a?(Array)
+              raw_args.reverse_each { |a| stack << [a, ctx, :enter] }
+            else
+              stack << [raw_args, ctx, :enter]
+            end
+          end
+
+        when Array
+          stack << [node, ctx, :exit]
+          node.reverse_each { |n| stack << [n, ctx, :enter] }
+
+        else
+          results << node
+        end
+      end
+
+      results.last
+    end
+
+    private
+
+    attr_reader :rule, :data
+
+    def solvers
+      @@solvers ||= {
+        "var" => ::ShinyJsonLogic::Operations::Var,
+        "missing" => ::ShinyJsonLogic::Operations::Missing,
+        "missing_some" => ::ShinyJsonLogic::Operations::MissingSome,
+        "if" => ::ShinyJsonLogic::Operations::If,
+        "==" => ::ShinyJsonLogic::Operations::Equal,
+        "===" => ::ShinyJsonLogic::Operations::StrictEqual,
+        "!=" => ::ShinyJsonLogic::Operations::Different,
+        "!==" => ::ShinyJsonLogic::Operations::StrictDifferent,
+        ">" => ::ShinyJsonLogic::Operations::Greater,
+        ">=" => ::ShinyJsonLogic::Operations::GreaterEqual,
+        "<" => ::ShinyJsonLogic::Operations::Smaller,
+        "<=" => ::ShinyJsonLogic::Operations::SmallerEqual,
+        "!" => ::ShinyJsonLogic::Operations::Not,
+        "or" => ::ShinyJsonLogic::Operations::Or,
+        "and" => ::ShinyJsonLogic::Operations::And,
+        "?:" => ::ShinyJsonLogic::Operations::If,
+        "in" => ::ShinyJsonLogic::Operations::Inclusion,
+        "cat" => ::ShinyJsonLogic::Operations::Concatenation,
+        "%" => ::ShinyJsonLogic::Operations::Modulo,
+        "max" => ::ShinyJsonLogic::Operations::Max,
+        "min" => ::ShinyJsonLogic::Operations::Min,
+        "+" => ::ShinyJsonLogic::Operations::Addition,
+        "*" => ::ShinyJsonLogic::Operations::Product,
+        "-" => ::ShinyJsonLogic::Operations::Subtraction,
+        "/" => ::ShinyJsonLogic::Operations::Division,
+        "substr" => ::ShinyJsonLogic::Operations::Substring,
+        "merge" => ::ShinyJsonLogic::Operations::Merge,
+        "!!" => ::ShinyJsonLogic::Operations::DoubleNot,
+        "val" => ::ShinyJsonLogic::Operations::Val,
+        "??" => ::ShinyJsonLogic::Operations::Coalesce,
+        "exists" => ::ShinyJsonLogic::Operations::Exists,
+      }
+    end
+
+    def collection_solvers
+      @@collection_solvers ||= {
+        "filter" => ::ShinyJsonLogic::Operations::Filter,
+        "map" => ::ShinyJsonLogic::Operations::Map,
+        "reduce" => ::ShinyJsonLogic::Operations::Reduce,
+        "all" => ::ShinyJsonLogic::Operations::All,
+        "none" => ::ShinyJsonLogic::Operations::None,
+        "some" => ::ShinyJsonLogic::Operations::Some,
+      }
+    end
+  end
+end

data/lib/shiny_json_logic/operations/coalesce.rb

@@ -0,0 +1,11 @@
+require "shiny_json_logic/operations/base"
+
+module ShinyJsonLogic
+  module Operations
+    class Coalesce < Base
+      def call
+        rules.compact.first
+      end
+    end
+  end
+end

data/lib/shiny_json_logic/operations/exists.rb

@@ -0,0 +1,21 @@
+require "shiny_json_logic/operations/base"
+
+module ShinyJsonLogic
+  module Operations
+    class Exists < Base
+      def call
+        current = data
+
+        Array.wrap(rules).each do |segment|
+          return false unless current.key?(segment)
+
+          current = current[segment]
+        end
+
+        true
+      rescue
+        false
+      end
+    end
+  end
+end

data/lib/shiny_json_logic/operations/val.rb

@@ -0,0 +1,12 @@
+require "shiny_json_logic/operations/base"
+
+module ShinyJsonLogic
+  module Operations
+    class Val < Base
+      def call
+        data.dig(*rules)
+      end
+    end
+  end
+end
+

data/lib/shiny_json_logic/version.rb

@@ -1,3 +1,3 @@
 module ShinyJsonLogic
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/shiny_json_logic.rb

@@ -1,106 +1,8 @@
 require "shiny_json_logic/version"
-require "core_ext/array"
-require "core_ext/hash"
-require "shiny_json_logic/operations/var"
-require "shiny_json_logic/operations/missing"
-require "shiny_json_logic/operations/missing_some"
-require "shiny_json_logic/operations/if"
-require "shiny_json_logic/operations/equal"
-require "shiny_json_logic/operations/strict_equal"
-require "shiny_json_logic/operations/different"
-require "shiny_json_logic/operations/strict_different"
-require "shiny_json_logic/operations/greater"
-require "shiny_json_logic/operations/greater_equal"
-require "shiny_json_logic/operations/smaller"
-require "shiny_json_logic/operations/smaller_equal"
-require "shiny_json_logic/operations/not"
-require "shiny_json_logic/operations/or"
-require "shiny_json_logic/operations/and"
-require "shiny_json_logic/operations/inclusion"
-require "shiny_json_logic/operations/concatenation"
-require "shiny_json_logic/operations/modulo"
-require "shiny_json_logic/operations/max"
-require "shiny_json_logic/operations/min"
-require "shiny_json_logic/operations/addition"
-require "shiny_json_logic/operations/product"
-require "shiny_json_logic/operations/subtraction"
-require "shiny_json_logic/operations/division"
-require "shiny_json_logic/operations/substring"
-require "shiny_json_logic/operations/merge"
-require "shiny_json_logic/operations/double_not"
-require "shiny_json_logic/operations/filter"
-require "shiny_json_logic/operations/map"
-require "shiny_json_logic/operations/reduce"
-require "shiny_json_logic/operations/all"
-require "shiny_json_logic/operations/none"
-require "shiny_json_logic/operations/some"
+require "shiny_json_logic/engine"
 
 module ShinyJsonLogic
-  class Error < StandardError; end
-
   def self.apply(rule, data = {})
-    if rule.is_a?(Hash)
-      operation, raw_args = rule.to_a.first
-      if collection_solvers.key?(operation)
-        collection_solvers.fetch(operation).new(raw_args, data).call
-      else
-        evaluated_args =
-          if raw_args.is_a?(Array)
-            raw_args.map { |val| apply(val, data) }
-          else
-            Array.wrap(apply(raw_args, data))
-          end
-
-        solvers.fetch(operation).new(evaluated_args, data).call
-      end
-    elsif rule.is_a?(Array)
-      rule.map { |item| apply(item, data) }
-    else
-      rule
-    end
-  end
-
-  def self.solvers
-    {
-      "var" => Operations::Var,
-      "missing" => Operations::Missing,
-      "missing_some" => Operations::MissingSome,
-      "if" => Operations::If,
-      "==" => Operations::Equal,
-      "===" => Operations::StrictEqual,
-      "!=" => Operations::Different,
-      "!==" => Operations::StrictDifferent,
-      ">" => Operations::Greater,
-      ">=" => Operations::GreaterEqual,
-      "<" => Operations::Smaller,
-      "<=" => Operations::SmallerEqual,
-      "!" => Operations::Not,
-      "or" => Operations::Or,
-      "and" => Operations::And,
-      "?:" => Operations::If,
-      "in" => Operations::Inclusion,
-      "cat" => Operations::Concatenation,
-      "%" => Operations::Modulo,
-      "max" => Operations::Max,
-      "min" => Operations::Min,
-      "+" => Operations::Addition,
-      "*" => Operations::Product,
-      "-" => Operations::Subtraction,
-      "/" => Operations::Division,
-      "substr" => Operations::Substring,
-      "merge" => Operations::Merge,
-      "!!" => Operations::DoubleNot,
-    }
-  end
-
-  def self.collection_solvers
-    {
-      "filter" => Operations::Filter,
-      "map" => Operations::Map,
-      "reduce" => Operations::Reduce,
-      "all" => Operations::All,
-      "none" => Operations::None,
-      "some" => Operations::Some,
-    }
+    Engine.new(rule, data).call
   end
 end

data/shiny_json_logic.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'byebug'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shiny_json_logic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Luis Moyano
@@ -13,16 +13,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,15 +107,18 @@ files:
 - lib/core_ext/array.rb
 - lib/core_ext/hash.rb
 - lib/shiny_json_logic.rb
+- lib/shiny_json_logic/engine.rb
 - lib/shiny_json_logic/operations/addition.rb
 - lib/shiny_json_logic/operations/all.rb
 - lib/shiny_json_logic/operations/and.rb
 - lib/shiny_json_logic/operations/base.rb
+- lib/shiny_json_logic/operations/coalesce.rb
 - lib/shiny_json_logic/operations/concatenation.rb
 - lib/shiny_json_logic/operations/different.rb
 - lib/shiny_json_logic/operations/division.rb
 - lib/shiny_json_logic/operations/double_not.rb
 - lib/shiny_json_logic/operations/equal.rb
+- lib/shiny_json_logic/operations/exists.rb
 - lib/shiny_json_logic/operations/filter.rb
 - lib/shiny_json_logic/operations/greater.rb
 - lib/shiny_json_logic/operations/greater_equal.rb
@@ -141,6 +144,7 @@ files:
 - lib/shiny_json_logic/operations/strict_equal.rb
 - lib/shiny_json_logic/operations/substring.rb
 - lib/shiny_json_logic/operations/subtraction.rb
+- lib/shiny_json_logic/operations/val.rb
 - lib/shiny_json_logic/operations/var.rb
 - lib/shiny_json_logic/truthy.rb
 - lib/shiny_json_logic/version.rb