lilypad 0.1.0 → 0.1.1

data/README.markdown

@@ -14,7 +14,6 @@ Use it
 ------
 
 <pre>
-require 'rubygems'
 require 'rack/lilypad'
 
 use Rack::Lilypad, 'fd48c7d26f724503a0280f808f44b339fc65fab8'
@@ -24,6 +23,11 @@ To specify environment filters:
 
 <pre>
 use Rack::Lilypad, 'fd48c7d26f724503a0280f808f44b339fc65fab8' do |hoptoad|
-	hoptoad.filters << %w(AWS_ACCESS_KEY  AWS_SECRET_ACCESS_KEY AWS_ACCOUNT SSH_AUTH_SOCK)
+  hoptoad.filters << %w(AWS_ACCESS_KEY  AWS_SECRET_ACCESS_KEY AWS_ACCOUNT SSH_AUTH_SOCK)
 end
-</pre>
+</pre>
+
+Thanks
+------
+
+Lilypad wouldn't have happened without [rack_hoptoad](http://github.com/atmos/rack_hoptoad), [toadhopper](http://github.com/toolmantim/toadhopper), [Builder](http://builder.rubyforge.org), and [Nokogiri](http://nokogiri.org).

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.0"
+  s.version = "0.1.1"
 end

data/lib/rack/lilypad.rb

@@ -1,7 +1,6 @@
 require 'builder'
 require 'net/http'
 require 'rack'
-require 'yaml'
 
 module Rack
   class Lilypad
@@ -77,8 +76,9 @@ module Rack
         request_path = request.script_name + request.path_info
         
         xml = ::Builder::XmlMarkup.new
-        xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-        xml.notice do |n|
+        xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
+        xml.notice(:version => '2.0.0') do |n|
+          n.tag! 'api-key', @api_key
           n.notifier do |n|
             n.name 'Lilypad'
             n.url 'http://github.com/winton/lilypad'
@@ -99,14 +99,14 @@ module Rack
             if request.params.any?
               r.params do |p|
                 request.params.each do |key, value|
-                  p.var(:key => key, :value => value)
+                  p.var(value, :key => key)
                 end
               end
             end
             if environment.any?
               r.tag!('cgi-data') do |c|
                 environment.each do |key, value|
-                  c.var(:key => key, :value => value)
+                  c.var(value, :key => key)
                 end
               end
             end
@@ -116,7 +116,13 @@ module Rack
             s.tag! 'environment-name', ENV['RACK_ENV'] || 'development'
           end
         end
-        xml.target!
+        @@last_response = xml.target!
+      end
+      
+      class <<self
+        def last_response
+          @@last_response
+        end
       end
 
       class Backtrace < Struct.new(:file, :number, :method)

data/spec/fixtures/hoptoad_2_0.xsd

@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="notice">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="api-key" type="xs:string"/>
+        <xs:element name="notifier" type="notifier"/>
+        <xs:element name="error" type="error"/>
+        <xs:element name="request" type="request" minOccurs="0"/>
+        <xs:element name="server-environment" type="serverEnvironment"/>
+      </xs:all>
+      <xs:attribute name="version" type="xs:string" use="required"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name="notifier">
+    <xs:all>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="version" type="xs:string"/>
+      <xs:element name="url" type="xs:string"/>
+    </xs:all>
+  </xs:complexType>
+
+  <xs:complexType name="error">
+    <xs:all>
+      <xs:element name="class" type="xs:string"/>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
+      <xs:element name="backtrace" type="backtrace"/>
+    </xs:all>
+  </xs:complexType>
+
+  <xs:complexType name="backtrace">
+    <xs:sequence>
+      <xs:element name="line" maxOccurs="unbounded">
+        <xs:complexType>
+          <xs:attribute name="file" type="xs:string" use="required"/>
+          <xs:attribute name="number" type="xs:string" use="required"/>
+          <xs:attribute name="method" type="xs:string" use="optional"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="request">
+    <xs:all>
+      <xs:element name="url" type="xs:string"/>
+      <xs:element name="component" type="xs:string"/>
+      <xs:element name="action" type="xs:string" minOccurs="0"/>
+      <xs:element name="params" type="varList" minOccurs="0"/>
+      <xs:element name="session" type="varList" minOccurs="0"/>
+      <xs:element name="cgi-data" type="varList" minOccurs="0"/>
+    </xs:all>
+  </xs:complexType>
+
+  <xs:complexType name="varList">
+    <xs:sequence>
+      <xs:element name="var" type="var" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="var" mixed="true">
+    <xs:sequence>
+      <xs:element name="var" type="var" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="key" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="serverEnvironment">
+    <xs:sequence>
+      <xs:element name="project-root" type="xs:string" minOccurs="0"/>
+      <xs:element name="environment-name" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+
+</xs:schema>

data/spec/rack/lilypad_spec.rb

@@ -8,7 +8,30 @@ describe Rack::Lilypad do
     SinatraApp.new
   end
   
-  # it "should do something" do
-  #   get "/raise"
-  # end
+  before(:each) do
+    ENV['RACK_ENV'] = 'production'
+    @http = mock(:http)
+    @http.stub!(:read_timeout=)
+    @http.stub!(:open_timeout=)
+    @http.stub!(:post)
+    Net::HTTP.stub!(:start).and_yield(@http)
+  end
+  
+  it "should post an error to Hoptoad" do
+    @http.should_receive(:post)
+    get "/raise" rescue nil
+  end
+  
+  it "should transfer valid XML to Hoptoad" do
+    get "/raise" rescue nil
+    
+    xsd = Nokogiri::XML::Schema(File.read(SPEC + '/fixtures/hoptoad_2_0.xsd'))
+    doc = Nokogiri::XML(Rack::Lilypad::Hoptoad.last_response)
+    
+    errors = xsd.validate(doc)
+    errors.each do |error|
+      puts error.message
+    end
+    errors.length.should == 0
+  end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rack/lilypad'
 require 'pp'
 
 require 'rubygems'
+require 'nokogiri'
 require 'rack/test'
 require 'sinatra/base'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lilypad
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Winton Welsh
@@ -27,11 +27,11 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.markdown
+- spec/fixtures/hoptoad_2_0.xsd
 - spec/fixtures/sinatra.rb
 - spec/rack/lilypad_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tmp/toadhopper.git.tgz
 has_rdoc: true
 homepage: http://github.com/winton/lilypad
 licenses: []