command_search 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 217fdaec3f53844fbda942d9b8f9cb6422cfd422
-  data.tar.gz: ffbc227be18fa8fcd947dd42889838719921cbed
+  metadata.gz: 0ff69a298e109d79d1cf70f7bc0d1470129d447d
+  data.tar.gz: 37bfc67ff6702e307087611b5e75db52ce6334c7
 SHA512:
-  metadata.gz: ec86ff8eccc714a7ac0aae2a36f78c6a36bad5fcfb87fd61dbfbb8544b27f008f787604a3e50241c309ce8335177097e78c311487873baee09043a5d3243fa4e
-  data.tar.gz: be520d824f7f9ef919089da78adfdde811a2e1e072b791cf5ec1fa4f462d09b538d7272e7417083992305ee4e4dbffa15a42efb3c11deadd5b7b4cfb1a796f93
+  metadata.gz: b53dbc26c9a8db5cd13c48b4def9065f29031fab0ed1336cefbb94f6e197ce7172db18e5b81937a4ee68d08a0ec700cd90145bf0996f1d5af32d70423b6f10ec
+  data.tar.gz: 5f5a24aed587abe88c7408c3855360826b7fedcc00ab7f242e161717a8858465f82196aacb5d046ed9b98b985e6e88f843aeeb97b2b47dfcb4da00038cd6b318

data/lib/command_search/aliaser.rb

@@ -3,8 +3,8 @@ module CommandSearch
     module_function
 
     def build_regex(str)
-      head_border = '(?<=^|\s|[|(-])'
-      tail_border = '(?=$|\s|[|)])'
+      head_border = '(?<=^|[^:\w])'
+      tail_border = '(?=$|\W)'
       Regexp.new(head_border + Regexp.escape(str) + tail_border, 'i')
     end
 

data/lib/command_search/memory.rb

@@ -26,11 +26,17 @@ module CommandSearch
       elsif !item.key?(cmd)
         return false
       elsif val[1][:type] == :str
-        item[cmd][/#{Regexp.escape(cmd_search)}/mi]
+        item[cmd][/#{Regexp.escape(cmd_search)}/i]
       elsif val[1][:type] == :quoted_str
-        item[cmd][/\b#{Regexp.escape(cmd_search)}\b/]
+        regex = /\b#{Regexp.escape(cmd_search)}\b/
+        if cmd_search.first[/\W/] || cmd_search.last[/\W/]
+          head_border = '(?<=^|[^:+\w])'
+          tail_border = '(?=$|[^:+\w])'
+          regex = Regexp.new(head_border + Regexp.escape(cmd_search) + tail_border)
+        end
+        item[cmd][regex]
       else
-        item[cmd].to_s[/#{Regexp.escape(cmd_search)}/mi]
+        item[cmd].to_s[/#{Regexp.escape(cmd_search)}/i]
       end
     end
 
@@ -77,9 +83,15 @@ module CommandSearch
         case node[:nest_type]
         when nil
           if node[:type] == :quoted_str
-            field_vals.any? { |x| x.to_s[/\b#{Regexp.escape(val)}\b/] }
+            regex = /\b#{Regexp.escape(val)}\b/
+            if val.first[/\W/] || val.last[/\W/]
+              head_border = '(?<=^|[^:+\w])'
+              tail_border = '(?=$|[^:+\w])'
+              regex = Regexp.new(head_border + Regexp.escape(val) + tail_border)
+            end
+            field_vals.any? { |x| x.to_s[regex] }
           else
-            field_vals.any? { |x| x.to_s[/#{Regexp.escape(val)}/mi] }
+            field_vals.any? { |x| x.to_s[/#{Regexp.escape(val)}/i] }
           end
         when :colon
           command_check(item, val, command_types)

data/lib/command_search/mongoer.rb

@@ -9,8 +9,13 @@ module CommandSearch
       fields = [fields] unless fields.is_a?(Array)
       if ast_node[:type] == :quoted_str
         regex = /\b#{Regexp.escape(str)}\b/
+        if str.first[/\W/] || str.last[/\W/]
+          head_border = '(?<=^|[^:+\w])'
+          tail_border = '(?=$|[^:+\w])'
+          regex = Regexp.new(head_border + Regexp.escape(str) + tail_border)
+        end
       else
-        regex = /#{Regexp.escape(str)}/mi
+        regex = /#{Regexp.escape(str)}/i
       end
       if ast_node[:negate]
         forms = fields.map { |f| { f => { '$not' => regex } } }
@@ -82,8 +87,13 @@ module CommandSearch
       elsif type == String
         if search_type == :quoted_str
           val = /\b#{Regexp.escape(raw_val)}\b/
+          if raw_val.first[/\W/] || raw_val.last[/\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)}/mi
+          val = /#{Regexp.escape(raw_val)}/i
         end
       elsif [Numeric, Integer].include?(type)
         if raw_val == raw_val.to_i.to_s
@@ -111,10 +121,6 @@ module CommandSearch
         end
       end
 
-      # regex (case insensitive probably best default, and let
-      # proper regex and alias support allow developers to have
-      # case sensitive if they want maybe.)
-
       if field_node[:negate] && (type == Numeric || type == String)
         { key => { '$not' => val } }
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_search
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - zumbalogy