predicator 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6f75523bd14777d85c7d52472823bad7eafa31f
-  data.tar.gz: cbf63f511abaccbac93ed564256d5d0caea7da87
+  metadata.gz: cccb4a93e1358c39913a03aff288de916bf3fe43
+  data.tar.gz: e28bf0d18f7b94d27c94baaec203eb99a1457ed7
 SHA512:
-  metadata.gz: 7c0c9e0fa3737b4c6f1ec27a20254197fbe0a52825f37cb2978c02c829473d3fd3777f5e5937cb08c754783acc0c1a9188f8e31054a4ab4eb1dfab325873c68a
-  data.tar.gz: af32c18e7d32ccf7047f02d7bafaa71fbb7d3fa0b7383d47f78854440fdb1ef45884d832f37e1ff364ca19a5ff90783fe6715b4e33c9b7e247ff6cb169a80444
+  metadata.gz: a6e74e9fae07264c552612a5fcd6c804b6f0deaf42b6a81012fd1e48900ee923e7b21ebd2e36a6b828bc6942358c1fada37ab25436a5d6dc090db89ee22d3d0b
+  data.tar.gz: 394b6bd004026f79cd6aed9bada7fefa863df8a44a1f2b64056c53f455b94106da9a5cc4fb54741f9894e848f763f7f4d30b4a7554c68addeb23ecaf3efa34b1

data/HISTORY.md

@@ -1,3 +1,9 @@
+### 0.4.0 / 2016-06-09
+
+* Adds double dispatch for relation predicates
+* Adds method predicate (.blank? and .present?)
+* Adds Context#eval
+
 ### 0.3.0 / 2016-03-11
 
 * Adds more relation predicates (GT, LT, GTE, LTE, NEQ)

data/lib/predicator.rb

@@ -1,6 +1,12 @@
+require "date"
+
 require "predicator/context"
+require "predicator/errors"
 require "predicator/lexer"
+require "predicator/nodes"
 require "predicator/parser"
+require "predicator/predicates"
+require "predicator/variable"
 require "predicator/version"
 
 module Predicator

data/lib/predicator/context.rb

@@ -4,20 +4,71 @@ module Predicator
   class Context
     attr_reader :bindings
 
-    def initialize
+    def initialize attrs={}
       @bindings = {}
+      attrs.each{ |key, val| bind key, val }
     end
 
-    def bind name, value
-      value = OpenStruct.new(value) if value.kind_of? Hash
-      bindings[name.to_s] = value
+    def bind name, obj
+      if obj.kind_of? Hash
+        obj = OpenStruct.new obj
+      end
+      bindings[name.to_s] = obj
     end
+    alias :[]= :bind
 
-    def value_for input
-      return input unless input.kind_of? Predicator::Variable
+    def node_for input
+      value = value_for input
+      node_class = Predicator::Nodes::BaseNode.class_for value
+      node_class.new value
+    end
 
-      input.value_in self
+    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
+    end
   end
 end

data/lib/predicator/errors.rb

@@ -0,0 +1,5 @@
+module Predicator
+  class UnknownNodeTypeError < StandardError; end
+  class NilValueError < StandardError; end
+  class ParseError < StandardError; end
+end

data/lib/predicator/generated_parser.rb

