logfmt 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebbeb9a0b99c4d279a682953bd40f6585acfc8ff
-  data.tar.gz: 0c24353022ea70cf672b07cc9126de375b0400d2
+  metadata.gz: 3ee31ce93089f77a986eeaf421bc81109629096a
+  data.tar.gz: cc396ac537f202d1b5a1422b068c19abdef6cf67
 SHA512:
-  metadata.gz: a14c02145816f5ec84487ef96b4fff690c6d1692bd3209c59eb58db7bf1af5b20148e19c6d56d4b99eb6ba8175e540b61852ddac2748441552fcc9d4faf7f4b8
-  data.tar.gz: 5db326288526225bd1084acaf9ef2fb57a785de7b0f6f7086c92b0e0a4eae58252f052632897f49d60dca488b03f5bd68c4cebe8d263e086cb5a94ada3774c6d
+  metadata.gz: f5846e36d0e21b576156ee0c8ef0ef94c503b50279807e734f5aaf6d4351f9f61946d0e51e99f8a545a85f81f5f7ac93f7971bfa069e99dc9a4acd70da5372ed
+  data.tar.gz: ef739d7f6a37e95ac60ab94ca1356f90e5e6133682603dd0ae7d87bddfdb08b4bfe5b3ab9bfb6eb91d4447a1569ad42499f4fc12ee3f258a7c1a46759529e1cc

data/lib/logfmt/parser.rb

@@ -1,3 +1,4 @@
+
 module Logfmt
   GARBAGE = 0
   KEY = 1
@@ -5,6 +6,14 @@ module Logfmt
   IVALUE = 3
   QVALUE = 4
 
+  def self.numeric?(s)
+    return s.match(/\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\Z/)
+  end
+
+  def self.integer?(s)
+    return s.match(/\A[-+]?[0-9]+\Z/)
+  end
+
   def self.parse(line)
     output = {}
     key, value = "", ""
@@ -54,12 +63,22 @@ module Logfmt
       end
       if state == IVALUE
         if not (c > ' ' && c != '"' && c != '=')
+          if integer?(value)
+            value = Integer(value)
+          elsif numeric?(value)
+            value = Float(value)
+          end
           output[key.strip()] = value
           state = GARBAGE
         else
           value << c
         end
         if i >= line.length
+          if integer?(value)
+            value = Integer(value)
+          elsif numeric?(value)
+            value = Float(value)
+          end
           output[key.strip()] = value
         end
         next

data/lib/logfmt/version.rb

@@ -1,3 +1,3 @@
 module Logfmt
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/logfmt/parser_spec.rb

@@ -65,11 +65,65 @@ describe Logfmt do
 
   it 'parse mixed characters pairs' do
     data = Logfmt.parse('foo=bar a=14 baz="hello kitty" ƒ=2h3s cool%story=bro f %^asdf')
-    expect(data).to eq({"foo" => "bar", "a" => "14", "baz" => "hello kitty", "ƒ" => "2h3s", "cool%story" => "bro", "f" => true, "%^asdf" => true})
+    expect(data).to eq({"foo" => "bar", "a" => 14, "baz" => "hello kitty", "ƒ" => "2h3s", "cool%story" => "bro", "f" => true, "%^asdf" => true})
   end
 
   it 'parse pair with empty quote' do
     data = Logfmt.parse('key=""')
     expect(data).to eq({"key" => ""})
   end
+
+  # Currently, the value comes back as "true", which could mess up stats
+  # Really, only "true" should come back as "true"
+  # it 'parse 1 as integer type' do
+  #   data = Logfmt.parse('key=1')
+  #   expect(data["key"].class).to eq(Fixnum)
+  # end
+
+  it 'parse positive integer as integer type' do
+    data = Logfmt.parse('key=234')
+    expect(data["key"]).to eq(234)
+    expect(data["key"].class).to eq(Fixnum)
+  end
+
+  it 'parse negative integer as integer type' do
+    data = Logfmt.parse('key=-3428')
+    expect(data["key"]).to eq(-3428)
+    expect(data["key"].class).to eq(Fixnum)
+  end
+
+
+  it 'parse positive float as float type' do
+    data = Logfmt.parse('key=3.342')
+    expect(data["key"]).to eq(3.342)
+    expect(data["key"].class).to eq(Float)
+  end
+
+  it 'parse negative float as float type' do
+    data = Logfmt.parse('key=-0.9934')
+    expect(data["key"]).to eq(-0.9934)
+    expect(data["key"].class).to eq(Float)
+  end
+
+  it 'parse exponential float as float type' do
+    data = Logfmt.parse('key=2.342342342342344e+18')
+    expect(data["key"]).to eq(2.342342342342344e+18)
+    expect(data["key"].class).to eq(Float)
+  end
+
+  it 'parse quoted integer as string type' do
+    data = Logfmt.parse('key="234"')
+    expect(data["key"].class).to eq(String)
+  end
+
+  it 'parse quoted float as string type' do
+    data = Logfmt.parse('key="3.14"')
+    expect(data["key"].class).to eq(String)
+  end
+
+  it 'parse IP address as string type' do
+    data = Logfmt.parse('key=10.10.10.1')
+    expect(data["key"].class).to eq(String)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logfmt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet