Coerce context and event attributes (#45)

* Coerce context and event attributes

* Coerce System.pid

* More tests

lib/timber/contexts/custom.rb

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

lib/timber/contexts/organization.rb

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

lib/timber/contexts/system.rb

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

lib/timber/contexts/user.rb

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

lib/timber/events/custom.rb

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

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

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

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

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

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

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

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