mailstro 0.0.8 → 0.0.9

data/Readme.md

@@ -42,22 +42,6 @@ Mailstro.deliver(
 )
 ```
 
-Sending an email to a list of users, with subscription management.
-
-```ruby
-Mailstro.subscribe('shanon@mailstroapp.com', :build_watchers, project_id)
-
-Mailstro.deliver(
-  :to            => [:build_watchers, project_id]
-  :template_name => :build_failure,
-  :template_data => {
-    :commit => '575ca555c23eca098202'
-  }
-)
-
-Mailstro.unsubscribe('shanon@mailstroapp.com', :build_watchers, project_id)
-```
-
 ## RSpec
 
 Require the mailstro spec helper to automatically enable test mode.
@@ -74,19 +58,10 @@ Mailstro.deliver(
   :template_name => :welcome,
 )
 
-Mailstro.should have_delivered(:welcome)
 Mailstro.should have_delivered(
   :to            => 'shanon@mailstroapp.com',
   :template_name => :welcome
 )
-
-Mailstro.should have_subscribed('a@a.com', :watchers, 2)
-Mailstro.should have_unsubscribed('a@a.com', :watchers, 2)
-
-Mailstro.should have_delivered(
-  :to            => [:build_watchers, project_name],
-  :template_name => :build_failed
-)
 ```
 
 ## Contributing

data/lib/mailstro/test_strategy.rb

@@ -4,32 +4,16 @@ module Mailstro
       Mailstro.strategy = Mailstro::TestStrategy
     end
 
-    @@deliveries   = []
-    @@subscribes   = []
-    @@unsubscribes = []
+    @@deliveries = []
 
     def self.clear
-      @@deliveries   = []
-      @@subscribes   = []
-      @@unsubscribes = []
+      @@deliveries = []
     end
 
     def self.deliver(options)
       @@deliveries << Delivery.new(options)
     end
 
-    def self.list_deliver(options)
-      @@deliveries << ListDelivery.new(options)
-    end
-
-    def self.subscribe(contact_email, list_type, list_name)
-      @@subscribes << ListSubscribe.new(contact_email, list_type, list_name)
-    end
-
-    def self.unsubscribe(contact_email, list_type, list_name)
-      @@unsubscribes << ListUnsubscribe.new(contact_email, list_type, list_name)
-    end
-
     def self.has_delivered?(conditions)
       @@deliveries.any? do |delivery|
         result = true
@@ -40,33 +24,11 @@ module Mailstro
           if conditions[:to]
             result = result && delivery.contact_email == conditions[:to]
           end
-          if conditions[:to_list_type]
-            result = result && delivery.list_type     == conditions[:to_list_type]
-          end
-          if conditions[:to_list_name]
-            result = result && delivery.list_name     == conditions[:to_list_name]
-          end
         else
           result = delivery.template_name == conditions
         end
         result
       end
     end
-
-    def self.has_subscribed?(contact_email, list_type, list_name)
-      @@subscribes.any? do |subscribe|
-        subscribe.contact_email == contact_email &&
-        subscribe.list_type     == list_type &&
-        subscribe.list_name     == list_name
-      end
-    end
-
-    def self.has_unsubscribed?(contact_email, list_type, list_name)
-      @@unsubscribes.any? do |unsubscribe|
-        unsubscribe.contact_email == contact_email &&
-        unsubscribe.list_type     == list_type &&
-        unsubscribe.list_name     == list_name
-      end
-    end
   end
 end

data/lib/mailstro/version.rb

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

data/lib/mailstro.rb

@@ -5,9 +5,6 @@ require_relative "mailstro/configuration"
 require_relative "mailstro/error"
 require_relative "mailstro/resource"
 require_relative "mailstro/delivery"
-require_relative "mailstro/list_delivery"
-require_relative "mailstro/list_subscribe"
-require_relative "mailstro/list_unsubscribe"
 
 module Mailstro
 
@@ -17,15 +14,6 @@ module Mailstro
       def deliver(options)
         Delivery.new(options).deliver
       end
-      def list_deliver(options)
-        ListDelivery.new(options).deliver
-      end
-      def subscribe(contact_email, list_type, list_name)
-        ListSubscribe.new(contact_email, list_type, list_name).deliver
-      end
-      def unsubscribe(contact_email, list_type, list_name)
-        ListUnsubscribe.new(contact_email, list_type, list_name).deliver
-      end
     end
   end
 
@@ -41,30 +29,10 @@ module Mailstro
   end
 
   def self.deliver(options)
-    if options[:to].is_a?(Array)
-      @strategy.list_deliver(options)
-    else
-      @strategy.deliver(options)
-    end
-  end
-
-  def self.subscribe(contact_email, list_type, list_name)
-    @strategy.subscribe(contact_email, list_type, list_name)
-  end
-
-  def self.unsubscribe(contact_email, list_type, list_name)
-    @strategy.unsubscribe(contact_email, list_type, list_name)
+    @strategy.deliver(options)
   end
 
   def self.has_delivered?(template_name)
     TestStrategy.has_delivered?(template_name)
   end
