equation 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a5da51d16c1c12ef567b1842c964e65dfb7729836770685270767674f8a532
-  data.tar.gz: 4b6f537c8f047cced5414b133cf8dd8749b92faa0930548cecf5b192ba96e122
+  metadata.gz: 53d1c83fe0fc09f8b53b716aa8cc1f687f3040519db6c52e448c7bdb733f7994
+  data.tar.gz: 5ba7d927c960fb443f04943ee15d4e10dc2ac6adc2738a341c512947363fbf5e
 SHA512:
-  metadata.gz: 5dc8d42ce509c4ee4df2c2fe59e17bd9050cd4fc717372c04ef38826dd66b9a663a35823161873fd54df1c91279c3eb38bc318c5325be411cfa6eeb186333c74
-  data.tar.gz: a8d9a8878e0445074867459dec86d63c7b640a72f3e15411ce1314544f15c6c7f81dfb35cbcaccdb2cbe84c3a6b03299cad1d57d2d213d77a52d07dc11461f16
+  metadata.gz: 47dae82304f39aa3f198f8cbb310c76a31176bf048cba00c4d8985dc4a2650bd4bd5570668ec570fb39720d9dbde27b327a71b8f1a0a4e6ee04a37ae19cc3623
+  data.tar.gz: 8ba44fd1839addcf2979b0391bc09de22448fdc8d12c3291f4921167ac6ad6e63c1c39826aa79dc6fc58b734704f80c7d4ba6449be0c39a74c070f04b794960f

data/README.md

@@ -10,6 +10,9 @@ Use cases include:
 
 Modeled loosely after [Symfony Expression Language](https://symfony.com/doc/current/components/expression_language.html).
 
+## Demos
+
+Take a look at the examples directory for some demonstrations of Equation's capabilities. The main example is a [web application firewall](https://github.com/ancat/equation/tree/main/examples/rails_waf) for Rails; rules can be managed from any ActiveStorage compatible backend (e.g. filesystem, Amazon AWS, etc) and updated independently of application code, allowing for faster and more expressive blocking logic without having to wait for a deploy to go through.
 
 ## Example
 

data/lib/equation.rb

@@ -19,13 +19,15 @@ class Context
     assert_defined!(identifier: identifier)
     child = symbols[identifier.to_sym]
     path.each{|segment|
-      segment_name = segment.elements[1].text_value.to_sym
-      if child.respond_to?(segment_name)
-        child = child.send(segment_name)
-      elsif child.include?(segment_name)
-        child = child[segment_name]
+      segment_name = segment.elements[1].text_value
+      if child.respond_to?(segment_name.to_sym)
+        child = child.send(segment_name.to_sym)
+      elsif child.is_a? Hash and child.include?(segment_name.to_sym)
+        child = child[segment_name.to_sym]
+      elsif child.is_a? Hash and child.include?(segment_name.to_s)
+        child = child[segment_name.to_s]
       else
-        raise "no"
+        return nil
       end
     }
 

data/lib/equation_grammar.rb

@@ -71,17 +71,21 @@ module Equation
   end
 
   module Logical1
-    def lhs
+    def space1
       elements[0]
     end
 
-    def space
+    def lhs
       elements[1]
     end
 
-    def tail
+    def space2
       elements[2]
     end
+
+    def tail
+      elements[3]
+    end
   end
 
   module Logical2
@@ -110,78 +114,82 @@ module Equation
     end
 
     i0, s0 = index, []
-    i1 = index
-    r2 = _nt_boolean_and
-    if r2
-      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-      r1 = r2
-    else
-      r3 = _nt_additive
+    r1 = _nt_space
+    s0 << r1
+    if r1
+      i2 = index
+      r3 = _nt_boolean_and
       if r3
         r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
-        r1 = r3
+        r2 = r3
       else
-        @index = i1
-        r1 = nil
+        r4 = _nt_additive
+        if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+          r2 = r4
+        else
+          @index = i2
+          r2 = nil
+        end
       end
-    end
-    s0 << r1
-    if r1
-      r4 = _nt_space
-      s0 << r4
-      if r4
-        s5, i5 = [], index
-        loop do
-          i6, s6 = index, []
-          if (match_len = has_terminal?('||', false, index))
-            r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-            @index += match_len
-          else
-            terminal_parse_failure('\'||\'')
-            r7 = nil
-          end
-          s6 << r7
-          if r7
-            r8 = _nt_space
-            s6 << r8
+      s0 << r2
+      if r2
+        r5 = _nt_space
+        s0 << r5
+        if r5
+          s6, i6 = [], index
+          loop do
+            i7, s7 = index, []
+            if (match_len = has_terminal?('||', false, index))
+              r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
+            else
+              terminal_parse_failure('\'||\'')
+              r8 = nil
+            end
+            s7 << r8
             if r8
-              i9 = index
-              r10 = _nt_boolean_and
-              if r10
-                r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
-                r9 = r10
-              else
-                r11 = _nt_additive
+              r9 = _nt_space
+              s7 << r9
+              if r9
+                i10 = index
+                r11 = _nt_boolean_and
                 if r11
                   r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
-                  r9 = r11
+                  r10 = r11
                 else
-                  @index = i9
-                  r9 = nil
+                  r12 = _nt_additive
+                  if r12
+                    r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
+                    r10 = r12
+                  else
+                    @index = i10
+                    r10 = nil
+                  end
+                end
+                s7 << r10
+                if r10
+                  r13 = _nt_space
+                  s7 << r13
                 end
-              end
-              s6 << r9
-              if r9
-                r12 = _nt_space
-                s6 << r12
               end
             end
+            if s7.last
+              r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+              r7.extend(Logical0)
+            else
+              @index = i7
+              r7 = nil
+            end
+            if r7
+              s6 << r7
+            else
+              break
+            end
           end
-          if s6.last
-            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-            r6.extend(Logical0)
-          else
-            @index = i6
-            r6 = nil
-          end
-          if r6
-            s5 << r6
-          else
-            break
-          end
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          s0 << r6
         end
-        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-        s0 << r5
       end
     end
     if s0.last

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: equation
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - OMAR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies: []
 description: Equation exposes a minimal environment to allow safe execution of Ruby
   code represented via a custom expression language.
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A rules engine for your Ruby apps.