command_search 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c13708c7f272c5f640c224c98f16e4a3565b18b811a95f6828a32723df29c9
-  data.tar.gz: 19e60779a228e284f9a5b554da53fc05c61e2e05a79df26d74302f322fe389de
+  metadata.gz: f2d4dc8f93128387f81a1db137c961877d7013fca4685708246313c631335844
+  data.tar.gz: 1febafa4673817a5b339283d417b280fe9823d7185aed8e3acdf4f634ec0691a
 SHA512:
-  metadata.gz: 066a231e69284fd8c97526d39ec5f0648d35b447b304c7322d9b58d1f01748763f59d2c347575a6402837df1ba884ba92f4d14491c1fb378061c4a06a791f09c
-  data.tar.gz: 906d147aec7b7fa2e6163b65f8fef0c1c98cc12ff39b5cdc166358029ff77f0080f57ba6612f8739ee5e07b5a7801f19f8ee963b55b5da8a77b7b21d0c02adca
+  metadata.gz: 61bf9662d85418432ec74454d501e37a64b15b3f1449e319628d2d262504e1c91809847281f6b85ac3812ceb6f59b496198b30b5a46ad6f9a564b50c7d31a0c6
+  data.tar.gz: 0a7c487210b398beb48e1a03d12d10bb8948849eeca87616a724d4a6ee993266bef0f9bed8f95b50448ab4b218f5995586277f1f83e0a31d816b2449d56c0379

data/lib/command_search/memory.rb

@@ -24,6 +24,14 @@ module CommandSearch
         end
       elsif !item.key?(cmd)
         return false
+      elsif [Date, Time, DateTime].include?(cmd_type)
+        item_time = item[cmd].to_time
+        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 })
+          input_times.first <= item_time && item_time < input_times.last
+        end
       elsif val[1][:type] == :quoted_str
         regex = /\b#{Regexp.escape(cmd_search)}\b/
         regex = /\A\Z/ if cmd_search == ''
@@ -48,8 +56,10 @@ module CommandSearch
         child_val = child[:value]
         item_val = item[child_val.to_s] || item[child_val.to_sym]
         item_val ||= child_val unless child == cmd
-        return unless item_val
-        if cmd_type == Time
+        next unless item_val
+        next item_val.to_time if child == cmd && [Date, Time, DateTime].include?(cmd_type)
+        next item_val if child == cmd
+        if [Date, Time, DateTime].include?(cmd_type)
           date_start_map = {
             '<' => :start,
             '>' => :end,
@@ -58,6 +68,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 })
           if date_pick == :start
             date.first

data/lib/command_search/mongoer.rb

@@ -100,19 +100,26 @@ module CommandSearch
         else
           val = raw_val
         end
-      elsif type == Time
+      elsif [Date, Time, DateTime].include?(type)
         time_str = raw_val.tr('_.-', ' ')
-        date = Chronic.parse(time_str, guess: nil)
+        if time_str == time_str.to_i.to_s
+          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_begin = date.begin
+          date_end = date.end
+        end
         if field_node[:negate]
           val = [
-            { key => { '$gt' => date.end   } },
-            { key => { '$lt' => date.begin } }
+            { key => { '$gt' => date_end   } },
+            { key => { '$lt' => date_begin } }
           ]
           key = '$or'
         else
           val = [
-            { key => { '$gte' => date.begin } },
-            { key => { '$lte' => date.end   } }
+            { key => { '$gte' => date_begin } },
+            { key => { '$lte' => date_end   } }
           ]
           key = '$and'
         end
@@ -177,7 +184,7 @@ module CommandSearch
         else
           val = val.to_f
         end
-      elsif type == Time
+      elsif [Date, Time, DateTime].include?(type)
         # foo <  day | day.start
         # foo <= day | day.end
         # foo >  day | day.end
@@ -190,7 +197,13 @@ module CommandSearch
         }
         date_pick = date_start_map[op]
         time_str = val.tr('_.-', ' ')
-        date = Chronic.parse(time_str, guess: nil)
+
+        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)
+        end
+
         if date_pick == :start
           val = date.first
         elsif date_pick == :end

metadata

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