hotdog 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23883464db0f7638a741072ace4c6251c99ccca
-  data.tar.gz: d09ef94c849e83df926a0b494bd4da4c02925e53
+  metadata.gz: bd0467d9928ac5366eec849cb7def564dd0d8ae3
+  data.tar.gz: 9588371163cbb077511b8b094360bb4ac4c7573d
 SHA512:
-  metadata.gz: ccdef2dbf2a090258ae0c89d5a35ae18c45859a2842c2236989583a8cf9ffe9c6394f734fca5d5e510c67554267c09f97d1f395f65d645deab0c6ac442158728
-  data.tar.gz: 4ab9d3132fd5d7af46bcc57282f14fc76946a9c94acd077d40b1ee61045b528bde159aefb76f044bf574bfc6a4ec9fd9baea7a1dd53c3ebe010151828e230ab7
+  metadata.gz: 4f7f359862f6d3b7b79a89d03b04406e3a4efb07655084f9526346c1db88601b45252918a910e5c2081bafff8b8ef334d9555e37b12c2db73915dda1a2c1b748
+  data.tar.gz: cd802bb419145c53342d0409aa1623e376b7577aaa09be595f2474c13bae62a2b96470d258839b0e9c12f69c002dda5b7e98204c1b81b9a75342fc30a337663c

data/lib/hotdog/expression/semantics.rb

@@ -437,10 +437,6 @@ module Hotdog
         @args = args
       end
 
-      def optimize(options={})
-        self
-      end
-
       def dump(options={})
         args = @args.map { |arg|
           if ExpressionNode === arg
@@ -452,6 +448,38 @@ module Hotdog
         {funcall: @function.to_s, args: args}
       end
 
+      def optimize(options={})
+        case function
+        when :HEAD
+          @args[0] = @args[0].optimize(options)
+        when :GROUP_BY
+          @args[0] = @args[0].optimize(options)
+          if TagExpressionNode === args[1]
+            # workaround for expressions like `ORDER_BY((environment:development),role)`
+            @args[1] = @args[1].tag_name
+          else
+            @args[1] = @args[1]
+          end
+        when :ORDER_BY
+          @args[0] = @args[0].optimize(options)
+          if @args[1]
+            if TagExpressionNode === @args[1]
+              # workaround for expressions like `ORDER_BY((environment:development),role)`
+              @args[1] = @args[1].tag_name
+            else
+              @args[1] = @args[1]
+            end
+          end
+        when :REVERSE
+          @args[0] = @args[0].optimize(options)
+        when :SHUFFLE
+          @args[0] = @args[0].optimize(options)
+        when :TAIL
+          @args[0] = @args[0].optimize(options)
+        end
+        self
+      end
+
       def evaluate(environment, options={})
         case function
         when :HEAD
@@ -462,27 +490,15 @@ module Hotdog
                 "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
                 "WHERE tags.name = ? AND hosts_tags.host_id IN (%s) " \
                 "GROUP BY tags.value;" % intermediate.map { "?" }.join(", ")
-          if TagExpressionNode === args[1]
-            # workaround for expressions like `ORDER_BY((environment:development),role)`
-            args1 = args[1].tag_name
-          else
-            args1 = args[1]
-          end
-          QueryExpressionNode.new(q, [args1] + intermediate, fallback: nil).evaluate(environment, options)
+          QueryExpressionNode.new(q, [args[1]] + intermediate, fallback: nil).evaluate(environment, options)
         when :ORDER_BY
           intermediate = args[0].evaluate(environment, options)
           if args[1]
-            if TagExpressionNode === args[1]
-              # workaround for expressions like `ORDER_BY((environment:development),role)`
-              args1 = args[1].tag_name
-            else
-              args1 = args[1]
-            end
             q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                   "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
                   "WHERE tags.name = ? AND hosts_tags.host_id IN (%s) " \
                   "ORDER BY tags.value;" % intermediate.map { "?" }.join(", ")
-            QueryExpressionNode.new(q, [args1] + intermediate, fallback: nil).evaluate(environment, options)
+            QueryExpressionNode.new(q, [args[1]] + intermediate, fallback: nil).evaluate(environment, options)
           else
             q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                   "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.17.0"
+  VERSION = "0.17.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler