predicator 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d52e8264560ab508f15b4580664b339b16a021b7
-  data.tar.gz: ba88b351e379ee8432417467176f24f95ae86101
+  metadata.gz: b6f75523bd14777d85c7d52472823bad7eafa31f
+  data.tar.gz: cbf63f511abaccbac93ed564256d5d0caea7da87
 SHA512:
-  metadata.gz: 4064737f39e41018800fe9b93f8d49c7ae03ae33cb240bdba0a33ccbe57b190d67e335c773deb15069988d98dbfab0e98a4f75c8b657cacabca2d045491195b1
-  data.tar.gz: b6846e08b25fdb5e2ebf3668c20cb5faa84a452200050fe52798f47843df8b1a1e2a0d826be66cb80fc6cac0776c7283f0db839a05796678d6c010bdce2b2835
+  metadata.gz: 7c0c9e0fa3737b4c6f1ec27a20254197fbe0a52825f37cb2978c02c829473d3fd3777f5e5937cb08c754783acc0c1a9188f8e31054a4ab4eb1dfab325873c68a
+  data.tar.gz: af32c18e7d32ccf7047f02d7bafaa71fbb7d3fa0b7383d47f78854440fdb1ef45884d832f37e1ff364ca19a5ff90783fe6715b4e33c9b7e247ff6cb169a80444

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.3.0 / 2016-03-11
+
+* Adds more relation predicates (GT, LT, GTE, LTE, NEQ)
+* Adds between predicate
+
 ### 0.2.1 / 2016-02-22
 
 * Makes RACC a development dependency (trying to get working on MagLev)

data/lib/predicator/context.rb

@@ -2,17 +2,16 @@ require "ostruct"
 
 module Predicator
   class Context
-    attr_reader :entities
+    attr_reader :bindings
 
     def initialize
-      @entities = {}
+      @bindings = {}
     end
 
     def bind name, value
       value = OpenStruct.new(value) if value.kind_of? Hash
-      entities[name.to_s] = value
+      bindings[name.to_s] = value
     end
-    alias :[]= :bind
 
     def value_for input
       return input unless input.kind_of? Predicator::Variable

data/lib/predicator/generated_parser.rb

@@ -10,76 +10,92 @@ module Predicator
 ##### State transition tables begin ###
 
 racc_action_table = [
-     9,    26,    25,     7,     8,    14,    15,    16,    17,    18,
-     9,    23,     5,     7,     8,    14,    15,    16,    17,    18,
-     9,    31,     5,     7,     8,    14,    15,    16,    17,    18,
-     9,   nil,     5,     7,     8,    14,    15,    16,    17,    18,
-    20,    21,     5,    14,    15,    16,    17,    18,   nil,   nil,
-     9,   nil,    29,     7,     8,    14,    15,    16,    17,    18,
-    19,   nil,     5,    20,    21 ]
+     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 ]
 
 racc_action_check = [
-     0,    19,    18,     0,     0,     0,     0,     0,     0,     0,
-    20,     6,     0,    20,    20,    20,    20,    20,    20,    20,
-     5,    25,    20,     5,     5,     5,     5,     5,     5,     5,
-    21,   nil,     5,    21,    21,    21,    21,    21,    21,    21,
-    22,    22,    21,    23,    23,    23,    23,    23,   nil,   nil,
-     9,   nil,    22,     9,     9,     9,     9,     9,     9,     9,
-     1,   nil,     9,     1,     1 ]
+     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 ]
 
 racc_action_pointer = [
-    -2,    60,   nil,   nil,   nil,    18,    -2,   nil,   nil,    48,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   -10,     1,
-     8,    28,    37,    36,   nil,    10,   nil,   nil,   nil,   nil,
-   nil,   nil ]
+    -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 ]
 
 racc_action_default = [
-   -20,   -20,    -1,    -2,    -3,   -20,   -20,    -6,    -7,   -20,
-   -11,   -12,   -13,   -14,   -15,   -16,   -17,   -18,   -20,   -20,
-   -20,   -20,   -20,   -20,   -10,   -20,    32,    -8,    -9,    -4,
-    -5,   -19 ]
+   -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 ]
 
 racc_goto_table = [
-     1,    30,   nil,   nil,   nil,    22,   nil,   nil,   nil,    24,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    27,    28 ]
+    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 ]
 
 racc_goto_check = [
-     1,     5,   nil,   nil,   nil,     1,   nil,   nil,   nil,     1,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     1,     1 ]
+     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 ]
 
 racc_goto_pointer = [
-   nil,     0,   nil,   nil,   nil,   -22,   nil,   nil,   nil,   nil ]
+   nil,     7,   nil,   nil,   nil,   -22,   nil,   nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,     2,     3,     4,     6,    10,    11,    12,    13 ]
+   nil,   nil,     2,     3,     4,     5,    10,    11,    12,    13 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 17, :_reduce_none,
-  1, 17, :_reduce_none,
-  1, 17, :_reduce_none,
-  3, 17, :_reduce_none,
-  3, 18, :_reduce_5,
-  1, 19, :_reduce_6,
-  1, 19, :_reduce_7,
-  3, 20, :_reduce_8,
-  3, 20, :_reduce_9,
-  2, 20, :_reduce_10,
-  1, 21, :_reduce_none,
-  1, 21, :_reduce_none,
-  1, 22, :_reduce_none,
-  1, 22, :_reduce_none,
-  1, 24, :_reduce_15,
-  1, 25, :_reduce_16,
-  1, 25, :_reduce_17,
-  1, 25, :_reduce_18,
-  3, 23, :_reduce_19 ]
-
-racc_reduce_n = 20
-
-racc_shift_n = 32
+  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
 
 racc_token_table = {
   false => 0,
@@ -94,12 +110,18 @@ racc_token_table = {
   :tINTEGER => 9,
   :tDATE => 10,
   :tIDENTIFIER => 11,
-  :tDOT => 12,
-  :tEQUAL => 13,
+  :tBETWEEN => 12,
+  :tDOT => 13,
   :tLPAREN => 14,
-  :tRPAREN => 15 }
+  :tRPAREN => 15,
+  :tEQ => 16,
+  :tNEQ => 17,
+  :tLEQ => 18,
+  :tGEQ => 19,
+  :tLT => 20,
+  :tGT => 21 }
 
