msg 0.1.0 → 0.2.0

data/spec/factories/msg/bounces.rb

@@ -4,6 +4,7 @@ FactoryGirl.define do
   factory :bounce, :class => 'Msg::Bounce' do
     factory :valid_bounce do
       association :envelope, factory: :valid_envelope
+      email "test@spanner.org"
     end
   end
 end

data/spec/models/msg/bounce_spec.rb

@@ -9,9 +9,9 @@ module Msg
       @bounce = FactoryGirl.create(:valid_bounce)
     end
 
-    it "should require an envelope" do
+    it "should require an email address" do
       @bounce.should be_valid
-      @bounce.envelope = nil
+      @bounce.email = nil
       @bounce.should_not be_valid
     end
 

data/spec/models/msg/envelope_spec.rb

@@ -20,10 +20,6 @@ module Msg
       @envelope.should_not be_valid
     end
 
-    it "should generate a tracker url" do
-      pending "tracker?"
-    end
-
     it "should by default be marked unopened" do
       @envelope.opened_at.should be_nil
     end
@@ -48,14 +44,13 @@ module Msg
       @envelope.from_address.should eq "#{@message.from_name} <#{@message.from_address}>"
     end
 
-    it "should render the message contents and append a tracker dot" do
-      @envelope.send(:render_with_tracker).should eq "#{@message.body}<img src=\"#{@envelope.url_to_open}\" />"
-    end
-
     it "should send the message" do
       @envelope.send(:send_email)
       @envelope.sent_at.should_not be_nil
-      pending "test for send"
+      mail = ActionMailer::Base.deliveries.last
+      mail[:from].to_s.should == @envelope.from_address
+      mail[:subject].to_s.should == @envelope.subject
+      mail[:message_id].to_s.should == @envelope.email_id.to_s
     end
 
   end

data/spec/models/msg/message_spec.rb

@@ -6,10 +6,6 @@ module Msg
     # Receivers must define a for_email method, which returns the hash we pass to the mustache
     # template. In the dummy we can use any old value just to test that they get through.
     it "should interpolate values provided by the receiver"
-    
-    # after rendering and before sending we have to strip out anything foolish or malicious 
-    # that has been entered by a user.
-    it "should sanitize html in the rendered template"
     it "should accept tags allowed in Msg configuration"
     it "should reject tags not allowed in Msg configuration"
     it "should accept attributes allowed in Msg configuration"

data/spec/requests/bounce_notification_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe "Bounce notification" do
+
+  it "creates some Bounce objects" do
+    envelope = FactoryGirl.create(:valid_envelope)
+    bounce = {
+      "notificationType" => "Bounce",
+      "bounce" => {
+        "bounceType" => "Permanent",
+        "reportingMTA" => "dns; email.example.com",
+        "bouncedRecipients" => [
+          {
+            "emailAddress" => "username@example.com",
+            "status" => "5.1.1",
+            "action" => "failed",
+            "diagnosticCode" => "smtp; 550 5.1.1 <username@example.com>... User"
+          },
+          {
+            "emailAddress" => "othername@example.com"
+          }
+        ],
+        "bounceSubType" => "General",
+        "timestamp" => "2012-06-19T01:07:52.000Z",
+        "feedbackId" => "00000138111222aa-33322211-cccc-cccc-cccc-ddddaaaa068a-000000"
+      },
+      "mail" => {
+        "timestamp" => "2012-06-19T01:05:45.000Z",
+        "source" => "sender@example.com",
+        "messageId" => envelope.email_id,
+        "destination" =>  [
+          "username@example.com"
+        ]
+      }
+    }
+    
+    post msg.bounces_url, bounce.to_json, {'x-amz-sns-message-type' => "Notification", 'Content-Type' => 'text/plain; charset=UTF-8'}
+    expect(response).to be_success
+  end
+
+end

