toadhopper 0.9.7 → 0.9.8

data/Gemfile

@@ -8,5 +8,4 @@ end
 group :test do
   gem 'rake'
   gem 'test-unit', :require => 'test/unit'
-  gem 'ruby-debug'
 end

data/lib/toadhopper.rb

@@ -4,7 +4,7 @@ require 'ostruct'
 
 # Posts errors to the Hoptoad API
 class ToadHopper
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 
   # Hoptoad API response
   class Response < Struct.new(:status, :body, :errors); end
@@ -77,13 +77,13 @@ class ToadHopper
 
   # @private
   def document_for(exception, options={})
-    data = filtered_data(exception, options)
+    data = document_data(exception, options)
     scope = OpenStruct.new(data).extend(ERB::Util)
     ERB.new(notice_template, nil, '-').result(scope.send(:binding))
   end
 
-  def filtered_data(error, options)
-    defaults = {
+  def document_defaults(error)
+    {
       :error            => error,
       :api_key          => api_key,
       :environment      => ENV.to_hash,
@@ -98,15 +98,13 @@ class ToadHopper
       :session          => {},
       :framework_env    => ENV['RACK_ENV'] || 'development',
       :project_root     => Dir.pwd
-    }.merge(options)
-
-    # Backwards compatibility
-    defaults[:params] ||= defaults[:request].params if defaults[:request]
-
-    # Filter params, session and environment
-    [:params, :session, :environment].each{|n| defaults[n] = clean(defaults[n]) if defaults[n] }
+    }
+  end
 
-    defaults
+  def document_data(error, options)
+    data = document_defaults(error).merge(options)
+    [:params, :session, :environment].each{|n| data[n] = clean(data[n]) if data[n] }
+    data
   end
 
   # @private

data/test/helper.rb

@@ -6,3 +6,7 @@ require File.expand_path("../../lib/toadhopper", __FILE__)
 def toadhopper
   @toadhopper ||= ToadHopper.new(ENV['HOPTOAD_API_KEY'] || "test api key")
 end
+
+def error
+  begin; raise "Kaboom!"; rescue => e; e end
+end

data/test/test_filters.rb

@@ -24,25 +24,3 @@ class ToadHopper::TestFilters < Test::Unit::TestCase
                  toadhopper.clean(:id => "myid", :email => "myemail", :password => "mypassword"))
   end
 end
-
-class ToadHopper::TestCleanedOptions < Test::Unit::TestCase
-  def setup
-    @request = Struct.new(:params).new
-    @request.params = {:password => "foo"}
-    def @request.params=(*); raise NoMethodError, "requests don't have #params=, you fool"; end
-    @error = begin; raise "Kaboom!"; rescue => e; e end
-    toadhopper.filters = "password"
-  end
-
-  def test_filtering_params_with_backwards_compatibility
-    filtered_data = toadhopper.filtered_data(@error, :request => @request)[:params]
-
-    assert_equal({:password => "[FILTERED]"}, filtered_data)
-  end
-
-  def test_filtering_params
-    filtered_data = toadhopper.filtered_data(@error, :params => @request.params)[:params]
-
-    assert_equal({:password => "[FILTERED]"}, filtered_data)
-  end
-end

data/test/test_notice_document_data.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class ToadHopper::TestNoticeDocument < Test::Unit::TestCase
+  def test_filtering
+    toadhopper.filters = "password"
+    sensitive_options = {
+      :params      => {"password" => "sensitive"},
+      :session     => {"password" => "sensitive"},
+      :environment => {"password" => "sensitive"}
+    }
+    notice_document = toadhopper.document_for(error, sensitive_options)
+    assert_false notice_document.include?("sensitive")
+  end
+end

data/test/test_posting.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toadhopper
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Tim Lucas
@@ -36,6 +36,7 @@ files:
 - lib/toadhopper.rb
 - test/helper.rb
 - test/test_filters.rb
+- test/test_notice_document_data.rb
 - test/test_posting.rb
 has_rdoc: true
 homepage: http://github.com/toolmantim/toadhopper
@@ -68,4 +69,5 @@ summary: Post error notifications to Hoptoad
 test_files: 
 - test/helper.rb
 - test/test_filters.rb
+- test/test_notice_document_data.rb
 - test/test_posting.rb