lilypad 0.1.7 → 0.1.8

data/README.markdown

@@ -10,33 +10,47 @@ Install
 sudo gem install lilypad --source http://gemcutter.org
 </pre>
 
-Use it
-------
+Rails
+-----
+
+In **config/environment.rb**:
 
 <pre>
 require 'rack/lilypad'
-use Rack::Lilypad, 'hoptoad_api_key_goes_here'
+
+Rails::Initializer.run do |config|
+  ENV['RACK_ENV'] = ENV['RAILS_ENV']
+  config.middleware.use Rack::Lilypad, 'hoptoad_api_key_goes_here'
+end
 </pre>
 
-To specify environment filters:
+Sinatra
+-------
 
 <pre>
-use Rack::Lilypad, 'hoptoad_api_key_goes_here' do |hoptoad|
-  hoptoad.filters << %w(AWS_ACCESS_KEY  AWS_SECRET_ACCESS_KEY AWS_ACCOUNT SSH_AUTH_SOCK)
+require 'rack/lilypad'
+
+class MyApp < Sinatra::Application
+  enable :raise_errors # not necessary for Sinatra::Base
+  use Rack::Lilypad, 'hoptoad_api_key_goes_here'
 end
 </pre>
 
-In Rails, you will need to do this in the <code>Rails::Initializer.run</code> block in environment.rb:
+Filters
+-------
+
+Don't send certain environment variables to Hoptoad.
 
 <pre>
-ENV['RACK_ENV'] = ENV['RAILS_ENV']
-config.middleware.use Rack::Lilypad, 'hoptoad_api_key_goes_here'
+use Rack::Lilypad, 'hoptoad_api_key_goes_here' do |hoptoad|
+  hoptoad.filters << %w(AWS_ACCESS_KEY  AWS_SECRET_ACCESS_KEY AWS_ACCOUNT SSH_AUTH_SOCK)
+end
 </pre>
 
 Debug
 -----
 
-Use the log option to see what is happening:
+See what you are sending and receiving from Hoptoad.
 
 <pre>
 use Rack::Lilypad, 'hoptoad_api_key_goes_here' do |hoptoad|

data/gemspec.rb

@@ -13,5 +13,5 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.name = GEM_NAME
   s.platform = Gem::Platform::RUBY
   s.require_path = "lib"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 end

data/lib/rack/lilypad.rb

@@ -52,8 +52,8 @@ module Rack
         end
       end
       
-      def log(msg)
-        ::File.open(@log, 'a') { |f| f.write(msg) } if @log
+      def log(*msg)
+        ::File.open(@log, 'a') { |f| f.write(msg.compact.join("\n\n")) } if @log
       end
       
       def post(exception, env)
@@ -70,12 +70,11 @@ module Rack
             http.post uri.path, xml(exception, env), headers
           rescue TimeoutError => e
           end
-          case response
-          when Net::HTTPSuccess then
+          if response == Net::HTTPSuccess
             env['hoptoad.notified'] = true
             log "Hoptoad Success: #{response.class}"
           else
-            log "Hoptoad Failure: #{response.class}\n\n#{response.body if response.respond_to? :body}\n\n#{@@last_response}"
+            log "Hoptoad Failure:", (response.body rescue nil), @@last_request
           end
         end
       end
@@ -84,10 +83,6 @@ module Rack
         %w(staging production).include?(ENV['RACK_ENV'])
       end
       
-      def to_string(obj)
-        obj.respond_to?(:strip) ? obj : obj.inspect
-      end
-      
       def xml(exception, env)
         environment = filter(ENV.to_hash.merge(env))
         request = Rack::Request.new(env)
@@ -117,14 +112,14 @@ module Rack
             if request.params.any?
               r.params do |p|
                 request.params.each do |key, value|
-                  p.var(to_string(value), :key => key)
+                  p.var(value.to_s, :key => key)
                 end
               end
             end
             if environment.any?
               r.tag!('cgi-data') do |c|
                 environment.each do |key, value|
-                  c.var(to_string(value), :key => key)
+                  c.var(value.to_s, :key => key)
                 end
               end
             end
@@ -134,12 +129,12 @@ module Rack
             s.tag! 'environment-name', ENV['RACK_ENV'] || 'development'
           end
         end
-        @@last_response = xml.target!
+        @@last_request = xml.target!
       end
       
       class <<self
-        def last_response
-          @@last_response
+        def last_request
+          @@last_request
         end
       end
 

data/spec/rack/lilypad_spec.rb

@@ -22,20 +22,31 @@ describe Rack::Lilypad do
   it "should yield a configuration object to the block when created" do
     notifier = Rack::Lilypad.new(@app, '') do |app|
       app.filters << %w(T1 T2)
+      app.log = 'T3'
     end
-    notifier.filters.should include('T1')
-    notifier.filters.should include('T2')
+    notifier.filters.include?('T1').should == true
+    notifier.filters.include?('T2').should == true
+    notifier.log.should == 'T3'
   end
   
-  it "should write to a log if specified" do
-    path = "#{SPEC}/fixtures/hoptoad.log"
+  it "should write to a log file on success and failure" do
+    log = "#{SPEC}/fixtures/hoptoad.log"
     notifier = Rack::Lilypad.new(@app, '') do |app|
-      app.log = path
+      app.log = log
     end
+    
+    notifier.call(@env) rescue nil
+    
+    File.exists?(log).should == true
+    File.read(log).should =~ /Hoptoad Success/
+    File.delete(log)
+    
+    @http.stub!(:post).and_return false
     notifier.call(@env) rescue nil
-    File.exists?(path).should == true
-    File.delete path
-    File.exists?(path).should == false
+    
+    File.exists?(log).should == true
+    File.read(log).should =~ /Hoptoad Failure/
+    File.delete(log)
   end
   
   it "should post an error to Hoptoad" do
@@ -48,10 +59,16 @@ describe Rack::Lilypad do
   end
   
   it "should transfer valid XML to Hoptoad" do
-    get "/raise" rescue nil
+    # Test complex environment variables
+    @env['rack.hash_test'] = { :test => true }
+    @env['rack.object_test'] = Object.new
+    
+    notifier = Rack::Lilypad.new(@app, '')
+    notifier.call(@env) rescue nil
     
+    # Validate XML
     xsd = Nokogiri::XML::Schema(File.read(SPEC + '/fixtures/hoptoad_2_0.xsd'))
-    doc = Nokogiri::XML(Rack::Lilypad::Hoptoad.last_response)
+    doc = Nokogiri::XML(Rack::Lilypad::Hoptoad.last_request)
     
     errors = xsd.validate(doc)
     errors.each do |error|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lilypad
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Winton Welsh