justlogging-rails 0.0.5 → 0.0.6

data/.travis.yml

@@ -0,0 +1,28 @@
+language: ruby
+
+rvm:
+  # - 1.9.2
+  - 1.9.3
+  - 1.8.7
+  - ree
+  # - ruby-head
+  # - jruby-18mode
+  - jruby-19mode
+  # - jruby-head
+  # - rbx-18mode
+  - rbx-19mode
+
+gemfile:
+  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
+  - gemfiles/3.2.gemfile
+  - gemfiles/edge.gemfile
+
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/edge.gemfile
+  allow_failures:
+    - gemfile: gemfiles/edge.gemfile
+
+script: RAILS_ENV=test bundle exec rspec spec

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    justlogging-rails (0.0.4)
-      activesupport
+    justlogging-rails (0.0.5)
       rails
       rake
       rspec
@@ -10,31 +9,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.7)
-      actionpack (= 3.2.7)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
       mail (~> 2.4.4)
-    actionpack (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.7)
-      activesupport (= 3.2.7)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
-    activesupport (3.2.7)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -44,7 +43,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -59,17 +58,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.7)
-      actionmailer (= 3.2.7)
-      actionpack (= 3.2.7)
-      activerecord (= 3.2.7)
-      activeresource (= 3.2.7)
-      activesupport (= 3.2.7)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.7)
-    railties (3.2.7)
-      actionpack (= 3.2.7)
-      activesupport (= 3.2.7)
+      railties (= 3.2.6)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -77,19 +76,19 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.10.1)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
+    thor (0.15.3)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot

data/README.md

@@ -1,2 +1,15 @@
 justlogging-gem
-===============
+===============
+
+## Pulllrequests / issues
+
+New features should be made in an issue or pullrequest. Title format is as follows:
+
+
+    name [request_count]
+    
+example
+
+    tagging [2]
+    
+    

data/config/justlogging.yml

@@ -1,4 +1,6 @@
-development:
-  endpoint: "http://localhost:3000/api/1/log_entries"
+development: &development
+  endpoint: "http://localhost:3000/api/1"
   api_key: "abc"
   active: true
+test:
+  <<: *development

data/gemfiles/3.0.gemfile

@@ -0,0 +1,6 @@
+# encoding: utf-8
+source :rubygems
+
+gem 'rails', '~> 3.0.17'
+gem 'rspec'
+gem 'rake'

data/gemfiles/3.1.gemfile

@@ -0,0 +1,6 @@
+# encoding: utf-8
+source :rubygems
+
+gem 'rails', '~> 3.1.8'
+gem 'rspec'
+gem 'rake'

data/gemfiles/3.2.gemfile

@@ -0,0 +1,6 @@
+# encoding: utf-8
+source :rubygems
+
+gem 'rails', '~> 3.2.8'
+gem 'rspec'
+gem 'rake'

data/gemfiles/edge.gemfile

@@ -0,0 +1,6 @@
+# encoding: utf-8
+source :rubygems
+
+gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'rspec'
+gem 'rake'

data/justlogging-rails.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/justlogging/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Robert Beekman"]
-  gem.email         = ["robert@80beans.com"]
+  gem.authors       = ["Robert Beekman", "Steven Weller"]
+  gem.email         = ["robert@80beans.com", "steven@80beans.com"]
   gem.description   = %q{The official justlogging.com gem}
   gem.summary       = %q{Logs rails's notifications to justlogging.com}
   gem.homepage      = "http://github.com/80beans/justlogging-rails"
@@ -17,6 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'rails'
   gem.add_dependency 'rspec'
-  gem.add_dependency 'activesupport'
   gem.add_dependency 'rake'
 end

data/lib/justlogging.rb

@@ -1,11 +1,8 @@
 raise 'This justlogging gem only works with rails' unless defined?(Rails)
-require 'net/http'
-require 'net/https'
-require 'uri'
 
 module Justlogging
-
   class << self
+
     attr_accessor :subscriber
 
     def transactions
@@ -17,12 +14,15 @@ module Justlogging
     end
 
     def config
-      @config ||= {:ignore_exceptions => []}.merge(YAML.load_file("#{Rails.root}/config/justlogging.yml")[Rails.env].symbolize_keys)
+      @config ||= {:ignore_exceptions => []}.merge(
+        YAML.load_file("#{Rails.root}/config/justlogging.yml")[Rails.env].
+          symbolize_keys)
     end
-  end
 
+  end
 end
 
+require 'justlogging/transmitter'
 require 'justlogging/agent'
 require 'justlogging/middleware'
 require 'justlogging/transaction'

data/lib/justlogging/agent.rb

@@ -1,8 +1,8 @@
 module Justlogging
-
   class Agent
 
-    attr_reader :queue, :active, :sleep_time
+    attr_reader :queue, :active, :sleep_time, :transmitter
+    ACTION = 'log_entries'
 
     def initialize
       @sleep_time = 5
@@ -16,37 +16,19 @@ module Justlogging
           sleep @sleep_time
         end
       end
+      @transmitter = Transmitter.new(
+        Justlogging.config[:endpoint],
+        ACTION,
+        Justlogging.config[:api_key]
+      )
     end
 
     def add_to_queue(transaction)
       @queue << transaction
     end
 
-    def uri
-      URI(Justlogging.config[:endpoint])
-    end
-
-    def http_client
-      Net::HTTP.new(uri.host, uri.port).tap do |http|
-        if uri.scheme == 'https'
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        end
-      end
-    end
-
     def send_queue
-      json = ActiveSupport::JSON.encode @queue
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request.set_form_data('api_key' => Justlogging.config[:api_key], 'log_entries' => json)
-
-      begin
-        result = http_client.request(request)
-        code = result.code
-      rescue => error
-        code = nil
-      end
-      handle_result(code)
+      handle_result transmitter.transmit(:log_entries => queue)
     end
 
     # Empty queue is result is 200 ok.
@@ -64,5 +46,4 @@ module Justlogging
     end
 
   end
-
 end

data/lib/justlogging/exception_notification.rb

@@ -1,5 +1,6 @@
 module Justlogging
   class MissingController
+
     def method_missing(*args, &block)
     end
   end
@@ -9,10 +10,7 @@ module Justlogging
     attr_reader :env, :exception, :kontroller, :request, :backtrace
 
     def initialize(env, exception)
-      #@env        = env
       @exception  = exception
-      #@kontroller = env['action_controller.instance'] || Justlogging::MissingController.new
-      #@request    = ActionDispatch::Request.new(env)
       @backtrace  = Rails.respond_to?(:backtrace_cleaner) ?
           Rails.backtrace_cleaner.send(:filter, exception.backtrace) :
           exception.backtrace

data/lib/justlogging/middleware.rb

@@ -11,7 +11,7 @@ module Justlogging
       Justlogging::Transaction.create(env['action_dispatch.request_id'], env)
       @app.call(env)
     rescue Exception => exception
-      unless Array.wrap(Justlogging.config[:ignore_exceptions]).include?(exception.class.name)
+      unless includes_exception?(exception)
         Justlogging::Transaction.current.add_exception(
           Justlogging::ExceptionNotification.new(env, exception)
         )
@@ -21,5 +21,12 @@ module Justlogging
       Justlogging::Transaction.current.complete!
     end
 
+    private
+
+    def includes_exception?(exception)
+      Array.wrap(Justlogging.config[:ignore_exceptions]).
+        include?(exception.class.name)
+    end
+
   end
 end

data/lib/justlogging/railtie.rb

@@ -4,7 +4,8 @@ module Justlogging
   class Railtie < Rails::Railtie
 
     initializer "justlogging.configure_rails_initialization" do |app|
-      app.middleware.insert_after ActionDispatch::DebugExceptions, Justlogging::Middleware
+      app.middleware.insert_before ActionDispatch::RemoteIp,
+        Justlogging::Middleware
 
       Justlogging.subscriber = ActiveSupport::Notifications.subscribe do |*args|
         if Justlogging::Transaction.current

data/lib/justlogging/transaction.rb

@@ -36,6 +36,10 @@ module Justlogging
       @exception = ex
     end
 
+    def exception?
+      !! @exception
+    end
+
     def formatted_exception
       return {} unless @exception
       {
@@ -58,15 +62,20 @@ module Justlogging
     end
 
     def formatted_log_entry
-      @log_entry.payload.merge(
-        :duration => @log_entry.duration,
-        :time => @log_entry.time,
-        :end => @log_entry.end,
+      {
         :name => request.fullpath,
         :environment => Rails.env,
         :server => @env['SERVER_NAME'],
         :kind => 'http_request'
-      )
+      }.tap { |o| o.merge!(formatted_payload) unless exception? }
+    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]}" }
     end
 
     def to_hash
@@ -83,10 +92,9 @@ module Justlogging
       Thread.current[:justlogging_transaction_id] = nil
       current_transaction = Justlogging.transactions.delete(@id)
       if @events.any? || @exception.present?
-        Justlogging.agent.add_to_queue(
-          current_transaction.to_hash
-        )
+        Justlogging.agent.add_to_queue(current_transaction.to_hash)
       end
     end
+
   end
 end

data/lib/justlogging/transmitter.rb

@@ -0,0 +1,51 @@
+require 'net/http'
+require 'net/https'
+require 'uri'
+
+module Justlogging
+  class Transmitter
+
+    attr_accessor :endpoint, :action, :api_key
+
+    def initialize(endpoint, action, api_key)
+      @endpoint = endpoint
+      @action = action
+      @api_key = api_key
+    end
+
+    def uri
+      URI("#{@endpoint}/#{@action}")
+    end
+
+    def transmit(payload)
+      begin
+        result = http_client.request(encoded_message(payload))
+        result.code
+      rescue
+        nil
+      end
+    end
+
+    def encoded_message(payload)
+      message(ActiveSupport::JSON.encode(payload))
+    end
+
+    def message(json)
+      Net::HTTP::Post.new(uri.request_uri).tap do |post|
+        post.set_form_data(json.reverse_merge('api_key' => api_key))
+      end
+    end
+
+    protected
+
+    def http_client
+      Net::HTTP.new(uri.host, uri.port).tap do |http|
+        if uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+      end
+    end
+
+  end
+end

data/lib/justlogging/version.rb

@@ -1,3 +1,3 @@
 module Justlogging
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/justlogging/agent_spec.rb

@@ -1,79 +1,58 @@
 require 'spec_helper'
 
 describe Justlogging::Agent do
-  before :each do
-    Thread.stub(:new)
-  end
-
-  let(:agent) { Justlogging::Agent.new }
   let(:event) { stub(:name => 'event') }
+  before(:each) { Thread.stub(:new) }
 
   describe '#add_to_queue' do
     it 'should add the event to the queue' do
       expect {
-        agent.add_to_queue(event)
-      }.to change(agent, :queue).to([event])
+        subject.add_to_queue(event)
+      }.to change(subject, :queue).to([event])
     end
   end
 
-  describe '#send_queue' do
-    let(:http_client) { stub(:request => stub(:code => '200')) }
-    before do
-      agent.stub(:http_client).and_return(http_client)
-      agent.add_to_queue(event)
-      ActiveSupport::JSON.stub(:encode => '{"abc":"def"}')
-    end
-
-    it 'should call Net::HTTP.post_form with the correct params' do
-      post = stub
-      post.should_receive(:set_form_data).with(
-        'api_key' => 'abc',
-        'log_entries' => '{"abc":"def"}'
-      )
-
-      Net::HTTP::Post.should_receive(:new).with(
-        '/api/1/log_entries'
-      ).and_return(post)
+  describe "#send_queue" do
+    it "transmits" do
+      subject.stub(:queue => 'foo')
+      subject.transmitter.should_receive(:transmit).with(:log_entries => 'foo')
     end
 
-    it "should call handle_result" do
-      agent.should_receive(:handle_result).with('200')
+    it "handles the return code" do
+      subject.transmitter.stub(:transmit => '200')
+      subject.should_receive(:handle_result).with('200')
     end
 
-    after { agent.send_queue }
+    after { subject.send_queue }
   end
 
   describe '#handle_result' do
-    before do
-      agent.add_to_queue(event)
-    end
+    before { subject.add_to_queue(event) }
 
     it "should empty the queue for 200" do
       expect {
-        agent.handle_result('200')
-      }.to change(agent, :queue).to([])
+        subject.handle_result('200')
+      }.to change(subject, :queue).to([])
     end
 
     it "should raise the sleep_time time for 403" do
       expect {
-        agent.handle_result('403')
-      }.to change(agent, :sleep_time).to(7.5)
+        subject.handle_result('403')
+      }.to change(subject, :sleep_time).to(7.5)
     end
 
     context "any other response" do
 
       it "should deactivate for any other response code" do
         expect {
-          agent.handle_result('500')
-        }.to change(agent, :active).to(false)
+          subject.handle_result('500')
+        }.to change(subject, :active).to(false)
       end
 
       it "should unsubscribe from the justlogging subscriber" do
         ActiveSupport::Notifications.should_receive(:unsubscribe)
-        agent.handle_result('500')
+        subject.handle_result('500')
       end
     end
-
   end
-
 end

data/spec/justlogging/exception_notification_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Justlogging::ExceptionNotification do
-  before { Rails.stub(:respond_to? => false) }
   let(:error) { StandardError.new('moo') }
   let(:notification) { Justlogging::ExceptionNotification.new({}, error) }
   subject { notification }
+  before { Rails.stub(:respond_to? => false) }
 
   its(:exception) { should == error }
   its(:name) { should == 'StandardError' }

data/spec/justlogging/middleware_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 module Justlogging
-  class IgnoreMeError < StandardError
-  end
+  IgnoreMeError = Class.new(StandardError)
 end
 
 class AppWithError
@@ -75,6 +74,5 @@ describe Justlogging::Middleware do
         after { middleware.call(env) rescue nil }
       end
     end
-
   end
 end

data/spec/justlogging/railtie_spec.rb

@@ -3,17 +3,15 @@ require 'action_controller/railtie'
 require 'justlogging/railtie'
 
 describe Justlogging::Railtie do
-
-  before :all do
-    MyApp::Application.initialize!
-  end
+  before(:all) { MyApp::Application.initialize! }
 
   it "should have set the justlogging subscriber" do
-    Justlogging.subscriber.should be_a ActiveSupport::Notifications::Fanout::Subscriber
+    Justlogging.subscriber.
+      should be_a ActiveSupport::Notifications::Fanout::Subscriber
   end
 
   it "should have added the middleware for exceptions" do
-    MyApp::Application.middleware.middlewares.should include Justlogging::Middleware
+    MyApp::Application.middleware.to_a.should include Justlogging::Middleware
   end
 
   context "non action_controller event" do
@@ -21,13 +19,11 @@ describe Justlogging::Railtie do
     it "should call add_event for non action_controller event" do
       current = stub
       current.should_receive(:add_event)
-      Justlogging::Transaction.should_receive(:current).twice.and_return(current)
-    end
-
-    after do
-      ActiveSupport::Notifications.instrument 'query.mongoid'
+      Justlogging::Transaction.should_receive(:current).twice.
+        and_return(current)
     end
 
+    after { ActiveSupport::Notifications.instrument 'query.mongoid' }
   end
 
   context "action_controller event" do
@@ -35,13 +31,13 @@ describe Justlogging::Railtie do
     it "should call set_log_entry for action_controller event" do
       current = stub
       current.should_receive(:set_log_entry)
-      Justlogging::Transaction.should_receive(:current).twice.and_return(current)
+      Justlogging::Transaction.should_receive(:current).twice.
+        and_return(current)
     end
 
     after do
-      ActiveSupport::Notifications.instrument 'process_action.action_controller'
+      ActiveSupport::Notifications.
+        instrument 'process_action.action_controller'
     end
-
   end
-
 end

data/spec/justlogging/transaction_spec.rb

@@ -25,7 +25,9 @@ describe Justlogging::Transaction do
   end
 
   describe 'transaction instance' do
-    let(:transaction) { Justlogging::Transaction.create('1', {'SERVER_NAME' => 'localhost'}) }
+    let(:transaction) do
+      Justlogging::Transaction.create('1', {'SERVER_NAME' => 'localhost'})
+    end
 
     describe '#request' do
       subject { transaction.request }
@@ -64,10 +66,14 @@ describe Justlogging::Transaction do
     end
 
     describe '#formatted_exception' do
-      let(:exception) { stub(:backtrace => ['test'], :name => 'Justlogging::Error', :message => 'nooo') }
-
+      let(:exception) do
+        stub({
+         :backtrace => ['test'],
+         :name => 'Justlogging::Error',
+         :message => 'nooo'
+        })
+      end
       before { transaction.add_exception(exception) }
-
       subject { transaction.formatted_exception }
 
       it 'should return a formatted exception' do
@@ -82,43 +88,84 @@ describe Justlogging::Transaction do
     describe '#formatted_events' do
       let(:start_time) { Time.parse('01-01-2001 10:00:00') }
       let(:end_time) { Time.parse('01-01-2001 10:00:01') }
-      let(:event) { stub(:name => 'name', :duration => 2, :time => start_time, :end => end_time, :payload => {}) }
+      let(:payload) do
+        {
+          :name => 'name',
+          :duration => 2,
+          :time => start_time,
+          :end => end_time,
+          :payload => {}
+        }
+      end
+      let(:event) { stub(payload) }
 
       before { transaction.add_event(event) }
 
       subject { transaction.formatted_events }
 
       it 'should return formatted events' do
-        should == [{:name=>'name', :duration=>2, :time=>start_time, :end=>end_time, :payload=>{}}]
+        should == [payload]
       end
     end
 
     describe '#formatted_log_entry' do
-      let(:start_time) { Time.parse('01-01-2001 10:00:00') }
-      let(:end_time) { Time.parse('01-01-2001 10:00:01') }
-      let(:log_entry) { stub(:name => 'name', :duration => 2, :time => start_time, :end => end_time, :payload => {:controller => 'JustSayinController'}) }
-      let(:request) { stub(:fullpath => '/blog') }
+      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
+      end
 
-      before { transaction.stub(:request => request) }
-      before { transaction.set_log_entry(log_entry) }
+      context "exception" do
+        before { transaction.stub(:exception? => true) }
 
-      subject { transaction.formatted_log_entry }
+        it 'returns a formatted log_entry' do
+          should == {
+            :name => '/blog',
+            :environment => 'care about it',
+            :server => 'localhost',
+            :kind => 'http_request'
+          }
+        end
+      end
+    end
+
+    describe '#formatted_payload' 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'}
+        ))
+      end
 
-      it 'should return formatted log_entry' do
+      it 'returns the formatted payload of the log entry' do
         should == {
-          :controller => 'JustSayinController',
+          :action => 'controller#action',
           :duration => 2,
           :time => start_time,
-          :end => end_time,
-          :name => '/blog',
-          :environment => "development",
-          :server => 'localhost',
-          :kind => "http_request"
+          :end => end_time
         }
       end
     end
 
     describe '#to_hash' do
+      subject { transaction.to_hash }
       before { transaction.stub(
         :formatted_log_entry => {:name => 'log_entry'},
         :formatted_events => [{:name => 'event'}],
@@ -126,8 +173,6 @@ describe Justlogging::Transaction do
         :failed => false
       )}
 
-      subject { transaction.to_hash }
-
       it 'should return a formatted hash of the transaction data' do
         should == {
           :request_id => '1',
@@ -184,8 +229,6 @@ describe Justlogging::Transaction do
           Thread.current[:justlogging_transaction_id].should be_nil
         end
       end
-
     end
   end
-
 end

data/spec/justlogging/transmitter_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Justlogging::Transmitter do
+  let(:_80beans_) { 'http://www.80beans.com' }
+  let(:action) { 'action' }
+  let(:klass) { Justlogging::Transmitter }
+  let(:instance) { klass.new(_80beans_, action, :the_api_key) }
+  subject { instance }
+
+  describe "#uri" do
+    it "returns uri" do
+      subject.uri.should == URI("http://www.80beans.com/action")
+    end
+  end
+
+  describe "#transmit" do
+    subject { instance.transmit(:shipit => :payload) }
+
+    context "without exception" do
+      let(:http_client) { stub(:request => stub(:code => '200')) }
+      before { instance.stub(:encoded_message => :the_message) }
+      before { instance.stub(:http_client => http_client) }
+
+      it { should == '200' }
+    end
+
+    context "with exception" do
+      let(:http_client) { stub(:request) }
+      before { instance.stub(:http_client).and_raise(Net::HTTPGatewayTimeOut) }
+
+      it { should == nil }
+    end
+  end
+
+  describe "#encoded_message" do
+    it "calls message" do
+      ActiveSupport::JSON.stub(:encode => :json)
+      subject.should_receive(:message).with(:json)
+    end
+
+    it "encodes the payload using json" do
+      subject.stub(:message)
+      ActiveSupport::JSON.should_receive(:encode).with(:payload)
+    end
+
+    after { subject.encoded_message(:payload) }
+  end
+
+  describe "#message" do
+    it "calls Net::HTTP.post_form with the correct params" do
+      post = stub
+      post.should_receive(:set_form_data).with(
+        'api_key' => :the_api_key,
+        :the => :payload
+      )
+      Net::HTTP::Post.should_receive(:new).with('/action').and_return(post)
+      instance.message(:the => :payload)
+    end
+  end
+end

data/spec/justlogging_spec.rb

@@ -20,7 +20,7 @@ describe Justlogging do
     subject { Justlogging.config }
 
     it 'should return the endpoint' do
-      subject[:endpoint].should eq 'http://localhost:3000/api/1/log_entries'
+      subject[:endpoint].should eq 'http://localhost:3000/api/1'
     end
 
     it 'should return the api key' do
@@ -31,5 +31,4 @@ describe Justlogging do
       subject[:ignore_exceptions].should eq []
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -8,8 +8,8 @@ end
 
 module MyApp
   class Application < Rails::Application
-    config.active_support.deprecation = proc { |message, stack| }
 
+    config.active_support.deprecation = proc { |message, stack| }
   end
 end
 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: justlogging-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
 - Robert Beekman
+- Steven Weller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,22 +44,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +63,7 @@ dependencies:
 description: The official justlogging.com gem
 email:
 - robert@80beans.com
+- steven@80beans.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -86,6 +72,8 @@ files:
   LmdpdGlnbm9yZQ==
 - !binary |-
   LnJ2bXJj
+- !binary |-
+  LnRyYXZpcy55bWw=
 - !binary |-
   R2VtZmlsZQ==
 - !binary |-
@@ -96,6 +84,14 @@ files:
   Y29uZmlnL2p1c3Rsb2dnaW5nLnltbA==
 - !binary |-
   ZG9jL2p1c3Rsb2dnaW5nLW1vbmdvLm1hcmtkb3du
+- !binary |-
+  Z2VtZmlsZXMvMy4wLmdlbWZpbGU=
+- !binary |-
+  Z2VtZmlsZXMvMy4xLmdlbWZpbGU=
+- !binary |-
+  Z2VtZmlsZXMvMy4yLmdlbWZpbGU=
+- !binary |-
+  Z2VtZmlsZXMvZWRnZS5nZW1maWxl
 - !binary |-
   anVzdGxvZ2dpbmctcmFpbHMuZ2Vtc3BlYw==
 - !binary |-
@@ -110,6 +106,8 @@ files:
   bGliL2p1c3Rsb2dnaW5nL3JhaWx0aWUucmI=
 - !binary |-
   bGliL2p1c3Rsb2dnaW5nL3RyYW5zYWN0aW9uLnJi
+- !binary |-
+  bGliL2p1c3Rsb2dnaW5nL3RyYW5zbWl0dGVyLnJi
 - !binary |-
   bGliL2p1c3Rsb2dnaW5nL3ZlcnNpb24ucmI=
 - !binary |-
@@ -123,6 +121,8 @@ files:
   c3BlYy9qdXN0bG9nZ2luZy9yYWlsdGllX3NwZWMucmI=
 - !binary |-
   c3BlYy9qdXN0bG9nZ2luZy90cmFuc2FjdGlvbl9zcGVjLnJi
+- !binary |-
+  c3BlYy9qdXN0bG9nZ2luZy90cmFuc21pdHRlcl9zcGVjLnJi
 - !binary |-
   c3BlYy9qdXN0bG9nZ2luZ19zcGVjLnJi
 - !binary |-
@@ -163,6 +163,8 @@ test_files:
   c3BlYy9qdXN0bG9nZ2luZy9yYWlsdGllX3NwZWMucmI=
 - !binary |-
   c3BlYy9qdXN0bG9nZ2luZy90cmFuc2FjdGlvbl9zcGVjLnJi
+- !binary |-
+  c3BlYy9qdXN0bG9nZ2luZy90cmFuc21pdHRlcl9zcGVjLnJi
 - !binary |-
   c3BlYy9qdXN0bG9nZ2luZ19zcGVjLnJi
 - !binary |-