hotdog 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2649bee0b66f057008d4276174d397b21ac87dd
-  data.tar.gz: 29d8d1620fab0110ac684b0059fc42e095c8c7bc
+  metadata.gz: ffbad3cddd1c8a203564a0a72f76f4afcdeedb31
+  data.tar.gz: 0b2a720a116b8a7744cfe91e83145106f6841bb6
 SHA512:
-  metadata.gz: c7024f0e5e985792bd9fe1105b8fab9c65291a7bea66c6cd22f0e33fb7c838873649ae8ee3dc3b889f51882c68c3641ad75da37ff857cc3fc5e898d100abbb07
-  data.tar.gz: acf1ba39e5aecf2df6a9e2c7312c38ae3cea71a818d82dc681c68f6068a4cf5ab4f40f3ad8e33ccd69aac8b30f143faf0382ce52afb2264ae292a3cc39183965
+  metadata.gz: e460694b774e72633795116768078474b89e3ff5196b1fd6081102264bd29f496b0b1e7addf9742c8912eeb6ec9fb0e1d8592220db10d4fa25e27a94a4fb4a91
+  data.tar.gz: 898f4efe04b91dff88a420d257c839391162354e5d985599940199c6afa91b37a3efba0f3c99fc48208241e5fa4ec72edbd48cacfef078932b18066a66145739

data/lib/hotdog/commands/hosts.rb

