fluent-plugin-woothee 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3613e4c7628249b38e3c9df0fc6e6cf04f0327
-  data.tar.gz: 4423e9af2140ae82f4b59df149d6385c14a82fb5
+  metadata.gz: a023e5af86e6a0c8e61e478271210b67f49a0cb9
+  data.tar.gz: 47c03e7e2554c15a2839b4e78f207cce867ebdd2
 SHA512:
-  metadata.gz: 419d0960010fbb59a344b5cd9be8697eb485dac41ea0f0f1e5efd7effa18b11037136a1c2db0b3589e054c311146449263edcdd8f875de96465a9d2356c64df2
-  data.tar.gz: 7318a37e5b0037df0cfafe27b739d8a28abbd891ce009a7d75900c1a684cc1ecdbb755160dcf709e66bf0053ef71c4a053d3072adff43c1fd014562cdeabab6c
+  metadata.gz: 4d4ec145c669b50764a57b546e2697d25237789c0e5e9339f6e35c9908db5bfcfd99cfe55225e9b305e80464e5becdbb1fabbffff21d5ae8c936ef66f75f3503
+  data.tar.gz: 629c34ed3cc1c175df26a3f06409fd1c0c3923163f0f7673b72a1fb967dc14db38f16ee3fb675b85320bcfb2d49f319742e5bd02457b50444d92348d21bcfa3b

data/README.md

@@ -4,7 +4,7 @@
 
 'fluent-plugin-woothee' is a Fluentd plugin to parse UserAgent strings and to filter/drop specified categories of user terminals (like 'pc', 'smartphone' and so on).
 
-'woothee' is multi-language user-agent strings parser project. See: https://github.com/tagomoris/woothee
+'woothee' is multi-language user-agent strings parser project. See: https://github.com/woothee/woothee
 
 ## Configuration
 
@@ -29,6 +29,7 @@ Output messages with tag 'merged.**' has attributes like 'agent\_name', 'agent\_
       out_key_name ua_name
       out_key_category ua_category
       out_key_os ua_os
+      out_key_os_version ua_os_version
       out_key_version ua_version
       out_key_vendor ua_vendor
     </match>

data/fluent-plugin-woothee.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-woothee"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
-  gem.description   = %q{parsing by Project Woothee. See https://github.com/tagomoris/woothee }
-  gem.summary       = %q{Fluentd plugin to parse UserAgent strings}
-  gem.homepage      = "https://github.com/woothee/fluent-plugin-woothee"
+  gem.description   = %q{parsing by Project Woothee. See https://github.com/woothee/woothee }
+  gem.summary       = %q{Fluentd plugin to parse UserAgent strings with woothee parser. It adds device information or filter records with specific device types.}
+  gem.homepage      = "https://github.com/tagomoris/fluent-plugin-woothee"
   gem.license       = "APLv2"
 
   gem.files         = `git ls-files`.split($\)
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit", "~> 3.0.2"
   gem.add_runtime_dependency "fluentd"
-  gem.add_runtime_dependency "woothee", ">= 0.2.4"
+  gem.add_runtime_dependency "woothee", ">= 1.0.0"
 end

data/lib/fluent/plugin/out_woothee.rb

@@ -22,6 +22,7 @@ class Fluent::WootheeOutput < Fluent::Output
   config_param :out_key_name, :string, :default => 'agent_name'
   config_param :out_key_category, :string, :default => 'agent_category'
   config_param :out_key_os, :string, :default => 'agent_os'
+  config_param :out_key_os_version, :string, :default => nil # supress output
   config_param :out_key_version, :string, :default => nil # supress output
   config_param :out_key_vendor, :string, :default => nil # supress output
 
@@ -30,11 +31,6 @@ class Fluent::WootheeOutput < Fluent::Output
     require 'woothee'
   end
 
-  # Define `log` method for v0.10.42 or earlier
-  unless method_defined?(:log)
-    define_method("log") { $log }
-  end
-
   def configure(conf)
     super
 
@@ -126,6 +122,7 @@ class Fluent::WootheeOutput < Fluent::Output
             @out_key_category => parsed[Woothee::ATTRIBUTE_CATEGORY].to_s,
             @out_key_os => parsed[Woothee::ATTRIBUTE_OS]
           })
+        record[@out_key_os_version] = parsed[Woothee::ATTRIBUTE_OS_VERSION] if @out_key_os_version
         record[@out_key_version] = parsed[Woothee::ATTRIBUTE_VERSION] if @out_key_version
         record[@out_key_vendor] = parsed[Woothee::ATTRIBUTE_VENDOR] if @out_key_vendor
       end

data/test/plugin/test_out_woothee.rb

@@ -28,6 +28,7 @@ merge_agent_info yes
 out_key_name ua_name
 out_key_category ua_category
 out_key_os ua_os
+out_key_os_version ua_os_version
 out_key_version ua_version
 out_key_vendor ua_vendor
 ]
@@ -40,6 +41,10 @@ drop_categories crawler,misc
 tag selected
 ]
 
+  def setup
+    Fluent::Test.setup
+  end
+
   def create_driver(conf=CONFIG1,tag='test')
     Fluent::Test::OutputTestDriver.new(Fluent::WootheeOutput, tag).configure(conf)
   end
@@ -85,6 +90,7 @@ tag selected
     assert_equal 'ua_name', d.instance.out_key_name
     assert_equal 'ua_category', d.instance.out_key_category
     assert_equal 'ua_os', d.instance.out_key_os
+    assert_equal 'ua_os_version', d.instance.out_key_os_version
     assert_equal 'ua_version', d.instance.out_key_version
     assert_equal 'ua_vendor', d.instance.out_key_vendor
 
@@ -250,11 +256,12 @@ tag selected
 
     # 'agent' => 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)'
     m = emits[0][2]
-    assert_equal 7, m.keys.size
+    assert_equal 8, m.keys.size
     assert_equal 0, m['value']
     assert_equal 'Internet Explorer', m['ua_name']
     assert_equal 'pc', m['ua_category']
     assert_equal 'Windows 8', m['ua_os']
+    assert_equal 'NT 6.2', m['ua_os_version']
     assert_equal 'Microsoft', m['ua_vendor']
     assert_equal '10.0', m['ua_version']
 
@@ -264,6 +271,7 @@ tag selected
     assert_equal 'Firefox', m['ua_name']
     assert_equal 'pc', m['ua_category']
     assert_equal 'Windows Vista', m['ua_os']
+    assert_equal 'NT 6.0', m['ua_os_version']
     assert_equal 'Mozilla', m['ua_vendor']
     assert_equal '9.0.1', m['ua_version']
 
@@ -273,6 +281,7 @@ tag selected
     assert_equal 'Firefox', m['ua_name']
     assert_equal 'pc', m['ua_category']
     assert_equal 'Linux', m['ua_os']
+    assert_equal 'UNKNOWN', m['ua_os_version']
     assert_equal 'Mozilla', m['ua_vendor']
     assert_equal '9.0.1', m['ua_version']
 
@@ -282,6 +291,7 @@ tag selected
     assert_equal 'Safari', m['ua_name']
     assert_equal 'smartphone', m['ua_category']
     assert_equal 'Android', m['ua_os']
+    assert_equal '3.1', m['ua_os_version']
     assert_equal 'Apple', m['ua_vendor']
     assert_equal '4.0', m['ua_version']
 
@@ -291,6 +301,7 @@ tag selected
     assert_equal 'docomo', m['ua_name']
     assert_equal 'mobilephone', m['ua_category']
     assert_equal 'docomo', m['ua_os']
+    assert_equal 'UNKNOWN', m['ua_os_version']
     assert_equal 'docomo', m['ua_vendor']
     assert_equal 'N505i', m['ua_version']
 
@@ -300,6 +311,7 @@ tag selected
     assert_equal 'PlayStation Vita', m['ua_name']
     assert_equal 'appliance', m['ua_category']
     assert_equal 'PlayStation Vita', m['ua_os']
+    assert_equal '1.51', m['ua_os_version']
     assert_equal 'Sony', m['ua_vendor']
     assert_equal 'UNKNOWN', m['ua_version']
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-woothee
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -44,15 +58,15 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
-description: 'parsing by Project Woothee. See https://github.com/tagomoris/woothee '
+        version: 1.0.0
+description: 'parsing by Project Woothee. See https://github.com/woothee/woothee '
 email:
 - tagomoris@gmail.com
 executables: []
@@ -69,7 +83,7 @@ files:
 - lib/fluent/plugin/out_woothee.rb
 - test/helper.rb
 - test/plugin/test_out_woothee.rb
-homepage: https://github.com/woothee/fluent-plugin-woothee
+homepage: https://github.com/tagomoris/fluent-plugin-woothee
 licenses:
 - APLv2
 metadata: {}
@@ -89,10 +103,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Fluentd plugin to parse UserAgent strings
+summary: Fluentd plugin to parse UserAgent strings with woothee parser. It adds device
+  information or filter records with specific device types.
 test_files:
 - test/helper.rb
 - test/plugin/test_out_woothee.rb
+has_rdoc: