justlogging-rails 0.0.7 → 0.0.9

data/lib/justlogging/transaction.rb

@@ -41,7 +41,7 @@ module Justlogging
     end
 
     def formatted_exception
-      return {} unless @exception
+      return {} unless exception?
       {
         :backtrace => @exception.backtrace,
         :exception => @exception.name,
@@ -67,15 +67,25 @@ module Justlogging
         :environment => Rails.env,
         :server => @env['SERVER_NAME'],
         :kind => 'http_request'
-      }.tap { |o| o.merge!(formatted_payload) unless exception? }
+      }.merge(formatted_payload)
     end
 
     def formatted_payload
-      @log_entry.payload.merge(
-        :duration => @log_entry.duration,
-        :time => @log_entry.time,
-        :end => @log_entry.end
-      ).tap { |o| o[:action] = "#{o.delete(:controller)}##{o[:action]}" }
+      if @log_entry
+        {
+          :duration => @log_entry.duration,
+          :time => @log_entry.time,
+          :end => @log_entry.end
+        }.merge(@log_entry.payload).tap do |o|
+          o[:action] = "#{o.delete(:controller)}##{o[:action]}"
+        end
+      else
+        if exception?
+          {:action => @exception.inspect.gsub(/^<#(.*)>$/, '\1')}
+        else
+          {}
+        end
+      end
     end
 
     def to_hash

data/lib/justlogging/transmitter.rb

@@ -37,7 +37,7 @@ module Justlogging
 
     def message(encoded_hash)
       Net::HTTP::Post.new(uri.request_uri).tap do |post|
-        post.set_form_data(encoded_hash.reverse_merge('api_key' => api_key))
+        post.set_form_data({'api_key' => api_key}.merge(encoded_hash))
       end
     end
 

data/lib/justlogging/version.rb

@@ -1,3 +1,3 @@
 module Justlogging
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
 end

data/spec/justlogging/transaction_spec.rb

@@ -110,35 +110,20 @@ describe Justlogging::Transaction do
 
     describe '#formatted_log_entry' do
       subject { transaction.formatted_log_entry }
-      before { transaction.stub(:request => mock(:fullpath => '/blog')) }
-      before { Rails.stub(:env => 'care about it') }
-
-      context "successfully handled request" do
-        before { transaction.stub(:exception? => false) }
-        before { transaction.stub(:formatted_payload => {:foo => :bar}) }
-
-        it 'returns a formatted log_entry' do
-          should == {
-            :name => '/blog',
-            :environment => 'care about it',
-            :server => 'localhost',
-            :kind => 'http_request',
-            :foo => :bar
-          }
-        end
+      before do
+        transaction.stub(:request => mock(:fullpath => '/blog'))
+        Rails.stub(:env => 'care about it')
+        transaction.stub(:formatted_payload => {:foo => :bar})
       end
 
-      context "exception" do
-        before { transaction.stub(:exception? => true) }
-
-        it 'returns a formatted log_entry' do
-          should == {
-            :name => '/blog',
-            :environment => 'care about it',
-            :server => 'localhost',
-            :kind => 'http_request'
-          }
-        end
+      it 'returns a formatted log_entry' do
+        should == {
+          :name => '/blog',
+          :environment => 'care about it',
+          :server => 'localhost',
+          :kind => 'http_request',
+          :foo => :bar
+        }
       end
     end
 
@@ -146,21 +131,38 @@ describe Justlogging::Transaction do
       let(:start_time) { Time.parse('01-01-2001 10:00:00') }
       let(:end_time) { Time.parse('01-01-2001 10:00:01') }
       subject { transaction.formatted_payload }
-      before do
-        transaction.set_log_entry(mock(
-          :name => 'name', :duration => 2, :time => start_time,
-          :end => end_time,
-          :payload => {:controller => 'controller', :action => 'action'}
-        ))
+
+      context "with a present log entry" do
+        before do
+          transaction.set_log_entry(mock(
+            :name => 'name',
+            :duration => 2,
+            :time => start_time,
+            :end => end_time,
+            :payload => {:controller => 'controller', :action => 'action'}
+          ))
+        end
+
+        it 'returns the formatted payload of the log entry' do
+          should == {
+            :action => 'controller#action',
+            :duration => 2,
+            :time => start_time,
+            :end => end_time
+          }
+        end
       end
 
-      it 'returns the formatted payload of the log entry' do
-        should == {
-          :action => 'controller#action',
-          :duration => 2,
-          :time => start_time,
-          :end => end_time
-        }
+      context "without a present log entry" do
+
+        it "returns the exception as the action if there is one" do
+          transaction.add_exception(mock(:inspect => '<#exceptional>'))
+          should == {:action => 'exceptional'}
+        end
+
+        it "returns an empty hash when no exception is set either" do
+          should == {}
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: justlogging-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails