toolmantim-toadhopper-sinatra 0.3 → 0.7

data/Rakefile

@@ -17,7 +17,7 @@ begin
   gem "yard"
   require 'yard'
   YARD::Rake::YardocTask.new do |t|
-    t.options = ['-r', 'Readme.md', '--files', 'LICENSE'] # optional
+    t.options = ['-r', 'README.md', '--files', 'LICENSE'] # optional
   end
 rescue Gem::LoadError
 end

data/lib/sinatra/toadhopper.rb

@@ -6,9 +6,7 @@ module Sinatra
   module Toadhopper
     # Reports the current sinatra error to Hoptoad
     def post_error_to_hoptoad!
-      if options.respond_to?(:toadhopper)
-        options.toadhopper.each_pair {|k, v| ::Toadhopper.__send__("#{k}=", v)}
-      end
+      options.toadhopper.each_pair {|k, v| ::Toadhopper.__send__("#{k}=", v)} if options.respond_to?(:toadhopper)
       unless ::Toadhopper.api_key
         STDERR.puts "WARNING: Ignoring hoptoad notification - :api_key not set"
         return
@@ -16,14 +14,20 @@ module Sinatra
       ::Toadhopper.post!(
         env['sinatra.error'],
         {
-          :parameters       => params,
-          :url              => request.url,
-          :cgi_data         => request.env,
-          :environment_vars => ENV,
-          :session_data     => session.to_hash
-        }
+          :environment => ENV,
+          :request => {
+            :params     => params,
+            :rails_root => options.root,
+            :url        => request.url
+          },
+          :session => {
+            :key  => 42, # Doesn't apply to Rack sessions
+            :data => session
+          }
+        },
+        {'X-Hoptoad-Client-Name' => 'toadhopper-sinatra'}
       )
     end
   end
   helpers Toadhopper
-end
+end

data/test/test_report_error_to_hoptoad.rb

@@ -1,23 +1,18 @@
 require 'rubygems'
 
 require 'test/unit'
+
+require 'rr'
+class Test::Unit::TestCase
+  include RR::Adapters::TestUnit
+end
+
 require 'sinatra/base'
 require 'rack/test'
-require 'toadhopper/test/methods'
 
 $:.unshift File.dirname(__FILE__) + "/../lib"
 require 'sinatra/toadhopper'
 
-# Stub the Toadhopper posting
-
-def Toadhopper.post!(*args)
-  instance_variable_set(:@last_post_arguments, args)
-end
-
-def Toadhopper.last_post_arguments
-  instance_variable_get(:@last_post_arguments)
-end
-
 class TestReportErrorToHoptoad < Test::Unit::TestCase
   
   class AppThatGoesBoom < Sinatra::Base
@@ -45,8 +40,8 @@ class TestReportErrorToHoptoad < Test::Unit::TestCase
   def app; AppThatGoesBoom end
 
   def setup
+    stub(Toadhopper).post! {|*args| @error, @options, @header_options = *args }
     get "/theid"
-    @error, @options, @header_options = Toadhopper.last_post_arguments
   end
 
   def test_api_key_set
@@ -60,35 +55,17 @@ class TestReportErrorToHoptoad < Test::Unit::TestCase
     assert_equal RuntimeError, @error.class
     assert_equal "Kaboom!", @error.message
   end
-  
-  def test_options
-    assert_equal({"id" => "theid"}, @options[:parameters])
-    assert_equal last_request.url, @options[:url]
-    assert_equal last_request.env, @options[:cgi_data]
-    assert_equal ENV, @options[:environment_vars]
-    assert_equal({"id" => "sessionid"}, @options[:session_data])
-  end
-  
-end
 
-class TestFailsSilentWithoutApiKey < Test::Unit::TestCase
-  
-  class AppWithoutApiKey < Sinatra::Base
-    helpers Sinatra::Toadhopper
-    set :raise_errors, false
-    get("/") { raise "Kaboom!" }
-    error do
-      post_error_to_hoptoad!
-      "Error"
-    end
+  def test_options
+    assert_equal ENV, @options[:environment]
+    assert_equal "http://example.org/theid", @options[:request][:url]
+    assert_equal({"id" => "theid"}, @options[:request][:params])
+    assert_equal nil, @options[:request][:rails_root]
+    assert_equal({:key => 42, :data => {"id" => "sessionid"}}, @options[:session])
   end
   
-  include Rack::Test::Methods
-
-  def app; AppWithoutApiKey end
-  
-  def test_doesnt_raise_an_error
-    assert_nothing_raised { get "/" }
+  def test_header_options
+    assert_equal "toadhopper-sinatra", @header_options['X-Hoptoad-Client-Name']
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toolmantim-toadhopper-sinatra
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.7"
 platform: ruby
 authors: 
 - Tim Lucas
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        version: "0.6"
     version: 
 description: Post Hoptoad notifications from Sinatra
 email: t.lucas@toolmantim.com
@@ -29,9 +29,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- Readme.md
+- README.md
+- LICENSE
 files: 
-- Readme.md
+- README.md
 - Rakefile
 - LICENSE
 - lib/sinatra/toadhopper.rb