logfmt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a31f473ee9fde670a1d317e2475c4d2b53f3c4b1
-  data.tar.gz: 07bd647465be8fa975fa9139be574f3ab7210734
+  metadata.gz: 8ea9ce7afd32bfdaa73e9399460c34f6c5cf2a60
+  data.tar.gz: c54d8967a623133fbabfbf50d160fb284e62a207
 SHA512:
-  metadata.gz: 2c2a583a06066f3685852a2cc843abef98d6db3006598c40b832e4ddb5a6cc5c4363c83ee69495a55ce78936a51c685f2d9a1fb1f1df78448f5b50ad2b8e4c91
-  data.tar.gz: a80d757664e17b368cdfb25acf45335e46f9aabd55790bb0201f32ea3d56c07e7b5d0f8f0b62bae7aa2f024bc3838302ee4260e73e4c9ff391418202f3eb769f
+  metadata.gz: 451bd0bc7ab6db03156c1bcd16277af82f36a597eef4d2a8e5ec7a989cbeb1224662a497918523478dc64850f868afb242a954453a882165027e27387ae186ae
+  data.tar.gz: 38780bd602894e7a57800ec52bbbe0325d476f155f5e09de3964232268d1906932576f576ce5d0d797dc34840d221e616f046a48330e19d40df4f0c94574a91f

data/.gitignore

@@ -14,4 +14,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp
+.ruby-version

data/.travis-ci.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.1
 script: bundle exec rspec spec

data/README.md

@@ -0,0 +1,7 @@
+# Logfmt
+
+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}

data/lib/logfmt/parser.rb

@@ -2,19 +2,23 @@ require "parslet"
 
 module Logfmt
   class Parser < Parslet::Parser
-    rule(:ident_byte) { match("[^ \t\r\n\f\"=]") }
-    rule(:string_byte) { match("[^\"\\\\]") }
-    rule(:garbage) { match("[ \t\r\n\f\"=]").repeat }
+    rule(:ident_byte) { match['^\s"='] }
+    rule(:string_byte) { match['^\\\\"'] }
+    rule(:garbage) { match['\s"='].repeat }
     rule(:ident) { ident_byte >> ident_byte.repeat }
     rule(:key) { ident }
     rule(:value) {
-      (ident.as(:value) | (str('"') >> (string_byte | str('\\') >> str('"')).repeat.as(:value) >> str('"')))
+      ident.as(:value) |
+      str('"') >> (string_byte | str('\"')).repeat.as(:value) >> str('"')
     }
     rule(:pair) {
       (key.as(:key) >> str('=') >> value) |
-      (key.as(:key) >> str('=')) | key.as(:key)
+      (key.as(:key) >> str('=')) |
+      key.as(:key)
+    }
+    rule(:message) {
+      (garbage >> pair.as(:pair)).repeat.as(:message) >> garbage
     }
-    rule(:message) { (garbage >> pair.as(:pair)).repeat.as(:message) >> garbage }
     root(:message)
   end
 
@@ -25,13 +29,13 @@ module Logfmt
       (ob.is_a?(Array) ? ob : [ ob ]).inject({}) { |h, p| h[p.key] = p.val; h }
     }
     rule(:pair => { :key => simple(:key), :value => simple(:val) }) {
-      Pair.new(key.to_sym, val.to_s)
+      Pair.new(key.to_s, val.to_s)
     }
     rule(:pair => { :key => simple(:key), :value => sequence(:val) }) {
-      Pair.new(key.to_sym, "")
+      Pair.new(key.to_s, "")
     }
     rule(:pair => { :key => simple(:key) }) {
-      Pair.new(key.to_sym, true)
+      Pair.new(key.to_s, true)
     }
   end
 
@@ -42,4 +46,4 @@ module Logfmt
     tree = parser.parse(logs)
     transformer.apply(tree)
   end
-end
+end

data/lib/logfmt/version.rb

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

data/logfmt.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   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_dependency "parslet"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rake"
-end
+  gem.add_dependency "parslet", "~> 1.5"
+  gem.add_development_dependency "rspec", "~> 2.14"
+  gem.add_development_dependency "rake", "~> 10.1"
+end

data/spec/logfmt/parser_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 require 'logfmt/parser'
 
@@ -14,61 +15,61 @@ describe Logfmt::Parser do
 
   it 'parse key without value' do
     data = Logfmt.parse("key")
-    expect(data).to eq({:key => true})
+    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})
+    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})
+    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"})
+    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"})
+    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})
+    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"})
+    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"')
-    expect(data).to eq({:key => 'quoted " value'})
+  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"})
   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" cool%story=bro f %^asdf')
-    expect(data).to eq({:foo => "bar", :a => "14", :baz => "hello kitty", :"cool%story" => "bro", :f => true, :"%^asdf" => true})
+    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})
   end
 
   it 'parse pair with empty quote' do
     data = Logfmt.parse('key=""')
-    expect(data).to eq({:key => ""})
+    expect(data).to eq({"key" => ""})
   end
-end
+end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: logfmt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 description: Parse log lines in the logfmt style.
 email:
 - timothee.peignier@tryphon.org
@@ -59,10 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis-ci.yml
+- ".gitignore"
+- ".rspec"
+- ".travis-ci.yml"
 - Gemfile
+- README.md
 - Rakefile
 - lib/logfmt.rb
 - lib/logfmt/parser.rb
@@ -80,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Parse logfmt messages.