mailcannon 0.0.6 → 0.0.8.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce8f8af0c1764d42f8fce3439f12656173aa38a0
-  data.tar.gz: fda77250125034d2e845af16f97dd9e7e052b514
+  metadata.gz: e6f70f3c3924e3fc9da5c29330ca8015df42ff3f
+  data.tar.gz: c5908d8e8cc1dc99f740336762d46109a7e40116
 SHA512:
-  metadata.gz: 801226bd8decb385e2db1c560e713ce918a3a117be730db2f3f6dfabd0146acb0a95098fecea68f63a3a77ac9ad8c8e59506f9f37e18709175fc59c487c6f8e7
-  data.tar.gz: 9dbf0a1f4260b54826006092437fa0e26766c6a0e2f35c94dad4685b6ee1014641bef9c04a7f1ba0165e52d182077d129abf19e0ddd7c7e11b96d49dc3797a59
+  metadata.gz: 2a9a225bdeb47b4e1df914b3ce708797f7b801c3edd0e497782ef20fe6b96cb1a0128b84caea6fa6f3756e3e5dc05e437d7905495307034164fefc773dc43d88
+  data.tar.gz: e7556aa2122b198b96143e8152514de44e1c91772d4f54831b63dfbc3fae2e9a9920d296f5a6f9b0ffdf99c7a334812d12b0f896fb1dca643c4cd7202d8b2784

data/.gitignore

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

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gem 'redis'
 gem 'activemodel'
 gem 'mongoid', '>=3.1.6'
-gem 'sidekiq'
+gem 'sidekiq', '2.17.7'
 gem 'sendgrid_webapi', '0.0.3'
-#gem 'librato-metrics'
+gem 'librato-metrics'
 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