-
-  def self.has_subscribed?(contact_email, list_type, list_name)
-    TestStrategy.has_subscribed?(contact_email, list_type, list_name)
-  end
-
-  def self.has_unsubscribed?(contact_email, list_type, list_name)
-    TestStrategy.has_unsubscribed?(contact_email, list_type, list_name)
-  end
 end

data/spec/mailstro/test_strategy_spec.rb

@@ -9,23 +9,11 @@ describe Mailstro::TestStrategy do
   describe '.enable' do
     it "doesn't send anything when enabled" do
       Mailstro::Delivery.should_not_receive(:deliver)
-      Mailstro::ListDelivery.should_not_receive(:deliver)
-      Mailstro::ListSubscribe.should_not_receive(:deliver)
-      Mailstro::ListUnsubscribe.should_not_receive(:deliver)
 
       Mailstro.deliver(
         :to            => 'a@a.com',
         :template_name => :welcome
       )
-
-      Mailstro.subscribe('a@a.com', :watchers, 12)
-
-      Mailstro.deliver(
-        :to            => [:watchers, 12],
-        :template_name => :welcome
-      )
-
-      Mailstro.unsubscribe('a@a.com', :watchers, 12)
     end
   end
 
@@ -60,62 +48,5 @@ describe Mailstro::TestStrategy do
         )
       end
     end
-
-    context "with a list delivery" do
-      before do
-        Mailstro.deliver(
-          :to            => [:build_watchers, 'mailstro/mailstro-ruby'],
-          :template_name => :build_failed
-        )
-      end
-
-      it "matches against list type, name and template name" do
-        Mailstro.should have_delivered(
-          :to_list_type  => :build_watchers,
-          :to_list_name  => 'mailstro/mailstro-ruby',
-          :template_name => :build_failed,
-        )
-      end
-
-      it "does not match an invalid list type" do
-        Mailstro.should_not have_delivered(
-          :to_list_type  => :customers,
-          :to_list_name  => 'mailstro/mailstro-ruby',
-          :template_name => :build_failed,
-        )
-      end
-
-      it "does not match an invalid list name" do
-        Mailstro.should_not have_delivered(
-          :to_list_type  => :build_watchers,
-          :to_list_name  => 'mailstro/mailstro',
-          :template_name => :build_failed,
-        )
-      end
-
-      it "does not match an invalid template name" do
-        Mailstro.should_not have_delivered(
-          :to_list_type  => :build_watchers,
-          :to_list_name  => 'mailstro/mailstro-ruby',
-          :template_name => :welcome,
-        )
-      end
-    end
-  end
-
-  describe '.has_subsribed?' do
-    it 'keeps a record of subscribes' do
-      Mailstro.subscribe('a@a.com', :watchers, 2)
-
-      Mailstro.should have_subscribed('a@a.com', :watchers, 2)
-    end
-  end
-
-  describe '.has_unsubsribed?' do
-    it 'keeps a record of unsubscribes' do
-      Mailstro.unsubscribe('a@a.com', :watchers, 2)
-
-      Mailstro.should have_unsubscribed('a@a.com', :watchers, 2)
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailstro
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -142,11 +142,7 @@ files:
 - lib/mailstro/configuration.rb
 - lib/mailstro/delivery.rb
 - lib/mailstro/error.rb
-- lib/mailstro/list_delivery.rb
-- lib/mailstro/list_subscribe.rb
-- lib/mailstro/list_unsubscribe.rb
 - lib/mailstro/middleware/response/raise_error.rb
-- lib/mailstro/real_strategy.rb
 - lib/mailstro/resource.rb
 - lib/mailstro/rspec.rb
 - lib/mailstro/test_strategy.rb
@@ -154,9 +150,6 @@ files:
 - mailstro-ruby.gemspec
 - spec/fixtures/response.json
 - spec/integration/delivery_spec.rb
-- spec/integration/list_delivery_spec.rb
-- spec/integration/list_subscribe_spec.rb
-- spec/integration/list_unsubscribe_spec.rb
 - spec/mailstro/configuration_spec.rb
 - spec/mailstro/test_strategy_spec.rb
 - spec/mailstro/version_spec.rb
@@ -191,9 +184,6 @@ summary: Ruby wrapper for mailstroapp.com
 test_files:
 - spec/fixtures/response.json
 - spec/integration/delivery_spec.rb
-- spec/integration/list_delivery_spec.rb
-- spec/integration/list_subscribe_spec.rb
-- spec/integration/list_unsubscribe_spec.rb
 - spec/mailstro/configuration_spec.rb
 - spec/mailstro/test_strategy_spec.rb
 - spec/mailstro/version_spec.rb

data/lib/mailstro/list_delivery.rb

@@ -1,32 +0,0 @@
-module Mailstro
-  class ListDelivery < Resource
-    def initialize(options)
-      @options = options
-    end
-
-    def list_type
-      @options.fetch(:to)[0]
-    end
-
-    def list_name
-      @options.fetch(:to)[1]
-    end
-
-    def template_name
-      @options.fetch(:template_name)
-    end
-
-    def template_data
-      @options.fetch(:template_data, nil)
-    end
-
-    def deliver
-      post("lists/deliveries",
-           :list_type     => list_type,
-           :list_name     => list_name,
-           :template_name => template_name,
-           :template_data => template_data
-      )
-    end
-  end
-end

data/lib/mailstro/list_subscribe.rb

@@ -1,19 +0,0 @@
-module Mailstro
-  class ListSubscribe < Resource
-    attr_reader :contact_email, :list_type, :list_name
-
-    def initialize(contact_email, list_type, list_name)
-      @contact_email = contact_email
-      @list_type     = list_type
-      @list_name     = list_name
-    end
-
-    def deliver
-      post("lists/subscribers",
-             :contact_email => @contact_email,
-             :list_type     => @list_type,
-             :list_name     => @list_name
-      )
-    end
-  end
-end

data/lib/mailstro/list_unsubscribe.rb

@@ -1,19 +0,0 @@
-module Mailstro
-  class ListUnsubscribe < Resource
-    attr_reader :contact_email, :list_type, :list_name
-
-    def initialize(contact_email, list_type, list_name)
-      @contact_email = contact_email
-      @list_type     = list_type
-      @list_name     = list_name
-    end
-
-    def deliver
-      delete("lists/subscribers",
-             :contact_email => @contact_email,
-             :list_type     => @list_type,
-             :list_name     => @list_name
-      )
-    end
-  end
-end

data/lib/mailstro/real_strategy.rb

@@ -1,2 +0,0 @@
-module Mailstro
-end

data/spec/integration/list_delivery_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe 'posting a list delivery', :integration do
-  let(:template_name) { :build_failure }
-  let(:list_type)     { :build_watchers }
-  let(:list_name)     { 12 }
-  let(:template_data) { { :commit => "Ooops" } }
-
-  before do
-    Mailstro.configure do |config|
-      config.api_key = 'lolapi'
-    end
-  end
-
-  let(:expected_body) {{
-    "api_key"       => "lolapi",
-    "template_name" => "build_failure",
-    "list_type"     => "build_watchers",
-    "list_name"      => 12,
-    "template_data" => { "commit" => "Ooops" }
-  }}
-
-  it "succesfully submits a list delivery to mailstro" do
-    stub_request(:post, "https://api.mailstroapp.com/v1/lists/deliveries").
-    with(:body => expected_body).to_return(:status => 200, :body => fixture("response.json"))
-
-    response = Mailstro.deliver(
-      :to            => [list_type, list_name],
-      :template_name => template_name,
-      :template_data => template_data
-    )
-
-    response[:success].should == true
-  end
-end

data/spec/integration/list_subscribe_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe 'posting a subscription to a list', :integration do
-  let(:list_type)     { :build_watchers }
-  let(:list_name)     { 12 }
-  let(:contact_email) { "test@example.com" }
-
-  before do
-    Mailstro.configure do |config|
-      config.api_key = 'lolapi'
-    end
-  end
-
-  let(:expected_body) {{
-    "api_key"       => "lolapi",
-    "list_type"     => "build_watchers",
-    "list_name"      => 12,
-    "contact_email" => "test@example.com",
-  }}
-
-  it "succesfully submits a subscription to mailstro" do
-    stub_request(:post, "https://api.mailstroapp.com/v1/lists/subscribers").
-    with(:body => expected_body).to_return(:status => 200, :body => fixture("response.json"))
-
-    response = Mailstro.subscribe(contact_email, list_type, list_name)
-    response['success'].should == true
-  end
-end

data/spec/integration/list_unsubscribe_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe 'deleting a subscription from a list', :integration do
-  let(:contact_email) { "test@example.com" }
-  let(:list_type)     { :build_watchers }
-  let(:list_name)     { 12 }
-
-  before do
-    Mailstro.configure do |config|
-      config.api_key = 'lolapi'
-    end
-  end
-
-  let(:expected_body) {{
-    "api_key"       => "lolapi",
-    "list_type"     => "build_watchers",
-    "list_name"     => 12,
-    "contact_email" => "test@example.com",
-  }}
-
-  it "succesfully deletes a subscription to mailstro" do
-    stub_request(:delete, "https://api.mailstroapp.com/v1/lists/subscribers").
-    with(:body => expected_body).to_return(:status => 200, :body => fixture("response.json"))
-
-    response = Mailstro.unsubscribe(contact_email, list_type, list_name)
-    response['success'].should == true
-  end
-end