gridhook 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d791609c5397b321d7f9df288063a033f854dd23
-  data.tar.gz: b6927324b781fafb331fbf19a806e14329f86095
+  metadata.gz: 8ad6d5bbe35f5ec6ea021d69e67971e053deb4af
+  data.tar.gz: 3eab2c6b882d0f6277b87fa8c8cdb9c2c177519d
 SHA512:
-  metadata.gz: 8acb4edbd86e175b7c6201eedc633e729283d7e963ae4c95dd896669b5cb9b49d659ace8e99ea86dc35f005d0553cb61b8ad8120aab019358a22af501f0ff1e3
-  data.tar.gz: 221de705910f0162ec166c7597de9824ecf58ce86bebef3dbaea406d000cdbb649a8c4233ccfa52cd71b2fab372cb349651c4d88543f8016b5670dd1e7a331f8
+  metadata.gz: 087d115559a7a5ab94831ad5a1375a36b933b7612100f4c7e3ed29131d7b844d5ed066c68d64ee8d736a43bc3557b47c8f2c7462fc32f530495bf1b201a281b5
+  data.tar.gz: 9d3bf84b34671514fd207e4212dc1f5d2648227c6bb6efe582d7e4f17f86713103dca19d990f9c6f7deb16e995d439a19c02da60d64fde6eaee197566fcbb5f3

data/README.md

@@ -48,6 +48,12 @@ Gridhook.configure do |config|
 end
 ```
 
+## Changelog
+v0.2.0 Supports version 3 of the Sendgrid webhook released on 
+September 6th, 2013, which provides the proper headers and JSON post body
+without hacks or middleware. If upgrading to this version, please make sure
+to update the Webhooks settings in your SendGrid App to use V3 of their API.
+
 ## TODO
 
 * More tests

data/gridhook.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['app', 'lib']
 
   spec.add_dependency 'rails', '>= 3.1.0'
-  spec.add_dependency 'yajl-ruby', '~> 1.1.0'
+  spec.add_dependency 'multi_json', '>= 1.3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.2'
   spec.add_development_dependency 'rake'

data/lib/gridhook.rb

@@ -1,6 +1,5 @@
 require 'rails/engine'
-require 'yajl'
-require 'yajl/json_gem'
+require 'multi_json'
 require 'action_view'
 require 'action_dispatch'
 

data/lib/gridhook/engine.rb

@@ -1,9 +1,4 @@
-require 'gridhook/unfortunate_sendgrid_fix'
-
 module Gridhook
   class Engine < ::Rails::Engine
-    # Insert our SendGrid JSON fix middleware before ParamsParser
-    # attempts to encode the JSON.
-    config.app_middleware.insert_before ActionDispatch::ParamsParser, 'Gridhook::UnfortunateSendgridFix'
   end
 end

data/lib/gridhook/event.rb

@@ -6,21 +6,18 @@ module Gridhook
     # Process a String or stream of JSON and execute our
     # event processor.
     #
-    # body - A String or stream for Yajl to parse
+    # body - A String or stream for MultiJson to parse
     #
     # Returns nothing.
     def self.process(body, params = {})
-      parser = Yajl::Parser.new
-      parser.on_parse_complete = proc do |event|
+      begin
+        event = MultiJson.load(body)
         if event.is_a?(Array)
           process_events event
         else
           process_event event
         end
-      end
-      begin
-        parser.parse(body)
-      rescue Yajl::ParseError
+      rescue MultiJson::LoadError
         process_event params.except(:controller, :action)
       end
     end

data/lib/gridhook/version.rb

@@ -1,3 +1,3 @@
 module Gridhook
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/test/gridlock/event_test.rb

@@ -18,15 +18,6 @@ class EventTest < TestCase
     assert_equal 'delivered', @events.first.name
   end
 
-  test 'parsing incoming (invalid) JSON in batches' do
-    process <<-E
-      {"email":"foo@bar.com","timestamp":1322000095,"unique_arg":"my unique arg","event":"delivered"}
-      {"email":"foo@bar.com","timestamp":1322000096,"unique_arg":"my unique arg","event":"open"}
-    E
-    assert_kind_of Gridhook::Event, @events.first
-    assert_equal 2, @events.size
-  end
-
   # for when sendgrid fix their JSON batch requests
   test 'parsing incoming (valid) JSON in batches' do
     obj = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridhook
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,6 @@ files:
 - lib/gridhook/engine.rb
 - lib/gridhook/errors.rb
 - lib/gridhook/event.rb
-- lib/gridhook/unfortunate_sendgrid_fix.rb
 - lib/gridhook/version.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -159,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.1
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A SendGrid webhook endpoint

data/lib/gridhook/unfortunate_sendgrid_fix.rb

@@ -1,14 +0,0 @@
-module Gridhook
-  class UnfortunateSendgridFix
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      if env['PATH_INFO'] == Gridhook.config.event_receive_path
-        env['CONTENT_TYPE'] = 'text/plain'
-      end
-      @app.call(env)
-    end
-  end
-end