hotdog 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5b7de644e20c6baece23e0cfb092c648f450e86
-  data.tar.gz: 5e12b97c01d76aa8b9a7d5ede0cf5fe3371dda3a
+  metadata.gz: 72dc15c8a8c3c455d56966dfc98939ff41c756c5
+  data.tar.gz: 391d7824e973ef9052b74b4f12147126d1e9d16d
 SHA512:
-  metadata.gz: 390fcdb204d802c1ed9a49e7657233d6d2581d7b910c22d5370ffa722d934ba9dc4aacc1b199a525694962bc435c2ded7d9bf7d9056c3e51ed6ad959cb58366c
-  data.tar.gz: 42fe7102b0c6cb9564fbdc1acb3f7dd739bacc1d59d7b7e82c7ad8391d71bb46007ea4386d76a228adc163b5fdc40ac0ef58e8422e3ac541d4e6b5fb30163cc2
+  metadata.gz: 2808053dc1e82f575acd539c47a3a5ef55aad0a205b53d58df352ec3d4fca4545a28add805c21be27d880aaa11eab2fa5e93f447ffcd9946b29687ee4886370f
+  data.tar.gz: 95179c55f323d9dd2d3fcacde85b63bb3ab57615e6940e6345d6089f7bed69b68cd9fe67652f104eedacf8860c37c65d2de102c9197a85307a3e232d421e6adc

data/lib/hotdog/commands/search.rb

@@ -127,6 +127,7 @@ module Hotdog
           ( expression4.as(:left) >> spacing.maybe >> str('&&').as(:binary_op) >> spacing.maybe >> expression.as(:right) \
           | expression4.as(:left) >> spacing.maybe >> str('||').as(:binary_op) >> spacing.maybe >> expression.as(:right) \
           | expression4.as(:left) >> spacing.maybe >> str('&').as(:binary_op) >> spacing.maybe >> expression.as(:right) \
+          | expression4.as(:left) >> spacing.maybe >> str(',').as(:binary_op) >> spacing.maybe >> expression.as(:right) \
           | expression4.as(:left) >> spacing.maybe >> str('^').as(:binary_op) >> spacing.maybe >> expression.as(:right) \
           | expression4.as(:left) >> spacing.maybe >> str('|').as(:binary_op) >> spacing.maybe >> expression.as(:right) \
           | expression4 \
@@ -359,7 +360,7 @@ module Hotdog
               environment.logger.debug("expr: #{values.length} value(s)")
             end
             if values.empty?
-              environment.execute("SELECT id FROM hosts").map { |row| row.first }.tap do |values|
+              EverythingNode.new().evaluate(environment, options).tap do |values|
                 environment.logger.debug("NOT expr: #{values.length} value(s)")
               end
             else
@@ -452,11 +453,11 @@ module Hotdog
 
         def initialize(op, left, right)
           case (op || "or").to_s
-          when "&&", "&", /\Aand\z/i
+          when "&&", "&", "AND", "and"
             @op = :AND
-          when "||", "|", /\Aor\z/i
+          when ",", "||", "|", "OR", "or"
             @op = :OR
-          when "^", /\Axor\z/i
+          when "^", "XOR", "xor"
             @op = :XOR
           else
             raise(SyntaxError.new("unknown binary operator: #{op.inspect}"))
@@ -665,7 +666,7 @@ module Hotdog
 
         def initialize(op, expressions, options={})
           case (op || "or").to_s
-          when "||", "|", /\Aor\z/i
+          when ",", "||", "|", "OR", "or"
             @op = :OR
           else
             raise(SyntaxError.new("unknown multinary operator: #{op.inspect}"))

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler