logfmt 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12311fc6d8f64e7c703b4d5ef3494ef51df9ad56
-  data.tar.gz: 8a3aa8fe3253121859df2c19eda8281e6dd2b599
+  metadata.gz: 2327cc4b6b81e1f8697b774dd0100e94465d9f13
+  data.tar.gz: 81758010bbe3acd78c67f01aa5947a27b165c70e
 SHA512:
-  metadata.gz: 845a530e2620fcf4eccabe54f715be1742cbe62996fbdb0ea020634fa9f21533620d44fd726921bc631980b89d28a615d604f647b45c1a770cf440520cea9939
-  data.tar.gz: 44c635fb1d2f7649821ebc15777acfca429246b9fe99c97ae686e3216f77132759e0baba61f9baf7b28d6d42a47ed647d18c5b65680595ccc23c271a1a56a259
+  metadata.gz: 726f73839a6139edf96a8632cd5c8bb978eb884ccb4c1ddad021ba9dc5e623b6275182340ffe6a6546321e19c082fb79e1e6346878fe3f972214c32a0f833694
+  data.tar.gz: bf601bd78782b3fa6d52421b7a101a1c17f399c113ba033da34a535daaed62797e80e46668be3513d7483dc09115662fd900b665cdcc18a7125d4ed79e836f37

data/Rakefile

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

data/bench.rb

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
 require 'benchmark'
 require 'logfmt'
@@ -12,4 +12,4 @@ Benchmark.bm(20) do |x|
       Logfmt.parse(line)
     end
   end
-end
+end

data/lib/logfmt.rb

@@ -1,2 +1,2 @@
-require "logfmt/version"
-require "logfmt/parser"
+require 'logfmt/version'
+require 'logfmt/parser'

data/lib/logfmt/parser.rb

@@ -6,16 +6,16 @@ module Logfmt
   QVALUE = 4
 
   def self.numeric?(s)
-    return s.match(/\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\Z/)
+    s.match(/\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\Z/)
   end
 
   def self.integer?(s)
-    return s.match(/\A[-+]?[0-9]+\Z/)
+    s.match(/\A[-+]?[0-9]+\Z/)
   end
 
   def self.parse(line)
     output = {}
-    key, value = "", ""
+    key, value = '', ''
     escaped = false
     state = GARBAGE
     i = 0
@@ -33,15 +33,13 @@ module Logfmt
           state = KEY
           key << c
         elsif c == '='
-          output[key.strip()] = true
+          output[key.strip] = true
           state = EQUAL
         else
-          output[key.strip()] = true
+          output[key.strip] = true
           state = GARBAGE
         end
-        if i >= line.length
-          output[key.strip()] = true
-        end
+        output[key.strip] = true if i >= line.length
         next
       end
       if state == EQUAL
@@ -49,7 +47,7 @@ module Logfmt
           value = c
           state = IVALUE
         elsif c == '"'
-          value = ""
+          value = ''
           escaped = false
           state = QVALUE
         else
@@ -61,18 +59,18 @@ module Logfmt
           elsif numeric?(value)
             value = Float(value)
           end
-          output[key.strip()] = value || true
+          output[key.strip] = value || true
         end
         next
       end
       if state == IVALUE
-        if not (c > ' ' && c != '"' && c != '=')
+        if !(c > ' ' && c != '"' && c != '=')
           if integer?(value)
             value = Integer(value)
           elsif numeric?(value)
             value = Float(value)
           end
-          output[key.strip()] = value
+          output[key.strip] = value
           state = GARBAGE
         else
           value << c
@@ -83,21 +81,21 @@ module Logfmt
           elsif numeric?(value)
             value = Float(value)
           end
-          output[key.strip()] = value
+          output[key.strip] = value
         end
         next
       end
       if state == QVALUE
         if c == '\\'
           escaped = true
-          value << "\\"
+          value << '\\'
         elsif c == '"'
           if escaped
             escaped = false
             value << c
             next
           end
-          output[key.strip()] = value
+          output[key.strip] = value
           state = GARBAGE
         else
           escaped = false

data/lib/logfmt/version.rb

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

data/logfmt.gemspec

@@ -4,19 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'logfmt/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "logfmt"
+  gem.name          = 'logfmt'
   gem.version       = Logfmt::VERSION
-  gem.authors       = ["Timothée Peignier"]
-  gem.email         = ["timothee.peignier@tryphon.org"]
+  gem.authors       = ['Timothée Peignier']
+  gem.email         = ['timothee.peignier@tryphon.org']
   gem.description   = %q{Parse log lines in the logfmt style.}
   gem.summary       = %q{Parse logfmt messages.}
-  gem.homepage      = "https://github.com/cyberdelia/logfmt-ruby"
+  gem.homepage      = 'https://github.com/cyberdelia/logfmt-ruby'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  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.0"
-  gem.add_development_dependency "rake", "~> 10.3"
+  gem.require_paths = ['lib']
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'rake', '~> 10.3'
 end

data/spec/logfmt/parser_spec.rb

@@ -4,7 +4,7 @@ require 'logfmt/parser'
 
 describe Logfmt do
   it 'parse empty log line' do
-    data = Logfmt.parse("")
+    data = Logfmt.parse('')
     expect(data).to eq({})
   end
 
@@ -14,121 +14,121 @@ describe Logfmt do
   end
 
   it 'parse key without value' do
-    data = Logfmt.parse("key")
-    expect(data).to eq({"key" => true})
+    data = Logfmt.parse('key')
+    expect(data).to eq('key' => true)
   end
 
   it 'parse key without value and whitespace' do
-    data = Logfmt.parse("  key  ")
-    expect(data).to eq({"key" => true})
+    data = Logfmt.parse('  key  ')
+    expect(data).to eq('key' => true)
   end
 
   it 'parse multiple single keys' do
-    data = Logfmt.parse("key1 key2")
-    expect(data).to eq({"key1" => true, "key2" => true})
+    data = Logfmt.parse('key1 key2')
+    expect(data).to eq('key1' => true, 'key2' => true)
   end
 
   it 'parse unquoted value' do
-    data = Logfmt.parse("key=value")
-    expect(data).to eq({"key" => "value"})
+    data = Logfmt.parse('key=value')
+    expect(data).to eq('key' => 'value')
   end
 
   it 'parse pairs' do
-    data = Logfmt.parse("key1=value1 key2=value2")
-    expect(data).to eq({"key1" => "value1", "key2" => "value2"})
+    data = Logfmt.parse('key1=value1 key2=value2')
+    expect(data).to eq('key1' => 'value1', 'key2' => 'value2')
   end
 
   it 'parse mixed single/non-single pairs' do
-    data = Logfmt.parse("key1=value1 key2")
-    expect(data).to eq({"key1" => "value1", "key2" => true})
+    data = Logfmt.parse('key1=value1 key2')
+    expect(data).to eq('key1' => 'value1', 'key2' => true)
   end
 
   it 'parse mixed pairs whatever the order' do
-    data = Logfmt.parse("key1 key2=value2")
-    expect(data).to eq({"key1" => true, "key2" => "value2"})
+    data = Logfmt.parse('key1 key2=value2')
+    expect(data).to eq('key1' => true, 'key2' => 'value2')
   end
 
   it 'parse quoted value' do
     data = Logfmt.parse('key="quoted value"')
-    expect(data).to eq({"key" => "quoted value"})
+    expect(data).to eq('key' => 'quoted value')
   end
 
   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
     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" => ""})
+    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)
+  #   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)
+    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)
+    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)
+    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)
+    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)
+    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)
+    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)
+    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)
+    expect(data['key'].class).to eq(String)
   end
 
   it 'parse last as integer type' do
     data = Logfmt.parse('key1=4 key2=9')
-    expect(data["key1"]).to eq(4)
-    expect(data["key2"]).to eq(9)
+    expect(data['key1']).to eq(4)
+    expect(data['key2']).to eq(9)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logfmt
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -85,4 +85,3 @@ summary: Parse logfmt messages.
 test_files:
 - spec/logfmt/parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: