command_search 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2d4dc8f93128387f81a1db137c961877d7013fca4685708246313c631335844
-  data.tar.gz: 1febafa4673817a5b339283d417b280fe9823d7185aed8e3acdf4f634ec0691a
+  metadata.gz: 3f2b041b01322aa1a4075fe249d11be0c2f09162e69004904c1c8f73bc55ef8e
+  data.tar.gz: 86b41dffb65a45e51301c3f83d8956c8788b53f62af0e070572154d07fe12785
 SHA512:
-  metadata.gz: 61bf9662d85418432ec74454d501e37a64b15b3f1449e319628d2d262504e1c91809847281f6b85ac3812ceb6f59b496198b30b5a46ad6f9a564b50c7d31a0c6
-  data.tar.gz: 0a7c487210b398beb48e1a03d12d10bb8948849eeca87616a724d4a6ee993266bef0f9bed8f95b50448ab4b218f5995586277f1f83e0a31d816b2449d56c0379
+  metadata.gz: 6cc6ad695a6655df003d5d0741c51e588e4ec11b875bfea45a9baf2695b33cee4e9fc8591f9cd2233f6112a5ff0765fc23370e73f0ad8871e4aee5c23c120f4d
+  data.tar.gz: 6a040c19da93e76992bbadb4a7e8d1adfdf786fd83a8fd0fd0818691ff5349f70531ac3eaf2374c48502b979652b6adafd9acd4f422c4c543bc3f1ac20082c73

data/lib/command_search/memory.rb

@@ -29,7 +29,8 @@ module CommandSearch
         if cmd_search == cmd_search.to_i.to_s
           Time.new(cmd_search) <= item_time && item_time < Time.new(cmd_search.to_i + 1)
         else
-          input_times = Chronic.parse(cmd_search, { guess: nil })
+          time_str = cmd_search.gsub(/[\._-]/, ' ')
+          input_times = Chronic.parse(time_str, { guess: nil }) || Chronic.parse(cmd_search, { guess: nil })
           input_times.first <= item_time && item_time < input_times.last
         end
       elsif val[1][:type] == :quoted_str
@@ -68,10 +69,9 @@ module CommandSearch
           }
           date_pick = date_start_map[node[:nest_op]]
           time_str = item_val.gsub(/[\._-]/, ' ')
-
           next Time.new(time_str) if time_str == time_str.to_i.to_s
 
-          date = Chronic.parse(time_str, { guess: nil })
+          date = Chronic.parse(time_str, { guess: nil }) || Chronic.parse(item_val, { guess: nil })
           if date_pick == :start
             date.first
           else

data/lib/command_search/mongoer.rb

@@ -4,7 +4,7 @@ module CommandSearch
   module Mongoer
     module_function
 
-    def build_search(ast_node, fields)
+    def build_search(ast_node, fields, command_types)
       str = ast_node[:value] || ''
       fields = [fields] unless fields.is_a?(Array)
       if ast_node[:type] == :quoted_str
@@ -18,9 +18,22 @@ module CommandSearch
         regex = /#{Regexp.escape(str)}/i
       end
       if ast_node[:negate]
-        forms = fields.map { |f| { f => { '$not' => regex } } }
+        forms = fields.map do |field|
+          if [Numeric, Integer].include?(command_types[field.to_sym])
+            { field => { '$ne' => str } }
+          else
+            { field => { '$not' => regex } }
+          end
+        end
       else
         forms = fields.map { |f| { f => regex } }
+        forms = fields.map do |field|
+          if [Numeric, Integer].include?(command_types[field.to_sym])
+            { field => str }
+          else
+            { field => regex }
+          end
+        end
       end
       return forms if forms.count < 2
       if ast_node[:negate]
@@ -106,7 +119,7 @@ module CommandSearch
           date_begin = Time.new(time_str)
           date_end = Time.new(time_str.to_i + 1).yesterday
         else
-          date = Chronic.parse(time_str, guess: nil)
+          date = Chronic.parse(time_str, guess: nil) || Chronic.parse(raw_val, guess: nil)
           date_begin = date.begin
           date_end = date.end
         end
@@ -124,8 +137,9 @@ module CommandSearch
           key = '$and'
         end
       end
-
-      if field_node[:negate] && (type == Numeric || type == String)
+      if field_node[:negate] && [Numeric, Integer].include?(type)
+        { key => { '$ne' => val } }
+      elsif field_node[:negate] && type == String
         { key => { '$not' => val } }
       else
         { key => val }
@@ -178,7 +192,7 @@ module CommandSearch
         key = '$' + key
         val = [key, val]
         key = '$expr'
-      elsif type == Numeric
+      elsif [Numeric, Integer].include?(type)
         if val == val.to_i.to_s
           val = val.to_i
         else
@@ -201,7 +215,7 @@ module CommandSearch
         if time_str == time_str.to_i.to_s
           date = [Time.new(time_str), Time.new(time_str.to_i + 1).yesterday]
         else
-          date = Chronic.parse(time_str, guess: nil)
+          date = Chronic.parse(time_str, guess: nil) || Chronic.parse(val, guess: nil)
         end
 
         if date_pick == :start
@@ -224,7 +238,7 @@ module CommandSearch
           build_searches!(x[:value], fields, command_types)
           x
         else
-          build_search(x, fields)
+          build_search(x, fields, command_types)
         end
       end
       ast.flatten!

data/lib/command_search/parser.rb

@@ -3,9 +3,9 @@ module CommandSearch
     module_function
 
     def parens_rindex(input)
-      open_i = input.rindex { |x| x[:value] == '(' && x[:type] == :paren}
+      open_i = input.rindex { |x| x[:value] == '(' && x[:type] == :paren }
       return unless open_i
-      close_offset = input.drop(open_i).index { |x| x[:value] == ')' && x[:type] == :paren}
+      close_offset = input.drop(open_i).index { |x| x[:value] == ')' && x[:type] == :paren }
       return unless close_offset
       [open_i, close_offset + open_i]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_search
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - zumbalogy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic