predicator 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cccb4a93e1358c39913a03aff288de916bf3fe43
-  data.tar.gz: e28bf0d18f7b94d27c94baaec203eb99a1457ed7
+  metadata.gz: ac9999a26155d5318cda41ac8d119352e63aa0b5
+  data.tar.gz: 3c1411fe73bae5d3ca3ee30604856b975d9027c3
 SHA512:
-  metadata.gz: a6e74e9fae07264c552612a5fcd6c804b6f0deaf42b6a81012fd1e48900ee923e7b21ebd2e36a6b828bc6942358c1fada37ab25436a5d6dc090db89ee22d3d0b
-  data.tar.gz: 394b6bd004026f79cd6aed9bada7fefa863df8a44a1f2b64056c53f455b94106da9a5cc4fb54741f9894e848f763f7f4d30b4a7554c68addeb23ecaf3efa34b1
+  metadata.gz: 2d5156cbdd62b081816d8d4035a5de20f410bddc9bc57540054de0e433ce61510d80ce694c452e1b4a3f219c7fc9ce8edea38e73db3d763a7f37587fb1b5d7eb
+  data.tar.gz: 25e56d9f070f10da1e956922072fe6f3ab086b4f16a99a77c281dd6e1c53028f5230a3247f2d473df54b844d916e0758f9be46ba1e2f3761ceb8f7e9b8646aca

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /test/reports/
 /tmp/
+.ruby-gemset
+.ruby-version

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
-before_install: gem install bundler
+  - 2.0
+  - 2.1
+  - 2.2

data/HISTORY.md

@@ -1,3 +1,12 @@
+### 1.0.0 / 2017-09-22
+
+* Adds new lexer
+* Introduces the stack machine and instructions
+* Adds LessThan predicate
+* Adds Between predicate
+* Adds In and Not In predicates (with arrays)
+* Adds BooleanVariable predicate
+
 ### 0.4.0 / 2016-06-09
 
 * Adds double dispatch for relation predicates

data/README.md

