gridhook 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43deaac095d3476254f00b52a8063f8754e9adee
-  data.tar.gz: 1b5885bf92c054839372af4504d83e7ed60cd96d
+  metadata.gz: d791609c5397b321d7f9df288063a033f854dd23
+  data.tar.gz: b6927324b781fafb331fbf19a806e14329f86095
 SHA512:
-  metadata.gz: 7ce42a670a616490d15ba22fe4f5be46fd7a48c93f54ec84c3c0d93fc24f2efc65f8cddfe1fe85af4bb308ec6817a9d03d87f41ffb4224d4378897b6cdc4ff76
-  data.tar.gz: 020513e2ca1876a628b17d217782626db34191583a32e4a7c7a6cd58dccb1bf31195440ce12fcaeb787d8466af82ac0c2e84d030d7516c6f84f6f78620262387
+  metadata.gz: 8acb4edbd86e175b7c6201eedc633e729283d7e963ae4c95dd896669b5cb9b49d659ace8e99ea86dc35f005d0553cb61b8ad8120aab019358a22af501f0ff1e3
+  data.tar.gz: 221de705910f0162ec166c7597de9824ecf58ce86bebef3dbaea406d000cdbb649a8c4233ccfa52cd71b2fab372cb349651c4d88543f8016b5670dd1e7a331f8

data/app/controllers/gridhook/events_controller.rb

@@ -1,7 +1,7 @@
 module Gridhook
   class EventsController < ActionController::Base
     def create
-      Gridhook::Event.process(request.body)
+      Gridhook::Event.process(request.body, params)
       head :ok
     end
   end

data/lib/gridhook/event.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/except'
+
 module Gridhook
   class Event
 
@@ -7,7 +9,7 @@ module Gridhook
     # body - A String or stream for Yajl to parse
     #
     # Returns nothing.
-    def self.process(body)
+    def self.process(body, params = {})
       parser = Yajl::Parser.new
       parser.on_parse_complete = proc do |event|
         if event.is_a?(Array)
@@ -16,7 +18,11 @@ module Gridhook
           process_event event
         end
       end
-      parser.parse(body)
+      begin
+        parser.parse(body)
+      rescue Yajl::ParseError
+        process_event params.except(:controller, :action)
+      end
     end
 
     # The original Hash of attributes received from SendGrid.
@@ -31,10 +37,11 @@ module Gridhook
     def name
       attributes[:event]
     end
+    alias event name
 
     # Returns a new Time object from the event timestamp.
     def timestamp
-      Time.at (attributes[:timestamp] || Time.now).to_i
+      Time.at((attributes[:timestamp] || Time.now).to_i)
     end
 
     # A helper for accessing the original values sent from

data/lib/gridhook/version.rb

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

data/test/gridlock/event_test.rb

@@ -37,10 +37,18 @@ class EventTest < TestCase
     assert_equal 2, @events.size
   end
 
+  test 'ensure we fallback to request parameters if invalid JSON found in body' do
+    process('email=test@gmail.com&arg2=2&arg1=1&category=testing&event=processed',
+      { :email => 'test@gmail.com', :arg2 => '2', :arg1 => '1', :category => 'testing',
+        :event => 'processed', :controller => 'sendgrid', :action => 'receive'})
+    assert_equal 1, @events.size
+    assert_equal 'processed', @events.first.event
+  end
+
   private
 
-  def process(str)
-    Gridhook::Event.process(str)
+  def process(str, params = {})
+    Gridhook::Event.process(str, params)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridhook
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.1
 signing_key: 
 specification_version: 4
 summary: A SendGrid webhook endpoint