toadhopper 0.9.5 → 0.9.7

data/Gemfile

@@ -1,10 +1,5 @@
 source :gemcutter
 
-group :runtime do
-  gem 'haml', '~> 2.2.0'
-  gem 'nokogiri'
-end
-
 group :development do
   gem 'yard'
   gem 'jeweler'
@@ -12,7 +7,6 @@ end
 
 group :test do
   gem 'rake'
-  gem 'nokogiri'
   gem 'test-unit', :require => 'test/unit'
   gem 'ruby-debug'
 end

data/Rakefile

@@ -1,5 +1,5 @@
-Bundler.setup(:runtime, :development, :test)
-Bundler.require(:runtime, :development, :test)
+Bundler.setup(:development, :test)
+Bundler.require(:development, :test)
 
 require 'rake/testtask'
 

data/lib/notice.erb

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<notice version="2.0.18">
+  <api-key><%=h api_key %></api-key>
+  <notifier>
+    <name><%=h notifier_name %></name>
+    <version><%=h notifier_version %></version>
+    <url><%=h notifier_url %></url>
+  </notifier>
+  <error>
+    <class><%=h error.class.name %></class>
+    <message><%=h "#{error.class.name}: #{error.message}" %></message>
+    <backtrace>
+      <%- backtrace.each do |line| -%>
+      <line file="<%=h line.file %>" method="<%=h line.method %>" number="<%=h line.number %>" />
+      <%- end -%>
+    </backtrace>
+  </error>
+  <request>
+    <url><%=h url %></url>
+    <component><%=h component %></component>
+    <%- if action =~ /\S/ -%>
+    <action><%=h action %></action>
+    <%- end -%>
+    <%- if params && params.any? -%>
+    <params>
+      <%- params.each do |key, value| -%>
+      <var key="<%=h key %>"><%=h value %></var>
+      <%- end -%>
+    </params>
+    <%- end -%>
+    <%- if session && session.any? -%>
+    <session>
+      <%- session.each do |key, value| -%>
+      <var key="<%=h key %>"><%=h value %></var>
+      <%- end -%>
+    </session>
+    <%- end -%>
+    <%- if environment && environment.any? -%>
+    <cgi-data>
+      <%- environment.each do |key,value| -%>
+      <var key="<%=h key %>"><%=h value %></var>
+      <%- end -%>
+    </cgi-data>
+    <%- end -%>
+  </request>
+  <server-environment>
+    <project-root><%=h project_root %></project-root>
+    <environment-name><%=h framework_env %></environment-name>
+  </server-environment>
+</notice>

data/lib/toadhopper.rb

@@ -1,11 +1,10 @@
 require 'net/http'
-require 'haml'
-require 'haml/engine'
-require 'nokogiri'
+require 'erb'
+require 'ostruct'
 
 # Posts errors to the Hoptoad API
 class ToadHopper
-  VERSION = "0.9.5"
+  VERSION = "0.9.7"
 
   # Hoptoad API response
   class Response < Struct.new(:status, :body, :errors); end
@@ -34,7 +33,7 @@ class ToadHopper
   # @option options [String]  url              The url for the request, required to post but not useful in a console environment
   # @option options [String]  component        Normally this is your Controller name in an MVC framework
   # @option options [String]  action           Normally the action for your request in an MVC framework
-  # @option options [#params] request          An object that response to #params and returns a hash
+  # @option options [Hash]    params           A hash of the request's parameters
   # @option options [String]  notifier_name    Say you're a different notifier than ToadHopper
   # @option options [String]  notifier_version Specify the version of your custom notifier
   # @option options [String]  notifier_url     Specify the project URL of your custom notifier
@@ -69,7 +68,7 @@ class ToadHopper
                              {'Content-type' => 'text/xml', 'Accept' => 'text/xml, application/xml'}.merge(headers)
         Response.new response.code.to_i,
                      response.body,
-                     Nokogiri::XML.parse(response.body).xpath('//errors/error').map {|e| e.content}
+                     response.body.scan(%r{<error>(.+)<\/error>}).flatten
       rescue TimeoutError => e
         Response.new(500, '', ['Timeout error'])
       end
@@ -78,19 +77,22 @@ class ToadHopper
 
   # @private
   def document_for(exception, options={})
