act-fluent-logger-rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8948529fa64435096f9be2f85e103b34268652a
-  data.tar.gz: 588ce44194197d65ca7528941e931107296bd255
+  metadata.gz: 029ec3e511f6dbc1e9ca367c6535723d09a3e5e7
+  data.tar.gz: f78130706c3241d68cab6508acd477bbaa350dda
 SHA512:
-  metadata.gz: 207a1c5007dca5360349c02224f70a95398fa9fa17a9d702cb94a2708a2e005cde466011f5df88de16df6a3bc7c995d068268b0f8527b3b589fd39396aa6e994
-  data.tar.gz: 9249a4c66f68484277066328e07e5a457f4a28e411497400cb170a798f8a0bc12992e03859c99e0d9efe96d06736e60352bbe390a6dcfda844fa8576ca6c8e87
+  metadata.gz: f8c7eb2eed9222e561c47234520d2158b21aa552f80c3b30dc0486a98ea1d07fc5e2655bbe76bc6368f2ced4bc07b0d10f408ec9d2346c504945c34e03215f6c
+  data.tar.gz: 38df687787843ffe946761d3990d631d486d9e9f648162fe0576cacd37cea8af211ee61d78fa52e6585a4d130d916cb9243212f05796ecf058d071710689315b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.6 / March 20 2015
+
+ * Fix incompatible character encodings #13.
+
 ## 0.1.5 / July 19 2014
 
  * Fix keynames of EVN['FLUENTD_URL']

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

@@ -74,7 +74,12 @@ module ActFluentLoggerRails
 
     def add_message(severity, message)
       @severity = severity if @severity < severity
-      @messages << message
+
+      if message.encoding == Encoding::UTF_8
+        @messages << message
+      else
+        @messages << message.dup.force_encoding(Encoding::UTF_8)
+      end
     end
 
     def [](key)

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

@@ -1,3 +1,3 @@
 module ActFluentLoggerRails
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/logger_spec.rb

@@ -4,12 +4,10 @@ require 'tempfile'
 
 describe ActFluentLoggerRails::Logger do
   before do
-
-    unless self.class.const_defined?(:Rails)
-      Rails = double("Rails", env: "test")
-      Rails.stub_chain(:application, :config, :log_level).and_return(:debug)
-      Rails.stub_chain(:application, :config, :log_tags=)
-    end
+    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=)
 
     class MyLogger
       attr_accessor :log
@@ -46,25 +44,47 @@ EOF
                                      })
   }
 
-  it 'info' do
-    request = double('request', uuid: 'uuid_value', foo: 'foo_value')
-    logger[:abc] = 'xyz'
-    logger.tagged([request]) { logger.info('hello') }
-    expect(@my_logger.log).to eq([['foo', {
-                                     abc: 'xyz',
-                                     messages: ['hello'],
-                                     level: 'INFO',
-                                     uuid: 'uuid_value',
-                                     foo: 'foo_value'
-                                   } ]])
-    @my_logger.clear
-    logger.tagged([request]) { logger.info('world'); logger.info('bye') }
-    expect(@my_logger.log).to eq([['foo', {
-                                     messages: ['world', 'bye'],
-                                     level: 'INFO',
-                                     uuid: 'uuid_value',
-                                     foo: 'foo_value'
-                                   } ]])
+  let(:request) {
+    double('request', uuid: 'uuid_value', foo: 'foo_value')
+  }
+
+  describe 'logging' do
+
+    describe 'basic' do
+      it 'info' do
+        logger[:abc] = 'xyz'
+        logger.tagged([request]) { logger.info('hello') }
+        expect(@my_logger.log).to eq([['foo', {
+                                         abc: 'xyz',
+                                         messages: ['hello'],
+                                         level: 'INFO',
+                                         uuid: 'uuid_value',
+                                         foo: 'foo_value'
+                                       } ]])
+        @my_logger.clear
+        logger.tagged([request]) { logger.info('world'); logger.info('bye') }
+        expect(@my_logger.log).to eq([['foo', {
+                                         messages: ['world', 'bye'],
+                                         level: 'INFO',
+                                         uuid: 'uuid_value',
+                                         foo: 'foo_value'
+                                       } ]])
+      end
+    end
+
+    describe 'frozen ascii-8bit string' do
+      it 'join messages' do
+        logger.instance_variable_set(:@messages_type, :string)
+        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
+
   end
 
   describe "use ENV['FLUENTD_URL']" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act-fluent-logger-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - TAHARA Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec