sendgrid_events 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sendgrid_events (0.0.2)
+    sendgrid_events (0.0.3)
       enumerated_field
       rails (~> 3.0.15)
       sendgrid

data/lib/generators/sendgrid_events/install/templates/initializer.rb

@@ -1,5 +1,5 @@
 SendgridEvents::Configure.config do
   handle %w[processed deferred delivered open click bounce dropped spamreport unsubscribe]
-  receive = true
-  mount_at = "/sendgrid_events/"
+  receive true
+  mount_at "/sendgrid_events/receiver"
 end

data/lib/generators/sendgrid_events/install/templates/routes.rb

@@ -1,2 +1,2 @@
 
-  match "#{SendgridEvents::Configure.mount_at}receiver" => "sendgrid_events/sendgrid_events#receiver", :via => :post
+  match SendgridEvents::Configure.mount_at => "sendgrid_events/sendgrid_events#receiver", :via => :post

data/lib/generators/sendgrid_events/install_generator.rb

@@ -14,21 +14,42 @@ module SendgridEvents
         @prev_migration_nr.to_s
       end
 
-      def install_migrations
+      def install
+        migrations
+        initializer
+        routes
+        middleware
+      end
+
+      private
+
+      def migrations
         puts "Copying Sengrid Events migrations..."
-        migration_template "sendgrid_events_table.rb", "db/migrate/sendgrid_events_table.rb"
+        begin
+          migration_template "sendgrid_events_table.rb", "db/migrate/sendgrid_events_table.rb"
+        rescue
+          puts "Already have that migration"
+        end
       end
 
-      def install_initializer
+      def initializer
         puts "Copying initializer..."
         copy_file "initializer.rb", "config/initializers/sendgrid_events.rb"
       end
 
-      def add_routes
+      def routes
+        puts "Copying routes..."
         insert_into_file Rails.root.join('config', 'routes.rb'),
           File.open(File.join(File.expand_path("../install/templates", __FILE__), 'routes.rb')).read,
           :after => /Application\.routes\.draw do$/
       end
+
+      def middleware
+        puts "Copying config..."
+        insert_into_file Rails.root.join('config', 'application.rb'), :after => /class Application.*$/ do
+          "\n\t\tconfig.middleware.insert_after ActiveRecord::ParamsParser, SendgridEvents::Middleware"
+        end
+      end
     end
   end
 end

data/lib/sendgrid_events.rb

@@ -6,3 +6,4 @@ require 'sendgrid_events/handlers'
 require 'sendgrid_events/receiver'
 require 'sendgrid_events/action_mailer_override'
 require 'sendgrid_events/configure'
+require 'sendgrid_events/middleware'

data/lib/sendgrid_events/handlers/dispatch.rb

@@ -6,7 +6,7 @@ module SendgridEvents
       end
 
       def self.registered_handlers
-        @registered_handlers ||= {}
+        @registered_handlers ||= {}.with_indifferent_access
       end
 
       def self.acceptable_handlers
@@ -21,13 +21,13 @@ module SendgridEvents
                                               spamreport
                                               unsubscribe
                                             ]
-                                   Hash[array.zip([true] * array.size)].symbolize_keys
+                                   Hash[array.zip([true] * array.size)].with_indifferent_access
                                  end
       end
 
       def self.selected_handlers=(handler_list)
         raise ArgumentError, "Found an unaccetable handler" unless handler_list.all? { |x| acceptable_handlers[x.to_sym] }
-        @selected_handlers = Hash[handler_list.zip([true] * handler_list.size)].symbolize_keys
+        @selected_handlers = Hash[handler_list.zip([true] * handler_list.size)].with_indifferent_access
       end
     end
   end

data/lib/sendgrid_events/middleware.rb

@@ -0,0 +1,22 @@
+module SendgridEvents
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      scrub(env) if env["REQUEST_URI"].include? Configure.mount_at
+      @app.call(env)
+    end
+
+    private
+    def scrub(env)
+      rack_input = env["rack.input"].read
+      rack_input ="[#{rack_input.split("\r\n").join(",")}]"
+      env["rack.input"] = StringIO.new(rack_input)
+    rescue
+    ensure
+      env["rack.input"].rewind
+    end
+  end
+end

data/lib/sendgrid_events/receiver.rb

@@ -1,18 +1,14 @@
 module SendgridEvents
   class Receiver
     def self.receive(params)
-      if Configure.receive?
-        extract_events_and_clean(params).each do |event|
-          Handlers::Base.choose_and_handle event
+      if Configure.receive? and params['_json'] and params['_json'].is_a? Array
+        params['_json'].each do |event|
+          if event.is_a? Hash and event.has_key? "sendgrid_events_id"
+            event = event.with_indifferent_access
+            Handlers::Base.choose_and_handle(event)
+          end
         end
       end
     end
-
-    private
-    def self.extract_events_and_clean(params)
-      params.first.first.split("\n").collect do |json_hash|
-        JSON.parse(json_hash).symbolize_keys
-      end
-    end
   end
 end

data/lib/sendgrid_events/version.rb

@@ -1,3 +1,3 @@
 module SendgridEvents
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/sendgrid_events/handlers/base_spec.rb

@@ -17,7 +17,7 @@ module SendgridEvents
       } }
 
       it "returns the list of handlers" do
-        subject.registered_handlers.symbolize_keys.keys.sort.should == Dispatch.acceptable_handlers.keys.sort
+        subject.registered_handlers.keys.sort.should == Dispatch.acceptable_handlers.keys.sort
       end
 
       it "chose a handler if handler is registered" do

data/spec/sendgrid_events/receiver_spec.rb

@@ -3,30 +3,17 @@ module SendgridEvents
   describe Receiver do
     subject { Receiver }
     it { should respond_to(:receive) }
-    it { should respond_to(:extract_events_and_clean) }
 
     let(:params) {
-      {"{\"email\":\"foo@bar.com\",\"timestamp\":1322000095,\"sendgrid_events_id\":\"7\",\"event\":\"delivered\"}\n{\"email\":\"foo@bar.com\",\"timestamp\":1322000096,\"sendgrid_events_id\":\"4\",\"event\":\"delivered\"}" => nil}
+      { "_json" => [
+        {"email" => "foo@bar.com", "timestamp" => 1322000095,"sendgrid_events_id" => "7", "event" => "delivered"},
+        {"email" => "foo@bar.com", "timestamp" => 1322000096, "sendgrid_events_id" => "4", "event" => "delivered"}
+      ] }
     }
 
     it "sends the poorly composed params to be cleaned then handles" do
       Handlers::Base.should_receive(:choose_and_handle).exactly(2).times
       subject.receive params
     end
-
-    it "extracts JSON objects" do
-      subject.extract_events_and_clean(params).should == [{
-        :email => "foo@bar.com",
-        :timestamp => 1322000095,
-        :sendgrid_events_id => '7',
-        :event => "delivered"
-      },
-      {
-        :email => "foo@bar.com",
-        :timestamp => 1322000096,
-        :sendgrid_events_id => "4",
-        :event => "delivered"
-      }]
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid_events
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -209,6 +209,7 @@ files:
 - lib/sendgrid_events/handlers/processed.rb
 - lib/sendgrid_events/handlers/spam_reported.rb
 - lib/sendgrid_events/handlers/unsubscribed.rb
+- lib/sendgrid_events/middleware.rb
 - lib/sendgrid_events/receiver.rb
 - lib/sendgrid_events/version.rb
 - script/rails
@@ -240,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1020654596744894138
+      hash: 143610152345397580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1020654596744894138
+      hash: 143610152345397580
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24