command_search 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93226578c66261e1923eeb6f56647b3eed274b3fe0dad3e8f016780c34e46831
-  data.tar.gz: 5d73e80d4b7f8fbca8febe5dc548332d48cd25f46b7611fae6c075268fdda5b0
+  metadata.gz: 8c362907118b743a2b22ec4828a138bc9dd825d7f9359bac7679818b0ccc1fa3
+  data.tar.gz: 82346ff2cce58d1b119fe96f35e92a8bc4527442038af10b8ad7f88b1d1ef902
 SHA512:
-  metadata.gz: a25f5ac8e3b4ba433df88abc38551162532ba7e04e47744e44a0ba7dd107a95471490d0506e98746f1344a259f94a8b2ff229f3468a5078ad4ef97158901b948
-  data.tar.gz: b14a8926f623e7b1ca05e51e5c0fbf1a754012a4e84284166e1fbc29b8894bf47b2fd58841d397575c1859dab46f722a21e0317afff482ec2da40302faddcf19
+  metadata.gz: 8f34e7224f15fdb9d54439a8ec6f3e0e155509e01a178f04d251baccb0421bedd31c0e5fe85701d60f7fba6ea2d6875b484e7f7546f43336c9ee2617d31c8331
+  data.tar.gz: e3069421cb073394cb54bda87d9329673674f4dd8392213e1b06afbdeed6862d3f7aa656266168651190869ac85267fa92e0a34d50a0d4493875ddff8d2a9a21

data/lib/command_search/aliaser.rb

@@ -8,13 +8,16 @@ module CommandSearch
       Regexp.new(head_border + Regexp.escape(str) + tail_border, 'i')
     end
 
-    def quotes?(head, tail)
+    def quotes?(str, offset)
+      head = str[0...offset[0]]
+      tail = str[offset[1]..-1]
       return true if head.count("'").odd? && tail.count("'").odd?
       return true if head.count('"').odd? && tail.count('"').odd?
       false
     end
 
     def alias_item(query, alias_key, alias_value)
+      return query unless alias_value.is_a?(String) || alias_value.is_a?(Proc)
       if alias_key.is_a?(Regexp)
         pattern = alias_key
       elsif alias_key.is_a?(String)
@@ -22,23 +25,14 @@ module CommandSearch
       else
         return query
       end
-      current_match = query[pattern]
-      return query unless current_match
-      offset = Regexp.last_match.offset(0)
-      head = query[0...offset.first]
-      tail = alias_item(query[offset.last..-1], alias_key, alias_value)
-      if quotes?(head, tail)
-        replacement = current_match
-      else
+      query.gsub(pattern) do |match|
+        next match if quotes?(query, Regexp.last_match.offset(0))
         if alias_value.is_a?(String)
-          replacement = alias_value
+          alias_value
         elsif alias_value.is_a?(Proc)
-          replacement = alias_value.call(current_match).to_s
-        else
-          return query
+          alias_value.call(match).to_s
         end
       end
-      head + replacement + tail
     end
 
     def alias(query, aliases)

data/lib/command_search/mongoer.rb

@@ -31,13 +31,11 @@ module CommandSearch
     end
 
     def is_bool_str?(str)
-      return true if str[/\Atrue\Z|\Afalse\Z/i]
-      false
+      str[/\Atrue\Z|\Afalse\Z/i]
     end
 
     def make_boolean(str)
-      return true if str[/\Atrue\Z/i]
-      false
+      str[/\Atrue\Z/i]
     end
 
     def build_command(ast_node, command_types)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_search
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - zumbalogy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-18 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Let users query collections with ease.