@@ -10,92 +10,97 @@ module Predicator
 ##### State transition tables begin ###
 
 racc_action_table = [
-     9,    31,    32,     7,     8,    14,    15,    16,    17,    18,
-     9,    43,     6,     7,     8,    14,    15,    16,    17,    18,
-     9,    44,     6,     7,     8,    14,    15,    16,    17,    18,
-     9,   nil,     6,     7,     8,    14,    15,    16,    17,    18,
-     9,   nil,     6,     7,     8,    14,    15,    16,    17,    18,
-    20,    21,     6,    19,   nil,   nil,    20,    21,   nil,    22,
-   nil,   nil,    42,    23,    28,    27,    26,    25,    24,    14,
-    15,    16,    17,    18,    14,    15,    16,    17,    18,    14,
-    15,    16,    17,    18,    14,    15,    16,    17,    18,    14,
-    15,    16,    17,    18,    14,    15,    16,    17,    18,    14,
-    15,    16,    17,    18,    14,    15,    16,    17,    18 ]
+    10,    21,    22,     8,     9,    15,    16,    17,    18,    19,
+    47,    10,     6,    37,     8,     9,    15,    16,    17,    18,
+    19,    10,    34,     6,     8,     9,    15,    16,    17,    18,
+    19,    10,    48,     6,     8,     9,    15,    16,    17,    18,
+    19,    10,    33,     6,     8,     9,    15,    16,    17,    18,
+    19,    24,    31,     6,   nil,    25,    30,    29,    28,    27,
+    26,    15,    16,    17,    18,    19,    15,    16,    17,    18,
+    19,    20,    45,    46,    21,    22,    15,    16,    17,    18,
+    19,    15,    16,    17,    18,    19,    15,    16,    17,    18,
+    19,    15,    16,    17,    18,    19,    15,    16,    17,    18,
+    19,    15,    16,    17,    18,    19 ]
 
 racc_action_check = [
-     0,    18,    19,     0,     0,     0,     0,     0,     0,     0,
-     6,    31,     0,     6,     6,     6,     6,     6,     6,     6,
-     9,    35,     6,     9,     9,     9,     9,     9,     9,     9,
-    20,   nil,     9,    20,    20,    20,    20,    20,    20,    20,
-    21,   nil,    20,    21,    21,    21,    21,    21,    21,    21,
-    29,    29,    21,     1,   nil,   nil,     1,     1,   nil,     5,
-   nil,   nil,    29,     5,     5,     5,     5,     5,     5,    22,
-    22,    22,    22,    22,    23,    23,    23,    23,    23,    24,
-    24,    24,    24,    24,    25,    25,    25,    25,    25,    26,
-    26,    26,    26,    26,    27,    27,    27,    27,    27,    28,
-    28,    28,    28,    28,    44,    44,    44,    44,    44 ]
+     0,    23,    23,     0,     0,     0,     0,     0,     0,     0,
+    33,     6,     0,    23,     6,     6,     6,     6,     6,     6,
+     6,    22,    20,     6,    22,    22,    22,    22,    22,    22,
+    22,    10,    38,    22,    10,    10,    10,    10,    10,    10,
+    10,    21,    19,    10,    21,    21,    21,    21,    21,    21,
+    21,     7,     7,    21,   nil,     7,     7,     7,     7,     7,
+     7,    24,    24,    24,    24,    24,    48,    48,    48,    48,
+    48,     1,    31,    31,     1,     1,    30,    30,    30,    30,
+    30,    25,    25,    25,    25,    25,    26,    26,    26,    26,
+    26,    27,    27,    27,    27,    27,    29,    29,    29,    29,
+    29,    28,    28,    28,    28,    28 ]
 
 racc_action_pointer = [
-    -2,    53,   nil,   nil,   nil,    47,     8,   nil,   nil,    18,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   -12,     2,
-    28,    38,    62,    67,    72,    77,    82,    87,    92,    47,
-   nil,     0,   nil,   nil,   nil,    18,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    97,   nil ]
+    -2,    71,   nil,   nil,   nil,   nil,     9,    39,   nil,   nil,
+    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29,
+    22,    39,    19,    -2,    54,    74,    79,    84,    94,    89,
+    69,    50,   nil,    -1,   nil,   nil,   nil,   nil,    29,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    59,   nil ]
 
 racc_action_default = [
-   -26,   -26,    -1,    -2,    -3,   -26,   -26,   -12,   -13,   -26,
-   -17,   -18,   -19,   -20,   -21,   -22,   -23,   -24,   -26,   -26,
-   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,
-   -16,   -26,    46,   -14,   -15,   -26,    -6,    -7,    -8,    -9,
-   -10,   -11,    -5,   -25,   -26,    -4 ]
+   -29,   -29,    -1,    -2,    -3,    -4,   -29,   -29,    -7,    -8,
+   -29,   -20,   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -29,
+   -29,   -29,   -29,   -29,   -29,   -29,   -29,   -29,   -29,   -29,
+   -29,   -29,   -11,   -29,    50,    -9,   -10,    -5,   -29,   -12,
+   -13,   -14,   -15,   -16,   -17,   -18,   -19,   -28,   -29,    -6 ]
 
 racc_goto_table = [
-    35,    36,    37,    38,    39,    40,    41,     1,   nil,   nil,
-   nil,   nil,   nil,    29,   nil,   nil,    30,   nil,   nil,   nil,
-   nil,   nil,    45,   nil,   nil,   nil,   nil,    33,    34 ]
+    38,    39,    40,    41,    42,    43,    44,     1,   nil,   nil,
+   nil,   nil,   nil,    23,   nil,   nil,   nil,    32,   nil,   nil,
+   nil,   nil,   nil,   nil,    49,   nil,   nil,   nil,    35,    36 ]
 
 racc_goto_check = [
-     5,     5,     5,     5,     5,     5,     5,     1,   nil,   nil,
-   nil,   nil,   nil,     1,   nil,   nil,     1,   nil,   nil,   nil,
-   nil,   nil,     5,   nil,   nil,   nil,   nil,     1,     1 ]
+     6,     6,     6,     6,     6,     6,     6,     1,   nil,   nil,
+   nil,   nil,   nil,     1,   nil,   nil,   nil,     1,   nil,   nil,
+   nil,   nil,   nil,   nil,     6,   nil,   nil,   nil,     1,     1 ]
 
 racc_goto_pointer = [
-   nil,     7,   nil,   nil,   nil,   -22,   nil,   nil,   nil,   nil ]
+   nil,     7,   nil,   nil,   nil,   nil,   -24,   nil,   nil,   nil,
+   nil ]
 
 racc_goto_default = [
-   nil,   nil,     2,     3,     4,     5,    10,    11,    12,    13 ]
+   nil,   nil,     2,     3,     4,     5,     7,    11,    12,    13,
+    14 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 23, :_reduce_none,
-  1, 23, :_reduce_none,
-  1, 23, :_reduce_none,
-  5, 23, :_reduce_4,
-  3, 23, :_reduce_none,
-  3, 24, :_reduce_6,
-  3, 24, :_reduce_7,
-  3, 24, :_reduce_8,
-  3, 24, :_reduce_9,
-  3, 24, :_reduce_10,
-  3, 24, :_reduce_11,
-  1, 25, :_reduce_12,
-  1, 25, :_reduce_13,
-  3, 26, :_reduce_14,
-  3, 26, :_reduce_15,
-  2, 26, :_reduce_16,
-  1, 27, :_reduce_none,
-  1, 27, :_reduce_none,
-  1, 28, :_reduce_none,
-  1, 28, :_reduce_none,
-  1, 30, :_reduce_21,
-  1, 31, :_reduce_22,
-  1, 31, :_reduce_23,
-  1, 31, :_reduce_24,
-  3, 29, :_reduce_25 ]
-
-racc_reduce_n = 26
-
-racc_shift_n = 46
+  1, 25, :_reduce_none,
+  1, 25, :_reduce_none,
+  1, 25, :_reduce_none,
+  1, 25, :_reduce_none,
+  3, 25, :_reduce_5,
+  5, 25, :_reduce_6,
+  1, 26, :_reduce_7,
+  1, 26, :_reduce_8,
+  3, 27, :_reduce_9,
+  3, 27, :_reduce_10,
+  2, 27, :_reduce_11,
+  3, 28, :_reduce_12,
+  3, 28, :_reduce_13,
+  3, 28, :_reduce_14,
+  3, 28, :_reduce_15,
+  3, 28, :_reduce_16,
+  3, 28, :_reduce_17,
+  3, 29, :_reduce_18,
+  3, 29, :_reduce_19,
+  1, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 33, :_reduce_24,
+  1, 34, :_reduce_25,
+  1, 34, :_reduce_26,
+  1, 34, :_reduce_27,
+  3, 32, :_reduce_28 ]
+
+racc_reduce_n = 29
+
+racc_shift_n = 50
 
 racc_token_table = {
   false => 0,
@@ -119,9 +124,11 @@ racc_token_table = {
   :tLEQ => 18,
   :tGEQ => 19,
   :tLT => 20,
-  :tGT => 21 }
+  :tGT => 21,
+  :tBLANK => 22,
+  :tPRESENT => 23 }
 
-racc_nt_base = 22
+racc_nt_base = 24
 
 racc_use_result_var = false
 
@@ -164,11 +171,14 @@ Racc_token_to_s_table = [
   "tGEQ",
   "tLT",
   "tGT",
+  "tBLANK",
+  "tPRESENT",
   "$start",
   "predicate",
-  "relation_predicate",
   "boolean_predicate",
   "logical_predicate",
+  "relation_predicate",
+  "method_predicate",
   "value",
   "scalar",
   "variable",
@@ -187,114 +197,132 @@ Racc_debug_parser = false
 
 # reduce 3 omitted
 
-module_eval(<<'.,.,', 'parser.y', 13)
-  def _reduce_4(val, _values)
-     Predicator::Predicates::Between.new val[0], val[2], val[4] 
+# reduce 4 omitted
+
+module_eval(<<'.,.,', 'parser.y', 14)
+  def _reduce_5(val, _values)
+     val[1] 
   end
 .,.,
 
-# reduce 5 omitted
-
-module_eval(<<'.,.,', 'parser.y', 17)
+module_eval(<<'.,.,', 'parser.y', 15)
   def _reduce_6(val, _values)
-     Predicator::Predicates::Equal.new val[0], val[2] 
+     Predicator::Predicates::Between.new val[0], val[2], val[4] 
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 18)
   def _reduce_7(val, _values)
