act-fluent-logger-rails 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb748e74cfb1f32ac69cadea7c313c718a61d2bc43f145058bfd422360ecac7d
-  data.tar.gz: b907cd807d165589c574c43c0327a563337642c9b68d589189437b5b1718bdf9
+  metadata.gz: acc73cf5a95c1d462332f38826653ce607550c8128195466089495427a7fbf8a
+  data.tar.gz: 5eccf02cf3437e591fe56c83a3cce224cd7734edcd9d5af9872cfda2c4ef6966
 SHA512:
-  metadata.gz: '04853d8847ba5915d11dcbf0b5833a0e50802905f8b56c94a4cfb02974c3dfb9747db07dd1bdd5347f14db8542e1c38ff9a68584b28685a2f1bf49a3bde4f58d'
-  data.tar.gz: 638eefe4822c6e41e878e2e0dbb69c5cde63079dcd85740423836fad68144512f808375205e936c4e97e9e90a35ab6394c6f91998156a5f156093c08bf4db421
+  metadata.gz: a19769ad38b13b59ed51f27ce0ccfcebd7b044be00b6c102b708cb90295ddc6f1ae56959f07261e362d21cc1e3a2bd66dd29bf70ef9674df4b8d2a40db1cffc6
+  data.tar.gz: e8b5d7371b6eff5463db65f7bc3794ecb4804dac9421184308010136a76e8157513672763fbfe7d6ddb967a450d7f99e04dbf445932de6a02645849dfaf05185

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.7.0 / Oct 13 2026
+* Package only `lib/`, README, CHANGELOG and LICENSE in the gem, not the specs and development files
+* Require fluent-logger 0.9.1 or later (TLS support for `tls_options`, and a fix for invalid messages polluting the next one)
+* Add `logger` as a runtime dependency, since it is a bundled gem from Ruby 4.0
+* Make `silence`, `log_at` and symbol levels like `logger.level = :warn` work. `FluentLogger` overrode `level`, so it ignored the per-thread level these use (thanks @costa, from #66)
+* Don't clear `config.log_tags` when another logger is created without `log_tags` (e.g. for Delayed::Job)
+* Send `log_tags` on Rails 7.2+, where `Rails::Rack::Logger` sets them with `push_tags` instead of `tagged`
+* Keep Array values of `log_tags` instead of flattening them into the following tags (based on #65)
+* Drop support for Rails < 7.0 and Ruby < 3.1
+* Parse `FLUENTD_URL` query parameters with `URI.decode_www_form`, since `CGI.parse` is not available in Ruby 4.0
+* Require only the ActiveSupport core extensions the logger uses instead of all of `active_support/core_ext`, so Rails 7.0's `disable_to_s_conversion` is not preempted during `Bundler.require`
+* Require `logger` before ActiveSupport so ActiveSupport < 7.1 loads with concurrent-ruby 1.3.5+
+
 ## 0.6.4 / Feb 19 2022
 * Rails 7
 * Fix the name of the gemfile used by Appraisal

data/README.md

@@ -4,7 +4,8 @@ Fluent logger.
 
 ## Supported versions
 
- * Rails 4, 5, 6, 7
+ * Rails 7.0, 7.1, 7.2, 8.0, 8.1
+ * Ruby 3.1+
 
 ## Installation
 
@@ -28,12 +29,16 @@ in config/environments/production.rb
     config.logger = ActFluentLoggerRails::Logger.
       new(log_tags: {
             ip: :ip,
-            ua: :user_agent,
-            uid: ->(request) { request.session[:uid] }
+            ua: :user_agent
           })
 
 Don't use config.log_tags.
 
+`log_tags` are evaluated by `Rails::Rack::Logger` at the start of each request,
+before the session and cookie middleware run, so they cannot read the session
+(see #41). To log session values such as a user id, set them at run time from
+the controller instead (see below).
+
 ### To define where to send messages to, either:
 
 #### create config/fluent-logger.yml
@@ -93,10 +98,22 @@ Don't use config.log_tags.
 	 <pre>tls_options:
 	  use_default_ca: true</pre>
 
-You can add any tags at run time.
+You can add any tags at run time. They are sent with the rest of the request's
+messages and cleared when the messages are flushed.
 
    logger[:foo] = "foo value"
 
+For example, to log a user id stored in the session:
+
+```ruby
+class ApplicationController < ActionController::Base
+  before_action { logger[:uid] = session[:uid] }
+end
+```
+
+With `flush_immediately: true` the tags are cleared after each message, so only
+the next message carries them.
+
 ### Usage as a standalone logger
 
 Typical usage is as a replacement for the default Rails logger, in which case

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

@@ -1,7 +1,14 @@
 require 'fluent-logger'
-require 'active_support/core_ext'
+# Require only what this file uses. Loading all of active_support/core_ext during
+# Bundler.require would preempt app config such as Rails 7.0's disable_to_s_conversion.
+require 'logger'
+require 'active_support'
+require 'active_support/logger'
+require 'active_support/tagged_logging'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/hash/keys'
 require 'uri'
-require 'cgi'
 require 'rails/version'
 
 module ActFluentLoggerRails
@@ -15,16 +22,19 @@ module ActFluentLoggerRails
                  log_tags: {},
                  settings: {},
                  flush_immediately: false)
-      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 }
+      # A second logger without log_tags (e.g. one for background jobs) shouldn't clear the app's tags.
+      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
       end
@@ -55,30 +65,49 @@ module ActFluentLoggerRails
 
     def self.parse_url(fluentd_url)
       uri = URI.parse fluentd_url
-      params = CGI.parse uri.query
+      # CGI.parse was removed from the default cgi library in Ruby 4.0. Keep the first value of duplicate keys like CGI.parse did.
+      params = URI.decode_www_form(uri.query.to_s).each_with_object({}) { |(key, value), h| h[key] ||= value }
 
       {
         fluent_host: uri.host,
         fluent_port: uri.port,
         tag: uri.path[1..-1],
-        nanosecond_precision: params['nanosecond_precision'].try(:first),
-        messages_type: params['messages_type'].try(:first),
-        severity_key: params['severity_key'].try(:first),
+        nanosecond_precision: params['nanosecond_precision'],
+        messages_type: params['messages_type'],
+        severity_key: params['severity_key'],
       }.stringify_keys
     end
 
+    # Tags are matched to log_tags keys by position, so don't flatten Array values.
+    # Rails 7.0 passes them as one Array, 7.1 as separate arguments.
     def tagged(*tags)
-      @tags_thread_key ||= "fluentd_tagged_logging_tags:#{object_id}".freeze
-      Thread.current[@tags_thread_key] = tags.flatten
+      tags = tags.first if ActFluentLoggerRails::Logger.rails_passes_tags_as_array? && tags.length == 1 && tags.first.is_a?(Array)
+      self.request_tags = tags
       yield self
     ensure
       flush
     end
+
+    # Used instead of `tagged` by Rails 7.2+.
+    def push_tags(*tags)
+      self.request_tags = tags
+      tags
+    end
+
+    # Keep the tags until flush, which Rails calls right after this.
+    def pop_tags(count = 1)
+      []
+    end
+
+    def self.rails_passes_tags_as_array?
+      Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 0
+    end
   end
 
   class FluentLogger < ActiveSupport::Logger
     def initialize(options, level, log_tags)
-      self.level = level
+      # No log device: messages go to fluentd in add/flush.
+      super(nil, level: level)
       port    = options[:port]
       host    = options[:host]
       nanosecond_precision = options[:nanosecond_precision]
@@ -91,7 +120,6 @@ module ActFluentLoggerRails
       @fluent_logger = ::Fluent::Logger::FluentLogger.new(nil, logger_opts)
       @severity = 0
       @log_tags = log_tags
-      after_initialize if respond_to?(:after_initialize) && Rails::VERSION::MAJOR < 6
     end
 
     def add(severity, message = nil, progname = nil, &block)
@@ -147,17 +175,28 @@ module ActFluentLoggerRails
       @fluent_logger.post(@tag, map)
       @severity = 0
       logger_messages.clear
-      Thread.current[@tags_thread_key] = nil if @tags_thread_key
+      self.request_tags = nil
       map.clear
     end
 
     def add_tags
-      return unless @tags_thread_key && Thread.current.key?(@tags_thread_key)
-      @log_tags.keys.zip(Thread.current[@tags_thread_key]).each do |k, v|
+      tags = request_tags
+      return unless tags
+      @log_tags.keys.zip(tags).each do |k, v|
         map[k] = v
       end
     end
 
+    def request_tags
+      @tags_thread_key ||= "fluentd_tagged_logging_tags:#{object_id}".freeze
+      Thread.current[@tags_thread_key]
+    end
+
+    def request_tags=(tags)
+      @tags_thread_key ||= "fluentd_tagged_logging_tags:#{object_id}".freeze
+      Thread.current[@tags_thread_key] = tags
+    end
+
     def logger_messages
       @messages_thread_key ||= "fluentd_logger_messages:#{object_id}".freeze
       Thread.current[@messages_thread_key] ||= []
@@ -172,14 +211,6 @@ module ActFluentLoggerRails
       @fluent_logger.close
     end
 
-    def level
-      @level
-    end
-
-    def level=(l)
-      @level = l
-    end
-
     def format_severity(severity)
       ActFluentLoggerRails::Logger::SEV_LABEL[severity] || 'ANY'
     end

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

@@ -1,3 +1,3 @@
 module ActFluentLoggerRails
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: act-fluent-logger-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - TAHARA Yoshinori
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,16 +15,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: fluent-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,28 +57,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '7.0'
 description: Fluent logger
 email:
 - read.eval.print@gmail.com
@@ -73,31 +86,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- Appraisals
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- act-fluent-logger-rails.gemspec
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_2.gemfile
-- gemfiles/rails_6_0.gemfile
-- gemfiles/rails_6_1.gemfile
-- gemfiles/rails_7_0.gemfile
 - lib/act-fluent-logger-rails.rb
 - lib/act-fluent-logger-rails/logger.rb
 - lib/act-fluent-logger-rails/version.rb
-- spec/logger_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/actindi/act-fluent-logger-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,17 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Fluent logger
-test_files:
-- spec/logger_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.github/workflows/ci.yml

@@ -1,36 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        ruby: [2.4, 2.5, 2.6, 2.7, 3.0, 3.1, head]
-        gemfile: [rails_5_0, rails_5_1, rails_5_2, rails_6_0, rails_6_1, rails_7_0]
-        exclude:
-          - ruby: 2.4
-            gemfile: rails_6_0
-          - ruby: 2.4
-            gemfile: rails_6_1
-          - ruby: 2.4
-            gemfile: rails_7_0
-          - ruby: 2.5
-            gemfile: rails_7_0
-          - ruby: 2.6
-            gemfile: rails_7_0
-    runs-on: ${{ matrix.os }}
-    env:
-      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Test
-      run: |
-        bundle exec rake spec

data/.gitignore

@@ -1,22 +0,0 @@
-*.gem
-*.rbc
-*~
-.bundle
-.config
-.yardoc
-/vendor
-Gemfile.lock
-gemfiles/*.lock
-gemfiles/vendor
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.ruby-version

data/Appraisals

@@ -1,29 +0,0 @@
-appraise 'rails-5_0' do
-  gem 'railties', '5.0.2'
-  gem 'activesupport', '5.0.2'
-end
-
-appraise 'rails-5_1' do
-  gem 'railties', '5.1.0'
-  gem 'activesupport', '5.1.0'
-end
-
-appraise 'rails-5_2' do
-  gem 'railties', '5.2.0'
-  gem 'activesupport', '5.2.0'
-end
-
-appraise 'rails-6_0' do
-  gem 'railties', '6.0.3.4'
-  gem 'activesupport', '6.0.3.4'
-end
-
-appraise 'rails-6_1' do
-  gem 'railties', '6.1.0'
-  gem 'activesupport', '6.1.0'
-end
-
-appraise 'rails-7_0' do
-  gem 'railties', '7.0.2'
-  gem 'activesupport', '7.0.2'
-end

data/Gemfile

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

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/act-fluent-logger-rails.gemspec

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'act-fluent-logger-rails/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "act-fluent-logger-rails"
-  gem.version       = ActFluentLoggerRails::VERSION
-  gem.authors       = ["TAHARA Yoshinori"]
-  gem.email         = ["read.eval.print@gmail.com"]
-  gem.description   = %q{Fluent logger}
-  gem.summary       = %q{Fluent logger}
-  gem.homepage      = "https://github.com/actindi/act-fluent-logger-rails"
-  gem.license       = "MIT"
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-
-  gem.add_development_dependency "rspec", '~> 3.5.0'
-  gem.add_runtime_dependency "fluent-logger"
-  gem.add_runtime_dependency "railties", ">= 4"
-  gem.add_runtime_dependency "activesupport", ">= 4"
-end

data/gemfiles/rails_5_0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "railties", "5.0.2"
-gem "activesupport", "5.0.2"
-
-gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "railties", "5.1.0"
-gem "activesupport", "5.1.0"
-
-gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "railties", "5.2.0"
-gem "activesupport", "5.2.0"
-
-gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "railties", "6.0.3.4"
-gem "activesupport", "6.0.3.4"
-
-gemspec path: "../"

data/gemfiles/rails_6_1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "railties", "6.1.0"
-gem "activesupport", "6.1.0"
-
-gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "railties", "7.0.2"
-gem "activesupport", "7.0.2"
-
-gemspec path: "../"

data/spec/logger_spec.rb

@@ -1,265 +0,0 @@
-require 'spec_helper'
-require 'tempfile'
-
-
-describe ActFluentLoggerRails::Logger do
-  before do
-    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
-      def post(tag, map)
-        @log ||= []
-        @log << [tag, map.merge(messages: map[:messages].dup)]
-      end
-      def clear
-        @log.clear
-      end
-      def close
-      end
-    end
-    @my_logger = MyLogger.new
-    allow(Fluent::Logger::FluentLogger).to receive(:new).and_return(@my_logger)
-
-    @config_file = Tempfile.new('fluent-logger-config')
-    @config_file.close(false)
-    File.open(@config_file.path, 'w') {|f|
-      f.puts <<EOF
-test:
-  fluent_host: '127.0.0.1'
-  fluent_port: 24224
-  tag:         'foo'
-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: log_tags)
-  }
-
-  let(:request) {
-    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(tags) { logger.info('hello') }
-        expect(@my_logger.log).to eq([['foo', {
-                                         abc: 'xyz',
-                                         messages: ['hello'],
-                                         severity: 'INFO',
-                                         uuid: 'uuid_value',
-                                         foo: 'foo_value'
-                                       } ]])
-        @my_logger.clear
-        logger.tagged(tags) { logger.info('world'); logger.info('bye') }
-        expect(@my_logger.log).to eq([['foo', {
-                                         messages: ['world', 'bye'],
-                                         severity: 'INFO',
-                                         uuid: 'uuid_value',
-                                         foo: 'foo_value'
-                                       } ]])
-      end
-    end
-
-    it 'is thread safe' do
-      threads = ['hello', 'world'].map do |tag_name|
-        Thread.new {
-          if tag_name == 'hello'
-            request = double('request', uuid: tag_name)
-            tags = log_tags.values.collect do |tag|
-              case tag
-              when Proc
-                tag.call(request)
-              when Symbol
-                request.send(tag)
-              else
-                tag
-              end
-            end
-          else
-            tags = []
-          end
-          logger.info(tag_name)
-          logger.tagged(tags) { sleep(1) if tag_name == 'hello'; logger.info(tag_name) }
-        }
-      end
-
-      while threads.any?(&:alive?)
-        sleep(0.1)
-      end
-      expect(@my_logger.log).to match_array([
-        ['foo', { messages: ['hello', 'hello'], severity: 'INFO', uuid: 'hello', foo: 'foo_value' } ],
-        ['foo', { messages: ['world', 'world'], severity: 'INFO', uuid: nil, foo: nil } ]
-      ])
-    end
-
-
-    describe 'frozen ascii-8bit string' do
-      before do
-        logger.instance_variable_set(:@messages_type, :string)
-      end
-
-      after do
-        logger.instance_variable_set(:@messages_type, :array)
-      end
-
-      it 'join messages' do
-        ascii = "\xe8\x8a\xb1".force_encoding('ascii-8bit').freeze
-        logger.tagged([request]) {
-          logger.info(ascii)
-          logger.info('咲く')
-        }
-        expect(@my_logger.log[0][1][:messages]).to eq("花\n咲く")
-        expect(ascii.encoding).to eq(Encoding::ASCII_8BIT)
-      end
-    end
-
-    describe 'Exception' do
-      it 'output message, class, backtrace' do
-        begin
-          3 / 0
-        rescue => e
-          logger.tagged([request]) {
-            logger.error(e)
-          }
-          expect(@my_logger.log[0][1][:messages][0]).
-            to match(%r|divided by 0 \(ZeroDivisionError\).*spec/logger_spec\.rb:|m)
-        end
-      end
-    end
-
-    describe 'Object' do
-      it 'output inspect' do
-        x = Object.new
-        logger.tagged([request]) {
-          logger.info(x)
-        }
-        expect(@my_logger.log[0][1][:messages][0]).to eq(x.inspect)
-      end
-    end
-
-    describe 'tls_options' do
-      context 'does not has key' do
-        before do
-          File.open(@config_file.path, 'w') do |f|
-            f.puts <<EOF
-test:
-  fluent_host: '127.0.0.1'
-  fluent_port: 24224
-  tag:         'foo'
-EOF
-          end
-        end
-        it do
-          expect(::Fluent::Logger::FluentLogger).not_to receive(:new).with(nil, hash_including(tls_options: { use_default_ca: true }))
-          logger
-        end
-      end
-      context 'has key' do
-        before do
-          File.open(@config_file.path, 'w') do |f|
-            f.puts <<EOF
-test:
-  fluent_host: '127.0.0.1'
-  fluent_port: 24224
-  tag:         'foo'
-  tls_options:
-    use_default_ca: true
-EOF
-          end
-        end
-        it do
-          expect(::Fluent::Logger::FluentLogger).to receive(:new).with(nil, hash_including(tls_options: { use_default_ca: true }))
-          logger
-        end
-      end
-    end
-
-    describe 'severity_key' do
-      describe 'not specified' do
-        it 'severity' do
-          logger.tagged([request]) { logger.info('hello') }
-          expect(@my_logger.log[0][1][:severity]).to eq('INFO')
-        end
-      end
-
-      describe 'severity_key: level' do
-        before do
-          @config_file = Tempfile.new('fluent-logger-config')
-          @config_file.close(false)
-          File.open(@config_file.path, 'w') {|f|
-            f.puts <<EOF
-test:
-  fluent_host: '127.0.0.1'
-  fluent_port: 24224
-  tag:         'foo'
-  severity_key: 'level'  # default severity
-EOF
-          }
-        end
-
-        it 'level' do
-          logger.tagged([request]) { logger.info('hello') }
-          expect(@my_logger.log[0][1][:level]).to eq('INFO')
-        end
-      end
-    end
-  end
-
-  describe "use ENV['FLUENTD_URL']" do
-    let(:fluentd_url) { "http://fluentd.example.com:42442/hoge?messages_type=string&severity_key=level" }
-
-    describe ".parse_url" do
-      subject { described_class.parse_url(fluentd_url) }
-      it { expect(subject['tag']).to eq 'hoge' }
-      it { expect(subject['fluent_host']).to eq 'fluentd.example.com' }
-      it { expect(subject['fluent_port']).to eq 42442 }
-      it { expect(subject['messages_type']).to eq 'string' }
-      it { expect(subject['severity_key']).to eq 'level' }
-    end
-  end
-
-  describe 'flush_immediately' do
-    describe 'flush_immediately: true' do
-      it 'flushed' do
-        logger = ActFluentLoggerRails::Logger.new(config_file: File.new(@config_file.path),
-                                                  flush_immediately: true)
-        logger.info('Immediately!')
-        expect(@my_logger.log[0][1][:messages][0]).to eq('Immediately!')
-      end
-    end
-
-    describe 'flush_immediately: false' do
-      it 'flushed' do
-        logger = ActFluentLoggerRails::Logger.new(config_file: File.new(@config_file.path),
-                                                  flush_immediately: false)
-        logger.info('Immediately!')
-        expect(@my_logger.log).to eq(nil)
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,10 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'active_support'
-require 'active_support/deprecation'
-require 'active_support/core_ext/module'
-require 'active_support/logger'
-require 'active_support/tagged_logging'
-require 'yaml'
-require 'act-fluent-logger-rails/logger'