contentful-webhook-listener 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead87c79c6faa39c84983c279db131c1968c03ae
-  data.tar.gz: 78d9920ce209f081d38328df7d36d6f199981746
+  metadata.gz: 5be0e0cdf9733135b317548fc9924c2bc8bdbf9b
+  data.tar.gz: 43efe07cf45335ad09e018bb37bb1877b6883bb7
 SHA512:
-  metadata.gz: 2e5111ccd3751dda799a590371247f919933d2aed6f4604fe5bd459f54582825b40a78e23a25240f3a424a574fa6296cd6662c5d824b6d8ac8b0e0e31b0f68e4
-  data.tar.gz: ff31507c823c30180b93ad98fe4cd2985f4ba44fb956acd6d73a33c8438765d83c885ae9622f444c5f410a862c97eed7e5d05a1992cdcd069f8e28d313b3ab34
+  metadata.gz: 1d60327e25d838c1510c637568aca70ef02341871b521321c431503ee11ef71ac1e09e2a4f824e5f40f13200f4c2cb7ca6ebf1c0447d0ed502623804719b3365
+  data.tar.gz: 51e8ff1d72c967fe88c8c2b3a6cbe263a79f1da28e921d9945ea4f101808db65466acc40418f0dab49b54ac95d03621ee343ae280a1595dc8e176f119ffa6fee

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v0.2.1
+### Fixed
+* Fixes Headers for case-insensitive retrieval
+
 ## v0.2.0
 ### Added
 * Added `WebhookAware` controller

data/contentful-webhook-listener.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "listen", "~> 3.0.0"
 end

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

@@ -35,13 +35,19 @@ module Contentful
           protected
 
           def perform(request, response)
-            @webhook = WebhookFactory.new(request).create
+            begin
+              @webhook = WebhookFactory.new(request).create
+            rescue Exception => e
+              logger.error e
+              response.body = "Not a Webhook"
+              response.status = 400
+              return
+            end
+
             super(request, response)
+
             logger.debug "Webhook Data: {id: #{webhook.id}, space_id: #{webhook.space_id}, kind: #{webhook.kind}, event: #{webhook.event}}"
             send(webhook.event)
-          rescue
-            response.body = "Not a Webhook"
-            response.status = 400
           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.0'
+      VERSION = '0.2.1'
     end
   end
 end

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

@@ -4,14 +4,14 @@ module Contentful
   module Webhook
     module Listener
       module WebhookConstants
-        WEBHOOK_TOPIC = 'X-Contentful-Topic'
-        WEBHOOK_NAME = 'X-Contentful-Webhook-Name'
+        WEBHOOK_TOPIC = 'x-contentful-topic'
+        WEBHOOK_NAME = 'x-contentful-webhook-name'
       end
 
       class WebhookFactory
         def initialize(request)
           @headers = {}
-          request.each { |header, value| @headers[header] = value }
+          request.each { |header, value| @headers[header.downcase] = value }
           @body = JSON.load(request.body)
         end
 

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

@@ -52,7 +52,7 @@ describe Contentful::Webhook::Listener::BaseWebhook do
   let(:body) { {'sys' => { 'id' => 'foo', 'space' => { 'sys' => { 'id' => 'space_foo' } } }, 'fields' => {} } }
   let(:topic) { 'ContentfulManagement.Entry.publish' }
   let(:name) { 'WebhookName' }
-  let(:headers) { {'X-Contentful-Topic' => topic, 'X-Contentful-Webhook-Name' => name} }
+  let(:headers) { {'x-contentful-topic' => topic, 'x-contentful-webhook-name' => name} }
   subject { described_class.new(headers, body) }
 
   describe 'attributes' do
@@ -92,34 +92,34 @@ describe Contentful::Webhook::Listener::BaseWebhook do
           expect(described_class.new(headers, body).entry?).to be_truthy
         end
         it 'false when kind != Entry' do
-          headers['X-Contentful-Topic'] = 'ContentfulManagement.Asset.publish'
+          headers['x-contentful-topic'] = 'ContentfulManagement.Asset.publish'
           expect(described_class.new(headers, body).entry?).to be_falsey
 
-          headers['X-Contentful-Topic'] = 'ContentfulManagement.ContentType.publish'
+          headers['x-contentful-topic'] = 'ContentfulManagement.ContentType.publish'
           expect(described_class.new(headers, body).entry?).to be_falsey
         end
       end
       describe '#asset?' do
         it 'true when kind == Asset' do
-          headers['X-Contentful-Topic'] = 'ContentfulManagement.Asset.publish'
+          headers['x-contentful-topic'] = 'ContentfulManagement.Asset.publish'
           expect(described_class.new(headers, body).asset?).to be_truthy
         end
         it 'false when kind != Asset' do
           expect(described_class.new(headers, body).asset?).to be_falsey
 
-          headers['X-Contentful-Topic'] = 'ContentfulManagement.ContentType.publish'
+          headers['x-contentful-topic'] = 'ContentfulManagement.ContentType.publish'
           expect(described_class.new(headers, body).asset?).to be_falsey
         end
       end
       describe '#content_type?' do
         it 'true when kind == ContentType' do
-          headers['X-Contentful-Topic'] = 'ContentfulManagement.ContentType.publish'
+          headers['x-contentful-topic'] = 'ContentfulManagement.ContentType.publish'
           expect(described_class.new(headers, body).content_type?).to be_truthy
         end
         it 'false when kind != ContentType' do
           expect(described_class.new(headers, body).content_type?).to be_falsey
 
-          headers['X-Contentful-Topic'] = 'ContentfulManagement.Asset.publish'
+          headers['x-contentful-topic'] = 'ContentfulManagement.Asset.publish'
           expect(described_class.new(headers, body).content_type?).to be_falsey
         end
       end
@@ -131,7 +131,7 @@ describe Contentful::Webhook::Listener::FieldWebhook do
   let(:body) { {'sys' => { 'id' => 'foo', 'space' => { 'sys' => { 'id' => 'space_foo' } } }, 'fields' => {} } }
   let(:topic) { 'ContentfulManagement.Entry.publish' }
   let(:name) { 'WebhookName' }
-  let(:headers) { {'X-Contentful-Topic' => topic, 'X-Contentful-Webhook-Name' => name} }
+  let(:headers) { {'x-contentful-topic' => topic, 'x-contentful-webhook-name' => name} }
   subject { described_class.new(headers, body) }
 
   describe 'attributes' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-webhook-listener
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: A Simple HTTP Webserver with pluggable behavior for listening to Contentful
   API Webhooks
 email: