search_lingo 2.0.0.pre3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a72223dbfe08f7309fc060e7bb30afd3e4941810ba9f52fcf50340d6573db74
-  data.tar.gz: c560f79d14abbf7daa9a570ac0594184afb0aca4f69acf66ed86f4af15c6d5be
+  metadata.gz: d697959cb461bb00ba17b4dbd3fe71037db81c65d3253fc22c42c27b69228f2e
+  data.tar.gz: 2a96f4b480d60d052bd1bf7f7ae02f645386144dbebccfacaa9ecfbf56fbbd30
 SHA512:
-  metadata.gz: 343f682d46cf9ea34fafa75499790e0e0a0474e812c8c00cce81fe75b3f2f1b5de66975d0e2d975f4eca8e12deeedf2e9b927ebcce425fef9871d5405b686023
-  data.tar.gz: 725c8dca98f88dd630475c200e7b2ecb0347cb191df5d10e7e0dae9ac0c3e3d815e2830966f2bf18c6bd5448842a78a946a5ec6e60a6e58acaf83aa586adc6d8
+  metadata.gz: aa98221d0840199c0ed21f96412f39fd82567210d8f99d1b2767a0b8f718ba2f1039f1624e7f9d04a63bd7b0c6a22d00ecbe81ddb4c8986322dfdda99da84b4f
+  data.tar.gz: 3ecc60bea0e32cc52548bbe5999e80704bc52e89ec0218f3076473220c14f8f4b2a5214bd8dadca5490b90a2229291dea960289819f53c9689bb4f3ab8859ac7

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3

data/lib/search_lingo/abstract_search.rb

@@ -33,7 +33,7 @@ module SearchLingo
   #     end
   #   end
   class AbstractSearch
-    attr_reader :query, :scope
+    attr_reader :query, :scope, :logger
 
     ##
     # Instantiates a new search object. +query+ is the string that is to be
@@ -42,9 +42,10 @@ module SearchLingo
     # should be sent, e.g., an +ActiveRecord::Relation+.
     #
     #   MySearchClass.new 'foo bar: baz "froz quux"', Task.all
-    def initialize(query, scope)
-      @query = query || ''
-      @scope = scope
+    def initialize(query, scope, logger: nil)
+      @query  = query || ''
+      @scope  = scope
+      @logger = logger
     end
 
     ##
@@ -98,26 +99,12 @@ module SearchLingo
     ##
     # Load search results by composing query string tokens into a query chain.
     #
-    # @query is borken down into tokens, and each token is passed through the
-    # list of defined parsers. If a parser is successful, +:match+ is thrown,
-    # processing moves on to the next token. If none of the parsers succeed and
-    # the token is compound, the token is simplified and reprocessed as before.
-    # If still no parser succeeds, fall back on +#default_parse+.
+    # @query is broken down into tokens and parses each one in turn. The
+    # results of parsing each token are chained onto the end of +scope+ to
+    # compose the query.
     def load_results
       tokenizer.reduce(scope) do |chain, token|
-        catch(:match) do
-          # 1. Try each parser with token until :match is thrown.
-          parse token, chain
-
-          # 2. If :match not thrown and token is compund, simplify and retry.
-          if token.compound?
-            token = tokenizer.simplify
-            parse token, chain
-          end
-
-          # 3. If :match still not thrown, fall back on default parser.
-          default_parse token, chain
-        end
+        parse token, chain
       end
     end
 
@@ -127,6 +114,26 @@ module SearchLingo
       @tokenizer ||= Tokenizer.new query
     end
 
+    ##
+    # Passes +token+ and +chain+ through the array of parsers until +:match+ is
+    # thrown. If none of the parsers match and the token is compound,
+    # simplifies the token and reruns the parsers. If no parsers match after
+    # the second pass or if the token was not compound, falls back on
+    # `#default_parse`.
+    def parse(token, chain)
+      catch(:match) do
+        run_parsers token, chain
+
+        if token.compound?
+          token = tokenizer.simplify
+          run_parsers token, chain
+        end
+
+        logger&.debug "default_parse token=#{token.inspect}"
+        default_parse token, chain
+      end
+    end
+
     ##
     # Passes +token+ to each parser in turn. If a parser succeeds, throws
     # +:match+ with the result.
@@ -134,10 +141,13 @@ module SearchLingo
     # A parser succeeds if +call+ returns a truthy value. A successful parser
     # will typically send something to +chain+ and return the result. In this
     # way, the tokens of the search are reduced into a composed query.
-    def parse(token, chain)
+    def run_parsers(token, chain)
       parsers.each do |parser|
         result = parser.call token, chain
-        throw :match, result if result
+        if result
+          logger&.debug "parser:#{parser.inspect} token=#{token.inspect}"
+          throw :match, result
+        end
       end
       nil
     end

data/lib/search_lingo/parsers/date_parser.rb

@@ -39,11 +39,7 @@ module SearchLingo
       def initialize(column, modifier: nil, &block)
         @column = column
         @prefix = /#{modifier}:[[:space:]]*/ if modifier
-        @append = if block_given?
-                    block
-                  else
-                    ->(chain) { chain }
-                  end
+        @append = block_given? ? block : ->(chain) { chain }
       end
 
       ##
@@ -63,7 +59,7 @@ module SearchLingo
         format '#<%<cls>s @prefix=%<prefix>s @column=%<column>s>',
           cls: self.class,
           prefix: prefix.inspect,
-          column: column.inspect
+          column: "#{column.relation.name}.#{column.name}".inspect
       end
 
       private

data/lib/search_lingo/version.rb

@@ -1,5 +1,5 @@
 # frozen-string-literal: true
 
 module SearchLingo
-  VERSION = '2.0.0.pre3'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_lingo
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0
 platform: ruby
 authors:
 - John Parker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-06 00:00:00.000000000 Z
+date: 2018-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,12 +185,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Framework for defining and parsing search queries.