toadhopper-sinatra 1.0.3 → 1.0.4

data/.gitignore

@@ -0,0 +1,5 @@
+/pkg/
+.yardoc
+/doc/
+Gemfile.lock
+.bundle

data/Gemfile

@@ -1,18 +1,2 @@
-source :gemcutter
-
-gem 'toadhopper', '~> 1.0'
-gem 'sinatra'
-
-group :development do
-  gem 'bundler', '~> 1.0.11'
-  gem 'rake'
-  gem 'yard'
-  gem 'jeweler'
-end
-
-group :test do
-  gem 'rake'
-  gem 'exemplor'
-  gem 'rack-test', :require => "rack/test"
-  gem 'rr'
-end
+source :rubygems
+gemspec

data/Rakefile

@@ -1,20 +1,8 @@
-require 'bundler'
-Bundler.setup(:default, :development, :test)
-Bundler.require(:development, :test)
+require 'bundler/setup'
 
-Jeweler::Tasks.new do |s|
-  s.name     = "toadhopper-sinatra"
-  s.summary  = "Post Hoptoad notifications from Sinatra"
-  s.email    = "t.lucas@toolmantim.com"
-  s.homepage = "http://github.com/toolmantim/toadhopper-sinatra"
-  s.authors  = ["Tim Lucas"]
-  s.extra_rdoc_files  = ["README.md", "LICENSE", "example.rb"]
-
-  require File.join(File.dirname(__FILE__), 'lib', 'sinatra', 'toadhopper')
-  s.version  = Sinatra::Toadhopper::VERSION
-end
+Bundler::GemHelper.install_tasks
 
 desc "Run tests"
 task :test do
-  exec "/usr/bin/env ruby #{File.dirname(__FILE__)}/test_example.rb"
+  exec "/usr/bin/env bundle exec ruby #{File.dirname(__FILE__)}/test_example.rb"
 end

data/lib/sinatra/toadhopper.rb

@@ -1,35 +1,53 @@
 require 'sinatra/base'
 require 'toadhopper'
+require 'sinatra/toadhopper/version'
 
 module Sinatra
-  # The Toadhopper helper methods
   module Toadhopper
-    VERSION = "1.0.3"
-    # Reports the current sinatra error to Hoptoad
-    def post_error_to_hoptoad!
-      unless options.toadhopper && options.toadhopper[:api_key]
-        STDERR.puts "Toadhopper api key not set, e.g. set :toadhopper, :api_key => 'my api key'"
-        return
+
+    module Helpers
+      # Reports the current sinatra error to Hoptoad
+      def post_error_to_hoptoad!
+        unless toadhopper_api_key
+          STDERR.puts "Toadhopper api key not set, e.g. set :toadhopper, :api_key => 'my api key'"
+          return
+        end
+        toadhopper = ::Toadhopper.new(toadhopper_api_key, toadhopper_options)
+        toadhopper.filters = toadhopper_filters if toadhopper_filters
+        toadhopper.post!(
+          env['sinatra.error'],
+          {
+            :url => request.url,
+            :params => request.params,
+            :session => session.to_hash,
+            :environment => ENV.to_hash,
+            :framework_env => options.environment.to_s,
+            :project_root => options.root,
+            :notifier_name => (notifier_name = "toadhopper-sinatra"),
+            :notifier_version => VERSION,
+            :notifier_url => 'http://github.com/toolmantim/toadhopper-sinatra'
+          },
+          {'X-Hoptoad-Client-Name' => notifier_name}
+        )
       end
-      filters = options.toadhopper.delete(:filters)
-      toadhopper = ::Toadhopper.new(options.toadhopper.delete(:api_key), options.toadhopper)
-      toadhopper.filters = filters if filters
-      toadhopper.post!(
-        env['sinatra.error'],
-        {
-          :url => request.url,
-          :params => request.params,
-          :session => session.to_hash,
-          :environment => ENV.to_hash,
-          :framework_env => options.environment.to_s,
-          :project_root => options.root,
-          :notifier_name => (notifier_name = "toadhopper-sinatra"),
-          :notifier_version => VERSION,
-          :notifier_url => 'http://github.com/toolmantim/toadhopper-sinatra'
-        },
-        {'X-Hoptoad-Client-Name' => notifier_name}
-      )
+      private
+        def toadhopper_filters
+          settings.toadhopper[:filters]
+        end
+        def toadhopper_api_key
+          settings.toadhopper[:api_key]
+        end
+        def toadhopper_options
+          settings.toadhopper.reject {|k,_| [:api_key, :filters].include?(k)}
+        end
+    end
+    
+    def self.registered(app)
+      app.helpers Toadhopper::Helpers
+      app.set :toadhopper, {}
     end
+    
   end
-  helpers Toadhopper
-end
+  
+  register Toadhopper
+end

data/lib/sinatra/toadhopper/version.rb

@@ -0,0 +1,5 @@
+module Sinatra
+  module Toadhopper
+    VERSION = "1.0.4"
+  end
+end

data/test_example.rb

@@ -1,5 +1,8 @@
-Bundler.setup(:default, :test)
-Bundler.require(:test)
+Bundler.setup
+
+require 'exemplor'
+require 'rr'
+require 'rack/test'
 
 $:.unshift "#{File.dirname(__FILE__)}/lib"
 require "#{File.dirname(__FILE__)}/example"
@@ -32,8 +35,7 @@ eg "Posting" do
   post "/register", :name => "Billy", :password => "Bob"
   
   Check(@api_key).is("apikey")
-
-  Check(@toadhopper.filters).is([/password/])
+  Check(@toadhopper.send(:filters)).is([/password/])
 
   Check(@error.class).is(RuntimeError)
   Check(@error.message).is("Kaboom!")

data/toadhopper-sinatra.gemspec

@@ -1,61 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{toadhopper-sinatra}
-  s.version = "1.0.3"
+$: << File.expand_path('../lib', __FILE__)
+
+require 'sinatra/toadhopper/version'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tim Lucas"]
-  s.date = %q{2011-07-01}
-  s.email = %q{t.lucas@toolmantim.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md",
-    "example.rb"
-  ]
-  s.files = [
-    ".yardopts",
-    "Gemfile",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "example.rb",
-    "lib/sinatra/toadhopper.rb",
-    "test_example.rb"
-  ]
-  s.homepage = %q{http://github.com/toolmantim/toadhopper-sinatra}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Post Hoptoad notifications from Sinatra}
+Gem::Specification.new do |s|
+  s.name        = 'toadhopper-sinatra'
+  s.version     = Sinatra::Toadhopper::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Tim Lucas', 'Gabriel Horner', 'Kyle Drake']
+  s.email       = ['t.lucas@toolmantim.com']
+  s.homepage    = 'http://github.com/toolmantim/toadhopper-sinatra'
+  s.summary     = %q{Post Hoptoad notifications from Sinatra}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.extra_rdoc_files  = ['README.md', 'LICENSE', 'example.rb']
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<toadhopper>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.11"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<toadhopper>, ["~> 1.0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.11"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<toadhopper>, ["~> 1.0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.11"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  s.add_dependency 'sinatra'
+  s.add_dependency 'toadhopper'
+  
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'exemplor'
+  s.add_development_dependency 'rr'
+  s.add_development_dependency 'rack-test'
 end
-

metadata

@@ -2,30 +2,31 @@
 name: toadhopper-sinatra
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Tim Lucas
+- Gabriel Horner
+- Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -04:00
-default_executable: 
+date: 2011-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: toadhopper
+  name: sinatra
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.0"
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: toadhopper
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,18 +37,18 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rake
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.11
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: exemplor
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,7 +59,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rr
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,7 +70,7 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rack-test
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,16 +81,18 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 description: 
-email: t.lucas@toolmantim.com
+email: 
+- t.lucas@toolmantim.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.md
+- LICENSE
 - example.rb
 files: 
+- .gitignore
 - .yardopts
 - Gemfile
 - LICENSE
@@ -97,9 +100,9 @@ files:
 - Rakefile
 - example.rb
 - lib/sinatra/toadhopper.rb
+- lib/sinatra/toadhopper/version.rb
 - test_example.rb
 - toadhopper-sinatra.gemspec
-has_rdoc: true
 homepage: http://github.com/toolmantim/toadhopper-sinatra
 licenses: []
 
@@ -113,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 563281939583734295
+      hash: -2461237549134524370
       segments: 
       - 0
       version: "0"
@@ -122,11 +125,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -2461237549134524370
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Post Hoptoad notifications from Sinatra