command_search 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b07ac2724b698183ea63b0ed1ad097bc6374942dde82a7cda70059b9f7a646ab
-  data.tar.gz: b99eea79391ad07bdafa18377bb0912b4056ea89639a19124b845e79842dc395
+  metadata.gz: f539639bfae594c29526089d4756e38c149b3a9e495b1aed57bbd8479bb89e4a
+  data.tar.gz: 842fcdbf6c9580ceb06f27f19e2385a1d931f6d815108e84f8d7e53b1363c801
 SHA512:
-  metadata.gz: 2d016c1b65bb7938675ec6423537f25cbf633ff125abc06f53c7229510a2fc967a8051e1e35d524b2c75cd902b9ba78982ea7696fb899162b95f303abe41142d
-  data.tar.gz: f2e1cd132aea6431ecfb7e63f0ce15532730ad7705a215346178a6bd9f50532eb30329bf55cbcfb41086afee7cc7564abba1f940caecd0c91f9fa689e9ff1f49
+  metadata.gz: 9c4b037f4f55d67e3107d81d77074dab14dc729c8abcdc4ce7dbdd44185f2620032310e8937ba341b4eedeeac6bd02bfcae39fbdc00c32f267c4914d78357993
+  data.tar.gz: a1d8d5eb5f2f565835a6a2f66c96678600d96225333329f6e3a1b1f05a0106405d0cd6ee3a869951fa9f3dca142f733547d06d1292e4bdb34e6538d9cd23b169

data/lib/command_search/aliaser.rb

@@ -37,7 +37,10 @@ module CommandSearch
     end
 
     def alias(query, aliases)
-      aliases.reduce(query) { |q, (k, v)| alias_item(q, k, v) }
+      return query unless aliases.any?
+      out = query.dup
+      aliases.each { |(k, v)| alias_item(out, k, v) }
+      out
     end
   end
 end

data/lib/command_search/optimizer.rb

@@ -7,37 +7,40 @@ module CommandSearch
         next node unless node[:nest_type] == :paren || node[:nest_type] == :pipe
         ands_and_ors!(node[:value])
         next node[:value].first if node[:value].length < 2
-        node[:value] = node[:value].flat_map do |kid|
+        node[:value].map! do |kid|
           next kid[:value] if kid[:nest_type] == :pipe
           kid
         end
+        node[:value].flatten!
         node[:value].uniq!
         node
       end
     end
 
-    def negate_negate(ast)
-      ast.flat_map do |node|
+    def negate_negate!(ast)
+      ast.map! do |node|
         next node unless node[:nest_type]
-        node[:value] = negate_negate(node[:value])
+        negate_negate!(node[:value])
         next [] if node[:value] == []
         type = node[:nest_type]
         child_type = node[:value].first[:nest_type]
         next node unless type == :minus && child_type == :minus
         node[:value].first[:value]
       end
+      ast.flatten!
     end
 
-    def denest_parens(ast, parent_type = :root)
-      ast.flat_map do |node|
+    def denest_parens!(ast, parent_type = :root)
+      ast.map! do |node|
         next node unless node[:nest_type]
-        node[:value] = denest_parens(node[:value], node[:nest_type])
+        denest_parens!(node[:value], node[:nest_type])
         # valid_self && (valid_parent || valid_child)
         if node[:nest_type] == :paren && (parent_type != :pipe || node[:value].count < 2)
           next node[:value]
         end
         node
       end
+      ast.flatten!
     end
 
     def remove_empty_strings!(ast)
@@ -48,13 +51,12 @@ module CommandSearch
     end
 
     def optimize(ast)
-      out = ast
-      out = denest_parens(out)
-      remove_empty_strings!(out)
-      out = negate_negate(out)
-      ands_and_ors!(out)
-      out.uniq!
-      out
+      denest_parens!(ast)
+      remove_empty_strings!(ast)
+      negate_negate!(ast)
+      ands_and_ors!(ast)
+      ast.uniq!
+      ast
     end
   end
 end

metadata

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