lines 0.1.18 → 0.1.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODA2Y2ZhNTJmYzQwYTE4ZDU1NjNhNDQ4MWVhNzAxZmMwZDcyY2U4ZA==
+    MjI0OWIzNjUxNDMzZjFiOGFjYjQ2NWY0YzBiMGFkNGRiNTkyM2Q1YQ==
   data.tar.gz: !binary |-
-    Nzc3ZTEzMDczYmI1ZGVhNjk3YmFhOGQzODhjYjUzOTU1NDkxNjM3Mw==
+    Y2EzOWYzNDlmZjkyMGRlZDJkNWFjNGU0NjYyNzU1YTZkYzUwYjlkNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmQyNDJkZjEwMjdlOWMwMGIyMjQwYzM0Y2NhMTk0ZGNkYjk2OWZkZTg4MWQx
-    NTRlMjZmNDkyNzM2ZTZjODljZmFiMzNkMWM2NzI5ZjMzZmM0ODVhNTExY2Ew
-    MzZjN2Y2YzE4MDY4Y2QzMjUyZTk3MWZiMDFmZDUyOTUyMTUzZjg=
+    NGY3YTIwMmExZDM0OGI3OTQ4YTA3ZmJiODkyNzUzMzIxMTZiYmFmMWEyYmUy
+    NWM4YTQ4M2VlNjc5ZDlmNmEwZDM2MTZkYWI0NDJiYjA3YjBhZTlhMGI1MDAx
+    YzNkMmMwNmJiZGU0MTc4YjM0MzhkN2VkOGMzZDBiN2U1MmVkZjI=
   data.tar.gz: !binary |-
-    NDQxOTdiMTc0ODk5MjBhYjNmY2JhOTcwZDk1ZTUzNmRlODRkOTdlMGY4MGVm
-    NTA1NTdkYzdjYjYyODBlNTA3N2RjMGY0M2RkY2U0ODUyYTU2MjA3ZDg2YTQy
-    MjRkNzdhZmZiYmY3MGI1ZGEyNGQxYjU4MDU5N2I5MzQzOTllMGI=
+    NTcwMTE4YmIxMmU2MTE3YTZhY2Q5NzNlMDg4NTBhODY5N2MxMTY2NWVjYzli
+    NGNjMzE1ZWFmMDBjNGQ0NTE1NDFhMDY3YWI4MDQ3MDQ0MmMxY2ZjMTliMzU5
+    ZTUxM2Y1OWQ5NmQ5MGQwZThmODNhOWFhYWQwYzkwYWEyODBjOTY=

data/.travis.yml

@@ -0,0 +1,7 @@
+---
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode

data/Gemfile

@@ -3,5 +3,8 @@ gemspec
 group :development do
   gem 'parslet'
   gem 'rdoc'
+end
+group :test do
   gem 'rspec'
+  gem 'rake'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines (0.1.16)
+    lines (0.1.18)
 
 GEM
   remote: http://rubygems.org/
@@ -11,6 +11,7 @@ GEM
     json (1.7.7)
     parslet (1.5.0)
       blankslate (~> 2.0)
+    rake (0.9.2.2)
     rdoc (4.0.0)
       json (~> 1.4)
     rspec (2.13.0)
@@ -26,7 +27,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (~> 1.3)
   lines!
   parslet
+  rake
   rdoc
   rspec

data/README.md

@@ -1,5 +1,7 @@
 Lines - structured logs for humans
 ==================================
+[![Build
+Status](https://travis-ci.org/zimbatm/lines-ruby.png)](https://travis-ci.org/zimbatm/lines-ruby)
 
 An oppinionated logging library that implement the
 [lines](https://github.com/zimbatm/lines) format.

data/Rakefile

@@ -0,0 +1,4 @@
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+task default: :spec
+

data/lib/lines.rb

@@ -237,16 +237,24 @@ module Lines
       @mapping[klass] = rule
     end
 
+    attr_accessor :max_depth
+
     protected
 
     attr_reader :mapping
 
     def initialize
       @mapping = {}
+      @max_depth = 3
     end
 
-    def objenc_internal(x)
-      x.map{|k,v| "#{keyenc(k)}=#{valenc(v)}" }.join(' ')
+    def objenc_internal(x, depth=0)
+      depth += 1
+      if depth > max_depth
+        '...'
+      else
+        x.map{|k,v| "#{keyenc(k)}=#{valenc(v, depth)}" }.join(' ')
+      end
     end
 
     def keyenc(k)
@@ -257,10 +265,10 @@ module Lines
       end
     end
 
-    def valenc(x)
+    def valenc(x, depth)
       case x
-      when Hash           then objenc(x)
-      when Array          then arrenc(x)
+      when Hash           then objenc(x, depth)
+      when Array          then arrenc(x, depth)
       when String, Symbol then strenc(x)
       when Numeric        then numenc(x)
       when Time, Date     then timeenc(x)
@@ -272,16 +280,19 @@ module Lines
       end
     end
 
-    def objenc(x)
-      '{' + objenc_internal(x) + '}'
+    def objenc(x, depth)
+      '{' + objenc_internal(x, depth) + '}'
     end
 
-    def arrenc(a)
+    def arrenc(a, depth)
+      depth += 1
       # num + unit. Eg: 3ms
       if a.size == 2 && a.first.kind_of?(Numeric) && is_literal?(a.last.to_s)
         numenc(a.first) + strenc(a.last)
+      elsif depth > max_depth
+        '[...]'
       else
-        '[' + a.map{|x| valenc(x)}.join(' ') + ']'
+        '[' + a.map{|x| valenc(x, depth)}.join(' ') + ']'
       end
     end
 
@@ -320,7 +331,7 @@ module Lines
     end
 
     def timeenc(t)
-      t.iso8601
+      t.utc.iso8601
     end
 
     def is_literal?(s)

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

data/spec/lines_spec.rb

@@ -95,12 +95,12 @@ describe Lines::Dumper do
   end
 
   it "can dump IO objects" do
-    expect_dump(foo: File.open(__FILE__)).to match(/foo=#<File:[^>]+>/)
-    expect_dump(foo: STDOUT).to eq("foo=#<IO:<STDOUT>>")
+    expect_dump(foo: File.open(__FILE__)).to match(/foo='?#<File:[^>]+>'?/)
+    expect_dump(foo: STDOUT).to match(/^foo=(?:#<IO:<STDOUT>>|'#<IO:fd 1>')$/)
   end
 
   it "dumps time as ISO zulu format" do
-    expect_dump(foo: Time.at(1337)).to eq('foo=1970-01-01T01:22:17+01:00')
+    expect_dump(foo: Time.at(1337)).to eq('foo=1970-01-01T00:22:17Z')
   end
 
   it "dumps symbols as strings" do
@@ -124,6 +124,12 @@ describe Lines::Dumper do
     expect_dump(foo: [3, :ms]).to eq('foo=3ms')
     expect_dump(foo: [54.2, 's']).to eq('foo=54.2s')
   end
+
+  it "knows how to handle circular dependencies" do
+    x = {}
+    x[:x] = x
+    expect_dump(x).to eq('x={x={x={...}}}')
+  end
 end
 
 describe Lines::UniqueIDs do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lines
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Jonas Pfenniger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,10 +46,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- Rakefile
 - lib/lines.rb
 - lib/lines/active_record.rb
 - lib/lines/loader.rb