act-fluent-logger-rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3620e98091da97133d63c7988fd39d6fead83c5
-  data.tar.gz: e5be5d05fbe18db5facccd4cc6273bba08ba6e6e
+  metadata.gz: 04d055709961370ec26fc8ab6ee6b3baed0082c7
+  data.tar.gz: 5a95cb9fb40bb95be1d78eb97c4793f1609bff00
 SHA512:
-  metadata.gz: 00ff02c7cc4536d5b1abd93184a6f632803ba73f71cb837b4aabd98ae4aa98b98c5e1f941c58f5ea66ada2f3a5e550c3131aaab3a60406a635e4c3f7e0692d99
-  data.tar.gz: 90b97b638e772f40cecfabe7c1de55b5134454b399c8da508a449ec56d8ee6a811d21023b555c3f05270f86c74e7c77a7358b7179195e7a174a2834139d958e2
+  metadata.gz: 46a6fa9fc3e7242266a2e73fb6dba526d34d91e4123497dabdcf970b01c62f665765acc9592b90a9593a1e5eca2866627977d91cd6a6d11cd09dcced720d2fdf
+  data.tar.gz: 06e933dd15de557d22890c6d0adbdd25260e21278598f6f17d5292f8b7cf96f86e67161114b6e681b0c8e99932628ab7b79274521fac59b92eadbaffc3cbfb17

data/.travis.yml

@@ -1,4 +1,17 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.2
+  - 2.0.0-p648
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+gemfile:
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+matrix:
+  exclude:
+    - rvm: 2.0.0-p648
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_5.0.gemfile

data/Appraisals

@@ -0,0 +1,15 @@
+appraise 'rails-4.0' do
+  gem 'rails', '4.0.13'
+end
+
+appraise 'rails-4.1' do
+  gem 'rails', '4.1.15'
+end
+
+appraise 'rails-4.2' do
+  gem 'rails', '4.2.6'
+end
+
+appraise 'rails-5.0' do
+  gem 'rails', '5.0.0'
+end

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0 / July 12 2016
+
+* Rails 5
+
 ## 0.2.0 / Mar 20 2016
 
 * Add severity_key parameter. Is is The key of severity(DEBUG, INFO, WARN, ERROR).

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'appraisal'
+
 # Specify your gem's dependencies in act-fluent-logger-rails.gemspec
 gemspec

data/README.md

@@ -4,7 +4,7 @@ Fluent logger.
 
 ## Supported versions
 
- * Rails 4.1
+ * Rails 4 and 5
 
 ## Installation
 

data/act-fluent-logger-rails.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec", '~> 3.5.0'
   gem.add_runtime_dependency "fluent-logger"
-  gem.add_runtime_dependency "rails", ">= 3.2.0", "< 5.0"
+  gem.add_runtime_dependency "rails", ">= 4", "< 5.1"
 end

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "4.0.13"
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile.lock

@@ -0,0 +1,106 @@
+PATH
+  remote: ../
+  specs:
+    act-fluent-logger-rails (0.3.0)
+      fluent-logger
+      rails (>= 4, < 5.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (4.0.2)
+    builder (3.1.4)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    fluent-logger (0.5.1)
+      msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
+    i18n (0.7.0)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (4.7.5)
+    msgpack (0.5.12)
+    multi_json (1.12.1)
+    rack (1.5.5)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (0.3.50)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  act-fluent-logger-rails!
+  appraisal
+  rails (= 4.0.13)
+  rspec (~> 3.5.0)
+
+BUNDLED WITH
+   1.12.5

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "4.1.15"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: ../
+  specs:
+    act-fluent-logger-rails (0.3.0)
+      fluent-logger
+      rails (>= 4, < 5.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.15)
+      actionpack (= 4.1.15)
+      actionview (= 4.1.15)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.15)
+      actionview (= 4.1.15)
+      activesupport (= 4.1.15)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.15)
+      activesupport (= 4.1.15)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.15)
+      activesupport (= 4.1.15)
+      builder (~> 3.1)
+    activerecord (4.1.15)
+      activemodel (= 4.1.15)
+      activesupport (= 4.1.15)
+      arel (~> 5.0.0)
+    activesupport (4.1.15)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    fluent-logger (0.5.1)
+      msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.9.0)
+    msgpack (0.5.12)
+    rack (1.5.5)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.1.15)
+      actionmailer (= 4.1.15)
+      actionpack (= 4.1.15)
+      actionview (= 4.1.15)
+      activemodel (= 4.1.15)
+      activerecord (= 4.1.15)
+      activesupport (= 4.1.15)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.15)
+      sprockets-rails (~> 2.0)
+    railties (4.1.15)
+      actionpack (= 4.1.15)
+      activesupport (= 4.1.15)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  act-fluent-logger-rails!
+  appraisal
+  rails (= 4.1.15)
+  rspec (~> 3.5.0)
+
+BUNDLED WITH
+   1.12.5

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "4.2.6"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile.lock

@@ -0,0 +1,138 @@
+PATH
+  remote: ../
+  specs:
+    act-fluent-logger-rails (0.3.0)
+      fluent-logger
+      rails (>= 4, < 5.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
+      globalid (>= 0.3.0)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.3)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    fluent-logger (0.5.1)
+      msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    msgpack (0.5.12)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.6)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  act-fluent-logger-rails!
+  appraisal
+  rails (= 4.2.6)
+  rspec (~> 3.5.0)
+
+BUNDLED WITH
+   1.12.5

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "5.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile.lock

@@ -0,0 +1,143 @@
+PATH
+  remote: ../
+  specs:
+    act-fluent-logger-rails (0.3.0)
+      fluent-logger
+      rails (>= 4, < 5.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.0)
+      actionpack (= 5.0.0)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.0)
+      activesupport (= 5.0.0)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.0.0)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    fluent-logger (0.5.1)
+      msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    msgpack (0.5.12)
+    nio4r (1.2.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.0)
+      actioncable (= 5.0.0)
+      actionmailer (= 5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      activemodel (= 5.0.0)
+      activerecord (= 5.0.0)
+      activesupport (= 5.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  act-fluent-logger-rails!
+  appraisal
+  rails (= 5.0.0)
+  rspec (~> 3.5.0)
+
+BUNDLED WITH
+   1.12.5

data/lib/act-fluent-logger-rails/logger.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'fluent-logger'
 require 'active_support/core_ext'
 require 'uri'
@@ -15,7 +14,19 @@ module ActFluentLoggerRails
                  log_tags: {},
                  settings: {},
                  flush_immediately: false)
-      Rails.application.config.log_tags = [ ->(request) { request } ] unless log_tags.empty?
+      Rails.application.config.log_tags = log_tags.values
+      if Rails.application.config.respond_to?(:action_cable)
+        Rails.application.config.action_cable.log_tags = log_tags.values.map do |x|
+          case
+          when x.respond_to?(:call)
+            x
+          when x.is_a?(Symbol)
+            -> (request) { request.send(x) }
+          else
+            -> (request) { x }
+          end
+        end
+      end
       if (0 == settings.length)
         fluent_config = if ENV["FLUENTD_URL"]
                           self.parse_url(ENV["FLUENTD_URL"])
@@ -53,7 +64,7 @@ module ActFluentLoggerRails
     end
 
     def tagged(*tags)
-      @request = tags[0][0]
+      @tags = tags.flatten
       yield self
     ensure
       flush
@@ -74,6 +85,7 @@ module ActFluentLoggerRails
       @messages = []
       @log_tags = log_tags
       @map = {}
+      after_initialize if respond_to? :after_initialize
     end
 
     def add(severity, message = nil, progname = nil, &block)
@@ -124,19 +136,15 @@ module ActFluentLoggerRails
                  end
       @map[:messages] = messages
       @map[@severity_key] = format_severity(@severity)
-      @log_tags.each do |k, v|
-        @map[k] = case v
-                  when Proc
-                    v.call(@request)
-                  when Symbol
-                    @request.send(v)
-                  else
-                    v
-                  end rescue :error
+      if @tags
+        @log_tags.keys.zip(@tags).each do |k, v|
+          @map[k] = v
+        end
       end
       @fluent_logger.post(@tag, @map)
       @severity = 0
       @messages.clear
+      @tags = nil
       @map.clear
     end
 

data/lib/act-fluent-logger-rails/version.rb

@@ -1,3 +1,3 @@
 module ActFluentLoggerRails
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/logger_spec.rb

@@ -4,10 +4,10 @@ require 'tempfile'
 
 describe ActFluentLoggerRails::Logger do
   before do
-    Rails = double("Rails") unless self.class.const_defined?(:Rails)
-    Rails.stub(env: "test")
-    Rails.stub_chain(:application, :config, :log_level).and_return(:debug)
-    Rails.stub_chain(:application, :config, :log_tags=)
+    stub_const('Rails', Class.new) unless defined?(Rails)
+    allow(Rails).to receive(:env).and_return('test')
+    allow(Rails).to receive_message_chain(:application, :config, :log_level).and_return(:debug)
+    allow(Rails).to receive_message_chain(:application, :config, :log_tags=)
 
     class MyLogger
       attr_accessor :log
@@ -22,7 +22,7 @@ describe ActFluentLoggerRails::Logger do
       end
     end
     @my_logger = MyLogger.new
-    Fluent::Logger::FluentLogger.stub(:new) { @my_logger }
+    allow(Fluent::Logger::FluentLogger).to receive(:new).and_return(@my_logger)
 
     @config_file = Tempfile.new('fluent-logger-config')
     @config_file.close(false)
@@ -36,24 +36,38 @@ EOF
     }
   end
 
