mailkick 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35835a6f8e9f1d62977205c3b4b381dc13baecf7
-  data.tar.gz: 528cb1cf61a126560de37a2b6dabccc6bc56283a
+  metadata.gz: b352637be3b03e2c64e52936662205cf4524aa93
+  data.tar.gz: 5c3340840799c56a44c246667f86c13e22ad375c
 SHA512:
-  metadata.gz: 635af4e2bfdb8d2dab9c70f2f7f9d5a88c903d42882b9234455d3bc82c7896bd5bb7521a7209b714b2795e7798ad01a2d5f7db40da99ba9cdd00d4c2560931e2
-  data.tar.gz: dd7bc1dad73ea07ebead206ceba06a48b5a9989f2691f911f238cc2ba33355bc67c5ea8c08885ccae184acbe01062bcbb40a3075924f9e924ba1fd0acdab203a
+  metadata.gz: 5a0b3d37bc1d3e883e30518960d486784850ab703ba4a8108cc4d1ca5b0d9d78fe0981bbf130fec0188db53d3011d0e5b9cd8ad8c9832b3491f77eb5263da92f
+  data.tar.gz: 1524cf7d6fd3d9a297a1ca9854868cccda35c42bff1ff325ade4f38b37ce6862cca05ce4ab91d00c70a2b0d353f82b9f733e520471e047b385454b1398e87065

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.2
+
+- Added support for Mailgun
+
 ## 0.1.1
 
 - Fixed tokens with `+` in them

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in mailkick.gemspec
 gemspec

data/README.md

@@ -114,6 +114,14 @@ gem 'gibbon'
 
 Be sure `ENV["MAILCHIMP_API_KEY"]` and `ENV["MAILCHIMP_LIST_ID"]` are set.
 
+#### Mailgun
+
+```ruby
+gem 'mailgun-ruby'
+```
+
+Be sure `ENV["MAILGUN_API_KEY"]` is set.
+
 #### Other
 
 Will gladly accept pull requests.
@@ -139,7 +147,7 @@ Set the list in the mailer.
 class UserMailer < ActionMailer::Base
 
   def order_reminder(user)
-    header[:mailkick_list] = "order_reminders"
+    headers[:mailkick_list] = "order_reminders"
     # ...
   end
 

data/Rakefile

@@ -1,2 +1 @@
 require "bundler/gem_tasks"
-

data/app/controllers/mailkick/subscriptions_controller.rb

@@ -53,8 +53,7 @@ module Mailkick
     private
 
     def url_token
-      @url_token ||= CGI::escape(params[:id])
+      @url_token ||= CGI.escape(params[:id])
     end
-
   end
 end

data/app/helpers/mailkick/url_helper.rb

@@ -1,6 +1,5 @@
 module Mailkick
   module UrlHelper
-
     def mailkick_unsubscribe_url
       Mailkick::Engine.routes.url_helpers.url_for(
         (ActionMailer::Base.default_url_options || {}).merge(
@@ -10,6 +9,5 @@ module Mailkick
         )
       )
     end
-
   end
 end

data/lib/generators/mailkick/install_generator.rb

@@ -24,7 +24,6 @@ module Mailkick
       def copy_migration
         migration_template "install.rb", "db/migrate/install_mailkick.rb"
       end
-
     end
   end
 end

data/lib/generators/mailkick/views_generator.rb

@@ -8,7 +8,6 @@ module Mailkick
       def copy_initializer_file
         directory "mailkick", "app/views/mailkick"
       end
-
     end
   end
 end

data/lib/mailkick/mailer.rb

@@ -1,6 +1,5 @@
 module Mailkick
   module Mailer
-
     def self.included(base)
       base.class_eval do
         alias_method_chain :mail, :mailkick
@@ -14,6 +13,5 @@ module Mailkick
 
       message
     end
-
   end
 end

data/lib/mailkick/model.rb

@@ -1,6 +1,5 @@
 module Mailkick
   module Model
-
     def mailkick_user(options = {})
       email_key = options[:email_key] || :email
       class_eval do
@@ -12,7 +11,7 @@ module Mailkick
           else
             query = "mailkick_opt_outs.list IS NULL"
           end
-          where("#{options[:not] ? "NOT " : ""}EXISTS(SELECT * FROM mailkick_opt_outs WHERE (#{table_name}.#{email_key} = mailkick_opt_outs.email OR (#{table_name}.#{primary_key} = mailkick_opt_outs.user_id AND mailkick_opt_outs.user_type = ?)) AND mailkick_opt_outs.active = ? AND #{query})", *binds)
+          where("#{options[:not] ? 'NOT ' : ''}EXISTS(SELECT * FROM mailkick_opt_outs WHERE (#{table_name}.#{email_key} = mailkick_opt_outs.email OR (#{table_name}.#{primary_key} = mailkick_opt_outs.user_id AND mailkick_opt_outs.user_type = ?)) AND mailkick_opt_outs.active = ? AND #{query})", *binds)
         }
         scope :not_opted_out, proc {|options = {}|
           opted_out(options.merge(not: true))
@@ -29,9 +28,7 @@ module Mailkick
         def opt_in(options = {})
           Mailkick.opt_in({email: email, user: self}.merge(options))
         end
-
       end
     end
-
   end
 end

data/lib/mailkick/processor.rb

@@ -20,9 +20,8 @@ module Mailkick
 
       parts = message.parts.any? ? message.parts : [message]
       parts.each do |part|
-        part.body.raw_source.gsub!(/%7B%7BMAILKICK_TOKEN%7D%7D/, CGI::escape(token))
+        part.body.raw_source.gsub!(/%7B%7BMAILKICK_TOKEN%7D%7D/, CGI.escape(token))
       end
     end
-
   end
 end

data/lib/mailkick/service/mailchimp.rb

@@ -3,7 +3,6 @@
 module Mailkick
   class Service
     class Mailchimp < Mailkick::Service
-
       def initialize(options = {})
         @gibbon = ::Gibbon::API.new(options[:api_key] || ENV["MAILCHIMP_API_KEY"])
         @list_id = options[:list_id] || ENV["MAILCHIMP_LIST_ID"]
@@ -37,7 +36,6 @@ module Mailkick
           }
         end
       end
-
     end
   end
 end

data/lib/mailkick/service/mailgun.rb

@@ -0,0 +1,46 @@
+# https://github.com/mailgun/mailgun-ruby
+
+module Mailkick
+  class Service
+    class Mailgun < Mailkick::Service
+      def initalize(options = {})
+        require 'mailgun'
+        mailgun_client = ::Mailgun::Client.new(options[:api_key] || ENV["MAILGUN_API_KEY"])
+        domain = options[:domain] || ActionMailer::Base.default_url_options[:host]
+        @mailgun_events = ::Mailgun::Events.new(mailgun_client, domain)
+      end
+
+      def opt_outs
+        unsubscribes + spam_reports + bounces
+      end
+
+      def unsubscribes
+        fetch(@mailgun_events.get({event: 'unsubscribed'}), 'unsubscribe')
+      end
+
+      def spam_reports
+        fetch(@mailgun_events.get({event: 'complained'}), 'spam')
+      end
+
+      def bounces
+        fetch(@mailgun_events.get({event: 'failed'}), 'bounce')
+      end
+
+      def self.discoverable?
+        !!(defined?(::Mailgun) && ENV["MAILGUN_API_KEY"])
+      end
+
+      protected
+
+      def fetch(response, reason)
+        response.to_h['items'].map do |record|
+          {
+            email: record['recipient'],
+            time: ActiveSupport::TimeZone['UTC'].at(record['timestamp']),
+            reason: reason
+          }
+        end
+      end
+    end
+  end
+end

data/lib/mailkick/service/mandrill.rb

@@ -29,7 +29,6 @@ module Mailkick
       def self.discoverable?
         !!(defined?(::Mandrill::API) && ENV["MANDRILL_APIKEY"])
       end
-
     end
   end
 end

data/lib/mailkick/service/sendgrid.rb

@@ -3,7 +3,6 @@
 module Mailkick
   class Service
     class Sendgrid < Mailkick::Service
-
       def initialize(options = {})
         @api_user = options[:api_user] || ENV["SENDGRID_USERNAME"]
         @api_key = options[:api_key] || ENV["SENDGRID_PASSWORD"]
@@ -41,7 +40,6 @@ module Mailkick
           }
         end
       end
-
     end
   end
 end

data/lib/mailkick/service.rb

@@ -1,13 +1,12 @@
 module Mailkick
   class Service
-
     def fetch_opt_outs
       opt_outs.each do |api_data|
         email = api_data[:email]
         time = api_data[:time]
 
         opt_out = Mailkick::OptOut.where(email: email).order("updated_at desc").first
-        if !opt_out or (time > opt_out.updated_at and !opt_out.active)
+        if !opt_out || (time > opt_out.updated_at && !opt_out.active)
           Mailkick.opt_out(
             email: email,
             user: Mailkick.user_method ? Mailkick.user_method.call(email) : nil,
@@ -18,6 +17,5 @@ module Mailkick
       end
       true
     end
-
   end
 end

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/mailkick.rb

@@ -7,17 +7,16 @@ require "mailkick/service"
 require "mailkick/service/mailchimp"
 require "mailkick/service/mandrill"
 require "mailkick/service/sendgrid"
+require "mailkick/service/mailgun"
 require "set"
 
 module Mailkick
   mattr_accessor :services, :user_method, :secret_token
   self.services = []
-  self.user_method = proc{|email| User.where(email: email).first rescue nil }
+  self.user_method = proc { |email| User.where(email: email).first rescue nil }
 
   def self.fetch_opt_outs
-    services.each do |service|
-      service.fetch_opt_outs
-    end
+    services.each(&:fetch_opt_outs)
   end
 
   def self.discover_services
@@ -33,7 +32,7 @@ module Mailkick
   end
 
   def self.opt_out(options)
-    if !opted_out?(options)
+    unless opted_out?(options)
       time = options[:time] || Time.now
       Mailkick::OptOut.create! do |o|
         o.email = options[:email]
@@ -90,7 +89,6 @@ module Mailkick
   def self.opted_out_users(options = {})
     Set.new(opt_outs(options).where("user_id IS NOT NULL").map(&:user))
   end
-
 end
 
 ActionMailer::Base.send :include, Mailkick::Mailer

data/mailkick.gemspec

@@ -1,15 +1,15 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mailkick/version'
+require "mailkick/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "mailkick"
   spec.version       = Mailkick::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = %q{Email subscriptions made easy}
-  spec.description   = %q{Email subscriptions made easy}
+  spec.summary       = "Email subscriptions made easy"
+  spec.description   = "Email subscriptions made easy"
   spec.homepage      = "https://github.com/ankane/mailkick"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - lib/mailkick/processor.rb
 - lib/mailkick/service.rb
 - lib/mailkick/service/mailchimp.rb
+- lib/mailkick/service/mailgun.rb
 - lib/mailkick/service/mandrill.rb
 - lib/mailkick/service/sendgrid.rb
 - lib/mailkick/version.rb
@@ -95,3 +96,4 @@ signing_key:
 specification_version: 4
 summary: Email subscriptions made easy
 test_files: []
+has_rdoc: