hotdog 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ca4475d60ac71c395df0cc485978f0a033fba5
-  data.tar.gz: f4cff2af354ca05fb772f72c27c7ca6fd5ba7f60
+  metadata.gz: a119b57eb88edbf96274e510fccff8dac8cec163
+  data.tar.gz: 97cb6d850508a644026ef397928f90391938f8de
 SHA512:
-  metadata.gz: 707e11d863479ae21086db299935460c5e78376a2c0a90f60d516a0c521f7ce95a39341f32523b1499833a5265e573e27f49fef7bd3e402728aa5f95c9be26ac
-  data.tar.gz: f604a28cc6aef9ea8a4ae98bc9f3b08d0dd7aa0b86d8f9ea042a28a7dece15ea6557cc0a6feef929d0f8a953b6e82802cb9b0eaa23f3684760b694235d9ebf92
+  metadata.gz: 6b4c12bc02f80a836ab9c7635258f0fe4be78942b6f390675092500ccc10c5549075792ea7b6045e3da0a84f0274f75dd8378eade4800a1b55649e3e6d4dcc39
+  data.tar.gz: eccae2d625eb64c21c8d703e505c7e02457106f687c17d7cc05860908c3bd527f65045975eaa3aeb2fce0dcbd37e8aeda9a2a0227a225cdf093eb6dc47223e54

data/lib/hotdog/expression.rb

@@ -81,7 +81,7 @@ module Hotdog
         if "/host/" == tag_name_regexp
           EverythingNode.new()
         else
-          RegexpNode.new(tag_name_regexp)
+          RegexpHostOrTagNode.new(tag_name_regexp)
         end
       }
       rule(tag_name_glob: simple(:tag_name_glob), separator: simple(:separator), tag_value_glob: simple(:tag_value_glob)) {
@@ -109,7 +109,7 @@ module Hotdog
         if "host" == tag_name_glob
           EverythingNode.new()
         else
-          GlobNode.new(tag_name_glob)
+          GlobHostOrTagNode.new(tag_name_glob)
         end
       }
       rule(tag_name: simple(:tag_name), separator: simple(:separator), tag_value_glob: simple(:tag_value_glob)) {
@@ -137,7 +137,7 @@ module Hotdog
         if "host" == tag_name
           EverythingNode.new()
         else
-          StringNode.new(tag_name)
+          StringHostOrTagNode.new(tag_name)
         end
       }
       rule(separator: simple(:separator), tag_value_regexp: simple(:tag_value_regexp)) {

data/lib/hotdog/expression/semantics.rb

@@ -830,7 +830,7 @@ module Hotdog
       end
     end
 
-    class StringNode < StringExpressionNode
+    class StringHostOrTagNode < StringExpressionNode
       def initialize(tag_name, separator=nil)
         super(tag_name.to_s, nil, separator)
       end
@@ -848,7 +848,7 @@ module Hotdog
       end
 
       def maybe_fallback(options={})
-        fallback = GlobNode.new(to_glob(tag_name), separator)
+        fallback = GlobHostOrTagNode.new(to_glob(tag_name), separator)
         query = fallback.maybe_query(options)
         if query
           QueryExpressionNode.new(query, fallback.condition_values(options))
@@ -981,7 +981,7 @@ module Hotdog
       end
     end
 
-    class GlobNode < GlobExpressionNode
+    class GlobHostOrTagNode < GlobExpressionNode
       def initialize(tag_name, separator=nil)
         super(tag_name.to_s, nil, separator)
       end
@@ -999,7 +999,7 @@ module Hotdog
       end
 
       def maybe_fallback(options={})
-        fallback = GlobNode.new(to_glob(tag_name), separator)
+        fallback = GlobHostOrTagNode.new(to_glob(tag_name), separator)
         query = fallback.maybe_query(options)
         if query
           QueryExpressionNode.new(query, fallback.condition_values(options))
@@ -1112,7 +1112,7 @@ module Hotdog
       end
     end
 
-    class RegexpNode < RegexpExpressionNode
+    class RegexpHostOrTagNode < RegexpExpressionNode
       def initialize(tag_name, separator=nil)
         super(tag_name, separator)
       end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.22.0"
+  VERSION = "0.22.1"
 end

data/spec/parser/glob_expression_spec.rb

@@ -51,7 +51,7 @@ describe "tag glob expression" do
   end
 
   it "interprets tag glob with tag_name without separator" do
-    expr = Hotdog::Expression::GlobNode.new("foo*", nil)
+    expr = Hotdog::Expression::GlobHostOrTagNode.new("foo*", nil)
     q = [
       "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags",
         "INNER JOIN hosts ON hosts_tags.host_id = hosts.id",

data/spec/parser/regexp_expression_spec.rb

@@ -51,7 +51,7 @@ describe "tag regexp expression" do
   end
 
   it "interprets tag regexp with tag_name without separator" do
-    expr = Hotdog::Expression::RegexpNode.new("foo", nil)
+    expr = Hotdog::Expression::RegexpHostOrTagNode.new("foo", nil)
     q = [
       "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags",
         "INNER JOIN hosts ON hosts_tags.host_id = hosts.id",

data/spec/parser/string_expression_spec.rb

@@ -51,7 +51,7 @@ describe "tag expression" do
   end
 
   it "interprets tag with tag_name without separator" do
-    expr = Hotdog::Expression::StringNode.new("foo", nil)
+    expr = Hotdog::Expression::StringHostOrTagNode.new("foo", nil)
     q = [
       "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags",
         "INNER JOIN hosts ON hosts_tags.host_id = hosts.id",

metadata

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