-     Predicator::Predicates::GreaterThan.new val[0], val[2] 
+     Predicator::Predicates::True.new 
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 19)
   def _reduce_8(val, _values)
-     Predicator::Predicates::LessThan.new val[0], val[2] 
+     Predicator::Predicates::False.new 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 20)
+module_eval(<<'.,.,', 'parser.y', 22)
   def _reduce_9(val, _values)
-     Predicator::Predicates::GreaterThanOrEqual.new val[0], val[2] 
+     Predicator::Predicates::And.new [val[0], val[2]] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 21)
+module_eval(<<'.,.,', 'parser.y', 23)
   def _reduce_10(val, _values)
-     Predicator::Predicates::LessThanOrEqual.new val[0], val[2] 
+     Predicator::Predicates::Or.new [val[0], val[2]] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 22)
+module_eval(<<'.,.,', 'parser.y', 24)
   def _reduce_11(val, _values)
-     Predicator::Predicates::NotEqual.new val[0], val[2] 
+     Predicator::Predicates::Not.new val[0] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 25)
+module_eval(<<'.,.,', 'parser.y', 27)
   def _reduce_12(val, _values)
-     Predicator::Predicates::True.new 
+     Predicator::Predicates::Equal.new val[0], val[2] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 26)
+module_eval(<<'.,.,', 'parser.y', 28)
   def _reduce_13(val, _values)
-     Predicator::Predicates::False.new 
+     Predicator::Predicates::GreaterThan.new val[0], val[2] 
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 29)
   def _reduce_14(val, _values)
-     Predicator::Predicates::And.new [val[0], val[2]] 
+     Predicator::Predicates::LessThan.new val[0], val[2] 
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 30)
   def _reduce_15(val, _values)
-     Predicator::Predicates::Or.new [val[0], val[2]] 
+     Predicator::Predicates::GreaterThanOrEqual.new val[0], val[2] 
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 31)
   def _reduce_16(val, _values)
-     Predicator::Predicates::Not.new val[0] 
+     Predicator::Predicates::LessThanOrEqual.new val[0], val[2] 
   end
 .,.,
 