+  let(:log_tags) {
+    { uuid: :uuid,
+      foo: ->(request) { 'foo_value' }
+    }
+  }
+
   let(:logger) {
     ActFluentLoggerRails::Logger.new(config_file: File.new(@config_file.path),
-                                     log_tags: {
-                                       uuid: :uuid,
-                                       foo: ->(request) { request.foo }
-                                     })
+                                     log_tags: log_tags)
   }
 
   let(:request) {
-    double('request', uuid: 'uuid_value', foo: 'foo_value')
+    double('request', uuid: 'uuid_value')
   }
 
   describe 'logging' do
 
     describe 'basic' do
       it 'info' do
+        # see Rails::Rack::compute_tags
+        tags = log_tags.values.collect do |tag|
+          case tag
+          when Proc
+            tag.call(request)
+          when Symbol
+            request.send(tag)
+          else
+            tag
+          end
+        end
         logger[:abc] = 'xyz'
-        logger.tagged([request]) { logger.info('hello') }
+        logger.tagged(tags) { logger.info('hello') }
         expect(@my_logger.log).to eq([['foo', {
                                          abc: 'xyz',
                                          messages: ['hello'],
@@ -62,7 +76,7 @@ EOF
                                          foo: 'foo_value'
                                        } ]])
         @my_logger.clear
-        logger.tagged([request]) { logger.info('world'); logger.info('bye') }
+        logger.tagged(tags) { logger.info('world'); logger.info('bye') }
         expect(@my_logger.log).to eq([['foo', {
                                          messages: ['world', 'bye'],
                                          severity: 'INFO',

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: act-fluent-logger-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - TAHARA Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 description: Fluent logger
 email:
 - read.eval.print@gmail.com
@@ -67,12 +67,21 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - act-fluent-logger-rails.gemspec
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.0.gemfile.lock
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.1.gemfile.lock
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_4.2.gemfile.lock
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.0.gemfile.lock
 - lib/act-fluent-logger-rails.rb
 - lib/act-fluent-logger-rails/logger.rb
 - lib/act-fluent-logger-rails/version.rb
@@ -98,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluent logger