fluent-plugin-gamobile 0.2.4 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3a103755eed9ca0f3e138133633e24af013a30cf
+  data.tar.gz: a1dc44ddc00185384f2b6b72456082efe1685d24
+SHA512:
+  metadata.gz: 700c94c78207f16866ecea32b969516b297b92925096bde9b6878b2372eabf0349c8dca551bcc8247ce35622e773228adabe6181b3d411f6886e700f90831d44
+  data.tar.gz: ef5b48c9a869f7aa6663eb01287dd39c22bf7599dc8ec7c223c9a3513709e89aa95176fb857cad65f075c007d4db95e4b0c56e879c7eef2878873f01177edd62

data/.travis.yml

@@ -0,0 +1,25 @@
+language: ruby
+
+rvm:
+  - 2.2
+  - 2.1
+
+before_script:
+ - export RAILS_ENV=default
+
+gemfile:
+  - Gemfile
+  - gemfiles/fluentd_v0.10.gemfile
+  - gemfiles/fluentd_v0.12.gemfile
+
+# to avoid travis-ci issue since 2015-12-25
+before_install:
+  - gem update bundler
+
+matrix:
+  include:
+    - rvm: 1.9.3
+      gemfile: gemfiles/fluentd_v0.10.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/fluentd_v0.10.gemfile
+

data/Appraisals

@@ -0,0 +1,8 @@
+appraise "fluentd v0.10" do
+  gem "fluentd", "~> 0.10.46"
+end
+
+appraise "fluentd v0.12" do
+  gem "fluentd", "~> 0.12.0"
+end
+

data/README.md