-# reduce 17 omitted
+module_eval(<<'.,.,', 'parser.y', 32)
+  def _reduce_17(val, _values)
+     Predicator::Predicates::NotEqual.new val[0], val[2] 
+  end
+.,.,
 
-# reduce 18 omitted
+module_eval(<<'.,.,', 'parser.y', 35)
+  def _reduce_18(val, _values)
+     Predicator::Predicates::Method.new val[0], val[2] 
+  end
+.,.,
 
-# reduce 19 omitted
+module_eval(<<'.,.,', 'parser.y', 36)
+  def _reduce_19(val, _values)
+     Predicator::Predicates::Method.new val[0], val[2] 
+  end
+.,.,
 
 # reduce 20 omitted
 
-module_eval(<<'.,.,', 'parser.y', 42)
-  def _reduce_21(val, _values)
+# reduce 21 omitted
+
+# reduce 22 omitted
+
+# reduce 23 omitted
+
+module_eval(<<'.,.,', 'parser.y', 47)
+  def _reduce_24(val, _values)
      val[0] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 45)
-  def _reduce_22(val, _values)
+module_eval(<<'.,.,', 'parser.y', 50)
+  def _reduce_25(val, _values)
      val[0].to_f 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 46)
-  def _reduce_23(val, _values)
+module_eval(<<'.,.,', 'parser.y', 51)
+  def _reduce_26(val, _values)
      val[0].to_i 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 47)
-  def _reduce_24(val, _values)
+module_eval(<<'.,.,', 'parser.y', 52)
+  def _reduce_27(val, _values)
      Date.new *val[0] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 50)
-  def _reduce_25(val, _values)
+module_eval(<<'.,.,', 'parser.y', 55)
+  def _reduce_28(val, _values)
      Predicator::Variable.new val[0], val[2] 
   end
 .,.,

data/lib/predicator/lexer.rb

@@ -22,6 +22,8 @@ module Predicator
     AND     = /and/i
     OR      = /or/i
     BETWEEN = /between/i
+    BLANK   = /blank\?/i
+    PRESENT = /present\?/i
     STRING  = /(["])(?:\\?.)*?\1/
     IDENTIFIER = /[a-z][A-Za-z0-9_]*/
 
@@ -100,6 +102,12 @@ module Predicator
         when text = @ss.scan(BETWEEN)
           @tokens.push [:tBETWEEN, text]
 
+        when text = @ss.scan(BLANK)
+          @tokens.push [:tBLANK, text]
+
+        when text = @ss.scan(PRESENT)
+          @tokens.push [:tPRESENT, text]
+
         when text = @ss.scan(STRING)
           @tokens.push [:tSTRING, text[1..-2]]
 

data/lib/predicator/nodes.rb

@@ -0,0 +1,6 @@
+require "predicator/nodes/base_node"
+require "predicator/nodes/date_node"
+require "predicator/nodes/fixnum_node"
+require "predicator/nodes/float_node"
+require "predicator/nodes/nil_class_node"
+require "predicator/nodes/string_node"

data/lib/predicator/nodes/base_node.rb

@@ -0,0 +1,53 @@
+module Predicator
+  module Nodes
+    class BaseNode
+      attr_reader :value
+
+      def self.class_for value
+        class_name = "#{value.class.name}Node"
+        if ::Predicator::Nodes.const_defined? class_name
+          ::Predicator::Nodes.const_get class_name
+        else
+          raise UnknownNodeTypeError, "Unknown node type for #{value.class} (#{value.inspect})"
+        end
+      end
+
+      def initialize value
+        @value = value
+      end
+
+      def blank?
+        value.respond_to?(:empty?) ?
+          !!value.empty? :
+          !value
+      end
+
+      def present?
+        !blank?
+      end
+
+      def comparison_method
+        "compare_to_#{type}"
+      end
+
+      def compare_to_nil
+        raise NilValueError
+      end
+
+      #def compare_to_date
+      #end
+
+      def compare_to_fixnum
+        value.to_i
+      end
+
+      def compare_to_float
+        value.to_f
+      end
+
+      def compare_to_string
+        value.to_s
+      end
+    end
+  end
+end

data/lib/predicator/nodes/date_node.rb

@@ -0,0 +1,13 @@
+module Predicator
+  module Nodes
+    class DateNode < BaseNode
+      def type
+        :date
+      end
+
+      def compare_to_date
+        value
+      end
+    end
+  end
+end

data/lib/predicator/nodes/fixnum_node.rb

@@ -0,0 +1,9 @@
+module Predicator
+  module Nodes
+    class FixnumNode < BaseNode
+      def type
+        :fixnum
+      end
+    end
+  end
+end

data/lib/predicator/nodes/float_node.rb

@@ -0,0 +1,9 @@
+module Predicator
+  module Nodes
+    class FloatNode < BaseNode
+      def type
+        :float
+      end
+    end
+  end
+end

data/lib/predicator/nodes/nil_class_node.rb

@@ -0,0 +1,25 @@
+module Predicator
+  module Nodes
+    class NilClassNode < BaseNode
+      def type
+        :nil
+      end
+
+      def compare_to_date
+        raise NilValueError
+      end
+
+      def compare_to_fixnum
+        raise NilValueError
+      end
+
+      def compare_to_float
+        raise NilValueError
+      end
+
+      def compare_to_string
+        raise NilValueError
+      end
+    end
+  end
+end

data/lib/predicator/nodes/string_node.rb

@@ -0,0 +1,13 @@
+module Predicator
+  module Nodes
+    class StringNode < BaseNode
+      def type
+        :string
+      end
+
+      def compare_to_date
+        Date.parse value
+      end
+    end
+  end
+end

data/lib/predicator/parser.rb

@@ -1,26 +1,7 @@
-require "date"
-
 require "predicator/generated_parser"
 require "predicator/lexer"
-require "predicator/variable"
-
-require "predicator/predicates/relation"
-require "predicator/predicates/equal"
-require "predicator/predicates/not_equal"
-require "predicator/predicates/greater_than"
-require "predicator/predicates/less_than"
-require "predicator/predicates/greater_than_or_equal"
-require "predicator/predicates/less_than_or_equal"
-require "predicator/predicates/between"
-require "predicator/predicates/true"
-require "predicator/predicates/false"
-require "predicator/predicates/and"
-require "predicator/predicates/or"
-require "predicator/predicates/not"
 
 module Predicator
-  class ParseError < StandardError; end
-
   class Parser < GeneratedParser
     def next_token
       @lexer.next_token
@@ -33,7 +14,7 @@ module Predicator
 
     def on_error type, val, values
       super
-    rescue Racc::ParseError => e
+    rescue Racc::ParseError
       trace = values.each_with_index.map{|l, i| "#{' ' * i}#{l}"}
       raise ParseError, "\nparse error on value #{val.inspect}\n#{trace.join("\n")}"
     end

data/lib/predicator/parser.y

@@ -5,22 +5,15 @@ prechigh
   left  tAND tOR
 preclow
 token tTRUE tFALSE tSTRING tFLOAT tINTEGER tDATE tIDENTIFIER tAND tOR tBETWEEN
-      tDOT tLPAREN tRPAREN tBANG tEQ tNEQ tLEQ tGEQ tLT tGT
+      tDOT tLPAREN tRPAREN tBANG tEQ tNEQ tLEQ tGEQ tLT tGT tBLANK tPRESENT
 rule
   predicate
-    : relation_predicate
-    | boolean_predicate
+    : boolean_predicate
     | logical_predicate
+    | relation_predicate
+    | method_predicate
+    | tLPAREN predicate tRPAREN { val[1] }
     | value tBETWEEN value tAND value { Predicator::Predicates::Between.new val[0], val[2], val[4] }
-    | tLPAREN predicate tRPAREN
-    ;
-  relation_predicate
-    : value tEQ value           { Predicator::Predicates::Equal.new val[0], val[2] }
-    | value tGT value           { Predicator::Predicates::GreaterThan.new val[0], val[2] }
-    | value tLT value           { Predicator::Predicates::LessThan.new val[0], val[2] }
-    | value tGEQ value          { Predicator::Predicates::GreaterThanOrEqual.new val[0], val[2] }
-    | value tLEQ value          { Predicator::Predicates::LessThanOrEqual.new val[0], val[2] }
-    | value tNEQ value          { Predicator::Predicates::NotEqual.new val[0], val[2] }
     ;
   boolean_predicate
     : tTRUE                     { Predicator::Predicates::True.new }
@@ -31,6 +24,18 @@ rule
     | predicate tOR predicate   { Predicator::Predicates::Or.new [val[0], val[2]] }
     | tBANG predicate           { Predicator::Predicates::Not.new val[0] }
     ;
+  relation_predicate
+    : value tEQ value           { Predicator::Predicates::Equal.new val[0], val[2] }
+    | value tGT value           { Predicator::Predicates::GreaterThan.new val[0], val[2] }
+    | value tLT value           { Predicator::Predicates::LessThan.new val[0], val[2] }
+    | value tGEQ value          { Predicator::Predicates::GreaterThanOrEqual.new val[0], val[2] }
+    | value tLEQ value          { Predicator::Predicates::LessThanOrEqual.new val[0], val[2] }
+    | value tNEQ value          { Predicator::Predicates::NotEqual.new val[0], val[2] }
+    ;
+  method_predicate
+    : value tDOT tBLANK         { Predicator::Predicates::Method.new val[0], val[2] }
+    | value tDOT tPRESENT       { Predicator::Predicates::Method.new val[0], val[2] }
+    ;
   value
     : scalar
     | variable

data/lib/predicator/predicates.rb

@@ -0,0 +1,14 @@
+require "predicator/predicates/relation"
+require "predicator/predicates/equal"
+require "predicator/predicates/not_equal"
+require "predicator/predicates/greater_than"
+require "predicator/predicates/less_than"
+require "predicator/predicates/greater_than_or_equal"
+require "predicator/predicates/less_than_or_equal"
+require "predicator/predicates/between"
+require "predicator/predicates/true"
+require "predicator/predicates/false"
+require "predicator/predicates/and"
+require "predicator/predicates/or"
+require "predicator/predicates/not"
+require "predicator/predicates/method"

data/lib/predicator/predicates/between.rb

@@ -8,8 +8,16 @@ module Predicator
       end
 
       def satisfied? context=Predicator::Context.new
-        context.value_for(value) >= context.value_for(left) &&
-          context.value_for(value) <= context.value_for(right)
+        value_node = context.node_for value
+        left_node = context.node_for left
+        right_node = context.node_for right
+        method = "compare_to_#{value_node.type}"
+
+        left_value = left_node.send method
+        right_value = right_node.send method
+
+        (value_node.value >= left_value) &&
+          (value_node.value <= right_value)
       end
 
       def == other

data/lib/predicator/predicates/equal.rb

@@ -1,8 +1,8 @@
 module Predicator
   module Predicates
     class Equal < Predicator::Predicates::Relation
-      def satisfied? context=Predicator::Context.new
-        context.value_for(left) == context.value_for(right)
+      def compare_values lhs, rhs
+        lhs == rhs
       end
     end
   end

data/lib/predicator/predicates/greater_than.rb

@@ -1,8 +1,8 @@
 module Predicator
   module Predicates
     class GreaterThan < Predicator::Predicates::Relation
-      def satisfied? context=Predicator::Context.new
-        context.value_for(left) > context.value_for(right)
+      def compare_values lhs, rhs
+        lhs > rhs
       end
     end
   end

data/lib/predicator/predicates/greater_than_or_equal.rb

@@ -1,8 +1,8 @@
 module Predicator
   module Predicates
     class GreaterThanOrEqual < Predicator::Predicates::Relation
-      def satisfied? context=Predicator::Context.new
-        context.value_for(left) >= context.value_for(right)
+      def compare_values lhs, rhs
+        lhs >= rhs
       end
     end
   end

data/lib/predicator/predicates/less_than.rb

@@ -1,8 +1,8 @@
 module Predicator
   module Predicates
     class LessThan < Predicator::Predicates::Relation
-      def satisfied? context=Predicator::Context.new
-        context.value_for(left) < context.value_for(right)
+      def compare_values lhs, rhs
+        lhs < rhs
       end
     end
   end

data/lib/predicator/predicates/less_than_or_equal.rb

@@ -1,8 +1,8 @@
 module Predicator
   module Predicates
     class LessThanOrEqual < Predicator::Predicates::Relation
-      def satisfied? context=Predicator::Context.new
-        context.value_for(left) <= context.value_for(right)
+      def compare_values lhs, rhs
+        lhs <= rhs
       end
     end
   end

data/lib/predicator/predicates/method.rb

@@ -0,0 +1,17 @@
+module Predicator
+  module Predicates
+    class Method
+      attr_reader :value, :method
+
+      def initialize value, method
+        @value = value
+        @method = method
+      end
+
+      def satisfied? context=Predicator::Context.new
+        node = context.node_for value
+        node.send method
+      end
+    end
+  end
+end

data/lib/predicator/predicates/not_equal.rb

@@ -1,8 +1,8 @@
 module Predicator
   module Predicates
     class NotEqual < Predicator::Predicates::Relation
-      def satisfied? context=Predicator::Context.new
-        context.value_for(left) != context.value_for(right)
+      def compare_values lhs, rhs
+        lhs != rhs
       end
     end
   end

data/lib/predicator/predicates/relation.rb

@@ -7,6 +7,20 @@ module Predicator
         @left, @right = left, right
       end
 
+      def satisfied? context=Predicator::Context.new
+        lhs, rhs = values_for_comparison context
+        compare_values lhs, rhs
+      rescue NilValueError
+        return false
+      end
+
+      def values_for_comparison context=Context.new
+        left_node = context.node_for left
+        right_node = context.node_for right
+        method = "compare_to_#{left_node.type}"
+        [left_node.value, right_node.send(method)]
+      end
+
       def == other
         other.kind_of?(self.class) &&
           other.left == left &&

data/lib/predicator/variable.rb

@@ -9,7 +9,7 @@ module Predicator
 
     def value_in context
       entity_name = model.to_s
-      entity = context.bindings[model]
+      entity = context.bindings[entity_name]
       if entity.nil?
         raise ArgumentError, "Unknown entity #{entity_name}"
       else

data/lib/predicator/version.rb

@@ -1,3 +1,3 @@
 module Predicator
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 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 "pry"
   spec.add_development_dependency "racc"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - JohnnyT
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-06-10 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: 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'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -97,10 +111,19 @@ files:
 - Rakefile
 - lib/predicator.rb
 - lib/predicator/context.rb
+- lib/predicator/errors.rb
 - lib/predicator/generated_parser.rb
 - lib/predicator/lexer.rb
+- lib/predicator/nodes.rb
+- lib/predicator/nodes/base_node.rb
+- lib/predicator/nodes/date_node.rb
+- lib/predicator/nodes/fixnum_node.rb
+- lib/predicator/nodes/float_node.rb
+- lib/predicator/nodes/nil_class_node.rb
+- lib/predicator/nodes/string_node.rb
 - lib/predicator/parser.rb
 - lib/predicator/parser.y
+- lib/predicator/predicates.rb
 - lib/predicator/predicates/and.rb
 - lib/predicator/predicates/between.rb
 - lib/predicator/predicates/equal.rb
@@ -109,6 +132,7 @@ files:
 - lib/predicator/predicates/greater_than_or_equal.rb
 - lib/predicator/predicates/less_than.rb
 - lib/predicator/predicates/less_than_or_equal.rb
+- lib/predicator/predicates/method.rb
 - lib/predicator/predicates/not.rb
 - lib/predicator/predicates/not_equal.rb
 - lib/predicator/predicates/or.rb