@@ -1,13 +1,17 @@
 [![Gem version](https://badge.fury.io/rb/mailcannon.png)](http://rubygems.org/gems/mailcannon) [![Code Climate](https://codeclimate.com/github/lucasmartins/mailcannon.png)](https://codeclimate.com/github/lucasmartins/mailcannon) [![Build Status](https://travis-ci.org/lucasmartins/mailcannon.png?branch=master)](https://travis-ci.org/lucasmartins/mailcannon) [![Coverage Status](https://coveralls.io/repos/lucasmartins/mailcannon/badge.png)](https://coveralls.io/r/lucasmartins/mailcannon) [![Dependency Status](https://gemnasium.com/lucasmartins/mailcannon.png)](https://gemnasium.com/lucasmartins/mailcannon) [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/lucasmartins/mailcannon/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
+![MailCannon_logo](http://blog.railsnapraia.com/images/mailcannon_seal_128.png)
+
 MailCannon
 ==========
 
-This is a **WORK IN PROGRESS**
+Although this is a **WORK IN PROGRESS**, we're getting great results on **production** 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 workers 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).
+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.
 
 Install
 =======
@@ -18,7 +22,7 @@ You can:
 ```
 
 Or just add it to your Gemfile
-```
+```ruby
   gem 'mailcannon'
 ```
 
@@ -64,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 sent using the 'hot-account'.
+envelope_bag.post! # this will be sent using the 'hot-account'.
 ```
 
 ### Configuration file
@@ -83,17 +87,52 @@ 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,7 +1,9 @@
 export REDIS_URL='redis://localhost:6379'
-export SENDGRID_PASSWORD=''
 export SENDGRID_USERNAME=''
-export LIBRATO_SOURCE='staging'
-export LIBRATO_USER=''
-export LIBRATO_TOKEN=''
+export SENDGRID_PASSWORD=''
+#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
   
@@ -50,30 +50,66 @@ module MailCannon::Adapter::SendgridWeb
     validate_envelope!
     self.xsmtpapi = {} if self.xsmtpapi.nil?
     self.xsmtpapi['sub']={} unless self.xsmtpapi['sub']
-    self.xsmtpapi = self.xsmtpapi.merge(build_xsmtpapi({'to'=>self.to},{'sub'=>self.substitutions}))
+    self.xsmtpapi = self.xsmtpapi.deep_merge(build_xsmtpapi({'to'=>self.to},{'sub'=>self.substitutions}))
     validate_xsmtpapi!
     self.save!
   end
 
-  def build_name_subs
-    name_placeholder = MailCannon.config['default_name_placeholder'] || '%name%'
+  def build_to_subs(placeholder, to_key)
     selected_hash_array = []
-    self.to.map {|h| selected_hash_array.push h['name']||h[:name]||''}
-    {'sub'=>{"#{name_placeholder}"=>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
   end
 
   def build_xsmtpapi(recipients,subs)
     xsmtpapi = self.xsmtpapi || {}
-    to = []
     recipients.symbolize_keys!
-    recipients[:to].each do |h|
+    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|
       h.symbolize_keys!
-      to.push h[:email]
+      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
     end
-    xsmtpapi.merge!({'to' => to})
-    xsmtpapi.deep_merge!(subs) if subs!=nil && subs.is_a?(Hash)
-    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/envelope.rb

@@ -4,10 +4,12 @@ class MailCannon::Envelope
   include Mongoid::Timestamps
   include MailCannon::Adapter::SendgridWeb
   
-  embeds_one :mail
-  embeds_many :stamps
   belongs_to :envelope_bag
 
+  embeds_one :mail
+  embeds_many :stamps
+  has_many :sendgrid_events
+  
   field :from, type: String
   field :from_name, type: String
   field :to, type: Array # of hashes. [{email: '', name: ''},...]
@@ -19,7 +21,6 @@ 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
@@ -29,15 +30,8 @@ class MailCannon::Envelope
     self.save if self.changed?
     raise "Envelope(#{self.id}) has no mail! Didn't you already send it?" unless self.mail
     if validate_xsmtpapi(self.xsmtpapi)
-      if MailCannon.config['waiting_time'] && MailCannon.config['waiting_time'].to_i>0
-        self.jid = MailCannon::Barrel.perform_in(MailCannon.config['waiting_time'].seconds,self.id)
-      else
-        self.jid = MailCannon::Barrel.perform_async(self.id)
-      end
-      if self.jid
-        self.stamp! MailCannon::Event::Posted.stamp
-        return self.jid
-      end
+      jid = schedule_send_job
+      self.save if self.changed?
     else
       raise 'Invalid xsmtpapi hash!'
     end
@@ -72,8 +66,28 @@ 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
+    if MailCannon.config['waiting_time'].to_i>0
+      self.jid = MailCannon::Barrel.perform_in(MailCannon.config['waiting_time'].seconds,self.id)
+    else
+      self.jid = MailCannon::Barrel.perform_async(self.id)
+    end
+    if self.jid
+      self.stamp! MailCannon::Event::Posted.stamp
+      return self.jid
+    end
+  end
+
   def self.valid_code_kind?(code)
     unless [Fixnum, MailCannon::Stamp].include?(code.class) || MailCannon::Event.constants.include?(code.to_s.camelize.to_sym)
       raise 'code must be an Integer, MailCannon::Event::*, or MailCannon::Stamp !'

data/lib/mailcannon/envelope_bag.rb

@@ -2,11 +2,20 @@
 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/envelope_bag_map_reduce.rb

@@ -0,0 +1,106 @@
+module MailCannon::EnvelopeBagMapReduce
+  module ClassMethods
+
+    def find_gem_root_path
+      path = ""
+      begin
+        spec = Gem::Specification.find_by_name("mailcannon")
+        path = spec.gem_dir
+      rescue LoadError => e
+        raise unless e.message =~ /mailcannon/
+        puts 'mailcannon gem path not found'
+      end
+      path
+    end
+
+    def reduce_statistics_for_envelope_bag(id)
+      events = change_events_status_for_envelope_bag(id, nil, :lock)
+      result = events.map_reduce(self.js_map, self.js_reduce).out(merge: "mail_cannon_envelope_bag_statistics")
+      set_events_to(events,:processed)
+      {raw: result.raw, count: events.count}
+    end
+
+    def statistics_for_envelope(id)
+      self.stats
+    end
+
+    def js_map
+      root_path = find_gem_root_path
+      root_path += "/" unless root_path.empty?
+      @js_map ||= File.read("#{root_path}lib/mailcannon/reduces/envelope_bag_map.js")
+      #TODO cache this
+      @js_map
+    end
+
+    def js_reduce
+      root_path = find_gem_root_path
+      root_path += "/" unless root_path.empty?
+      @js_reduce ||= File.read("#{root_path}lib/mailcannon/reduces/envelope_bag_reduce.js")
+      #TODO cache this
+      @js_reduce
+    end
+
+    # [from|to]sym = :new, :lock, :processed
+    def change_events_status_for_envelope_bag(id, from_sym, to_sym)
+      from_status = processed_status_for(from_sym)
+      to_status = processed_status_for(to_sym)
+      if from_sym
+        query = MailCannon::SendgridEvent.where(envelope_bag_id: id, processed: from_status)
+      else
+        query = MailCannon::SendgridEvent.where(envelope_bag_id: id)
+      end
+      if query.kind_of?(Mongoid::Criteria)
+        query.update_all(processed: to_status)
+      else
+        query.processed=to_status
+        query.save
+      end
+      query
+    end
+
+    #private
+    def set_events_to(events,status)
+      status = processed_status_for(status)
+      if events.kind_of?(Mongoid::Criteria)
+        events.update_all(processed: status)
+      else
+        events.processed=status
+        events.save
+      end
+    end
+
+    def processed_status_for(input)
+      status_map = {
+        lock: false,
+        processed: true,
+        new: nil
+      }
+      if [false,true,nil].include?(input)
+        status_map = status_map.invert
+        raise "Unexpected  input(#{input})" unless status_map.has_key?(input)
+      end
+      status_map[input]
+    end
+
+  end
+  
+  module InstanceMethods
+    def reduce_statistics
+      self.class.reduce_statistics_for_envelope_bag(self.id)
+    end
+
+    def statistics
+      self.class.statistics_for_envelope(self.id)
+    end
+
+    def change_events_status(from_sym, to_sym)
+      self.set_processed_status_for_envelope(self.id, from_sym, to_sym)
+    end
+  end
+  
+  def self.included(receiver)
+    receiver.extend         ClassMethods
+    receiver.send :include, InstanceMethods
+  end
+end
+

data/lib/mailcannon/envelope_bag_statistic.rb

@@ -0,0 +1,5 @@
+# Holds information about a recipient's email event, like deliveries and bounces.
+class MailCannon::EnvelopeBagStatistic
+  include Mongoid::Document
+  include Mongoid::Timestamps
+end

data/lib/mailcannon/reduces/envelope_bag_map.js

@@ -0,0 +1,3 @@
+function () {
+  emit(this.envelope_bag_id, { target_id: this.target_id, event: this.event, type: this.type });
+}

data/lib/mailcannon/reduces/envelope_bag_reduce.js

@@ -0,0 +1,116 @@
+function (key, values) {
+  var result = {
+    'posted': {
+      'count': 0,
+      'targets': []
+    },
+    'processed': {
+      'count': 0,
+      'targets': []
+    },
+    'delivered': {
+      'count': 0,
+      'targets': []
+    },
+    'open': {
+      'count': 0,
+      'targets': []
+    },
+    'click': {
+      'count': 0,
+      'targets': []
+    },
+    'deferred': {
+      'count': 0,
+      'targets': []
+    },
+    'spam_report': {
+      'count': 0,
+      'targets': []
+    },
+    'spam': {
+      'count': 0,
+      'targets': []
+    },
+    'unsubscribe': {
+      'count': 0,
+      'targets': []
+    },
+    'drop': {
+      'count': 0,
+      'targets': []
+    },
+    'hard_bounce': {
+      'count': 0,
+      'targets': []
+    },
+    'soft_bounce': {
+      'count': 0,
+      'targets': []
+    },
+    'unknown': {
+      'count': 0,
+      'targets': []
+    }
+  };
+
+  values.forEach(function(value) {
+    switch (value['event']) {
+      case 'posted':
+        result['posted']['count']++;
+        result['posted']['targets'].push(value['target_id']);
+      break;
+      case 'processed':
+        result['processed']['count']++;
+        result['processed']['targets'].push(value['target_id']);
+      break;
+      case 'delivered':
+        result['delivered']['count']++;
+        result['delivered']['targets'].push(value['target_id']);
+      break;
+      case 'open':
+        result['open']['count']++;
+        result['open']['targets'].push(value['target_id']);
+      break;
+      case 'click':
+        result['click']['count']++;
+        result['click']['targets'].push(value['target_id']);
+      break;
+      case 'deferred':
+        result['deferred']['count']++;
+        result['deferred']['targets'].push(value['target_id']);
+      break;
+      case 'spam_report':
+        result['spam_report']['count']++;
+        result['spam_report']['targets'].push(value['target_id']);
+      break;
+      case 'spam':
+        result['spam']['count']++;
+        result['spam']['targets'].push(value['target_id']);
+      break;
+      case 'unsubscribe':
+        result['unsubscribe']['count']++;
+        result['unsubscribe']['targets'].push(value['target_id']);
+      break;
+      case 'drop':
+        result['drop']['count']++;
+        result['drop']['targets'].push(value['target_id']);
+      break;
+      case 'bounce':
+        if(value['type'] == "bounce"){
+          result['hard_bounce']['count']++;
+          result['hard_bounce']['targets'].push(value['target_id']);
+        }
+        else {
+          result['soft_bounce']['count']++;
+          result['soft_bounce']['targets'].push(value['target_id']);
+        }  
+      break;
+      default:
+        result['unknown']['count']++;
+        result['unknown']['targets'].push(value['target_id']);
+      break;
+    }
+  });
+  return result;
+}

data/lib/mailcannon/sendgrid_event.rb

@@ -0,0 +1,18 @@
+class MailCannon::SendgridEvent
+  include Mongoid::Document
+  field :envelope_id, type: String
+  field :envelope_bag_id, type: String
+  field :email, type: String
+  field :timestamp, type: String
+  field :unique_arg, type: String
+  field :event, type: String
+  field :type, type: String
+  field :processed, type: Boolean, default: nil
+  
+  belongs_to :envelope
+  belongs_to :envelope_bag
+
+  def self.insert_bulk(tha_huge_string)
+    MailCannon::SendgridEvent.collection.insert(tha_huge_string)
+  end
+end

data/lib/mailcannon/version.rb

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

data/lib/mailcannon/workers/barrel.rb

@@ -1,9 +1,14 @@
 # This worker handles Envelopes dispatch
 class MailCannon::Barrel
   include Sidekiq::Worker
-
+  
   def perform(envelope_id)
     envelope_id = envelope_id['$oid'] if envelope_id['$oid']
+    shoot!(envelope_id)
+  end
+
+  private
+  def shoot!(envelope_id)
     logger.info "sending MailCannon::Envelope.find('#{envelope_id}')"
     begin
       envelope = MailCannon::Envelope.find(envelope_id.to_s)
@@ -16,7 +21,7 @@ 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}')\n#{e.backtrace}"
+      logger.error "unable to send MailCannon::Envelope.find('#{envelope_id}') #{e.backtrace}"
     end
   end
 end

data/lib/mailcannon/workers/envelope_bag_reduce_job.rb

@@ -0,0 +1,11 @@
+class MailCannon::EnvelopeBagReduceJob
+  include Sidekiq::Worker
+  
+  def perform(envelope_bag_ids)
+    envelope_bag_ids.each do |id|
+      id = id['$oid'] if id['$oid']
+      MailCannon::EnvelopeBag.reduce_statistics_for_envelope_bag(id)
+    end
+  end
+  
+end

data/lib/mailcannon.rb

@@ -7,7 +7,6 @@ require 'sidekiq'
 require 'sendgrid_webapi'
 require 'yajl-ruby' if RUBY_PLATFORM=='ruby'
 require 'jruby-openssl' if RUBY_PLATFORM=='jruby'
-#require 'librato-metrics'
 
 Encoding.default_internal = "utf-8"
 Encoding.default_external = "utf-8"
@@ -15,16 +14,18 @@ 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/version'
   
-  #Librato::Metrics.authenticate(ENV['LIBRATO_USER'], ENV['LIBRATO_TOKEN']) if ENV['LIBRATO_TOKEN'] && ENV['LIBRATO_USER'] # change to initializer
-  
   # To be used with caution
   def self.warmode
     #Mongoid.load!("config/mongoid.yml", ENV['RACK_ENV']||'development') # change to env URL

data/mailcannon.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency 'activemodel', '>= 3.0.0'
   
-  #s.add_dependency 'librato-metrics'
   s.add_dependency 'redis'
   s.add_dependency 'mongoid'
   s.add_dependency 'sidekiq'