fluent-plugin-referer-parser 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fed5b60490e817d6807e1d9dc5f07d130a6d9a3c
-  data.tar.gz: c62073a54c3654f73975743523fce6643bceb6d8
+  metadata.gz: d258ae6d39fefa38045afceb356ddef7b0b63bd3
+  data.tar.gz: aa497f178a1d9bfae485102a05b315a021c5232e
 SHA512:
-  metadata.gz: 7eb93fc1bb3c17ee7f164cab04b018ffd91a20a6492ad7cd10627f75fad5d847233e2ea10eaf597b3284518cdedfc68b8067a6e09a3f452232bf19955df7a95a
-  data.tar.gz: e1c540daa4e27ab38bdc319b66811b778acc163d4d812e3077d2c02247bfc8e4cdcd711544d35807ccdee6154d6507d038aa6b4db01ee79a28877a41c6037bf7
+  metadata.gz: 16e4fc677a4f6251c4815e091a0a1f8bffb632c454d47d5d5f49c5bca757655ff4b58509d445833e4787d319c05a9669aefba12e74f6c05d719c81dd5aac3784
+  data.tar.gz: 3928930d0b7158f3b46c12934c3ef23c4f38ee16a550892b607e45ac0248783d3d0371cec3ef8801656a26f7af26dc5e1da72769d25e3a83b934d3aecb208c9c

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2
+  - 2.3.4
+  - 2.4.1

data/README.md

@@ -11,7 +11,7 @@
 To add referer-parser result into matched messages:
 
     <match input.**>
-      type referer_parser
+      @type referer_parser
       key_name referer
       remove_prefix input
       add_prefix merged
@@ -20,7 +20,7 @@ To add referer-parser result into matched messages:
 Output messages with tag 'merged.**' has 'referer_known', 'referer_referer' and 'referer_search_term' attributes. If you want to change attribute names, write configurations as below:
 
     <match input.**>
-      type referer_parser
+      @type referer_parser
       key_name ref
       remove_prefix input
       add_prefix merged

data/fluent-plugin-referer-parser.gemspec

@@ -3,7 +3,7 @@ require 'English'
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-referer-parser'
-  gem.version       = '0.0.8'
+  gem.version       = '0.0.9'
   gem.authors       = ['TAGOMORI Satoshi', 'HARUYAMA Seigo']
   gem.email         = ['haruyama@unixuser.org']
   gem.description   = %q(parsing by referer-parser. See: https://github.com/snowplow/referer-parser)
@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'test-unit', '>= 3.2'
   gem.add_runtime_dependency 'fluentd', '~> 0.12.0'
-  gem.add_runtime_dependency 'referer-parser', '~> 0.2.0'
+  gem.add_runtime_dependency 'referer-parser', '~> 0.3.0'
 end

data/lib/fluent/plugin/out_referer_parser.rb

@@ -25,7 +25,11 @@ class Fluent::RefererParserOutput < Fluent::Output
   def configure(conf)
     super
 
-    @referer_parser = RefererParser::Referer.new('http://example.org/', @referers_yaml)
+    @referer_parser = if @referers_yaml
+                        RefererParser::Parser.new(@referers_yaml)
+                      else
+                        RefererParser::Parser.new
+                      end
 
     if @encodings_yaml
       @encodings = YAML.load_file(@encodings_yaml)
@@ -69,29 +73,31 @@ class Fluent::RefererParserOutput < Fluent::Output
     tag = tag_mangle(tag)
     es.each do |time, record|
       is_valid = true
-      begin
-        @referer_parser.parse(record[@key_name])
-      rescue
-        is_valid = false
-      end
-      if is_valid && @referer_parser.known?
-        search_term = @referer_parser.search_term
-        host = @referer_parser.uri.host
-        parameters = CGI.parse(@referer_parser.uri.query)
+      parsed = begin
+                 @referer_parser.parse(record[@key_name])
+               rescue
+                 is_valid = false
+                 {}
+               end
+      if is_valid && parsed[:known]
+        search_term = parsed[:term]
+        uri = URI.parse(parsed[:uri])
+        host = uri.host
+        parameters = CGI.parse(uri.query)
         input_encoding = @encodings[host] || parameters['ie'][0] || parameters['ei'][0]
         begin
           search_term = search_term.force_encoding(input_encoding).encode('utf-8') if input_encoding && /\Autf-?8\z/i !~ input_encoding
         rescue
-          $log.error('invalid referer: ' + @referer_parser.uri.to_s)
+          log.error('invalid referer: ' + uri.to_s)
         end
         record.merge!(
           @out_key_known       => true,
-          @out_key_referer     => @referer_parser.referer,
+          @out_key_referer     => parsed[:source],
           @out_key_host        => host,
           @out_key_search_term => search_term
         )
       else
-        record.merge!(@out_key_known => false)
+        record[@out_key_known] = false
       end
       router.emit(tag, time, record)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-referer-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: 'parsing by referer-parser. See: https://github.com/snowplow/referer-parser'
 email:
 - haruyama@unixuser.org