mailcannon 0.0.8.pre.1 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f70f3c3924e3fc9da5c29330ca8015df42ff3f
-  data.tar.gz: c5908d8e8cc1dc99f740336762d46109a7e40116
+  metadata.gz: 16aeff734b9badfd24d471a07fc5a750f6a799a1
+  data.tar.gz: 05bf51210743215b43333d337f9f3cfd88e0079f
 SHA512:
-  metadata.gz: 2a9a225bdeb47b4e1df914b3ce708797f7b801c3edd0e497782ef20fe6b96cb1a0128b84caea6fa6f3756e3e5dc05e437d7905495307034164fefc773dc43d88
-  data.tar.gz: e7556aa2122b198b96143e8152514de44e1c91772d4f54831b63dfbc3fae2e9a9920d296f5a6f9b0ffdf99c7a334812d12b0f896fb1dca643c4cd7202d8b2784
+  metadata.gz: 41bd9d22235bbb8fcbece0a246b3821487f0bf2c4e5fadedf1a03b22567d8fb499443900ebe014b1e66e8ffaae49cad4a309820727dd4737a4ffe0f30c9318d5
+  data.tar.gz: b08f2360e0901a2d3d9a2c5b73a02fed45182e5ed1b2a0bbe7a9429601bd5bfca017d0bc56354b2c89ff94b7d3f05244e0d74355e731ae66c2517aaa9270b6cf

data/.gitignore

@@ -8,4 +8,3 @@ coverage/
 pkg/
 Gemfile.lock
 config/mailcannon.yml
-.bundle/

data/Gemfile

@@ -3,9 +3,10 @@ source 'https://rubygems.org'
 gem 'redis'
 gem 'activemodel'
 gem 'mongoid', '>=3.1.6'
-gem 'sidekiq', '2.17.7'
+gem 'sidekiq'
 gem 'sendgrid_webapi', '0.0.3'
 gem 'librato-metrics'
+gem 'airbrake'
 gem 'rubysl', platform: :rbx
 gem 'jruby-openssl', platform: :jruby
 gem 'yajl-ruby', :platforms=>[:rbx,:ruby]

data/Rakefile

@@ -23,4 +23,4 @@ task :travis do
     system("export DISPLAY=:99.0 && bundle exec #{cmd}")
     raise "#{cmd} failed!" unless $?.exitstatus == 0
   end
-end
+end

data/Readme.md

@@ -5,13 +5,13 @@
 MailCannon
 ==========
 
-Although this is a **WORK IN PROGRESS**, we're getting great results on **production** at [Resultados Digitais](http://resultadosdigitais.com.br/).
+Although this is a **WORK IN PROGRESS**, we're rolling it out to **production** with no issues for now at [Resultados Digitais](http://resultadosdigitais.com.br/).
 
 This Gem relies heavily on both [Sidekiq](https://github.com/mperham/sidekiq) and Celluloid Gems, you are encouraged to use it anywhere with Ruby (a http interface is on the Roadmap ).
 
 This Gem provides a worker ready for deploy cooked with [MongoDB](http://www.mongodb.org/) + [Mongoid](https://github.com/mongoid/mongoid) + [Sidekiq](https://github.com/mperham/sidekiq) + [Rubinius](http://rubini.us/) (feel free to use on MRI and jRuby as well).
 
-For production deployment, you should take a look at both [MailCannon Outpost](https://github.com/lucasmartins/mailcannon-outpost) and [MailCannon Monitor](https://github.com/lucasmartins/mailcannon-monitor) projects.
+For production deployment, you should take a loot at both [MailCannon Outpost](https://github.com/lucasmartins/mailcannon-outpost) and [MailCannon Monitor](https://github.com/lucasmartins/mailcannon-monitor) projects.
 
 Install
 =======
@@ -68,7 +68,7 @@ envelope = MailCannon::Envelope.create(
   subject: 'Test',
   mail: MailCannon::Mail.new(text: 'you will see this when no HTML reader is available', html: 'this should be an HTML'))
 envelope_bag.push envelope
-envelope_bag.post! # this will be sent using the 'hot-account'.
+envelope_bag.post! # this will sent using the 'hot-account'.
 ```
 
 ### Configuration file
@@ -87,52 +87,17 @@ Edit the file to meet your environemnt needs.
 
 Check the [specs](https://github.com/lucasmartins/mailcannon/tree/master/spec) to see the testing example, it will surely make it clearer.
 
-### Statistics & MapReduce
-
-MailCannon provides statistics calculation/reduce for the events related to an `Envelope`, like `open`,`click`,`spam`, etc. Assuming you have your Outpost running properly (running reduce jobs), you can access the data through the `envelope.stats` method to get the following hash:
-
-```ruby
-{
-  "posted"=>{"count"=>0.0, "targets"=>[]},
-  "processed"=>{"count"=>0.0, "targets"=>[]},
-  "delivered"=>{"count"=>1.0, "targets"=>["1"]},
-  "open"=>{"count"=>1.0, "targets"=>["2"]},
-  "click"=>{"count"=>0.0, "targets"=>[]},
-  "deferred"=>{"count"=>0.0, "targets"=>[]},
-  "spam_report"=>{"count"=>0.0, "targets"=>[]},
-  "spam"=>{"count"=>0.0, "targets"=>[]},
-  "unsubscribe"=>{"count"=>0.0, "targets"=>[]},
-  "drop"=>{"count"=>0.0, "targets"=>[]},
-  "bounce"=>{"count"=>1.0, "targets"=>["3"]}
-}
-```
-
-You can trigger the reduce operation directly with `envelope.reduce_statistics`.
-
-**Targets** are your __glue_id__ to link this data inside your own application, we use it as the "Contact#id" so we can show witch `Contact` has received, read, or clicked the email.
-
-Repeating events on the same target will increase the array: `"click"=>{"count"=>3.0, "targets"=>["3","3","3"]}`
-
-
 Docs
 ====
 You should check the [factories](https://github.com/lucasmartins/mailcannon/tree/master/spec/factories) to learn what you need to build your objects, and the [tests](https://github.com/lucasmartins/mailcannon/tree/master/spec/mailcannon) to learn how to use them. But hey, we have docs [right here](http://rdoc.info/github/lucasmartins/mailcannon/master/frames).
 
-Roadmap
-=======
-
-- Statistics (Map&Reduce awesomeness);
-- Memory optimization (focused on MailCannon Outpost);
-- HTTP (webservice) interface - so you don't need to be coding Ruby to use it!;
-- New service adapter (Mandrill?);
-
 Contribute
 ==========
 
 Just fork [MailCannon](https://github.com/lucasmartins/mailcannon), add your feature+spec, and make a pull request. Do not mess up with the version file though.
 
 **NOTICE**: The project is at embrionary stage, breaking changes will apply.
-  
+
 Support
 =======
 

data/env.sample.sh

@@ -1,9 +1,8 @@
 export REDIS_URL='redis://localhost:6379'
 export SENDGRID_USERNAME=''
 export SENDGRID_PASSWORD=''
-#export AIRBRAKE_TOKEN=''
-#export LIBRATO_SOURCE='staging'
-#export LIBRATO_USER=''
-#export LIBRATO_TOKEN=''
+export AIRBRAKE_TOKEN=''
+export LIBRATO_SOURCE='staging'
+export LIBRATO_USER=''
+export LIBRATO_TOKEN=''
 export MONGODB_URL=mongodb://localhost:27017:mailcannon_development
-export MONGODB_PORT=27017

data/lib/mailcannon/adapters/sendgrid_web.rb

@@ -29,7 +29,7 @@ module MailCannon::Adapter::SendgridWeb
       rescue Exception => e
         logger.error "Unable to read auth config from Envelope or Bag, using default auth options from ENV"
         return default_auth
-      end
+      end      
     end
   end
   
@@ -55,61 +55,25 @@ module MailCannon::Adapter::SendgridWeb
     self.save!
   end
 
-  def build_to_subs(placeholder, to_key)
-    selected_hash_array = []
-    self.to.map {|h| selected_hash_array.push h[to_key]||h[to_key.to_sym]||''}
-    {'sub'=>{"#{placeholder}"=>selected_hash_array}}
-  end
-
   def build_name_subs
-    placeholder = MailCannon.config['default_name_placeholder'] || '%name%'
-    build_to_subs(placeholder, 'name')
-  end
-
-  def build_email_subs
-    placeholder = MailCannon.config['default_email_placeholder'] || '%email%'
-    build_to_subs(placeholder, 'email')
-  end
-
-
-  def build_unique_args
-    unique_args = {}
-    if MailCannon.config['add_envelope_id_to_unique_args']
-      unique_args.merge!({'envelope_id'=>self.id})
-    end
-    if MailCannon.config['add_envelope_bag_id_to_unique_args'] && self.envelope_bag
-      unique_args.merge!({'envelope_bag_id'=>self.envelope_bag.id})
-    end
-    unique_args
+    name_placeholder = MailCannon.config['default_name_placeholder'] || '%name%'
+    selected_hash_array = []
+    self.to.map {|h| selected_hash_array.push h['name']||h[:name]||''}
+    {'sub'=>{"#{name_placeholder}"=>selected_hash_array}}
   end
 
   def build_xsmtpapi(recipients,subs)
     xsmtpapi = self.xsmtpapi || {}
+    to = []
     recipients.symbolize_keys!
-    to = extract_values(recipients[:to],:email)
-    xsmtpapi.merge!({'to' => to}) if to
-    xsmtpapi = merge_subs_hash(xsmtpapi,subs)
-    xsmtpapi = merge_subs_hash(xsmtpapi,build_name_subs)
-    xsmtpapi = merge_subs_hash(xsmtpapi,build_email_subs)
-    xsmtpapi.merge!({'unique_args' => build_unique_args })
-    return xsmtpapi
-  end
-
-  def extract_values(values,key)
-    extract=[]
-    values.each do |h|
+    recipients[:to].each do |h|
       h.symbolize_keys!
-      extract.push h[key]
-    end
-    extract
-  end
-
-  def merge_subs_hash(xsmtpapi,subs)
-    if subs!=nil && subs.is_a?(Hash)
-      xsmtpapi.deep_merge(subs)
-    else
-      xsmtpapi
+      to.push h[:email]
     end
+    xsmtpapi.merge!({'to' => to}) if to
+    xsmtpapi = xsmtpapi.deep_merge(subs) if subs!=nil && subs['sub']!=nil
+    xsmtpapi = xsmtpapi.deep_merge(build_name_subs) if build_name_subs!=nil && build_name_subs.is_a?(Hash)
+    return xsmtpapi
   end
 
   def validate_xsmtpapi!

data/lib/mailcannon/airbrake.rb

@@ -0,0 +1,18 @@
+module MailCannon::Airbrake
+  extend self
+  
+  def available?
+    if ENV['AIRBRAKE_TOKEN']
+      true
+    else
+      false
+    end
+  end
+
+  def authenticate
+    Airbrake.configure do |config|
+      config.api_key = ENV['AIRBRAKE_TOKEN']
+      config.host = 'api.airbrake.io'
+    end
+  end
+end

data/lib/mailcannon/envelope.rb

@@ -4,12 +4,10 @@ class MailCannon::Envelope
   include Mongoid::Timestamps
   include MailCannon::Adapter::SendgridWeb
   
-  belongs_to :envelope_bag
-
   embeds_one :mail
   embeds_many :stamps
-  has_many :sendgrid_events
-  
+  belongs_to :envelope_bag
+
   field :from, type: String
   field :from_name, type: String
   field :to, type: Array # of hashes. [{email: '', name: ''},...]
@@ -21,6 +19,7 @@ class MailCannon::Envelope
   field :xsmtpapi, type: Hash # this will mostly be used by MailCannon itself. http://sendgrid.com/docs/API_Reference/SMTP_API/index.html
   field :auth, type: Hash # {user: 'foo', password: 'bar'}, some Adapters might need an token:secret pair, which you can translete into user:password pair.
   field :jid, type: String
+
   
   validates :from, :to, :subject, presence: true
   validates_associated :mail
@@ -66,14 +65,6 @@ class MailCannon::Envelope
       false
     end
   end
-
-  def processed?
-    if self.stamps.where(code: 1).count > 0
-      true
-    else
-      false
-    end
-  end
   
   private
   def schedule_send_job

data/lib/mailcannon/envelope_bag.rb

@@ -2,20 +2,11 @@
 class MailCannon::EnvelopeBag
   include Mongoid::Document
   include Mongoid::Timestamps
-  include MailCannon::EnvelopeBagMapReduce
   
   has_many :envelopes, autosave: true
   field :integration_code, type: String # Used to link your own app models to the Bag.
   field :auth, type: Hash # {user: 'foo', password: 'bar'}, some Adapters might need an token:secret pair, which you can translete into user:password pair. This config will be overriden by the Envelope.auth if present.
 
-  def stats
-    begin
-      MailCannon::EnvelopeBagStatistic.find(self.id).value  
-    rescue Mongoid::Errors::DocumentNotFound => e
-      raise "You haven't run envelope.reduce_statistics yet, no data available!"
-    end
-  end
-
   def push(envelope)
     self.envelopes.push envelope
   end

data/lib/mailcannon/librato.rb

@@ -0,0 +1,15 @@
+module MailCannon::Librato
+  extend self
+  
+  def available?
+    if ENV['LIBRATO_USER'] && ENV['LIBRATO_TOKEN']
+      true
+    else
+      false
+    end
+  end
+
+  def authenticate
+    Librato::Metrics.authenticate(ENV['LIBRATO_USER'], ENV['LIBRATO_TOKEN']) if available?
+  end
+end

data/lib/mailcannon/version.rb

@@ -4,7 +4,6 @@ module MailCannon
     MAJOR = 0
     MINOR = 0
     PATCH = 8
-    ALPHA = '.pre.1'
-    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}#{ALPHA}"
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/lib/mailcannon/workers/barrel.rb

@@ -4,10 +4,23 @@ class MailCannon::Barrel
   
   def perform(envelope_id)
     envelope_id = envelope_id['$oid'] if envelope_id['$oid']
-    shoot!(envelope_id)
+    if MailCannon::Librato.available?
+      shoot_with_librato!(envelope_id)
+    else
+      shoot!(envelope_id)
+    end
   end
 
   private
+  def shoot_with_librato!(envelope_id)
+    MailCannon::Librato.authenticate
+    aggregator = Librato::Metrics::Aggregator.new
+    aggregator.time 'mailcannon.shoot' do
+      shoot!(envelope_id)
+    end
+    aggregator.submit
+  end
+
   def shoot!(envelope_id)
     logger.info "sending MailCannon::Envelope.find('#{envelope_id}')"
     begin
@@ -21,7 +34,8 @@ class MailCannon::Barrel
     rescue Mongoid::Errors::DocumentNotFound
       logger.error "unable to find the document MailCannon::Envelope.find('#{envelope_id}')"
     rescue Exception => e
-      logger.error "unable to send MailCannon::Envelope.find('#{envelope_id}') #{e.backtrace}"
+      logger.error "unable to send MailCannon::Envelope.find('#{envelope_id}')\n#{e.backtrace}"
+      Airbrake.notify(e, parameters: {'envelope_id'=>envelope_id}, cgi_data: ENV.to_hash) if MailCannon::Airbrake.available?
     end
   end
 end

data/lib/mailcannon.rb

@@ -7,6 +7,8 @@ require 'sidekiq'
 require 'sendgrid_webapi'
 require 'yajl-ruby' if RUBY_PLATFORM=='ruby'
 require 'jruby-openssl' if RUBY_PLATFORM=='jruby'
+require 'librato/metrics'
+require 'airbrake'
 
 Encoding.default_internal = "utf-8"
 Encoding.default_external = "utf-8"
@@ -14,16 +16,14 @@ Encoding.default_external = "utf-8"
 module MailCannon
   require_relative 'mailcannon/adapter'
   require_relative 'mailcannon/adapters/sendgrid_web'
-  require_relative 'mailcannon/envelope_bag_map_reduce'
-  require_relative 'mailcannon/envelope_bag_statistic'
   require_relative 'mailcannon/envelope_bag'
-  require_relative 'mailcannon/envelope'  
+  require_relative 'mailcannon/envelope'
   require_relative 'mailcannon/mail'
   require_relative 'mailcannon/stamp'
   require_relative 'mailcannon/event'
-  require_relative 'mailcannon/sendgrid_event'
   require_relative 'mailcannon/workers/barrel'
-  require_relative 'mailcannon/workers/envelope_bag_reduce_job'
+  require_relative 'mailcannon/librato'
+  require_relative 'mailcannon/airbrake'
   require_relative 'mailcannon/version'
   
   # To be used with caution

data/mailcannon.gemspec

@@ -36,6 +36,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'sidekiq'
   s.add_dependency 'sendgrid_webapi'
   s.add_dependency 'json-schema'
+  s.add_dependency 'librato-metrics'
+  s.add_dependency 'airbrake'
 
   s.add_development_dependency "vcr"
   s.add_development_dependency "rspec"

data/spec/integration/1k_spec.rb

@@ -1,24 +1,10 @@
 require "spec_helper"
-require 'benchmark'
-
 
 describe "shoot 1k emails!" do
-  let!(:envelope_a) { build(:envelope_multi_1k) }
+  let(:envelope) { build(:envelope_multi_1k) }
   it "sends http request for Sendgrid web API" do
     VCR.use_cassette('mailcannon_integration_1k') do
-      Sidekiq::Testing.inline! do
-        bm = Benchmark.measure do
-          envelope_a.post!
-        end
-        puts "1k test real time: #{bm.real}"
-        expect(envelope_a.reload.processed?).to be_true
-
-        # Travis has been showing unstable performance, not feasible to include performance tests.
-        # The performance varies from machine to machine, specially when using dedicated servers for each service.
-        if ENV['PERFORMANCE_TEST']
-          expect(bm.real<0.2).to be_true
-        end
-      end
+      expect(envelope.send_bulk!).to be_true
     end
   end
 end

data/spec/integration/xsmtpapi_spec.rb

@@ -5,13 +5,10 @@ describe 'X-SMTPAPI compatibility' do
     # This should guarantee the expected behavior for the following api:
     #   http://sendgrid.com/docs/API_Reference/SMTP_API/unique_arguments.html
     context "generates expected xsmtpapi for #post!" do
-      let(:envelope_bag) { build(:empty_envelope_bag)}
       let(:envelope) { build(:envelope_multi, xsmtpapi: { "sub" => { "-email-id-" => ["314159","271828"] }, "unique_args" => { "email_id" => "-email-id-"} }) }
-      let(:expectated_hash) { {"sub"=>{"-email-id-"=>["314159", "271828"], "*|NAME|*"=>["Mail Cannon", "Lucas Martins", "Contact"], "*|EMAIL|*"=>["mailcannon@railsnapraia.com", "lucasmartins@railsnapraia.com", "contact@railsonthebeach.com"]}, "unique_args"=>{"email_id"=>"-email-id-", "envelope_id"=>envelope.id, "envelope_bag_id"=>envelope_bag.id}, "to"=>["mailcannon@railsnapraia.com", "lucasmartins@railsnapraia.com", "contact@railsonthebeach.com"]} }
+      let(:expectated_hash) { {"sub"=>{"-email-id-"=>["314159", "271828"], "*|NAME|*"=>["Mail Cannon", "Lucas Martins", "Contact"]}, "unique_args"=>{"email_id"=>"-email-id-"}, "to"=>["mailcannon@railsnapraia.com", "lucasmartins@railsnapraia.com", "contact@railsonthebeach.com"]} }
 
       it "returns true" do
-        envelope_bag.save
-        envelope_bag.envelopes << envelope
         VCR.use_cassette('mailcannon_adapter_sendgrid_send_bulk') do
           Sidekiq::Testing.inline! do
             envelope.post!

data/spec/mailcannon/adapters/sendgrid_spec.rb

@@ -21,19 +21,13 @@ describe MailCannon::Adapter::SendgridWeb do
     end
   end
   describe "#send!" do
-    let(:envelope_bag) { build(:empty_envelope_bag) }
     let(:envelope) { build(:envelope) }
-
     it "sends http request for Sendgrid web API" do
-      envelope_bag.save
-      envelope_bag.envelopes << envelope
       VCR.use_cassette('mailcannon_adapter_sendgrid_send') do
         expect(envelope.send!).to be_true
       end
     end
     it "calls after_sent callback" do
-      envelope_bag.save
-      envelope_bag.envelopes << envelope
       VCR.use_cassette('mailcannon_adapter_sendgrid_send') do
         envelope.should_receive(:after_sent)
         envelope.send!
@@ -42,11 +36,8 @@ describe MailCannon::Adapter::SendgridWeb do
   end
 
   describe "#send_bulk!" do
-    let(:envelope_bag) { build(:empty_envelope_bag) }
     let(:envelope) { build(:envelope_multi) }
     it "sends http request for Sendgrid web API" do
-      envelope_bag.save
-      envelope_bag.envelopes << envelope
       VCR.use_cassette('mailcannon_adapter_sendgrid_send_bulk') do
         expect(envelope.send_bulk!).to be_true
       end
@@ -55,16 +46,12 @@ describe MailCannon::Adapter::SendgridWeb do
 
   context "grab auth exception" do
     describe "#send!" do
-    let(:envelope_bag) { build(:empty_envelope_bag) }
     let(:envelope) { build(:envelope_wrong_auth) }
-      it "sends http request for Sendgrid web API with a wrong user/passwd combination" do
-        envelope_bag.save
-        envelope_bag.envelopes << envelope
-        Sidekiq::Testing.inline! do
-          expect{envelope.send!}.to raise_error(MailCannon::Adapter::AuthException)
-        end
+    it "sends http request for Sendgrid web API with a wrong user/passwd combination" do
+      Sidekiq::Testing.inline! do
+        expect{envelope.send!}.to raise_error(MailCannon::Adapter::AuthException)
       end
     end
   end
-
+  end
 end

data/spec/mailcannon/airbrake_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe MailCannon::Airbrake do
+  before(:each) do
+    ENV['AIRBRAKE_TOKEN']=nil
+  end
+  after(:each) do
+    ENV['AIRBRAKE_TOKEN']=nil
+  end
+  describe "#available?" do
+    context 'when Airbrake token is NOT in the ENV' do
+      it "returns false" do
+        expect(MailCannon::Airbrake.available?).to be_false
+      end
+    end
+    context 'when Airbrake token IS in the ENV' do
+      it "returns false" do
+        ENV['AIRBRAKE_TOKEN']='a.token'
+        expect(MailCannon::Airbrake.available?).to be_true
+      end
+    end
+  end
+end

data/spec/mailcannon/envelope_spec.rb

@@ -73,13 +73,10 @@ describe MailCannon::Envelope do
 
   describe "xsmtpapi" do
     context "keep xsmtpapi arguments after #post!" do
-      let(:envelope_bag) { build(:empty_envelope_bag)}
       let(:envelope) { build(:envelope_multi, xsmtpapi: { "unique_args" => { "userid" => "1123", "template" => "welcome" }}) }
       let(:name_placeholder) { MailCannon.config['default_name_placeholder'].to_s }
 
       it "returns true" do
-        envelope_bag.save
-        envelope_bag.envelopes << envelope
         VCR.use_cassette('mailcannon_adapter_sendgrid_send_bulk') do
           Sidekiq::Testing.inline! do
             envelope.post!
@@ -87,8 +84,6 @@ describe MailCannon::Envelope do
         end
         envelope.reload # content is changed inside the Adapter module
         expect(envelope.xsmtpapi).to have_key("unique_args")
-        expect(envelope.xsmtpapi["unique_args"]).to have_key("envelope_id") if MailCannon.config['add_envelope_id_to_unique_args']
-        expect(envelope.xsmtpapi["unique_args"]).to have_key("envelope_bag_id") if MailCannon.config['add_envelope_bag_id_to_unique_args']
         expect(envelope.xsmtpapi).to have_key("to")
         expect(envelope.xsmtpapi).to have_key("sub")
         expect(envelope.xsmtpapi['sub']).to have_key("*|NAME|*")

data/spec/mailcannon/librato_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe MailCannon::Librato do
+  after(:each) do
+    ENV['LIBRATO_USER']=nil
+    ENV['LIBRATO_TOKEN']=nil
+  end
+  describe "#available?" do
+    context 'when Librato info is NOT in the ENV' do
+      it "returns false" do
+        ENV['LIBRATO_USER']=nil
+        ENV['LIBRATO_TOKEN']=''
+        expect(MailCannon::Librato.available?).to be_false
+      end
+    end
+    context 'when Librato info IS in the ENV' do
+      it "returns false" do
+        ENV['LIBRATO_USER']='tha.user'
+        ENV['LIBRATO_TOKEN']='tha.password'
+        expect(MailCannon::Librato.available?).to be_true
+      end
+    end
+  end
+end

data/templates/config/mailcannon.yml

@@ -11,13 +11,4 @@ waiting_time: 0
 auto_destroy: true
 
 # MailCannon builds the 'name' substitution Array for convenience, using the name from Envelope.to: [{email: 'foo', name: 'bar'}]
-default_name_placeholder: "*|NAME|*"
-
-# MailCannon builds the 'email' substitution Array for convenience, using the email from Envelope.to: [{email: 'foo', name: 'bar'}]
-default_email_placeholder: "*|EMAIL|*"
-
-# Pretty self explanatory. This is intended to be used by your event consuming service.
-add_envelope_id_to_unique_args: true
-
-# Pretty self explanatory. This is intended to be used by your event consuming service.
-add_envelope_bag_id_to_unique_args: true
+default_name_placeholder: "*|NAME|*"