-    Haml::Engine.new(notice_template, :escape_html => true).render(Object.new, filtered_data(exception, options))
+    data = filtered_data(exception, options)
+    scope = OpenStruct.new(data).extend(ERB::Util)
+    ERB.new(notice_template, nil, '-').result(scope.send(:binding))
   end
 
-  def filtered_data(exception, options)
+  def filtered_data(error, options)
     defaults = {
-      :error            => exception,
+      :error            => error,
       :api_key          => api_key,
       :environment      => ENV.to_hash,
-      :backtrace        => exception.backtrace.map {|l| backtrace_line(l)},
+      :backtrace        => error.backtrace.map {|l| backtrace_line(l)},
       :url              => 'http://localhost/',
       :component        => 'http://localhost/',
       :action           => nil,
       :request          => nil,
+      :params           => nil,
       :notifier_version => VERSION,
       :notifier_url     => 'http://github.com/toolmantim/toadhopper',
       :session          => {},
@@ -98,11 +100,11 @@ class ToadHopper
       :project_root     => Dir.pwd
     }.merge(options)
 
-    # Filter session and environment
-    [:session, :environment].each{|n| defaults[n] = clean(defaults[n]) if defaults[n] }
+    # Backwards compatibility
+    defaults[:params] ||= defaults[:request].params if defaults[:request]
 
-    # Filter params
-    defaults[:request].params = clean(defaults[:request].params) if defaults[:request] && defaults[:request].params
+    # Filter params, session and environment
+    [:params, :session, :environment].each{|n| defaults[n] = clean(defaults[n]) if defaults[n] }
 
     defaults
   end
@@ -114,7 +116,7 @@ class ToadHopper
 
   # @private
   def notice_template
-    File.read(::File.join(::File.dirname(__FILE__), 'notice.haml'))
+    File.read(::File.join(::File.dirname(__FILE__), 'notice.erb'))
   end
 
   # @private

data/test/helper.rb

@@ -1,5 +1,5 @@
-Bundler.setup(:runtime, :test)
-Bundler.require(:runtime, :test)
+Bundler.setup(:test)
+Bundler.require(:test)
 
 require File.expand_path("../../lib/toadhopper", __FILE__)
 

data/test/test_filters.rb

@@ -26,12 +26,23 @@ class ToadHopper::TestFilters < Test::Unit::TestCase
 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
-    request = Struct.new(:params).new
-    request.params = {:password => "foo"}
-    error = begin; raise "Kaboom!"; rescue => e; e end
+    filtered_data = toadhopper.filtered_data(@error, :params => @request.params)[:params]
 
-    toadhopper.filters = "password"
-    assert_equal({:password => "[FILTERED]"}, toadhopper.filtered_data(error, :request => request)[:request].params)
+    assert_equal({:password => "[FILTERED]"}, filtered_data)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toadhopper
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors: 
 - Tim Lucas
@@ -12,29 +12,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -08:00
+date: 2010-02-23 00:00:00 +11:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.2.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: 
 email: t.lucas@toolmantim.com
 executables: []
@@ -51,7 +32,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/notice.haml
+- lib/notice.erb
 - lib/toadhopper.rb
 - test/helper.rb
 - test/test_filters.rb

data/lib/notice.haml

@@ -1,34 +0,0 @@
-!!!XML
-%notice{:version => '2.0.18'}
-  %api-key= api_key
-  %notifier
-    %name= notifier_name
-    %version= notifier_version
-    %url= notifier_url
-  %error
-    %class= error.class.name
-    %message= "#{error.class.name}: #{error.message}"
-    %backtrace
-      - backtrace.each do |line|
-        %line{:method => line.method, :file => line.file, :number => line.number}/
-  %request
-    %url= url
-    %component= component
-    - if action && !action.blank?
-      %action= action
-    - if request && request.params.any?
-      %params
-        - request.params.each do |key,value|
-          %var{:key => key}= value
-    - if session && session.any?
-      %session
-        - session.each do |key,value|
-          %var{:key => key}= value
-    - if environment && environment.any?
-      %cgi-data
-        - environment.each do |key,value|
-          %var{:key => key}= value
-
-  %server-environment
-    %project-root= project_root
-    %environment-name= framework_env