logfmt 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2327cc4b6b81e1f8697b774dd0100e94465d9f13
-  data.tar.gz: 81758010bbe3acd78c67f01aa5947a27b165c70e
+  metadata.gz: 0d84880517339f8a0d4e92bec5c50a60e1565616
+  data.tar.gz: f49a8ab504c1c50312d585e3b4f2ed01d70bcf9c
 SHA512:
-  metadata.gz: 726f73839a6139edf96a8632cd5c8bb978eb884ccb4c1ddad021ba9dc5e623b6275182340ffe6a6546321e19c082fb79e1e6346878fe3f972214c32a0f833694
-  data.tar.gz: bf601bd78782b3fa6d52421b7a101a1c17f399c113ba033da34a535daaed62797e80e46668be3513d7483dc09115662fd900b665cdcc18a7125d4ed79e836f37
+  metadata.gz: c7880b117caee1ef7e794c04e59362db10076c58d58a28bbf360d9a71a56cc40cc089e7298f9a7f528a2bf3f304f1a45de68c9a24f2b419ff7afd3c8a4d3130d
+  data.tar.gz: d4f7b9e924dbeed9ef56c8be8e1e3d3109ea6c8e96d52da77ad06b34c5098639c4e00a8c45a463f442fbc6b56fa4cea9fb8f9d7cc1e2be82a693c9f6ba4a7eee

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .ruby-version
+.tags

data/README.md

@@ -4,4 +4,4 @@ Parse log lines on the logfmt style:
 
     >> require "logfmt"
     >> Logfmt.parse('foo=bar a=14 baz="hello kitty" cool%story=bro f %^asdf')
-    => {"foo"=>"bar", "a"=>"14", "baz"=>"hello kitty", "cool%story"=>"bro", "f"=>true, "%^asdf"=>true}
+    => {"foo"=>"bar", "a"=>14, "baz"=>"hello kitty", "cool%story"=>"bro", "f"=>true, "%^asdf"=>true}

data/lib/logfmt/parser.rb

@@ -6,11 +6,11 @@ module Logfmt
   QVALUE = 4
 
   def self.numeric?(s)
-    s.match(/\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\Z/)
+    s.is_a?(Numeric) || s.to_s.match(/\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\Z/)
   end
 
   def self.integer?(s)
-    s.match(/\A[-+]?[0-9]+\Z/)
+    s.is_a?(Integer) || s.to_s.match(/\A[-+]?[0-9]+\Z/)
   end
 
   def self.parse(line)
@@ -55,20 +55,20 @@ module Logfmt
         end
         if i >= line.length
           if integer?(value)
-            value = Integer(value)
+            value = value.to_i
           elsif numeric?(value)
-            value = Float(value)
+            value = value.to_f
           end
           output[key.strip] = value || true
         end
         next
       end
       if state == IVALUE
-        if !(c > ' ' && c != '"' && c != '=')
+        if !(c > ' ' && c != '"')
           if integer?(value)
-            value = Integer(value)
+            value = value.to_i
           elsif numeric?(value)
-            value = Float(value)
+            value = value.to_f
           end
           output[key.strip] = value
           state = GARBAGE
@@ -77,9 +77,9 @@ module Logfmt
         end
         if i >= line.length
           if integer?(value)
-            value = Integer(value)
+            value = value.to_i
           elsif numeric?(value)
-            value = Float(value)
+            value = value.to_f
           end
           output[key.strip] = value
         end
@@ -92,7 +92,7 @@ module Logfmt
         elsif c == '"'
           if escaped
             escaped = false
-            value << c
+            value.chop! << c
             next
           end
           output[key.strip] = value

data/lib/logfmt/version.rb

@@ -1,3 +1,3 @@
 module Logfmt
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/logfmt/parser_spec.rb

@@ -55,12 +55,12 @@ describe Logfmt do
 
   it 'parse escaped quote value ' do
     data = Logfmt.parse('key="quoted \" value" r="esc\t"')
-    expect(data).to eq('key' => 'quoted \" value', 'r' => 'esc\\t')
+    expect(data).to eq('key' => 'quoted " value', 'r' => 'esc\t')
   end
 
   it 'parse mixed pairs' do
     data = Logfmt.parse('key1="quoted \" value" key2 key3=value3')
-    expect(data).to eq('key1' => 'quoted \" value', 'key2' => true, 'key3' => 'value3')
+    expect(data).to eq('key1' => 'quoted " value', 'key2' => true, 'key3' => 'value3')
   end
 
   it 'parse mixed characters pairs' do
@@ -131,4 +131,24 @@ describe Logfmt do
     expect(data['key1']).to eq(4)
     expect(data['key2']).to eq(9)
   end
+
+  it 'parse string containing quotes' do
+    data = Logfmt.parse('key1="{\"msg\": \"hello\tworld\"}"')
+    expect(data['key1']).to eq('{"msg": "hello\tworld"}')
+  end
+
+  it 'parse value containing equal sign' do
+    query = 'position=44.80450799126121%2C33.58320759981871&uid=1'
+    data = Logfmt.parse("method=GET query=#{query} status=200")
+    expect(data).to eq(
+      'method' => 'GET',
+      'query' => query,
+      'status' => 200
+    )
+  end
+
+  it 'parses integers correctly' do
+    data = Logfmt.parse('key=111 ')
+    expect(data['key']).to eq(111)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logfmt
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Parse logfmt messages.