fluent-plugin-filter_where 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f1c27433b1df5e239750bb6cb245439f8ad860
-  data.tar.gz: 87831d270a3c55207fae546fe20fb46d484fdb8e
+  metadata.gz: 9e758b04ade2bd2cff6ff9e2ed181a5e621493fc
+  data.tar.gz: e9c2b7cedb2c2d5cbdcb07f3536ff6bf559b7458
 SHA512:
-  metadata.gz: ca8830bf8f2418674ca5777fab1dd4f44fc4655e63221d822093a9e9f29d9b50b98740176e8a7d0375aa98333095b055324e1660626b0172c16c4a4f3e579d0b
-  data.tar.gz: b425a6b2fc96b0a3acd7b1dc1ebc355996862ff9d0420b3f1329484829c5218dec25a6a99087fd4b97d74fc620aae610df1b96e05ff3a58c0e8e04569c99aec6
+  metadata.gz: e4be09bba4b267d18a125314fa6499ce05a368c13278c390f3bd44acd587d316fcfa18c211a0dff6aa188375aeeda571ace5a8bb4d8310472656ca22bec98869
+  data.tar.gz: c5cba7efd6332ba53083e0732918a83919b883257973f07c8a0417f24e792fc0feafba96a2cf39ec82cb2fa64b17f26a59df2e2155be1c92e9d27fbc32468e61

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.2 (2017-05-23)
+
+Enhancements:
+
+* raise ConfigError if failed to parse where
+
 ## 1.0.1 (2017-05-23)
 
 Fixes:

data/fluent-plugin-filter_where.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-filter_where"
-  gem.version     = "1.0.1"
+  gem.version     = "1.0.2"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-filter_where"

data/lib/fluent/plugin/filter_where/core.rb

@@ -14,7 +14,7 @@ module Fluent
     def configure(conf)
       super
 
-      parser = Fluent::FilterWhere::Parser.new
+      parser = Fluent::FilterWhere::Parser.new(log: log)
       @scanner = parser.scan(@where)
     end
 

data/lib/fluent/plugin/filter_where/parser.rex

@@ -86,7 +86,13 @@ rule
 :STRING       \\                      { @string << "\\"; nil }
 
 inner
+  attr_reader :log
+  def initialize(log: nil)
+    @log = log || ::Logger.new(nil)
+    super()
+  end
+
   def on_error(error_token_id, error_value, value_stack)
-    super
+    raise Fluent::ConfigError.new("filter_where: failed to parse where value_stack:#{value_stack} error_value:#{error_value.inspect}")
   end
 end

data/lib/fluent/plugin/filter_where/parser.rex.rb

@@ -200,7 +200,12 @@ class Fluent::FilterWhere::Parser < Racc::Parser
     token
   end  # def _next_token
 
+  attr_reader :log
+  def initialize(log: nil)
+    @log = log || ::Logger.new(nil)
+    super()
+  end
   def on_error(error_token_id, error_value, value_stack)
-    super
+    raise Fluent::ConfigError.new("filter_where: failed to parse where value_stack:#{value_stack} error_value:#{error_value.inspect}")
   end
 end # class

data/lib/fluent/plugin/filter_where/parser/literal.rb

@@ -41,14 +41,16 @@ module Fluent
       end
 
       class IdentifierLiteral < Literal
-        attr_reader :name
-
-        def initialize(name)
-          @name = name
+        def initialize(text)
+          @text = text
         end
 
         def get(record)
-          record[@name]
+          record[@text]
+        end
+
+        def name
+          @text
         end
       end
     end

data/test/test_where_parser.rb

@@ -53,7 +53,7 @@ class WhereParserTest < Test::Unit::TestCase
     assert_true(result.eval(record))
     result = parser.scan(%q[boolean != false])
     assert_true(result.eval(record))
-    assert_raise(Racc::ParseError) { parser.scan(%q[boolean > false]) }
+    assert_raise(Fluent::ConfigError) { parser.scan(%q[boolean > false]) }
   end
 
   def test_number_op

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter_where
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd