search_lingo 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44d740566f9aa77034514ebcfa50c3233527ac24
-  data.tar.gz: 5cf05354fa6244b95e971062233830e1e6f68d6d
+  metadata.gz: 2bdd0cc2315966fc0399d9e24299260dba55e4ed
+  data.tar.gz: 25f6f3aab4dec1fb3a612cda703bdcd3cb42ed77
 SHA512:
-  metadata.gz: f1629acbe2b30ee2d2355ce615ab92b497921dcdfcaf20018075818ba96bde07ff7e62a013cc28befa4e455e1e70f7544104ea23ddfc7dfdabb162db8ab96c8e
-  data.tar.gz: fc856b51c4bdba1a5ec41eafdf77c2401cc36ea4dc814d34131c70f65134b9c2e4000a0efd22d66bfdeba49e439404044f422d1c2375c547b863e948ec600180
+  metadata.gz: 8bb20be38c50a3c4307d60bbe9ad95697fb1b9d526a37ae2c6d832f1356fa3913737f87d8ceb2955a2b5901c24208586d7bbfbf9fe55107ae4e7c5b552471288
+  data.tar.gz: e5a96234ad506535a278478306a0b7b9d9f0b4c408c75d4d81b55721af385dfa609648cdf8d887ae4abbd0f8c262027a0d256e83fe279e15475cdc5414a5559c

data/examples/complex.rb

@@ -27,9 +27,7 @@ class JobSearch < AbstractSearch
     :date
   parser SearchLingo::Parsers::DateRangeParser.new Job.table_name,
     :date
-  parser SearchLingo::Parsers::LTEDateParser.new Job.table_name,
-    :date, connection: Job.connection
-  parser SearchLingo::Parsers::GTEDateParser.new Job.table_name,
+  parser SearchLingo::Parsers::OpenDateRangeParser.new Job.table_name,
     :date, connection: Job.connection
 
   def default_parse(token)
@@ -44,18 +42,14 @@ class ReceiptSearch < AbstractSearch
     :check_date
   parser SearchLingo::Parsers::DateRangeParser.new Receipt.table_name,
     :check_date
-  parser SearchLingo::Parsers::LTEDateParser.new Receipt.table_name,
-    :check_date, connection: Receipt.connection
-  parser SearchLingo::Parsers::GTEDateParser.new Receipt.table_name,
+  parser SearchLingo::Parsers::OpenDateRangeParser.new Receipt.table_name,
     :check_date, connection: Receipt.connection
 
   parser SearchLingo::Parsers::DateParser.new Receipt.table_name,
     :post_date, 'posted'
   parser SearchLingo::Parsers::DateRangeParser.new Receipt.table_name,
     :post_date, 'posted'
-  parser SearchLingo::Parsers::LTEDateParser.new Receipt.table_name,
-    :post_date, 'posted', connection: Receipt.connection
-  parser SearchLingo::Parsers::GTEDateParser.new Receipt.table_name,
+  parser SearchLingo::Parsers::OpenDateRangeParser.new Receipt.table_name,
     :post_date, 'posted', connection: Receipt.connection
 
   parser do |token|

data/lib/search_lingo/parsers/gte_date_parser.rb

@@ -1,25 +1,13 @@
-require 'search_lingo/parsers/date_parser'
-require 'forwardable'
+require 'search_lingo/parsers/open_date_range_parser'
 
 module SearchLingo
   module Parsers
-    class GTEDateParser < DateParser
-      extend Forwardable
-
-      def call(token)
-        token.match /\A#{prefix}(?<date>#{US_DATE})-\z/ do |m|
-          date = parse m[:date]
-          if date
-            [:where, "#{quote_table_name table}.#{quote_column_name column} >= ?", date]
-          end
-        end
-      end
-
-      def post_initialize(connection:, **)
-        @connection = connection
+    class GTEDateParser < OpenDateRangeParser
+      def initialize(*)
+        warn "DEPRECATION WARNING: use SearchLingo::Parsers::OpenDateRangeParser " \
+          "instead of #{self.class} (from #{caller.first})"
+        super
       end
-
-      def_delegators :@connection, :quote_column_name, :quote_table_name
     end
   end
 end

data/lib/search_lingo/parsers/lte_date_parser.rb

@@ -1,25 +1,13 @@
-require 'search_lingo/parsers/date_parser'
-require 'forwardable'
+require 'search_lingo/parsers/open_date_range_parser'
 
 module SearchLingo
   module Parsers
-    class LTEDateParser < DateParser
-      extend Forwardable
-
-      def call(token)
-        token.match /\A#{prefix}-(?<date>#{US_DATE})\z/ do |m|
-          date = parse m[:date]
-          if date
-            [:where, "#{quote_table_name table}.#{quote_column_name column} <= ?", date]
-          end
-        end
-      end
-
-      def post_initialize(connection:, **)
-        @connection = connection
+    class LTEDateParser < OpenDateRangeParser
+      def initialize(*)
+        warn "DEPRECATION WARNING: use SearchLingo::Parsers::OpenDateRangeParser " \
+          "instead of #{self.class} (from #{caller.first})"
+        super
       end
-
-      def_delegators :@connection, :quote_column_name, :quote_table_name
     end
   end
 end

data/lib/search_lingo/parsers/open_date_range_parser.rb

@@ -0,0 +1,38 @@
+require 'search_lingo/parsers/date_parser'
+require 'forwardable'
+
+module SearchLingo
+  module Parsers
+    class OpenDateRangeParser < DateParser
+      extend Forwardable
+
+      DATE_RANGE = /(?:-(?<max>#{US_DATE})|(?<min>#{US_DATE})-)/
+
+      def call(token)
+        token.match /\A#{prefix}#{DATE_RANGE}\z/ do |m|
+          if m[:max]
+            date = parse m[:max]
+            [
+              :where,
+              "#{quote_table_name table}.#{quote_column_name column} <= ?",
+              date
+            ] if date
+          else
+            date = parse m[:min]
+            [
+              :where,
+              "#{quote_table_name table}.#{quote_column_name column} >= ?",
+              date
+            ] if date
+          end
+        end
+      end
+
+      def post_initialize(connection:, **)
+        @connection = connection
+      end
+
+      def_delegators :@connection, :quote_column_name, :quote_table_name
+    end
+  end
+end

data/lib/search_lingo/parsers.rb

@@ -1,4 +1,6 @@
 require 'search_lingo/parsers/date_parser'
 require 'search_lingo/parsers/date_range_parser'
-require 'search_lingo/parsers/gte_date_parser'
+require 'search_lingo/parsers/open_date_range_parser'
+
 require 'search_lingo/parsers/lte_date_parser'
+require 'search_lingo/parsers/gte_date_parser'

data/lib/search_lingo/version.rb

@@ -1,3 +1,3 @@
 module SearchLingo
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_lingo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - John Parker
@@ -107,6 +107,7 @@ files:
 - lib/search_lingo/parsers/gte_date_parser.rb
 - lib/search_lingo/parsers/lte_date_parser.rb
 - lib/search_lingo/parsers/mdy.rb
+- lib/search_lingo/parsers/open_date_range_parser.rb
 - lib/search_lingo/token.rb
 - lib/search_lingo/tokenizer.rb
 - lib/search_lingo/version.rb