ltsv_ng 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 410eb98ad781584ffb894d45d3bbc912c836c54c
-  data.tar.gz: 8d07103d322bde19bb36d32b79ca26631563d5bc
+  metadata.gz: 14be5c2fcdc34c05f693a36209a81f6cf36baff8
+  data.tar.gz: 441f8accb004f00caf648b59236987535ba275c2
 SHA512:
-  metadata.gz: 4e812debf57093ea7ca9395f0748694d7cbeb304eea92d486a11c6e12731124cab4b5cd8c80f326601cebe9b92f4d7f54309da7c2a4e022a330bd73ccc46e577
-  data.tar.gz: b0db9b99a5f9a646687839ad01cc0a6e05e6cca46843589acec10b63e229ad340b53b02a88d950a78f7dae968a59726da28afc473407e13f4a5fa1979a4070cf
+  metadata.gz: 5ee67bf03c5addaf509087c566c9416aa7c9dca9fcec91008c756a8442bb928385d223a9053f3f3041c6fdcdb8da20c81c70398c1307fa2a06fcd31a04d21935
+  data.tar.gz: 66f47c99844e5a16b3ce7c632100c26c92154898efa02c8a29aa9cffc860a96ba8d58054450ab6ad39d8ed3b3bc7139127c81223e34b890d61b2b8421a9f12e5

data/lib/ltsv_ng/formatter.rb

@@ -1,14 +1,21 @@
 module LtsvNg
   class Formatter < ::Logger::Formatter
     def call(severity, timestamp, progname, msg)
-      raws = ["level:#{ severity }", "time:#{ timestamp }", "uuid:#{ SecureRandom.uuid }"]
+      raws = { level: severity, time: timestamp, uuid: SecureRandom.uuid }
       case msg
       when Hash
-        raws = msg.inject(raws) { |h, (key, value)| h << "#{key}:#{value}"; h }
+        msg.each do |key, value|
+          if raws.has_key? key
+            raws["dup_#{key}".to_sym] = value
+          else
+            raws[key] = value
+          end
+        end
       when String
-        raws << "msg:#{ msg }"
+        raws[:msg] = msg
       end
-      "#{raws.join("\t")}\n"
+
+      raws.inject(Array.new) { |h, (key, value)| h << "#{key}:#{value}" }.join("\t") + "\n"
     end
   end
 end

data/lib/ltsv_ng/version.rb

@@ -1,3 +1,3 @@
 module LtsvNg
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/ltsv_ng.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "timecop"
 end

data/spec/formatter_spec.rb

@@ -20,5 +20,12 @@ describe "LtsvNg::Formatter" do
         expect(text).to eq "level:INFO\ttime:#{time}\tuuid:b746d58e-e4c0-4f2b-86fd-f8ff78131745\tid:123\tname:foobar\n"
       end
     end
+
+    context "Duplicate default hash key " do
+      it "returns changed key text" do
+        text =  formatter.call("INFO", time, nil, { id: 123, name: "foobar", time: 456})
+        expect(text).to eq "level:INFO\ttime:#{time}\tuuid:b746d58e-e4c0-4f2b-86fd-f8ff78131745\tid:123\tname:foobar\tdup_time:456\n"
+      end
+    end
   end
 end

data/spec/logger_spec.rb

@@ -1,11 +1,16 @@
 require_relative "spec_helper"
 
 describe "LtsvNg::Logger" do
-  let(:time) { Time.now }
+
   before do
     @output = StringIO.new
     @logger = LtsvNg::Logger.new(@output)
     allow(SecureRandom).to receive(:uuid).and_return("b746d58e-e4c0-4f2b-86fd-f8ff78131745")
+    Timecop.freeze
+  end
+
+  after do
+    Timecop.return
   end
 
   describe "#formatter" do
@@ -17,11 +22,10 @@ describe "LtsvNg::Logger" do
   describe "#info" do
     it "returns info log by String Text" do
       @logger.info("Test")
-
       @output.seek(0)
       ltsv = @output.read.strip.split("\t")
       expect(ltsv).to include("level:INFO")
-      expect(ltsv).to include("time:#{time}")
+      expect(ltsv).to include("time:#{Time.now}")
       expect(ltsv).to include("uuid:b746d58e-e4c0-4f2b-86fd-f8ff78131745")
       expect(ltsv).to include("msg:Test")
     end
@@ -31,7 +35,7 @@ describe "LtsvNg::Logger" do
       @output.seek(0)
       ltsv = @output.read.strip.split("\t")
       expect(ltsv).to include("level:INFO")
-      expect(ltsv).to include("time:#{time}")
+      expect(ltsv).to include("time:#{Time.now}")
       expect(ltsv).to include("id:123")
       expect(ltsv).to include("uuid:b746d58e-e4c0-4f2b-86fd-f8ff78131745")
       expect(ltsv).to include("name:foobar")

data/spec/spec_helper.rb

@@ -96,3 +96,4 @@ RSpec.configure do |config|
 end
 
 require "ltsv_ng"
+require "timecop"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ltsv_ng
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - hirocaster
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: LTSV logger for Ruby application.
 email:
 - hohtsuka@gmail.com