Merge pull request #40 from travis-ci/joshk-json-rulez-the-world

All events from an App are json payloads

Author: joecorcoran

lib/travis/listener/app.rb

@@ -32,7 +32,7 @@ class App < Sinatra::Base
       end
 
       get '/' do
-        redirect "http://about.travis-ci.org"
+        redirect "http://travis-ci.com"
       end
 
       # Used for new relic uptime monitoring
@@ -205,21 +205,23 @@ def push_head_commit
       end
 
       def delivery_guid
-        env['HTTP_X_GITHUB_GUID']
+        env['HTTP_X_GITHUB_GUID'] || env['HTTP_X_GITHUB_DELIVERY']
       end
 
       def payload
-        if github_pr_event?
+        if !params[:payload].blank?
           params[:payload]
-        elsif github_apps_event?
-          begin
-            @_parsed_json ||= JSON.parse(request.body.read)
-          rescue JSON::ParserError
-            nil
-          end
+        elsif !request_body.blank?
+          request_body
+        else
+          nil
         end
       end
 
+      def request_body
+        @_request_body ||= request.body.read
+      end
+
       def slug
         "#{owner_login}/#{repository_name}"
       end

spec/travis/app_spec.rb

@@ -13,7 +13,12 @@
   end
 
   def create(opts = {})
-    params  = { :payload => (opts[:payload] || payload) }
+    params  = {}
+
+    if params_payload = (opts[:payload] || payload)
+      params[:payload] = params_payload
+    end
+
     headers = { 'HTTP_X_GITHUB_EVENT' => 'push', 'HTTP_X_GITHUB_GUID' => 'abc123' }
     headers.merge!(opts.delete(:headers) || {})