@@ -1,11 +1,11 @@
 [![Gem Version](https://badge.fury.io/rb/predicator.svg)](http://badge.fury.io/rb/predicator)
-[![Build Status](https://travis-ci.org/johnnyt/predicator.svg?branch=master)](https://travis-ci.org/johnnyt/predicator)
+[![Build Status](https://travis-ci.org/predicator/predicator.svg?branch=master)](https://travis-ci.org/predicator/predicator)
 [![Dependency Status](https://img.shields.io/gemnasium/johnnyt/predicator.svg)](https://gemnasium.com/johnnyt/predicator)
-[![Coverage Status](https://coveralls.io/repos/github/johnnyt/predicator/badge.svg?branch=master)](https://coveralls.io/github/johnnyt/predicator?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/predicator/predicator/badge.svg?branch=master)](https://coveralls.io/github/predicator/predicator?branch=master)
 
 # Predicator
 
-Predicator is a predicate engine
+Predicator is a predicate engine.
 
 ## Usage
 
@@ -14,12 +14,11 @@ Example usage:
 ```ruby
 require "predicator"
 
-pred = Predicator.parse "a.b = 5"
+Predicator.evaluate "age > 21" # false
 
-context = Predicator::Context.new
-context[:a] = {b:5}
+Predicator.evaluate "age > 21", age: 10 # false
 
-pred.satisfied? context
+Predicator.evaluate "age > 21", age: 50 # true
 ```
 
 ## Installation
@@ -48,7 +47,7 @@ To release a new version, update the version number in `version.rb`, and then ru
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/johnnyt/predicator.
+Bug reports and pull requests are welcome on GitHub at https://github.com/predicator/predicator.
 This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 

data/Rakefile

@@ -1,15 +1,24 @@
+require "rubygems"
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "oedipus_lex"
+
+Rake.application.rake_require "oedipus_lex"
 
 Rake::TestTask.new :test do |t|
   t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.test_files = FileList["test/**/test_*.rb"]
+  t.warning = false
 end
 
-task :default => :test
+desc "Generate the lexer"
+task lexer: "lib/predicator/lexer.rex.rb"
 
 desc "Compile and generate the parser"
-task :compile do
-  sh "racc lib/predicator/parser.y -o lib/predicator/generated_parser.rb"
+task parser: :lexer do
+  sh "racc -l -o lib/predicator/parser.rb lib/predicator/parser.y"
 end
+
+task test: :parser
+
+task default: :test

data/lib/predicator.rb

@@ -1,16 +1,24 @@
-require "date"
-
 require "predicator/context"
-require "predicator/errors"
-require "predicator/lexer"
-require "predicator/nodes"
+require "predicator/evaluator"
 require "predicator/parser"
-require "predicator/predicates"
-require "predicator/variable"
-require "predicator/version"
 
 module Predicator
-  def self.parse string
-    Predicator::Parser.new.parse string
+  def self.parse source
+    Predicator::Parser.new.parse source
+  end
+
+  def self.compile source
+    ast = parse source
+    ast.to_instructions
+  end
+
+  def self.evaluate source, context={}
+    instructions = compile source
+    evaluate_instructions instructions, context
+  end
+
+  def self.evaluate_instructions instructions, context={}
+    evaluator = Evaluator.new instructions, context
+    evaluator.result
   end
 end

data/lib/predicator/ast.rb

@@ -0,0 +1,138 @@
+module Predicator
+  module AST
+    class Node
+      include Enumerable
+
+      attr_accessor :left
+
+      def initialize left
+        @left = left
+      end
+
+      def each &block
+        Visitors::Each.new(block).accept self
+      end
+
+      def to_dot
+        Visitors::Dot.new.accept self
+      end
+
+      def to_instructions
+        Visitors::Instructions.new.accept self
+      end
+
+      def to_predicate
+        Visitors::Predicate.new.accept self
+      end
+
+      def to_s
+        Visitors::String.new.accept self
+      end
+
+      def type
+        raise NotImplementedError
+      end
+
+      def variable?; false; end
+      def literal?; false; end
+    end
+
+    class Terminal < Node
+      alias :symbol :left
+    end
+
+    class Literal < Terminal
+      def type; :LITERAL; end
+      def literal?; true; end
+    end
+
+    class Variable < Terminal
+      def type; :VARIABLE; end
+      def variable?; true; end
+    end
+
+    %w[ True False Integer String ].each do |t|
+      class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        class #{t} < Literal;
+          def type; :#{t.upcase}; end
+        end
+      eoruby
+    end
+
+    class Unary < Node
+      def children; [left] end
+    end
+
+    class Array < Unary
+      def type; :ARRAY; end
+    end
+
+    class Not < Unary
+      def type; :NOT; end
+    end
+
+    class Group < Unary
+      def type; :GROUP; end
+    end
+
+    class Binary < Node
+      attr_accessor :right
+
+      def initialize left, right
+        super left
+        @right = right
+      end
+
+      def children; [left, right] end
+    end
+
+    class Equal < Binary
+      def type; :EQ; end
+    end
+
+    class GreaterThan < Binary
+      def type; :GT; end
+    end
+
+    class LessThan < Binary
+      def type; :LT; end
+    end
+
+    class In < Binary
+      def type; :IN; end
+    end
+
+    class NotIn < Binary
+      def type; :NOTIN; end
+    end
+
+    class And < Binary
+      def type; :AND; end
+    end
+
+    class Or < Binary
+      def type; :OR; end
+    end
+
+    class Ternary < Node
+      attr_accessor :middle, :right
+
+      def initialize left, middle, right
+        super left
+        @middle = middle
+        @right = right
+      end
+
+      def children; [left, middle, right] end
+    end
+
+    class Between < Ternary
+      def type; :BETWEEN; end
+    end
+
+    class BooleanVariable < Unary
+      def type; :BOOL; end
+    end
+
+  end
+end

data/lib/predicator/context.rb

@@ -1,74 +1,18 @@
-require "ostruct"
-
 module Predicator
   class Context
-    attr_reader :bindings
-
-    def initialize attrs={}
+    def initialize params={}
       @bindings = {}
-      attrs.each{ |key, val| bind key, val }
+      params.each{ |key,value| bind key, value }
     end
 
-    def bind name, obj
-      if obj.kind_of? Hash
-        obj = OpenStruct.new obj
-      end
-      bindings[name.to_s] = obj
+    def bind name, value
+      @bindings[name.to_s] = value
     end
     alias :[]= :bind
 
-    def node_for input
-      value = value_for input
-      node_class = Predicator::Nodes::BaseNode.class_for value
-      node_class.new value
-    end
-
-    def value_for input
-      if input.kind_of? Predicator::Variable
-        input.value_in self
-      else
-        input
-      end
-    end
-    alias :[] :value_for
-
-    def respond_to? method
-      bindings.key?(method.to_s) || super
-    end
-
-    def method_missing method, *args, &block
-      found_binding = bindings.fetch method.to_s, nil
-      if found_binding.nil?
-        super
-      else
-        found_binding
-      end
-    end
-
-    def eval string
-      string.gsub(/{{([^}]+)}}/) do |match|
-        name, attribute = $1.strip.split "."
-        variable = Predicator::Variable.new name, attribute
-        value_for variable
-      end
-    end
-
-    def to_hash
-      hsh = {}
-      bindings.each do |key, value|
-        hsh[key] = hash_value_for value
-      end
-      hsh
-    end
-
-    private
-
-    def hash_value_for value
-      if value.kind_of? OpenStruct
-        value.to_h
-      else
-        value.to_hash
-      end
+    def binding_for name
+      @bindings[name.to_s]
     end
+    alias :[] :binding_for
   end
 end

data/lib/predicator/evaluator.rb

@@ -0,0 +1,108 @@
+module Predicator
+  class Evaluator
+    attr_reader :instructions, :stack, :context
+
+    def initialize instructions, context_data={}
+      @instructions = instructions
+      @context = context_for context_data
+      @stack = []
+      @ip = 0
+    end
+
+    def context_for context_data
+      return context_data unless context_data.kind_of? Hash
+      Context.new context_data
+    end
+
+    def result
+      while @ip < instructions.length
+        process @instructions[@ip]
+        @ip += 1
+      end
+      stack.pop
+    end
+
+    def process instruction
+      case instruction.first
+      when "not"
+        stack.push !stack.pop
+      when "jfalse"
+        jump_if_false instruction.last
+      when "jtrue"
+        jump_if_true instruction.last
+      when "lit", "array"
+        stack.push instruction.last
+      when "load"
+        stack.push context[instruction.last]
+      when "to_bool"
+        stack.push !!stack.pop
+      when "compare"
+        if instruction.last == "BETWEEN"
+          compare_BETWEEN
+        else
+          compare instruction.last
+        end
+      end
+    end
+
+    def jump_if_false offset
+      if stack[-1] == false
+        adjusted_offset = offset - 1
+        @ip += adjusted_offset
+      else
+        stack.pop
+      end
+    end
+
+    def jump_if_true offset
+      if stack[-1] == true
+        adjusted_offset = offset - 1
+        @ip += adjusted_offset
+      else
+        stack.pop
+      end
+    end
+
+    def compare comparison
+      right = stack.pop
+      left = stack.pop
+      if left.nil? || right.nil?
+        stack.push false
+      else
+        stack.push send("compare_#{comparison}", left, right)
+      end
+    end
+
+    def compare_EQ left, right
+      left == right
+    end
+
+    def compare_GT left, right
+      left > right
+    end
+
+    def compare_LT left, right
+      left < right
+    end
+
+    def compare_IN left, right
+      right.include? left
+    end
+
+    def compare_NOTIN left, right
+      !right.include? left
+    end
+
+    def compare_BETWEEN
+      max = stack.pop
+      min = stack.pop
+      val = stack.pop
+      if max.nil? || min.nil? || val.nil?
+        stack.push false
+      else
+        result = val.between? min, max
+        stack.push result
+      end
+    end
+  end
+end