mailstro 0.0.9 → 0.0.10

data/Readme.md

@@ -33,10 +33,9 @@ TODO: Write a gem description
 Sending a basic email.
 
 ```ruby
-Mailstro.deliver(
-  :to            => 'shanon@mailstroapp.com',
-  :template_name => :welcome,
-  :template_data => {
+Mailstro.deliver(:welcome
+  :to => 'shanon@mailstroapp.com',
+  :data => {
     :coupon_code => 'THANKS01'
   }
 )
@@ -53,14 +52,12 @@ require 'mailsto/rspec'
 Verify emails are being sent with simple matchers.
 
 ```ruby
-Mailstro.deliver(
-  :to            => 'shanon@mailstroapp.com',
-  :template_name => :welcome,
+Mailstro.deliver(:welcome
+  :to => 'shanon@mailstroapp.com'
 )
 
-Mailstro.should have_delivered(
-  :to            => 'shanon@mailstroapp.com',
-  :template_name => :welcome
+Mailstro.should have_delivered(:welcome,
+  :to => 'shanon@mailstroapp.com'
 )
 ```
 

data/lib/mailstro.rb

@@ -11,8 +11,8 @@ module Mailstro
   # Allows us to remove default behaviour during testing.
   class RealStrategy
     class << self
-      def deliver(options)
-        Delivery.new(options).deliver
+      def deliver(email_name, options)
+        Delivery.new(email_name, options).deliver
       end
     end
   end
@@ -28,11 +28,11 @@ module Mailstro
     yield(@configuration) && @configuration.validate!
   end
 
-  def self.deliver(options)
-    @strategy.deliver(options)
+  def self.deliver(email_name, options)
+    @strategy.deliver(email_name, options)
   end
 
-  def self.has_delivered?(template_name)
-    TestStrategy.has_delivered?(template_name)
+  def self.has_delivered?(email_name, options={})
+    TestStrategy.has_delivered?(email_name, options)
   end
 end

data/lib/mailstro/delivery.rb

@@ -1,26 +1,25 @@
 module Mailstro
   class Delivery < Resource
-    def initialize(options)
-      @options = options
-    end
+    attr_reader :email_name
 
-    def contact_email
-      @options.fetch(:to)
+    def initialize(email_name, options)
+      @email_name = email_name
+      @options    = options
     end
 
-    def template_name
-      @options.fetch(:template_name)
+    def to
+      @options.fetch(:to)
     end
 
-    def template_data
-      @options.fetch(:template_data, nil)
+    def data
+      @options.fetch(:data, nil)
     end
 
     def deliver
       post("deliveries",
-           :contact_email => contact_email,
-           :template_name => template_name,
-           :template_data => template_data
+           :to         => to,
+           :email_name => email_name,
+           :data       => data
       )
     end
   end

data/lib/mailstro/test_strategy.rb

@@ -10,22 +10,15 @@ module Mailstro
       @@deliveries = []
     end
 
-    def self.deliver(options)
-      @@deliveries << Delivery.new(options)
+    def self.deliver(email_name, options)
+      @@deliveries << Delivery.new(email_name, options)
     end
 
-    def self.has_delivered?(conditions)
+    def self.has_delivered?(email_name, conditions)
       @@deliveries.any? do |delivery|
-        result = true
-        if conditions.is_a?(Hash)
-          if conditions[:template_name]
-            result = result && delivery.template_name == conditions[:template_name]
-          end
-          if conditions[:to]
-            result = result && delivery.contact_email == conditions[:to]
-          end
-        else
-          result = delivery.template_name == conditions
+        result = delivery.email_name == email_name
+        if conditions[:to]
+          result = result && delivery.to == conditions[:to]
         end
         result
       end

data/lib/mailstro/version.rb

@@ -1,3 +1,3 @@
 module Mailstro
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/integration/delivery_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'posting a delivery', :integration do
   let(:contact_email) { "test@example.com" }
-  let(:template_name) { :test }
-  let(:template_data) { { :greeting => "Gday!" } }
+  let(:email_name)    { :test }
+  let(:data)          { { :greeting => "Gday!" } }
 
   before do
     Mailstro.configure do |config|
@@ -12,20 +12,19 @@ describe 'posting a delivery', :integration do
   end
 
   let(:expected_body) {{
-    "api_key"       => "lolapi",
-    "contact_email" => "test@example.com",
-    "template_name" => "test",
-    "template_data" => { "greeting" => "Gday!" }
+    "api_key"    => "lolapi",
+    "to"         => "test@example.com",
+    "email_name" => "test",
+    "data"       => { "greeting"        => "Gday!" }
   }}
 
   it "succesfully submits a delivery to mailstro" do
     stub_request(:post, "https://api.mailstroapp.com/v1/deliveries").
       with(:body => expected_body).to_return(:status => 200, :body => fixture("response.json"))
 
-    response = Mailstro.deliver(
-      :to            => contact_email,
-      :template_name => template_name,
-      :template_data => template_data
+    response = Mailstro.deliver(email_name,
+      :to   => contact_email,
+      :data => data
     )
     response['success'].should == true
   end
@@ -35,10 +34,9 @@ describe 'posting a delivery', :integration do
       to_return(:status => 401)
 
     expect do
-      Mailstro.deliver(
-        :to            => contact_email,
-        :template_name => template_name,
-        :template_data => template_data
+      Mailstro.deliver(email_name,
+        :to   => contact_email,
+        :data => data
       )
     end.to raise_error(Mailstro::Error::AuthorisationError, "api_key not authorised")
   end

data/spec/mailstro/test_strategy_spec.rb

@@ -10,9 +10,8 @@ describe Mailstro::TestStrategy do
     it "doesn't send anything when enabled" do
       Mailstro::Delivery.should_not_receive(:deliver)
 
-      Mailstro.deliver(
-        :to            => 'a@a.com',
-        :template_name => :welcome
+      Mailstro.deliver(:welcome,
+        :to => 'a@a.com'
       )
     end
   end
@@ -20,9 +19,8 @@ describe Mailstro::TestStrategy do
   describe '.has_delivered?' do
     context "with a delivery" do
       before do
-        Mailstro.deliver(
-          :to            => 'a@a.com',
-          :template_name => :welcome
+        Mailstro.deliver(:welcome,
+          :to => 'a@a.com'
         )
       end
 
@@ -31,9 +29,8 @@ describe Mailstro::TestStrategy do
       end
 
       it 'matches contact email and template name' do
-        Mailstro.should have_delivered(
-          :to            => 'a@a.com',
-          :template_name => :welcome,
+        Mailstro.should have_delivered(:welcome,
+          :to => 'a@a.com'
         )
       end
 
@@ -42,9 +39,8 @@ describe Mailstro::TestStrategy do
       end
 
       it 'does not match an invalid contact email' do
-        Mailstro.should_not have_delivered(
-          :to            => 'b@a.com',
-          :template_name => :welcome,
+        Mailstro.should_not have_delivered(:welcome,
+          :to => 'b@a.com'
         )
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailstro
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday