toadhopper 0.9.4 → 0.9.5

data/Gemfile

@@ -1,15 +1,18 @@
-only :release do
-  gem 'haml', '~> 2.0'
+source :gemcutter
+
+group :runtime do
+  gem 'haml', '~> 2.2.0'
   gem 'nokogiri'
 end
 
-only :development do
+group :development do
   gem 'yard'
   gem 'jeweler'
 end
 
-only :test do
+group :test do
   gem 'rake'
   gem 'nokogiri'
-  gem 'test-unit', :require_as => 'test/unit'
+  gem 'test-unit', :require => 'test/unit'
+  gem 'ruby-debug'
 end

data/README.md

@@ -15,23 +15,24 @@ You can install it via rubygems:
 
 ## Development
 
-Firstly, `gem install bundler`, then:
+Install Bundler 0.9.x, then:
 
     % git clone git://github.com/toolmantim/toadhopper.git
     % cd toadhopper
-    % gem bundle
-    % bin/rake test
+    % bundle install
+    % bundle exec rake test
 
 If you set a `HOPTOAD_API_KEY` environment variable it'll test actually posting to the Hoptoad API. For example:
 
-    % bin/rake test HOPTOAD_API_KEY=abc123
+    % bundle exec rake test HOPTOAD_API_KEY=abc123
 
 To generate the docs:
 
-    % bin/yardoc
+    % bundle exec yardoc
 
 ## Contributors
 
 * [Tim Lucas](http://github.com/toolmantim)
 * [Samuel Tesla](http://github.com/stesla)
 * [atmos](http://github.com/atmos)
+* [indirect](http://github.com/indirect)

data/Rakefile

@@ -1,4 +1,5 @@
-Bundler.require_env(:development)
+Bundler.setup(:runtime, :development, :test)
+Bundler.require(:runtime, :development, :test)
 
 require 'rake/testtask'
 
@@ -13,16 +14,16 @@ Jeweler::Tasks.new do |s|
   s.summary  = "Post error notifications to Hoptoad"
   s.email    = "t.lucas@toolmantim.com"
   s.homepage = "http://github.com/toolmantim/toadhopper"
-  s.authors  = ["Tim Lucas", "Samuel Tesla", "Corey Donohoe"]
+  s.authors  = ["Tim Lucas", "Samuel Tesla", "Corey Donohoe", "Andre Arko"]
   s.extra_rdoc_files  = ["README.md", "LICENSE"]
   s.executables = nil # stops jeweler automatically adding bin/*
-  
+
   require File.join(File.dirname(__FILE__), 'lib', 'toadhopper')
   s.version  = ToadHopper::VERSION
 
   require 'bundler'
-  bundler_env = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
-  bundler_env.dependencies.each do |d|
-    s.add_dependency(d.name, d.version) if d.in?(:release)
-  end
+  bundle = Bundler::Definition.from_gemfile("Gemfile")
+  bundle.dependencies.
+    select { |d| d.groups.include?(:runtime) }.
+    each   { |d| s.add_dependency(d.name, d.version_requirements.to_s)  }
 end

data/lib/notice.haml

@@ -1,5 +1,5 @@
 !!!XML
-%notice{:version => '2.0.0'}
+%notice{:version => '2.0.18'}
   %api-key= api_key
   %notifier
     %name= notifier_name

data/lib/toadhopper.rb

@@ -5,7 +5,7 @@ require 'nokogiri'
 
 # Posts errors to the Hoptoad API
 class ToadHopper
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 
   # Hoptoad API response
   class Response < Struct.new(:status, :body, :errors); end
@@ -78,10 +78,14 @@ class ToadHopper
 
   # @private
   def document_for(exception, options={})
+    Haml::Engine.new(notice_template, :escape_html => true).render(Object.new, filtered_data(exception, options))
+  end
+
+  def filtered_data(exception, options)
     defaults = {
       :error            => exception,
       :api_key          => api_key,
-      :environment      => clean(ENV.to_hash),
+      :environment      => ENV.to_hash,
       :backtrace        => exception.backtrace.map {|l| backtrace_line(l)},
       :url              => 'http://localhost/',
       :component        => 'http://localhost/',
@@ -94,7 +98,13 @@ class ToadHopper
       :project_root     => Dir.pwd
     }.merge(options)
 
-    Haml::Engine.new(notice_template, :escape_html => true).render(Object.new, defaults)
+    # Filter session and environment
+    [:session, :environment].each{|n| defaults[n] = clean(defaults[n]) if defaults[n] }
+
+    # Filter params
+    defaults[:request].params = clean(defaults[:request].params) if defaults[:request] && defaults[:request].params
+
+    defaults
   end
 
   # @private
@@ -135,4 +145,4 @@ end
 # @return [ToadHopper]
 def ToadHopper(api_key)
   ToadHopper.new(api_key)
-end
+end

data/test/helper.rb

@@ -1,3 +1,8 @@
-Bundler.require_env(:test)
+Bundler.setup(:runtime, :test)
+Bundler.require(:runtime, :test)
 
-require File.join(File.dirname(__FILE__), "..", "lib", "toadhopper")
+require File.expand_path("../../lib/toadhopper", __FILE__)
+
+def toadhopper
+  @toadhopper ||= ToadHopper.new(ENV['HOPTOAD_API_KEY'] || "test api key")
+end

data/test/test_filters.rb

@@ -1,10 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class ToadHopper::TestFilters < Test::Unit::TestCase
-  def toadhopper
-    @toadhopper ||= ToadHopper("test api key")
-  end
-  
   def test_no_filters
     assert_equal(                {:id => "myid", :password => "mypassword"},
                  toadhopper.clean(:id => "myid", :password => "mypassword"))
@@ -28,3 +24,14 @@ class ToadHopper::TestFilters < Test::Unit::TestCase
                  toadhopper.clean(:id => "myid", :email => "myemail", :password => "mypassword"))
   end
 end
+
+class ToadHopper::TestCleanedOptions < Test::Unit::TestCase
+  def test_filtering_params
+    request = Struct.new(:params).new
+    request.params = {:password => "foo"}
+    error = begin; raise "Kaboom!"; rescue => e; e end
+
+    toadhopper.filters = "password"
+    assert_equal({:password => "[FILTERED]"}, toadhopper.filtered_data(error, :request => request)[:request].params)
+  end
+end

data/test/test_posting.rb

@@ -2,17 +2,16 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class ToadHopper::TestPosting < Test::Unit::TestCase
   def test_posting
-    toadhopper = ToadHopper("abc123")
     error = begin; raise "Kaboom!"; rescue => e; e end
 
-    response = toadhopper.post!(error)
+    response = ToadHopper('bogus key').post!(error)
     assert_equal 422, response.status
     assert_equal ['No project exists with the given API key.'], response.errors
   end
 
   if ENV['HOPTOAD_API_KEY']
     def test_posting_integration
-      toadhopper = ToadHopper(ENV['HOPTOAD_API_KEY'])
+      toadhopper.filters = "HOPTOAD_API_KEY", "ROOT_PASSWORD"
       error = begin; raise "Kaboom!"; rescue => e; e end
 
       response = toadhopper.post!(error)

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: toadhopper
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Tim Lucas
 - Samuel Tesla
 - Corey Donohoe
+- Andre Arko
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 +11:00
+date: 2010-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +23,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 2.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri