command_search 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da69ccede9f11407bf8cb7891a5171df25006638
-  data.tar.gz: 578158cfcb0d5341704df96b665c9b0df5549f16
+SHA256:
+  metadata.gz: 15ffe763615f2dbf119a8960fb91405376f2d2e30b3f43f594c6b3c7730ce96c
+  data.tar.gz: afe8f45ba3199a987b5ee2abbb7429fc13d89658d8dd0c48af74c19d3f4634ac
 SHA512:
-  metadata.gz: 13894e8550b893d07a122b28c9e01df1b2bae2eaad69dd13202f9761e5fcc4f735265c86d03211981096f6cd1af313dc2150ca29bd54fb1df1158305e8136127
-  data.tar.gz: eb74c17244825021a4b641e29ff97564bc7138f67b25c5fee7ef3ad0c117303b2c716d53595dea08fc11d80d328f848318439ffe34b74f6c4c5fdbaea0986ee7
+  metadata.gz: 3b10c60d4c3cca7daea2f1d14b3fc87afbdaf79922f1fc2f6fb4b33b97af8983c61ce0140e5ec1234749bd1b738fe6f34b9f6932db7f7f5ec7b95492ad863e3b
+  data.tar.gz: ad4acd1ceeafa32f0982a9c076724b3b933177653e997f2d8a5c9635f61d3f17980e47285c32b375a1ec0a28765dd5eaf00f01c5a160d8cd7e9cc1f1c3cc04f2

data/lib/command_search/command_dealiaser.rb

@@ -15,9 +15,13 @@ module CommandSearch
 
     def unnest_unaliased(node, aliases)
       type = node[:nest_type]
-      values = node[:value].map { |x| x[:value].to_sym }
-      return node if type == :colon && aliases[values.first]
-      return node if type == :compare && (values & aliases.keys).any?
+      if type == :colon
+        val = node[:value][0][:value].to_sym
+        return node if aliases[val]
+      elsif type == :compare
+        return node if node[:value].any? { |child| aliases[child[:value].to_sym] }
+      end
+      values = node[:value].map { |x| x[:value] }
       str_values = values.join(node[:nest_op])
       { type: :str, value: str_values }
     end

data/lib/command_search/mongoer.rb

@@ -5,28 +5,27 @@ module CommandSearch
     module_function
 
     def numeric_field?(field, command_types)
-      raw_type = command_types[field.to_sym]
-      if raw_type.is_a?(Array)
-        type = (raw_type - [:allow_existence_boolean]).first
-      else
-        type = raw_type
+      type = command_types[field.to_sym]
+      if type.is_a?(Array)
+        type = (type - [:allow_existence_boolean]).first
       end
       [Numeric, Integer].include?(type)
     end
 
+    def build_str_regex(raw, type)
+      str = Regexp.escape(raw)
+      return /#{str}/i unless type == :quoted_str
+      return '' if raw == ''
+      return /\b#{str}\b/ unless raw[/(^\W)|(\W$)/]
+      border_a = '(^|\s|[^:+\w])'
+      border_b = '($|\s|[^:+\w])'
+      Regexp.new(border_a + str + border_b)
+    end
+
     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
-        regex = /\b#{Regexp.escape(str)}\b/
-        if str[/(^\W)|(\W$)/]
-          head_border = '(?<=^|[^:+\w])'
-          tail_border = '(?=$|[^:+\w])'
-          regex = Regexp.new(head_border + Regexp.escape(str) + tail_border)
-        end
-      else
-        regex = /#{Regexp.escape(str)}/i
-      end
+      regex = build_str_regex(str, ast_node[:type])
 
       forms = fields.map do |field|
         if numeric_field?(field, command_types)
@@ -39,12 +38,29 @@ module CommandSearch
       { '$or' => forms }
     end
 
-    def is_bool_str?(str)
-      str[/\Atrue\Z|\Afalse\Z/i]
+    def is_bool_str?(str, search_type)
+      search_type != :quoted_str && str[/\Atrue\Z|\Afalse\Z/i]
     end
 
     def make_boolean(str)
-      str[/\Atrue\Z/i]
+      str[0] == 't'
+    end
+
+    def build_time_command(key, val)
+      time_str = val.tr('_.-', ' ')
+      if time_str == time_str.to_i.to_s
+        date_a = Time.new(time_str)
+        date_b = Time.new(time_str.to_i + 1).yesterday
+      else
+        date = Chronic.parse(time_str, guess: nil) || Chronic.parse(val, guess: nil)
+        return [{ CommandSeachDummyDate: true }, { CommandSeachDummyDate: false }] unless date
+        date_a = date.begin
+        date_b = date.end
+      end
+      [
+        { key => { '$gte' => date_a } },
+        { key => { '$lte' => date_b } }
+      ]
     end
 
     def build_command(ast_node, command_types)
@@ -57,11 +73,11 @@ module CommandSearch
       search_type = search_node[:type]
 
       if raw_type.is_a?(Array)
-        is_bool = raw_type.include?(:allow_existence_boolean) && is_bool_str?(raw_val) && search_type != :quoted_str
         type = (raw_type - [:allow_existence_boolean]).first
+        is_bool = raw_type.include?(:allow_existence_boolean) && is_bool_str?(raw_val, search_type)
       else
-        is_bool = false
         type = raw_type
+        is_bool = false
       end
 
       if type == Boolean
@@ -84,40 +100,11 @@ module CommandSearch
           val = { '$exists' => false }
         end
       elsif type == String
-        if search_type == :quoted_str
-          val = /\b#{Regexp.escape(raw_val)}\b/
-          val = '' if raw_val == ''
-          if raw_val[/(^\W)|(\W$)/]
-            head_border = '(?<=^|[^:+\w])'
-            tail_border = '(?=$|[^:+\w])'
-            val = Regexp.new(head_border + Regexp.escape(raw_val) + tail_border)
-          end
-        else
-          val = /#{Regexp.escape(raw_val)}/i
-        end
+        val = build_str_regex(raw_val, search_type)
       elsif [Numeric, Integer].include?(type)
-        if raw_val == raw_val.to_i.to_s
-          val = raw_val.to_i
-        elsif raw_val.to_f != 0 || raw_val[/\A[\.0]*0\Z/]
-          val = raw_val.to_f
-        else
-          val = raw_val
-        end
+        val = raw_val
       elsif [Date, Time, DateTime].include?(type)
-        time_str = raw_val.tr('_.-', ' ')
-        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) || Chronic.parse(raw_val, guess: nil)
-          date_begin = date.begin
-          date_end = date.end
-        end
-        val = [
-          { key => { '$gte' => date_begin } },
-          { key => { '$lte' => date_end   } }
-        ]
-        key = '$and'
+        return build_time_command(key, raw_val)
       end
       { key => val }
     end
@@ -151,7 +138,7 @@ module CommandSearch
       raw_type = command_types[key.to_sym]
 
       if raw_type.is_a?(Array)
-        type = (raw_type - [:allow_boolean]).first
+        type = (raw_type - [:allow_existence_boolean]).first
       else
         type = raw_type
       end
@@ -161,12 +148,6 @@ module CommandSearch
         key = '$' + key
         val = [key, val]
         key = '$expr'
-      elsif [Numeric, Integer].include?(type)
-        if val == val.to_i.to_s
-          val = val.to_i
-        else
-          val = val.to_f
-        end
       elsif [Date, Time, DateTime].include?(type)
         # foo <  day | day.start
         # foo <= day | day.end
@@ -187,6 +168,8 @@ module CommandSearch
           date = Chronic.parse(time_str, guess: nil) || Chronic.parse(val, guess: nil)
         end
 
+        date = date || []
+
         if date_pick == :start
           val = date.first
         elsif date_pick == :end
@@ -233,7 +216,7 @@ module CommandSearch
       end
     end
 
-    def build_query(ast, fields, command_types = {})
+    def build_query(ast, fields, command_types)
       out = ast
       build_searches!(out, fields, command_types)
       build_tree!(out)

data/lib/command_search/parser.rb

@@ -2,40 +2,42 @@ module CommandSearch
   module Parser
     module_function
 
-    def parens_rindex(input)
-      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 }
-      return unless close_offset
-      [open_i, close_offset + open_i]
-    end
-
     def group_parens!(input)
-      while parens_rindex(input)
-        (a, b) = parens_rindex(input)
-        val = input[(a + 1)..(b - 1)]
-        input[a..b] = { type: :nest, nest_type: :paren, value: val }
+      i = 0
+      opening_idxs = []
+      while i < input.length
+        next i += 1 unless input[i][:type] == :paren
+        if input[i][:value] == '('
+          opening_idxs.push(i)
+        elsif opening = opening_idxs.pop()
+          val = input[(opening + 1)..(i - 1)]
+          input[opening..i] = { type: :nest, nest_type: :paren, value: val }
+          i -= (val.length + 1)
+        end
+        i += 1
       end
     end
 
     def cluster!(type, input, cluster_type = :binary)
       binary = (cluster_type == :binary)
-      input.compact!
-      # rindex (vs index) important for nested prefixes
-      while (i = input.rindex { |x| x[:type] == type })
-        val = [input[i + 1]]
-        val.unshift(input[i - 1]) if binary && i > 0
-        front_offset = 0
-        front_offset = 1 if binary && i > 0
-        input[(i - front_offset)..(i + 1)] = {
-          type: :nest,
-          nest_type: type,
-          nest_op: input[i][:value],
-          value: val
-        }
-      end
-      input.each do |x|
-        cluster!(type, x[:value], cluster_type) if x[:type] == :nest
+      i = input.length - 1
+      while i >= 0
+        if input[i][:type] == type
+          val = [input[i + 1]]
+          val.compact!
+          val.unshift(input[i - 1]) if binary && i > 0
+          front_offset = 0
+          front_offset = 1 if binary && i > 0
+          input[(i - front_offset)..(i + 1)] = {
+            type: :nest,
+            nest_type: type,
+            nest_op: input[i][:value],
+            value: val
+          }
+          i -= 1 if binary
+        end
+        cluster!(type, input[i][:value], cluster_type) if input[i][:type] == :nest
+        i -= 1
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_search
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - zumbalogy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -57,8 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Let users query collections with ease.