examples/complex.rb in search_lingo-1.0.3 vs examples/complex.rb in search_lingo-2.0.0.pre1

@@ -10,50 +10,52 @@
   class IdParser # :nodoc:
     def initialize(table)
       @table = table
     end
 
-    def call(token)
+    def call(token, chain)
       token.match /\Aid:\s*([[:digit:]]+)\z/ do |m|
-        [:where, { @table => { id: m[1] } }]
+        chain.where @table => { id: m[1] }
       end
     end
   end
 end
 
 class JobSearch < SearchLingo::AbstractSearch # :nodoc:
   parser SearchLingo::Parsers::DateParser.new Job.arel_table[:date]
   parser Parsers::IdParser.new Job.table_name
 
-  def default_parse(token)
-    [:where, Job.arel_table[:name].lower.like("%#{token}%")]
+  def default_parse(token, chain)
+    chain.where Job.arel_table[:name].matches "%#{token}%"
   end
 end
 
 class ReceiptSearch < SearchLingo::AbstractSearch # :nodoc:
   parser SearchLingo::Parsers::DateParser.new Receipt.arel_table[:check_date]
   parser SearchLingo::Parsers::DateParser.new Receipt.arel_table[:post_date],
     modifier: 'posted'
 
-  parser do |token|
-    token.match /\Aamount: (\d+(?:\.\d+)?)\z/ do |m|
-      [:where, { receipts: { amount: m[1] } }]
+  parser do |token, chain|
+    token.match(/\Aamount: (\d+(?:\.\d+)?)\z/) do |m|
+      chain.where receipts: { amount: m[1] }
     end
   end
 
-  def default_parse(token)
-    [:where, Receipt.arel_table[:check_no].like(token)]
+  def default_parse(token, chain)
+    chain.where Receipt.arel_table[:check_no].matches token
   end
 end
 
 search = JobSearch.new('6/4/15-6/5/15 id: 42 "foo bar"')
 search.results
-# => Job.where(Job.arel_table[:date].in(Date.new(2015,6,4)..Date.new(2015,6,5)))
-#       .where('jobs' => { id: '42' })
-#       .where(Job.arel_table[:name].lower.like('%foo bar%'))
+# => Job
+#     .where(Job.arel_table[:date].in(Date.new(2015,6,4)..Date.new(2015,6,5)))
+#     .where('jobs' => { id: '42' })
+#     .where(Job.arel_table[:name].matches('%foo bar%'))
 
 search = ReceiptSearch.new('-6/4/15 posted: 6/5/15- amount: 1000 123')
 search.results
-# => Receipt.where(Receipt.arel_table[:check_date].lteq(Date.new(2015,6,4)))
-#           .where(Receipt.arel_table[:post_date].gteq(Date.new(2015,6,5)))
-#           .where(receipts: { amount: '1000' })
-#           .where(Receipt.arel_table[:check_no].matches('123'))
+# => Receipt
+#     .where(Receipt.arel_table[:check_date].lteq(Date.new(2015, 6, 4)))
+#     .where(Receipt.arel_table[:post_date].gteq(Date.new(2015, 6, 5)))
+#     .where(receipts: { amount: '1000' })
+#     .where(Receipt.arel_table[:check_no].matches('123'))