-racc_nt_base = 16
+racc_nt_base = 22
 
 racc_use_result_var = false
 
@@ -132,13 +154,19 @@ Racc_token_to_s_table = [
   "tINTEGER",
   "tDATE",
   "tIDENTIFIER",
+  "tBETWEEN",
   "tDOT",
-  "tEQUAL",
   "tLPAREN",
   "tRPAREN",
+  "tEQ",
+  "tNEQ",
+  "tLEQ",
+  "tGEQ",
+  "tLT",
+  "tGT",
   "$start",
   "predicate",
-  "equals_predicate",
+  "relation_predicate",
   "boolean_predicate",
   "logical_predicate",
   "value",
@@ -159,78 +187,114 @@ Racc_debug_parser = false
 
 # reduce 3 omitted
 
-# reduce 4 omitted
+module_eval(<<'.,.,', 'parser.y', 13)
+  def _reduce_4(val, _values)
+     Predicator::Predicates::Between.new val[0], val[2], val[4] 
+  end
+.,.,
+
+# reduce 5 omitted
 
-module_eval(<<'.,.,', 'parser.y', 16)
-  def _reduce_5(val, _values)
-     Predicator::Predicates::Equals.new val[0], val[2] 
+module_eval(<<'.,.,', 'parser.y', 17)
+  def _reduce_6(val, _values)
+     Predicator::Predicates::Equal.new val[0], val[2] 
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 18)
+  def _reduce_7(val, _values)
+     Predicator::Predicates::GreaterThan.new val[0], val[2] 
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 19)
-  def _reduce_6(val, _values)
-     Predicator::Predicates::True.new 
+  def _reduce_8(val, _values)
+     Predicator::Predicates::LessThan.new val[0], val[2] 
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 20)
-  def _reduce_7(val, _values)
+  def _reduce_9(val, _values)
+     Predicator::Predicates::GreaterThanOrEqual.new val[0], val[2] 
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 21)
+  def _reduce_10(val, _values)
+     Predicator::Predicates::LessThanOrEqual.new val[0], val[2] 
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 22)
+  def _reduce_11(val, _values)
+     Predicator::Predicates::NotEqual.new val[0], val[2] 
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 25)
+  def _reduce_12(val, _values)
+     Predicator::Predicates::True.new 
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 26)
+  def _reduce_13(val, _values)
      Predicator::Predicates::False.new 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 23)
-  def _reduce_8(val, _values)
+module_eval(<<'.,.,', 'parser.y', 29)
+  def _reduce_14(val, _values)
      Predicator::Predicates::And.new [val[0], val[2]] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 24)
