contentful-webhook-listener 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5be0e0cdf9733135b317548fc9924c2bc8bdbf9b
-  data.tar.gz: 43efe07cf45335ad09e018bb37bb1877b6883bb7
+  metadata.gz: 9f6ded8f1bbba252903740a01f7d5ab58bee71e2
+  data.tar.gz: c62f6b5fe90567201e1cca0f1a447e76f5377c0d
 SHA512:
-  metadata.gz: 1d60327e25d838c1510c637568aca70ef02341871b521321c431503ee11ef71ac1e09e2a4f824e5f40f13200f4c2cb7ca6ebf1c0447d0ed502623804719b3365
-  data.tar.gz: 51e8ff1d72c967fe88c8c2b3a6cbe263a79f1da28e921d9945ea4f101808db65466acc40418f0dab49b54ac95d03621ee343ae280a1595dc8e176f119ffa6fee
+  metadata.gz: 5c1f7fe9ef0c72d0f79f09776cd10e8e839d76bf170549ca6ba232e221acfa349e4d328fa51c96a9c59a5b1920b45130d06c52f2448399c2d519c9b9cb7f539c
+  data.tar.gz: dd9b4feedaf0d2e05bfafbf094bcd339be0f9b2978a5ae05b56ba6ad79331e1d68e92597129b3ed64ab91d7a9628a8df6ae3051ac548866aa64e0b1d66452a54

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v0.3.0
+### Fixed
+* Fix race condition on response [#4](https://github.com/contentful/contentful-webhook-listener.rb/issues/4)
+
 ## v0.2.1
 ### Fixed
 * Fixes Headers for case-insensitive retrieval

data/lib/contentful/webhook/listener/controllers/base.rb

@@ -18,8 +18,12 @@ module Contentful
             response.body = ''
             response.status = 200
 
+            pre_perform(request, response)
+
+            return if response.status != 200
+
             Thread.new do
-                perform(request, response)
+              perform(request, response)
             end
           end
 
@@ -28,6 +32,11 @@ module Contentful
 
           protected
 
+          def pre_perform(_request, _response)
+          ensure
+            _response
+          end
+
           def perform(_request, _response)
             fail 'must implement'
           end

data/lib/contentful/webhook/listener/controllers/wait.rb

@@ -19,6 +19,8 @@ module Contentful
 
           def perform(_request, _response)
             sleep(webhook_timeout)
+          ensure
+            _response
           end
         end
       end

data/lib/contentful/webhook/listener/controllers/webhook_aware.rb

@@ -34,20 +34,22 @@ module Contentful
 
           protected
 
-          def perform(request, response)
-            begin
-              @webhook = WebhookFactory.new(request).create
-            rescue Exception => e
-              logger.error e
-              response.body = "Not a Webhook"
-              response.status = 400
-              return
-            end
+          def pre_perform(request, response)
+            @webhook = WebhookFactory.new(request).create
+          rescue Exception => e
+            logger.error 'Not a Webhook. Stacktrace: '
+            logger.error e
+            response.body = "Not a Webhook"
+            response.status = 400
+          end
 
+          def perform(request, response)
             super(request, response)
 
             logger.debug "Webhook Data: {id: #{webhook.id}, space_id: #{webhook.space_id}, kind: #{webhook.kind}, event: #{webhook.event}}"
             send(webhook.event)
+          ensure
+            response
           end
         end
       end

data/lib/contentful/webhook/listener/version.rb

@@ -2,7 +2,7 @@ module Contentful
   module Webhook
     # Webhook Listener
     module Listener
-      VERSION = '0.2.1'
+      VERSION = '0.3.0'
     end
   end
 end

data/lib/contentful/webhook/listener/webhooks.rb

@@ -28,6 +28,8 @@ module Contentful
         def webhook_class_name
           event_name = @headers[::Contentful::Webhook::Listener::WebhookConstants::WEBHOOK_TOPIC].split('.')[-1].split('_').collect(&:capitalize).join
           "Contentful::Webhook::Listener::#{event_name}Webhook"
+        rescue Exception
+          fail 'Could not detect Webhook class'
         end
       end
 

data/spec/contentful/webhook/listener/controllers/webhook_aware_spec.rb

@@ -18,7 +18,7 @@ describe Contentful::Webhook::Listener::Controllers::WebhookAware do
 
   it 'returns 400 Bad Request on non-webhook call' do
     response = MockResponse.new
-    subject.respond(RequestDummy.new(nil, "foo"), response).join
+    subject.respond(RequestDummy.new(nil, "foo"), response)
 
     expect(response.status).to eq(400)
     expect(response.body).to eq('Not a Webhook')

data/spec/contentful/webhook/listener/webhooks_spec.rb

@@ -44,6 +44,12 @@ describe Contentful::Webhook::Listener::WebhookFactory do
           expect(webhook).to be_a Contentful::Webhook::Listener::DeleteWebhook
         end
       end
+
+      describe 'errors' do
+        it 'raises an error when it cant detect webhook' do
+          expect { described_class.new(RequestDummy.new({}, body)).create }.to raise_error "Could not detect Webhook class"
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-webhook-listener
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Simple HTTP Webserver with pluggable behavior for listening to Contentful