search_lingo 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2e54fb0b61c4208e61b6edec4936b1fae5d37c9872c775ed2091f1ebbb0806f
-  data.tar.gz: 3d0f886c18e7f7acf5725d4c1101acd277805e8b8d02eaf0c524bd6f41b222cb
+  metadata.gz: 48dc212ce20b6ca6d502ad3776598375e9aadf5aba67448a0db0833ff9ae9b22
+  data.tar.gz: 9110f9d208a47032ded854d4541eb2d212359599f8b6ddc13bdb6add5c4ee6ab
 SHA512:
-  metadata.gz: bee8e661b253b3e356b14d0a587ea019d4f8f9bcebf3090d7fbb6e12d410ddd85e29ceecaa41735a3b510a924ac119cd770500ad6c9828992c026b0e81e59bd2
-  data.tar.gz: ac76a97eb3ec3fd5c42c975462642b2d35366f7e29a1be7c22c32cf07f8f0442b9e79c7a4d4966826be56b6143cb293d8dd5831201166ff94d4b4fe5e72be579
+  metadata.gz: a9bfec6dad76471dedab609b8eef445c3b61bfb3eaded66d362849a1f42192de117485b7a9c4157aa8277a7a8a34df5f9c9f1aa15997d001751c92a3259172fe
+  data.tar.gz: 38a894d13baec1cb47a68bf805243fe238355dcf65cc35effae2d5c3d304082883fa73e60de07340d2f29c74ad15e89b5b1ca6d20235a63bfd6cd545b07d67af

data/examples/sequel_example.rb

@@ -1,38 +1,27 @@
 require 'sequel'
 require 'sqlite3'
 
-DB = Sequel.sqlite
-
-if ENV['LOG_TO_STDOUT']
-  require 'logger'
-  DB.loggers << Logger.new(STDOUT)
-end
-
-DB.create_table :categories do
-  primary_key :id
-  String :name, null: false, unique: true
-end
-
-DB.create_table :tasks do
-  foreign_key :category_id, :categories
-  String :name, null: false, unique: true
-  Integer :priority, null: false
-  Date :due_date, null: false
-end
-
-class Category < Sequel::Model # :nodoc:
-  one_to_many :tasks
-end
-
-class Task < Sequel::Model # :nodoc:
-  many_to_one :category
-end
+# DB = Sequel.sqlite
+#
+# DB.create_table :categories do
+#   primary_key :id
+#   String :name, null: false, unique: true
+# end
+#
+# DB.create_table :tasks do
+#   foreign_key :category_id, :categories
+#   String :name, null: false, unique: true
+#   Integer :priority, null: false
+#   Date :due_date, null: false
+# end
 
 class CategoryParser # :nodoc:
   def call(token, chain)
     if token.modifier == 'cat'
-      chain.eager_graph(:category)
-        .where Sequel.qualify('category', 'name') => token.term
+      # This is kind of broken. The categories table will be joined once each
+      # time this parser matches a token.
+      chain.join(:categories, id: :category_id)
+        .where Sequel.qualify('categories', 'name') => token.term
     end
   end
 end
@@ -40,14 +29,21 @@ end
 class TaskSearch < SearchLingo::AbstractSearch # :nodoc:
   parser CategoryParser.new
 
-  # Match categories with priority less than or greater than a given value.
+  # Match tasks with matching priority
   #
-  # <2 => Categories with priority < 2
-  # >5 => Categories with priority > 5
+  # prio<2 => Tasks with priority less than 2
+  # prio>2 => Tasks with priority greater than 2
+  # prio=2 => Tasks with priority equal to 5
   parser do |token, chain|
-    token.match /\A([<>])([[:digit:]]+)\z/ do |m|
-      chain.eager_graph(:category)
-        .where Sequel.expr { priority.send m[1], m[2] }
+    token.match(/\A prio ([<=>]) (\d+) \z/x) do |m|
+      case m[1]
+      when '<'
+        chain.where { priority <  m[2] }
+      when '>'
+        chain.where { priority >  m[2] }
+      else
+        chain.where { priority =~ m[2] }
+      end
     end
   end
 
@@ -56,21 +52,18 @@ class TaskSearch < SearchLingo::AbstractSearch # :nodoc:
   # 7/4/1776 => Tasks with due_date == Date.new(1776, 7, 4)
   # 7/4/17   => Tasks with due_date == Date.new(2017, 7, 4)
   parser do |token, chain|
-    token.match %r{\A(\d{1,2})/(\d{1,2})/(\d{2}\d{2}?)\z} do |m|
-      date = begin
-               Date.parse '%d/%d/%d' % m.values_at(3, 1, 2)
-             rescue ArgumentError
-               return nil
-             end
-      chain.where due_date: date
+    token.match %r{\A(?<m>\d{1,2})/(?<d>\d{1,2})/(?<y>\d{2}\d{2}?)\z} do |m|
+      begin
+        date = Date.parse "#{m[:y]}/#{m[:m]}/#{m[:d]}"
+        chain.where due_date: date
+      rescue ArgumentError
+        # Date.parse raised an ArgumentError
+      end
     end
   end
 
-  # Match tasks with names that contain a given term.
-  #
-  # pay bills   => Match tasks with names like "pay bills", "pay bills by today"
-  # brush teeth => Match tasks with names like "brush teeth", "brush teeth and floss"
+  # Match tasks with names containing the given string.
   def default_parse(token, chain)
-    chain.where Sequel.lit 'tasks.name LIKE ?', "%#{token.term}%"
+    chain.where { name.like "%#{token.term}%" }
   end
 end

data/lib/search_lingo/parsers/mdy.rb

@@ -24,7 +24,7 @@ module SearchLingo
       # Available as both a class method and an instance method.
       def parse(term, relative_to: Date.today)
         term.match /\A#{US_DATE}\z/ do |m|
-          return Date.parse '%d/%d/%d' % m.values_at(:y, :m, :d) if m[:y]
+          return Date.parse "#{m[:y]}/#{m[:m]}/#{m[:d]}" if m[:y]
 
           ref   = relative_to
           day   = Integer(m[:d])

data/lib/search_lingo/version.rb

@@ -1,3 +1,3 @@
 module SearchLingo
-  VERSION = '2.0.0.pre1'
+  VERSION = '2.0.0.pre2'
 end

data/search_lingo.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["John Parker"]
   spec.email         = ["jparker@urgetopunt.com"]
 
-  spec.summary       = %q{Framework for building simple query languages}
-  spec.description   = %q{Framework for building simple query language for converting user queries into database queries.}
+  spec.summary       = %q{Framework for defining and parsing search queries.}
+  spec.description   = %q{SearchLingo is a simple framework for defining simple query languages and translating them into application-specific queries.}
   spec.homepage      = "https://github.com/jparker/search_lingo"
   spec.license       = "MIT"
 
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-focus'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'sequel', '~> 4.48'
+  spec.add_development_dependency 'sequel', '~> 5.0'
   spec.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_lingo
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - John Parker
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.48'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.48'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,8 +122,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Framework for building simple query language for converting user queries
-  into database queries.
+description: SearchLingo is a simple framework for defining simple query languages
+  and translating them into application-specific queries.
 email:
 - jparker@urgetopunt.com
 executables: []
@@ -177,5 +177,5 @@ rubyforge_project:
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Framework for building simple query languages
+summary: Framework for defining and parsing search queries.
 test_files: []