-  def _reduce_9(val, _values)
+module_eval(<<'.,.,', 'parser.y', 30)
+  def _reduce_15(val, _values)
      Predicator::Predicates::Or.new [val[0], val[2]] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 25)
-  def _reduce_10(val, _values)
+module_eval(<<'.,.,', 'parser.y', 31)
+  def _reduce_16(val, _values)
      Predicator::Predicates::Not.new val[0] 
   end
 .,.,
 
-# reduce 11 omitted
+# reduce 17 omitted
 
-# reduce 12 omitted
+# reduce 18 omitted
 
-# reduce 13 omitted
+# reduce 19 omitted
 
-# reduce 14 omitted
+# reduce 20 omitted
 
-module_eval(<<'.,.,', 'parser.y', 36)
-  def _reduce_15(val, _values)
+module_eval(<<'.,.,', 'parser.y', 42)
+  def _reduce_21(val, _values)
      val[0] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 39)
-  def _reduce_16(val, _values)
+module_eval(<<'.,.,', 'parser.y', 45)
+  def _reduce_22(val, _values)
      val[0].to_f 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 40)
-  def _reduce_17(val, _values)
+module_eval(<<'.,.,', 'parser.y', 46)
+  def _reduce_23(val, _values)
      val[0].to_i 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 41)
-  def _reduce_18(val, _values)
+module_eval(<<'.,.,', 'parser.y', 47)
+  def _reduce_24(val, _values)
      Date.new *val[0] 
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 44)
-  def _reduce_19(val, _values)
+module_eval(<<'.,.,', 'parser.y', 50)
+  def _reduce_25(val, _values)
      Predicator::Variable.new val[0], val[2] 
   end
 .,.,

data/lib/predicator/lexer.rb

@@ -5,10 +5,15 @@ module Predicator
   class Lexer
     SPACE   = /[ \t\r\n]/
     DOT     = /\./
-    BANG    = /!/
-    EQUAL   = /=/
     LPAREN  = /\(/
     RPAREN  = /\)/
+    NEQ     = /!=/
+    GEQ     = />=/
+    LEQ     = /<=/
+    GT      = />/
+    LT      = /</
+    EQ      = /=/
+    BANG    = /!/
     DATE    = /(\d{4})-(\d{2})-(\d{2})/i
     FLOAT   = /[+-]?(?:[0-9_]+\.[0-9_]*|\.[0-9_]+|\d+(?=[eE]))(?:[eE][+-]?[0-9_]+)?\b/
     INTEGER = /[+-]?\d(_?\d)*\b/
@@ -16,6 +21,7 @@ module Predicator
     FALSE   = /false\b/
     AND     = /and/i
     OR      = /or/i
+    BETWEEN = /between/i
     STRING  = /(["])(?:\\?.)*?\1/
     IDENTIFIER = /[a-z][A-Za-z0-9_]*/
 
@@ -42,18 +48,33 @@ module Predicator
         when text = @ss.scan(DOT)
           @tokens.push [:tDOT, text]
 
-        when text = @ss.scan(BANG)
-          @tokens.push [:tBANG, text]
-
-        when text = @ss.scan(EQUAL)
-          @tokens.push [:tEQUAL, text]
-
         when text = @ss.scan(LPAREN)
           @tokens.push [:tLPAREN, text]
 
         when text = @ss.scan(RPAREN)
           @tokens.push [:tRPAREN, text]
 
+        when text = @ss.scan(NEQ)
+          @tokens.push [:tNEQ, text]
+
+        when text = @ss.scan(GEQ)
+          @tokens.push [:tGEQ, text]
+
+        when text = @ss.scan(LEQ)
+          @tokens.push [:tLEQ, text]
+
+        when text = @ss.scan(GT)
+          @tokens.push [:tGT, text]
+
+        when text = @ss.scan(LT)
+          @tokens.push [:tLT, text]
+
+        when text = @ss.scan(EQ)
+          @tokens.push [:tEQ, text]
+
+        when text = @ss.scan(BANG)
+          @tokens.push [:tBANG, text]
+
         when text = @ss.scan(DATE)
           args = [ @ss[1], @ss[2], @ss[3] ].map(&:to_i)
           @tokens.push [:tDATE, args]
@@ -76,6 +97,9 @@ module Predicator
         when text = @ss.scan(OR)
           @tokens.push [:tOR, text]
 
+        when text = @ss.scan(BETWEEN)
+          @tokens.push [:tBETWEEN, text]
+
         when text = @ss.scan(STRING)
           @tokens.push [:tSTRING, text[1..-2]]
 

data/lib/predicator/parser.rb

@@ -4,7 +4,14 @@ require "predicator/generated_parser"
 require "predicator/lexer"
 require "predicator/variable"
 
-require "predicator/predicates/equals"
+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"

data/lib/predicator/parser.y

@@ -4,26 +4,32 @@ prechigh
   right tBANG
   left  tAND tOR
 preclow
-token tTRUE tFALSE tSTRING tFLOAT tINTEGER tDATE tIDENTIFIER tDOT tEQUAL
-      tLPAREN tRPAREN tAND tOR tBANG
+token tTRUE tFALSE tSTRING tFLOAT tINTEGER tDATE tIDENTIFIER tAND tOR tBETWEEN
+      tDOT tLPAREN tRPAREN tBANG tEQ tNEQ tLEQ tGEQ tLT tGT
 rule
   predicate
-    : equals_predicate
+    : relation_predicate
     | boolean_predicate
     | logical_predicate
+    | value tBETWEEN value tAND value { Predicator::Predicates::Between.new val[0], val[2], val[4] }
     | tLPAREN predicate tRPAREN
     ;
-  equals_predicate
-    : value tEQUAL value { Predicator::Predicates::Equals.new val[0], val[2] }
+  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 }
-    | tFALSE { Predicator::Predicates::False.new }
+    : tTRUE                     { Predicator::Predicates::True.new }
+    | tFALSE                    { Predicator::Predicates::False.new }
     ;
   logical_predicate
-    : predicate tAND predicate { Predicator::Predicates::And.new [val[0], val[2]] }
-    | predicate tOR predicate  { Predicator::Predicates::Or.new [val[0], val[2]] }
-    | tBANG predicate          { Predicator::Predicates::Not.new val[0] }
+    : predicate tAND predicate  { Predicator::Predicates::And.new [val[0], val[2]] }
+    | predicate tOR predicate   { Predicator::Predicates::Or.new [val[0], val[2]] }
+    | tBANG predicate           { Predicator::Predicates::Not.new val[0] }
     ;
   value
     : scalar

data/lib/predicator/predicates/between.rb

@@ -0,0 +1,23 @@
+module Predicator
+  module Predicates
+    class Between
+      attr_reader :value, :left, :right
+
+      def initialize value, left, right
+        @value, @left, @right = value, left, right
+      end
+
+      def satisfied? context=Predicator::Context.new
+        context.value_for(value) >= context.value_for(left) &&
+          context.value_for(value) <= context.value_for(right)
+      end
+
+      def == other
+        other.kind_of?(self.class) &&
+          other.value == value &&
+          other.left == left &&
+          other.right == right
+      end
+    end
+  end
+end

data/lib/predicator/predicates/equal.rb

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

data/lib/predicator/predicates/greater_than.rb

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

data/lib/predicator/predicates/greater_than_or_equal.rb

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

data/lib/predicator/predicates/less_than.rb

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

data/lib/predicator/predicates/less_than_or_equal.rb

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

data/lib/predicator/predicates/not_equal.rb

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

data/lib/predicator/predicates/{equals.rb → relation.rb}

@@ -1,16 +1,12 @@
 module Predicator
   module Predicates
-    class Equals
+    class Relation
       attr_reader :left, :right
 
       def initialize left, right
         @left, @right = left, right
       end
 
-      def satisfied? context=Predicator::Context.new
-        context.value_for(left) == context.value_for(right)
-      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.entities[model]
+      entity = context.bindings[model]
       if entity.nil?
         raise ArgumentError, "Unknown entity #{entity_name}"
       else

data/lib/predicator/version.rb

@@ -1,3 +1,3 @@
 module Predicator
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - JohnnyT
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,10 +102,17 @@ files:
 - lib/predicator/parser.rb
 - lib/predicator/parser.y
 - lib/predicator/predicates/and.rb
-- lib/predicator/predicates/equals.rb
+- lib/predicator/predicates/between.rb
+- lib/predicator/predicates/equal.rb
 - lib/predicator/predicates/false.rb
+- lib/predicator/predicates/greater_than.rb
+- 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/not.rb
+- lib/predicator/predicates/not_equal.rb
 - lib/predicator/predicates/or.rb
+- lib/predicator/predicates/relation.rb
 - lib/predicator/predicates/true.rb
 - lib/predicator/variable.rb
 - lib/predicator/version.rb