toadhopper-sinatra 0.1 → 0.3

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2009 Tim Lucas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -10,5 +10,14 @@ begin
   gem "sr-mg", "<= 0.0.5"
   require "mg"
   MG.new("toadhopper-sinatra.gemspec")
-rescue LoadError
+rescue Gem::LoadError
+end
+
+begin
+  gem "yard"
+  require 'yard'
+  YARD::Rake::YardocTask.new do |t|
+    t.options = ['-r', 'Readme.md', '--files', 'LICENSE'] # optional
+  end
+rescue Gem::LoadError
 end

data/Readme.md

@@ -1,12 +1,26 @@
-A Sinatra plugin for [Hoptoad](http://www.hoptoadapp.com/) error reporting that uses the toadhopper gem.
+[Hoptoad](http://www.hoptoadapp.com/) meets [Sinatra](http://www.sinatrarb.com/).
 
-You configure the Toadhopper gem as-per usual, this plugin simply adds a `report_error_to_hoptoad!` method.
+        _____                                ,
+       /     \______                         |\        __
+      | o     |     \____                    | |      |--|             __
+      /\_____/           \___                |/       |  |            |~'
+     /                       \              /|_      () ()            |
+    |_______/                 \            //| \             |\      ()
+      \______   _       ___    \          | \|_ |            | \
+            /\_//      /   \    |          \_|_/            ()  |
+           // //______/    /___/             |                  |
+          /\/\/\      \   / \ \             @'                 ()
+                        \ \   \ \      
+                          \ \   \ \    
+                            \ \  \ \   
+                             \ \ /\/\  
+                             /\/\
 
-## Example
+How?
 
     require 'sinatra/toadhopper'
     
-    set :toadhopper, :api_key => "YOURAPIKEY"
+    set :toadhopper, :api_key => "your hoptoad API key", :filters => /password/
     
     get "/" do
       raise "Kaboom!"
@@ -16,3 +30,7 @@ You configure the Toadhopper gem as-per usual, this plugin simply adds a `report
       post_error_to_hoptoad!
       "Ouch, that hurt."
     end
+
+Install it via rubygems:
+
+    gem install toadhopper-sinatra

data/lib/sinatra/toadhopper.rb

@@ -2,14 +2,17 @@ require 'sinatra/base'
 require 'toadhopper'
 
 module Sinatra
+  # The Toadhopper helper methods
   module Toadhopper
-    # Reports the current sinatra error to Hoptoad.
+    # Reports the current sinatra error to Hoptoad
     def post_error_to_hoptoad!
-      unless api_key = options.respond_to?(:toadhopper) && options.toadhopper[:api_key]
-        STDERR.puts "WARNING: Ignoring post_error_to_hoptoad! - :api_key not set"
+      if options.respond_to?(:toadhopper)
+        options.toadhopper.each_pair {|k, v| ::Toadhopper.__send__("#{k}=", v)}
+      end
+      unless ::Toadhopper.api_key
+        STDERR.puts "WARNING: Ignoring hoptoad notification - :api_key not set"
         return
       end
-      ::Toadhopper.api_key = api_key
       ::Toadhopper.post!(
         env['sinatra.error'],
         {

data/test/test_report_error_to_hoptoad.rb

@@ -8,6 +8,16 @@ 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
@@ -17,7 +27,7 @@ class TestReportErrorToHoptoad < Test::Unit::TestCase
     set :raise_errors, false
     set :sessions, true
 
-    set :toadhopper, :api_key => "apikey"
+    set :toadhopper, :api_key => "apikey", :filters => /afilter/
 
     get "/:id" do
       session["id"] = "sessionid"
@@ -31,19 +41,20 @@ class TestReportErrorToHoptoad < Test::Unit::TestCase
   end
   
   include Rack::Test::Methods
-  include Toadhopper::Test::Methods
 
   def app; AppThatGoesBoom end
 
   def setup
-    stub_toadhopper_post!
     get "/theid"
-    @error, @options, @header_options = last_toadhopper_post_arguments
+    @error, @options, @header_options = Toadhopper.last_post_arguments
   end
 
   def test_api_key_set
     assert_equal "apikey", Toadhopper.api_key
   end
+  def test_filter_set
+    assert_equal [/afilter/], Toadhopper.filters
+  end
 
   def test_reported_error
     assert_equal RuntimeError, @error.class
@@ -73,12 +84,10 @@ class TestFailsSilentWithoutApiKey < Test::Unit::TestCase
   end
   
   include Rack::Test::Methods
-  include Toadhopper::Test::Methods
 
   def app; AppWithoutApiKey end
   
   def test_doesnt_raise_an_error
-    stub_toadhopper_post!
     assert_nothing_raised { get "/" }
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toadhopper-sinatra
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.3"
 platform: ruby
 authors: 
 - Tim Lucas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +10:00
+date: 2009-09-17 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.4"
+        version: "0.5"
     version: 
 description: Post Hoptoad notifications from Sinatra
 email: t.lucas@toolmantim.com
@@ -33,6 +33,7 @@ extra_rdoc_files:
 files: 
 - Readme.md
 - Rakefile
+- LICENSE
 - lib/sinatra/toadhopper.rb
 - test/test_report_error_to_hoptoad.rb
 has_rdoc: true
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: th-sinatra
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2