timber 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 711c51f2448d07c0149c2c13fe73d15b42d5314e
-  data.tar.gz: 1cedd7c199a732958fab544e6890e9b4589071a7
+  metadata.gz: cfc7a63ba3d0400f2c4dd67bc0844126e5d155fe
+  data.tar.gz: 1ccf7ffb850c87ae7ccc51c04daaa94b1d685adf
 SHA512:
-  metadata.gz: ca1143f0d28d2b797be5b852fd835b62bdd0fb5aeaac3ace0f680e96301b86d5df4d93ee9d8a8f40dbbf1b84a244c8bce4abe793240eeef475650afe9520331f
-  data.tar.gz: ec709d117addb3085ac60c310c264c27ffc4f4b9c2bc1811cd2857302974131d53664c285dd11fbc798f56c49bca5d7b80a4f5afd0bdb11c753f924721994e21
+  metadata.gz: a207f1fccdd43e25fbb3e7c9b31809f00cd53884f09d1ca21201348330b3ac66999f422a6e9a9eb8831b807dc1cc53e2731e2c5f0f0e8e2c5bfe96e992e69f65
+  data.tar.gz: 29da7a68133255e47dbbb58498d120b308176d6d5a1f554a4661c3d9820b4e80043ac4a94da740ae10ccf0be2485404815e13860412376d54f8333b7c2c96af6

data/lib/timber/contexts/custom.rb

@@ -18,7 +18,7 @@ module Timber
       end
 
       def as_json(_options = {})
-        {type => data}
+        {Timber::Object.try(type, :to_sym) => data}
       end
     end
   end

data/lib/timber/contexts/organization.rb

@@ -26,7 +26,7 @@ module Timber
       end
 
       def as_json(_options = {})
-        {id: id, name: name}
+        {id: Timber::Object.try(id, :to_s), name: name}
       end
     end
   end

data/lib/timber/contexts/system.rb

@@ -12,7 +12,7 @@ module Timber
       end
 
       def as_json(_options = {})
-        {pid: pid}
+        {pid: Timber::Object.try(pid, :to_s)}
       end
     end
   end

data/lib/timber/contexts/user.rb

@@ -27,7 +27,7 @@ module Timber
       end
 
       def as_json(_options = {})
-        {id: id, name: name}
+        {id: Timber::Object.try(id, :to_s), name: name}
       end
     end
   end

data/lib/timber/events/custom.rb

@@ -26,7 +26,7 @@ module Timber
       end
 
       def to_hash
-        {type => data}
+        {Timber::Object.try(type, :to_sym) => data}
       end
       alias to_h to_hash
 

data/lib/timber/util.rb

@@ -1,5 +1,6 @@
 require "timber/util/active_support_log_subscriber"
 require "timber/util/hash"
+require "timber/util/object"
 require "timber/util/struct"
 
 module Timber

data/lib/timber/util/object.rb

@@ -0,0 +1,13 @@
+module Timber
+  # @private
+  module Object
+    # @private
+    def self.try(object, method)
+      if object == nil
+        nil
+      else
+        object.send(method) rescue object
+      end
+    end
+  end
+end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/timber/contexts/custom_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Timber::Contexts::Custom, :rails_23 => true do
+  describe ".as_json" do
+    it "should coerce type into an atom" do
+      custom_context = described_class.new(:type => "my type", :data => {:key => "value"})
+      json = custom_context.as_json()
+      expect(json.keys.first).to eq(:"my type")
+    end
+  end
+end

data/spec/timber/contexts/organization_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Timber::Contexts::Organization, :rails_23 => true do
+  describe ".as_json" do
+    it "should coerce id into a string" do
+      user_context = described_class.new(:id => 1)
+      json = user_context.as_json()
+      expect(json[:id]).to eq("1")
+    end
+  end
+end

data/spec/timber/contexts/system_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Timber::Contexts::System, :rails_23 => true do
+  describe ".as_json" do
+    it "should coerce pid into an string" do
+      custom_context = described_class.new(:pid => 1)
+      json = custom_context.as_json()
+      expect(json[:pid]).to eq("1")
+    end
+  end
+end

data/spec/timber/contexts/user_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Timber::Contexts::User, :rails_23 => true do
+  describe ".as_json" do
+    it "should coerce id into a string" do
+      user_context = described_class.new(:id => 1)
+      json = user_context.as_json()
+      expect(json[:id]).to eq("1")
+    end
+  end
+end

data/spec/timber/events/custom_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Timber::Events::Custom, :rails_23 => true do
+  describe ".to_hash" do
+    it "should coerce type into an atom" do
+      custom_context = described_class.new(:type => "my type", :message => "hello", :data => {:key => "value"})
+      hash = custom_context.to_hash()
+      expect(hash.keys.first).to eq(:"my type")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -95,6 +95,7 @@ files:
 - lib/timber/util.rb
 - lib/timber/util/active_support_log_subscriber.rb
 - lib/timber/util/hash.rb
+- lib/timber/util/object.rb
 - lib/timber/util/struct.rb
 - lib/timber/version.rb
 - spec/README.md
@@ -111,7 +112,12 @@ files:
 - spec/support/timber.rb
 - spec/support/timecop.rb
 - spec/support/webmock.rb
+- spec/timber/contexts/custom_spec.rb
+- spec/timber/contexts/organization_spec.rb
+- spec/timber/contexts/system_spec.rb
+- spec/timber/contexts/user_spec.rb
 - spec/timber/contexts_spec.rb
+- spec/timber/events/custom_spec.rb
 - spec/timber/events_spec.rb
 - spec/timber/log_devices/http_spec.rb
 - spec/timber/log_entry_spec.rb
@@ -161,7 +167,12 @@ test_files:
 - spec/support/timber.rb
 - spec/support/timecop.rb
 - spec/support/webmock.rb
+- spec/timber/contexts/custom_spec.rb
+- spec/timber/contexts/organization_spec.rb
+- spec/timber/contexts/system_spec.rb
+- spec/timber/contexts/user_spec.rb
 - spec/timber/contexts_spec.rb
+- spec/timber/events/custom_spec.rb
 - spec/timber/events_spec.rb
 - spec/timber/log_devices/http_spec.rb
 - spec/timber/log_entry_spec.rb