@@ -1,4 +1,4 @@
-fluent-plugin-gamobile
+fluent-plugin-gamobile [![Build Status](https://travis-ci.org/y-ken/fluent-plugin-gamobile.png?branch=master)](https://travis-ci.org/y-ken/fluent-plugin-gamobile)
 =====================
 
 ## Component
@@ -24,8 +24,7 @@ Please setup "gem install fluent-plugin-rewrite-tag-filter" before trying this s
 <source>
   type tail
   path /var/log/httpd/access_log
-  format /^(?<domain>[^ ]*) (?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<status>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)" (?<response_time>[^ ]*))?$/
-  time_format %d/%b/%Y:%H:%M:%S %z
+  format apache2
   tag td.apache.access
   pos_file /var/log/td-agent/apache_access.pos
 </source>
@@ -48,13 +47,11 @@ Please setup "gem install fluent-plugin-rewrite-tag-filter" before trying this s
   # treat same user these keys are same.
   unique_ident_key host,agent  # Optional
   # mapping internal name with record
-  map_domain       domain        # Optional (default: domain)
-  map_remoteaddr   host          # Optional (default: host)
-  map_path         path          # Optional (default: path)
-  map_referer      referer       # Optional (default: referer)
-  map_useragent    agent         # Optional (default: agent)
-  map_guid         guid          # Optional (default: guid)
-  map_acceptlang   lang          # Optional (default: lang)
+  map_dh           domain
+  map_remoteaddr   host
+  map_dp           path
+  map_referer      referer
+  map_useragent    agent
 </match>
 `````
 
@@ -64,6 +61,7 @@ Please setup "gem install fluent-plugin-rewrite-tag-filter" before trying this s
 
 ## Backend Service
 http://www.google.com/intl/ja/analytics/
+https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters?hl=ja
 
 ## TODO
 patches welcome!
@@ -73,4 +71,3 @@ Copyright © 2012- Kentaro Yoshida (@yoshi_ken)
 
 ## License
 Apache License, Version 2.0
-

data/fluent-plugin-gamobile.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-gamobile"
-  s.version     = "0.2.4"
+  s.version     = "0.3.0"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-gamobile"
@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "test-unit"
+  s.add_development_dependency "test-unit", '~> 3'
+  s.add_development_dependency "appraisal"
   s.add_runtime_dependency "fluentd"
   s.add_runtime_dependency "activesupport", '~> 3.0.0'
   s.add_runtime_dependency "i18n"

data/gemfiles/fluentd_v0.10.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "fluentd", "~> 0.10.46"
+
+gemspec :path => "../"

data/gemfiles/fluentd_v0.12.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "fluentd", "~> 0.12.0"
+
+gemspec :path => "../"

data/lib/fluent/plugin/out_gamobile.rb

@@ -4,10 +4,12 @@ class Fluent::GamobileOutput < Fluent::Output
   config_param :ga_account, :string
   config_param :development, :string, :default => 'no'
   config_param :set_var, :string, :default => nil
-  config_param :map_domain, :string, :default => 'domain'
+  config_param :map_dh, :string, :default => 'domain'
+  config_param :map_dp, :string, :default => 'path'
   config_param :map_remoteaddr, :string, :default => 'host'
-  config_param :map_path, :string, :default => 'path'
   config_param :map_referer, :string, :default => 'referer'
+  config_param :map_cd1, :string, :default => 'cd1'
+  config_param :map_cd2, :string, :default => 'cd2'
   config_param :map_useragent, :string, :default => 'agent'
   config_param :map_guid, :string, :default => 'guid'
   config_param :map_acceptlang, :string, :default => 'lang'
@@ -23,7 +25,6 @@ class Fluent::GamobileOutput < Fluent::Output
 
   def configure(conf)
     super
-    @ga_account = @ga_account.gsub(/^UA-/, 'MO-') if @ga_account.include?('UA-')
     @development = Fluent::Config.bool_value(@development) || false
     @unique_ident_key = @unique_ident_key.split(',')
     $log.info "gamobile treats unique identifer key with #{@unique_ident_key}"
@@ -72,17 +73,19 @@ class Fluent::GamobileOutput < Fluent::Output
   end
 
   def build_query
-    utm_gif_location = 'http://www.google-analytics.com/__utm.gif'
+    utm_gif_location = 'http://www.google-analytics.com/r/collect'
     queries = Array.new
-    queries << "utmwv=4.4sh"
-    queries << "utmn=#{rand(1000000*1000000)}"
-    queries << "utmhn=#{ERB::Util.u(get_record(@map_domain))}"
-    queries << "utmr=#{ERB::Util.u(get_record(@map_referer))}"
-    queries << "utmp=#{ERB::Util.u(get_record(@map_path))}"
-    queries << "utmac=#{@ga_account}"
-    queries << "utmcc=__utma%3D999.999.999.999.999.1%3B#{get_utmv}"
-    queries << "utmvid=#{get_visitor_id}"
-    queries << "utmip=#{get_remote_address}"
+    queries << "v=1"
+    queries << "t=pageview"
+    queries << "dh=#{ERB::Util.u(get_record(@map_dh))}"
+    queries << "dp=#{ERB::Util.u(get_record(@map_dp))}"
+    queries << "dr=#{ERB::Util.u(get_record(@map_referer))}"
+    queries << "tid=#{@ga_account}"
+    queries << "uip=#{get_remote_address}"
+    queries << "ua=#{get_utmv}"
+    queries << "cid=#{get_visitor_id}"
+    queries << "cd1=#{ERB::Util.u(get_record(@map_cd1))}"
+    queries << "cd2=#{ERB::Util.u(get_record(@map_cd2))}"
     $log.info "gamobile building query: #{queries}" if @development
     return URI.parse(utm_gif_location + '?' + queries.join('&'))
   end

metadata

@@ -1,94 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gamobile
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -98,38 +101,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - fluent-plugin-gamobile.gemspec
+- gemfiles/fluentd_v0.10.gemfile
+- gemfiles/fluentd_v0.12.gemfile
 - lib/fluent/plugin/out_gamobile.rb
 - test/helper.rb
 - test/plugin/test_out_gamobile.rb
 homepage: https://github.com/y-ken/fluent-plugin-gamobile
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fluentd Output plugin to send access report with "Google Analytics for mobile".
 test_files:
 - test/helper.rb