predicator 1.1.0 → 1.2.0

data/lib/predicator/version.rb

@@ -1,3 +1,3 @@
 module Predicator
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/predicator/visitors/dot.rb

@@ -23,20 +23,13 @@ digraph parse_tree {
 
       private
 
-      def binary node
+      def visit_children node
         node.children.each do |c|
           @edges << "#{node.object_id} -> #{c.object_id};"
         end
         super
       end
 
-      alias_method :ternary, :binary
-
-      def unary node
-        @edges << "#{node.object_id} -> #{node.left.object_id};"
-        super
-      end
-
       def visit_EQ node
         @nodes << "#{node.object_id} [label=\"=\"];"
         super
@@ -77,6 +70,26 @@ digraph parse_tree {
         super
       end
 
+      def visit_DATEAGO node
+        @nodes << "#{node.object_id} [label=\"ago\"];"
+        super
+      end
+
+      def visit_DATEFROMNOW node
+        @nodes << "#{node.object_id} [label=\"from now\"];"
+        super
+      end
+
+      def visit_STRSTARTSWITH node
+        @nodes << "#{node.object_id} [label=\"starts with\"];"
+        super
+      end
+
+      def visit_STRENDSWITH node
+        @nodes << "#{node.object_id} [label=\"ends with\"];"
+        super
+      end
+
       def visit_STRING node
         value = node.left
         @nodes << "#{node.object_id} [label=\"'#{value}'\"];"

data/lib/predicator/visitors/instructions.rb

@@ -37,35 +37,62 @@ module Predicator
       end
 
       def visit_EQ node
-        super
+        visit node.left
+        add_typecast_to_instructions node
+        visit node.right
         @instructions.push ["compare", "EQ"]
       end
 
       def visit_GT node
-        super
+        visit node.left
+        add_typecast_to_instructions node
+        visit node.right
         @instructions.push ["compare", "GT"]
       end
 
       def visit_LT node
-        super
+        visit node.left
+        add_typecast_to_instructions node
+        visit node.right
         @instructions.push ["compare", "LT"]
       end
 
       def visit_BETWEEN node
-        super
+        visit node.left
+        add_typecast_to_instructions node
+        visit node.middle
+        visit node.right
         @instructions.push ["compare", "BETWEEN"]
       end
 
       def visit_IN node
-        super
+        visit node.left
+        add_typecast_to_instructions node
+        visit node.right
         @instructions.push ["compare", "IN"]
       end
 
       def visit_NOTIN node
-        super
+        visit node.left
+        add_typecast_to_instructions node
+        visit node.right
         @instructions.push ["compare", "NOTIN"]
       end
 
+      def visit_STRSTARTSWITH node
+        visit node.left
+        add_typecast_to_instructions node
+        visit node.right
+        @instructions.push ["compare", "STARTSWITH"]
+      end
+
+      def visit_STRENDSWITH node
+        visit node.left
+        add_typecast_to_instructions node
+        visit node.right
+        @instructions.push ["compare", "ENDSWITH"]
+      end
+
       def visit_ARRAY node
         contents = node.left.map{ |item| item.left }
         @instructions.push ["array", contents]
@@ -80,10 +107,49 @@ module Predicator
         @instructions.push ["to_bool"]
       end
 
+      def visit_DATE node
+        @instructions.push ["lit", node.symbol]
+        @instructions.push ["to_date"]
+      end
+
+      def visit_DATEAGO node
+        visit node.left
+        @instructions.push ["date_ago"]
+      end
+
+      def visit_DATEFROMNOW node
+        visit node.left
+        @instructions.push ["date_from_now"]
+      end
+
+      def visit_DURATION node
+        as_seconds = node.symbol.to_i * 24 * 60 * 60
+        @instructions.push ["lit", as_seconds]
+      end
+
+      def visit_BLANK node
+        visit node.left
+        @instructions.push ["blank"]
+      end
+
+      def visit_PRESENT node
+        visit node.left
+        @instructions.push ["present"]
+      end
+
       def terminal node
         @instructions.push ["lit", node.symbol]
       end
 
+      def add_typecast_to_instructions node
+        type = case node.right.type.to_s
+               when /INT/  then "to_int"
+               when /STR/  then "to_str"
+               when /DATE/ then "to_date"
+               end
+        @instructions.push [type]
+      end
+
       def jump_instruction condition, node
         ["j#{condition}", node.object_id.to_s]
       end

data/lib/predicator/visitors/string.rb

@@ -55,6 +55,22 @@ module Predicator
       def visit_NOTIN node
         [visit(node.left), " not in ", visit(node.right)].join
       end
+
+      def visit_STRSTARTSWITH node
+        [visit(node.left), " starts with ", visit(node.right)].join
+      end
+
+      def visit_STRENDSWITH node
+        [visit(node.left), " ends with ", visit(node.right)].join
+      end
+
+      def visit_DATEAGO node
+        visit(node.left) + " ago"
+      end
+
+      def visit_DATEFROMNOW node
+        visit(node.left) + " from now"
+      end
     end
   end
 end

data/lib/predicator/visitors/visitor.rb

@@ -19,30 +19,82 @@ module Predicator
         node.children.each {|child| visit child}
       end
 
-      def visit_NOT node;   visit_children node; end
-      def visit_GROUP node; visit_children node; end
-      def visit_BOOL node;  visit_children node; end
-
-      def visit_EQ node;    visit_children node; end
-      def visit_GT node;    visit_children node; end
-      def visit_LT node;    visit_children node; end
-      def visit_AND node;   visit_children node; end
-      def visit_OR node;    visit_children node; end
-      def visit_IN node;    visit_children node; end
-      def visit_NOTIN node; visit_children node; end
-
-      def visit_BETWEEN node; visit_children node; end
-
       def terminal node; end
-      def visit_TRUE node;      terminal node; end
-      def visit_FALSE node;     terminal node; end
-      def visit_INTEGER node;   terminal node; end
-      def visit_STRING node;    terminal node; end
-      def visit_VARIABLE node;  terminal node; end
 
       def visit_ARRAY node
         node.left.each{ |item| visit item }
       end
+
+      visit_children_methods = %w(
+        visit_EQ visit_GT visit_LT
+        visit_NOT visit_GROUP visit_BOOL
+        visit_IN visit_NOTIN visit_BETWEEN
+        visit_DATEAGO visit_DATEFROMNOW
+        visit_AND visit_OR
+        visit_STRSTARTSWITH visit_STRENDSWITH
+      )
+      visit_children_methods.each do |method_name|
+        define_method method_name do |node|
+          visit_children node
+        end
+      end
+
+      %w( visit_INTEQ visit_STREQ visit_DATEQ ).each do |method_name|
+        define_method method_name do |node|
+          visit_EQ node
+        end
+      end
+
+      %w( visit_INTGT visit_STRGT visit_DATGT ).each do |method_name|
+        define_method method_name do |node|
+          visit_GT node
+        end
+      end
+
+      %w( visit_INTLT visit_STRLT visit_DATLT ).each do |method_name|
+        define_method method_name do |node|
+          visit_LT node
+        end
+      end
+
+      %w( visit_INTIN visit_STRIN ).each do |method_name|
+        define_method method_name do |node|
+          visit_IN node
+        end
+      end
+
+      %w( visit_INTNOTIN visit_STRNOTIN ).each do |method_name|
+        define_method method_name do |node|
+          visit_NOTIN node
+        end
+      end
+
+      %w( visit_INTBETWEEN visit_DATBETWEEN ).each do |method_name|
+        define_method method_name do |node|
+          visit_BETWEEN node
+        end
+      end
+
+      terminal_methods = %w(
+        visit_TRUE visit_FALSE
+        visit_DATE visit_DURATION
+        visit_INTEGER visit_STRING visit_VARIABLE
+        visit_BLANK visit_PRESENT
+      )
+      terminal_methods.each do |method_name|
+        define_method method_name do |node|
+          terminal node
+        end
+      end
+
+      array_methods = %w(
+        visit_INTARRAY visit_STRARRAY
+      )
+      array_methods.each do |method_name|
+        define_method method_name do |node|
+          visit_ARRAY node
+        end
+      end
     end
   end
 end

data/predicator.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "minitest", "= 5.4.2"
+  spec.add_development_dependency "minitest-focus"
   spec.add_development_dependency "oedipus_lex"
   spec.add_development_dependency "pry-nav"
   spec.add_development_dependency "racc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - JohnnyT
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.4.2
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  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: oedipus_lex
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -159,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Predicate Engine