data/spec/requests/sns_confirmation_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+describe "SNS subscription confirmation" do
+
+  it "calls the given url" do
+    envelope = FactoryGirl.create(:valid_envelope)
+    confirmation = {
+      "Type" => "SubscriptionConfirmation",
+      "MessageId" => "165545c9-2a5c-472c-8df2-7ff2be2b3b1b",
+      "Token" => "2336412f37fb687f5d51e6e241d09c805a5a57b30d712f794cc5f6a988666d92768dd60a747ba6f3beb71854e285d6ad02428b09ceece29417f1f02d609c582afbacc99c583a916b9981dd2728f4ae6fdb82efd087cc3b7849e05798d2d2785c03b0879594eeac82c01f235d0e717736",
+      "TopicArn" => "arn:aws:sns:us-east-1:123456789012:MyTopic",
+      "Message" => "You have chosen to subscribe to the topic arn:aws:sns:us-east-1:123456789012:MyTopic. To confirm the subscription, visit the SubscribeURL included in this message.",
+      "SubscribeURL" => "https://amazonses.com/?Action=ConfirmSubscription&TopicArn=arn:aws:sns:us-east-1:123456789012:MyTopic&Token=2336412f37fb687f5d51e6e241d09c805a5a57b30d712f794cc5f6a988666d92768dd60a747ba6f3beb71854e285d6ad02428b09ceece29417f1f02d609c582afbacc99c583a916b9981dd2728f4ae6fdb82efd087cc3b7849e05798d2d2785c03b0879594eeac82c01f235d0e717736",
+      "Timestamp" => "2012-04-26T20:45:04.751Z",
+      "SignatureVersion" => "1",
+      "Signature" => "EXAMPLEpH+DcEwjAPg8O9mY8dReBSwksfg2S7WKQcikcNKWLQjwu6A4VbeS0QHVCkhRS7fUQvi2egU3N858fiTDN6bkkOxYDVrY0Ad8L10Hs3zH81mtnPk5uvvolIC1CXGu43obcgFxeL3khZl8IKvO61GWB6jI9b5+gLPoBc1Q=",
+      "SigningCertURL" => "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem"
+    }
+    
+    post msg.bounces_url, confirmation.to_json, {'x-amz-sns-message-type' => "SubscriptionConfirmation", 'Content-Type' => 'text/plain; charset=UTF-8'}
+    expect(response).to be_success
+    FakeWeb.should have_requested(:get, "https://amazonses.com/?Action=ConfirmSubscription&TopicArn=arn:aws:sns:us-east-1:123456789012:MyTopic&Token=2336412f37fb687f5d51e6e241d09c805a5a57b30d712f794cc5f6a988666d92768dd60a747ba6f3beb71854e285d6ad02428b09ceece29417f1f02d609c582afbacc99c583a916b9981dd2728f4ae6fdb82efd087cc3b7849e05798d2d2785c03b0879594eeac82c01f235d0e717736")
+  end
+
+end

data/spec/routing/sendings_routing_spec.rb

@@ -3,28 +3,23 @@ module Msg
   describe SendingsController do
     describe "routing" do
       it "routes to #index" do
-        pending
-        get("/sendings").should route_to("msg/sendings#index")
+        get("/msg/sendings").should route_to("msg/sendings#index")
       end
 
       it "routes to #show" do
-        pending
-        get("/sendings/1").should route_to("msg/sendings#show", :id => "1")
+        get("/msg/sendings/1").should route_to("msg/sendings#show", :id => "1")
       end
 
       it "routes to #new" do
-        pending
-        get("/sendings/new").should route_to("msg/sendings#new")
+        get("/msg/sendings/new").should route_to("msg/sendings#new")
       end
 
       it "routes to #create" do
-        pending
-        post("/sendings").should route_to("msg/sendings#create")
+        post("/msg/sendings").should route_to("msg/sendings#create")
       end
 
       it "routes to #destroy" do
-        pending
-        delete("/sendings/1").should route_to("msg/sendings#destroy", :id => "1")
+        delete("/msg/sendings/1").should route_to("msg/sendings#destroy", :id => "1")
       end
     end
   end

data/spec/spec_helper.rb

@@ -12,6 +12,9 @@ Spork.prefork do
   require 'factory_girl_rails'
   require 'database_cleaner'
   require 'email_spec'
+  require 'fakeweb'
+  require 'fakeweb_matcher'
+
   # Requires supporting ruby files with custom matchers and macros, etc,
   # in spec/support/ and its subdirectories.
   Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
@@ -47,6 +50,8 @@ Spork.prefork do
     config.before(:suite) do
       DatabaseCleaner.strategy = :transaction
       DatabaseCleaner.clean_with(:truncation)
+      FakeWeb.allow_net_connect = false 
+      FakeWeb.register_uri(:get, %r|https://amazonses\.com/\?|, :body => "What ho!")
     end
     config.before(:each) do
       DatabaseCleaner.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -298,6 +298,7 @@ files:
 - config/routes.rb
 - db/migrate/20130320141926_msg_data.rb
 - db/migrate/20130327134754_sending_circumstances.rb
+- db/migrate/20130423091642_bounced_recipients.rb
 - lib/msg/engine.rb
 - lib/msg/receivers.rb
 - lib/msg/version.rb
@@ -336,7 +337,6 @@ files:
 - spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/2013032210540_users.rb
-- spec/dummy/db/migrate/20130326093048_msg_data.msg.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -361,6 +361,8 @@ files:
 - spec/models/msg/envelope_spec.rb
 - spec/models/msg/message_spec.rb
 - spec/models/msg/sending_spec.rb
+- spec/requests/bounce_notification_spec.rb
+- spec/requests/sns_confirmation_spec.rb
 - spec/routing/sendings_routing_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/spanner/msg
@@ -417,7 +419,6 @@ test_files:
 - spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/2013032210540_users.rb
-- spec/dummy/db/migrate/20130326093048_msg_data.msg.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -442,5 +443,7 @@ test_files:
 - spec/models/msg/envelope_spec.rb
 - spec/models/msg/message_spec.rb
 - spec/models/msg/sending_spec.rb
+- spec/requests/bounce_notification_spec.rb
+- spec/requests/sns_confirmation_spec.rb
 - spec/routing/sendings_routing_spec.rb
 - spec/spec_helper.rb

data/spec/dummy/db/migrate/20130326093048_msg_data.msg.rb

@@ -1,55 +0,0 @@
-# This migration comes from msg (originally 20130320141926)
-class MsgData < ActiveRecord::Migration
-  def change
-    create_table :msg_messages do |t|
-      t.string :subject
-      t.string :from_address
-      t.string :from_name
-      t.text :body
-      t.string :function
-      t.text :description
-      t.boolean :transactional, :default => false
-      t.boolean :saved, :default => false
-      t.integer :created_by_id
-      t.timestamps
-    end
-
-    create_table :msg_sendings do |t|
-      t.integer :message_id
-      t.integer :created_by_id
-      t.datetime :sent_at
-      t.timestamps
-    end
-    add_index :msg_sendings, :message_id
-    add_index :msg_sendings, :created_by_id
-    
-    create_table :msg_envelopes do |t|
-      t.integer :sending_id
-      t.integer :receiver_id
-      t.integer :email_id
-      t.string :receiver_type
-      t.string :to_address
-      t.string :from_address
-      t.string :subject
-      t.text :contents
-      t.datetime :sent_at
-      t.datetime :opened_at
-      t.timestamps
-    end
-    add_index :msg_envelopes, :sending_id
-    add_index :msg_envelopes, :email_id
-    add_index :msg_envelopes, :receiver_id
-    add_index :msg_envelopes, [:receiver_id, :receiver_type]
-    
-    create_table :msg_bounces do |t|
-      t.integer :envelope_id
-      t.string :bounce_type
-      t.string :bounce_subtype
-      t.string :reporter
-      t.text :raw_message
-      t.timestamps
-    end
-    add_index :msg_bounces, :envelope_id
-    
-  end
-end