@@ -11,7 +11,7 @@ module Hotdog
         else
           if args.any? { |host_name| glob?(host_name) }
             result = args.flat_map { |host_name|
-              execute("SELECT id FROM hosts WHERE name GLOB ?;", [host_name]).to_a.reduce(:+) || []
+              execute("SELECT id FROM hosts WHERE LOWER(name) GLOB LOWER(?);", [host_name]).to_a.reduce(:+) || []
             }
           else
             result = args.each_slice(SQLITE_LIMIT_COMPOUND_SELECT).flat_map { |args|

data/lib/hotdog/commands/search.rb

@@ -549,6 +549,7 @@ module Hotdog
           @identifier = identifier
           @attribute = attribute
           @separator = separator
+          @fallback = nil
         end
         attr_reader :identifier
         attr_reader :attribute
@@ -610,12 +611,26 @@ module Hotdog
           if q = plan(options)
             values = environment.execute(*q).map { |row| row.first }
             if values.empty?
-              fallback(environment, options)
+              if options[:did_fallback]
+                []
+              else
+                if not environment.fixed_string? and @fallback
+                  # avoid optimizing @fallback to prevent infinite recursion
+                  values = @fallback.evaluate(environment, options.merge(did_fallback: true))
+                  if values.empty?
+                    reload(environment, options)
+                  else
+                    values
+                  end
+                else
+                  reload(environment, options)
+                end
+              end
             else
               values
             end
           else
-            return []
+            []
           end
         end
 
@@ -623,25 +638,26 @@ module Hotdog
           self.class == other.class and @identifier == other.identifier and @attribute == other.attribute
         end
 
-        def fallback(environment, options={})
-          if environment.fixed_string?
-            []
+        def optimize(options={})
+          # fallback to glob expression
+          if identifier?
+            prefix = (identifier.start_with?("*")) ? "" : "*"
+            suffix = (identifier.end_with?("*")) ? "" : "*"
+            identifier_glob = prefix + identifier.gsub(/[-.\/_]/, "?") + suffix
           else
-            # fallback to glob expression
-            identifier_glob = "*#{identifier.gsub(/[-.\/_]/, "?")}*" if identifier?
-            attribute_glob = "*#{attribute.gsub(/[-.\/_]/, "?")}*" if attribute?
-            if (identifier? and identifier != identifier_glob) or (attribute? and attribute != attribute_glob)
-              environment.logger.info("fallback to glob expression: %s:%s" % [identifier_glob, attribute_glob])
-              values = TagGlobExpressionNode.new(identifier_glob, attribute_glob, separator).evaluate(environment, options)
-              if values.empty?
-                reload(environment, options)
-              else
-                values
-              end
-            else
-              []
-            end
+            identifier_glob = nil
+          end
+          if attribute?
+            prefix = (attribute.start_with?("*")) ? "" : "*"
+            suffix = (attribute.end_with?("*")) ? "" : "*"
+            attribute_glob = prefix + attribute.gsub(/[-.\/_]/, "?") + suffix
+          else
+            attribute_glob = nil
+          end
+          if (identifier? and identifier != identifier_glob) or (attribute? and attribute != attribute_glob)
+            @fallback = TagGlobExpressionNode.new(identifier_glob, attribute_glob, separator)
           end
+          self
         end
 
         def reload(environment, options={})
@@ -649,7 +665,7 @@ module Hotdog
           if 0 < ttl
             environment.logger.info("force reloading all hosts and tags.")
             environment.reload(force: true)
-            self.class.new(identifier, attribute, separator).evaluate(environment, options.merge(ttl: ttl-1))
+            self.class.new(identifier, attribute, separator).optimize(options).evaluate(environment, options.merge(ttl: ttl-1))
           else
             []
           end
@@ -657,9 +673,10 @@ module Hotdog
 
         def dump(options={})
           data = {}
-          data[:identifier] = @identifier if @identifier
-          data[:separator] = @separator if @separator
-          data[:attribute] = @attribute if @attribute
+          data[:identifier] = @identifier.to_s if @identifier
+          data[:separator] = @separator.to_s if @separator
+          data[:attribute] = @attribute.to_s if @attribute
+          data[:fallback ] = @fallback.dump(options) if @fallback
           data
         end
       end
@@ -671,25 +688,25 @@ module Hotdog
               case identifier
               when /\Ahost\z/i
                 q = "SELECT hosts.id AS host_id FROM hosts " \
-                      "WHERE hosts.name GLOB ?;"
+                      "WHERE LOWER(hosts.name) GLOB LOWER(?);"
                 [q, [attribute]]
               else
                 q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                       "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
-                        "WHERE tags.name GLOB ? AND tags.value GLOB ?;"
+                        "WHERE LOWER(tags.name) GLOB LOWER(?) AND LOWER(tags.value) GLOB LOWER(?);"
                 [q, [identifier, attribute]]
               end
             else
               if separator?
                 q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                       "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
-                        "WHERE tags.name GLOB ?;"
+                        "WHERE LOWER(tags.name) GLOB LOWER(?);"
                 [q, [identifier]]
               else
                 q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                       "INNER JOIN hosts ON hosts_tags.host_id = hosts.id " \
                       "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
-                        "WHERE hosts.name GLOB ? OR tags.name GLOB ? OR tags.value GLOB ?;"
+                        "WHERE LOWER(hosts.name) GLOB LOWER(?) OR LOWER(tags.name) GLOB LOWER(?) OR LOWER(tags.value) GLOB LOWER(?);"
                 [q, [identifier, identifier, identifier]]
               end
             end
@@ -697,7 +714,7 @@ module Hotdog
             if attribute?
               q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                     "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
-                      "WHERE tags.value GLOB ?;"
+                      "WHERE LOWER(tags.value) GLOB LOWER(?);"
               [q, [attribute]]
             else
               nil
@@ -707,9 +724,10 @@ module Hotdog
 
         def dump(options={})
           data = {}
-          data[:identifier_glob] = @identifier if @identifier
-          data[:separator] = @separator if @separator
-          data[:attribute_glob] = @attribute if @attribute
+          data[:identifier_glob] = @identifier.to_s if @identifier
+          data[:separator] = @separator.to_s if @separator
+          data[:attribute_glob] = @attribute.to_s if @attribute
+          data[:fallback] = @fallback.dump(options) if @fallback
           data
         end
       end
@@ -761,24 +779,16 @@ module Hotdog
           end
         end
 
-        def evaluate(environment, options={})
-          if q = plan(options)
-            values = environment.execute(*q).map { |row| row.first }
-            if values.empty?
-              reload(environment)
-            else
-              values
-            end
-          else
-            return []
-          end
+        def optimize(options={})
+          self # disable fallback
         end
 
         def dump(options={})
           data = {}
-          data[:identifier_regexp] = @identifier if @identifier
-          data[:separator] = @separator if @separator
-          data[:attribute_regexp] = @attribute if @attribute
+          data[:identifier_regexp] = @identifier.to_s if @identifier
+          data[:separator] = @separator.to_s if @separator
+          data[:attribute_regexp] = @attribute.to_s if @attribute
+          data[:fallback] = @fallback.dump(options) if @fallback
           data
         end
       end

data/lib/hotdog/commands/tags.rb

@@ -13,13 +13,13 @@ module Hotdog
           if tags.all? { |tag_name, tag_value| tag_value.empty? }
             result = tags.each_slice(SQLITE_LIMIT_COMPOUND_SELECT).flat_map { |tags|
               q = "SELECT value FROM tags " \
-                    "WHERE %s;" % tags.map { |tag_name, tag_value| glob?(tag_name) ? "name GLOB ?" : "name = ?" }.join(" OR ")
+                    "WHERE %s;" % tags.map { |tag_name, tag_value| glob?(tag_name) ? "LOWER(name) GLOB LOWER(?)" : "name = ?" }.join(" OR ")
               execute(q, tags.map { |tag_name, tag_value| tag_name }).map { |value| [value] }
             }
           else
             result = tags.each_slice(SQLITE_LIMIT_COMPOUND_SELECT / 2).flat_map { |tags|
               q = "SELECT value FROM tags " \
-                    "WHERE %s;" % tags.map { |tag_name, tag_value| (glob?(tag_name) or glob?(tag_value)) ?  "( name GLOB ? AND value GLOB ? )" : "( name = ? AND value = ? )" }.join(" OR ")
+                    "WHERE %s;" % tags.map { |tag_name, tag_value| (glob?(tag_name) or glob?(tag_value)) ?  "( LOWER(name) GLOB LOWER(?) AND LOWER(value) GLOB LOWER(?) )" : "( name = ? AND value = ? )" }.join(" OR ")
               execute(q, tags).map { |value| [value] }
             }
           end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/parser/tag_glob_expression_spec.rb

@@ -13,7 +13,7 @@ describe "tag glob expression" do
     expr = Hotdog::Commands::Search::TagGlobExpressionNode.new("host", "foo*", ":")
     q = [
       "SELECT hosts.id AS host_id FROM hosts",
-        "WHERE hosts.name GLOB ?;",
+        "WHERE LOWER(hosts.name) GLOB LOWER(?);",
     ]
     allow(cmd).to receive(:execute).with(q.join(" "), ["foo*"]) {
       [[1], [2], [3]]
@@ -27,7 +27,7 @@ describe "tag glob expression" do
     q = [
       "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags",
         "INNER JOIN tags ON hosts_tags.tag_id = tags.id",
-          "WHERE tags.name GLOB ? AND tags.value GLOB ?;",
+          "WHERE LOWER(tags.name) GLOB LOWER(?) AND LOWER(tags.value) GLOB LOWER(?);",
     ]
     allow(cmd).to receive(:execute).with(q.join(" "), ["foo*", "bar*"]) {
       [[1], [2], [3]]
@@ -41,7 +41,7 @@ describe "tag glob expression" do
     q = [
       "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags",
         "INNER JOIN tags ON hosts_tags.tag_id = tags.id",
-          "WHERE tags.name GLOB ?;",
+          "WHERE LOWER(tags.name) GLOB LOWER(?);",
     ]
     allow(cmd).to receive(:execute).with(q.join(" "), ["foo*"]) {
       [[1], [2], [3]]
@@ -56,7 +56,7 @@ describe "tag glob expression" do
       "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags",
         "INNER JOIN hosts ON hosts_tags.host_id = hosts.id",
         "INNER JOIN tags ON hosts_tags.tag_id = tags.id",
-          "WHERE hosts.name GLOB ? OR tags.name GLOB ? OR tags.value GLOB ?;",
+          "WHERE LOWER(hosts.name) GLOB LOWER(?) OR LOWER(tags.name) GLOB LOWER(?) OR LOWER(tags.value) GLOB LOWER(?);",
     ]
     allow(cmd).to receive(:execute).with(q.join(" "), ["foo*", "foo*", "foo*"]) {
       [[1], [2], [3]]
@@ -70,7 +70,7 @@ describe "tag glob expression" do
     q = [
       "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags",
         "INNER JOIN tags ON hosts_tags.tag_id = tags.id",
-          "WHERE tags.value GLOB ?;",
+          "WHERE LOWER(tags.value) GLOB LOWER(?);",
     ]
     allow(cmd).to receive(:execute).with(q.join(" "), ["foo*"]) {
       [[1], [2], [3]]
@@ -84,7 +84,7 @@ describe "tag glob expression" do
     q = [
       "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags",
         "INNER JOIN tags ON hosts_tags.tag_id = tags.id",
-          "WHERE tags.value GLOB ?;",
+          "WHERE LOWER(tags.value) GLOB LOWER(?);",
     ]
     allow(cmd).to receive(:execute).with(q.join(" "), ["foo*"]) {
       [[1], [2], [3]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yamashita Yuu