mailkick 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0750bea0ea92b3202ed0d741f50efb0c40ec7a1f
-  data.tar.gz: 55d4087445153084af0810e7e5a729eb379d3bbb
+  metadata.gz: 0bf0541ba51746a50f8a286d7acd0bed58660b4b
+  data.tar.gz: 796d78becdc4f302b06dd1eb7bf44df154fd9e6f
 SHA512:
-  metadata.gz: 3fce62385ba937b6ad173db9a27d93dcb26a95e453868bf5f81b278ee1d8b5ce3ae98661aa4bc53894e07793ad6be240fc29b2294123717e03b4f4cf6916aa22
-  data.tar.gz: 57818f63ff5dba4a8c020e926a19bc5733e7b75c3b0278629ed2ca9ee010195d9791061f544cd5b8e06e8fa0b2173baa3c3459ecab3cd728e71095d75245a731
+  metadata.gz: da32468a31c92c6e674eb1b397827d155c01bd918ade637c9145702b92c35ebb39c916eee01c680efad85ac1b2d298ad2b4b9bb2033bd1d04dfab67baca8e58c
+  data.tar.gz: 11cbb1e1b2cce5d3763cb11517892d010240ad24e467ff3a2f9b9d8f1d69a1320ab8efd777093edaf328ba1241495bf2f50303d39e82b5333e35dd49b8b130bd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4
+
+- Use `Module#prepend` instead of `alias_method_chain`
+
 ## 0.1.3
 
 - Fixed issue with double escaping tokens

data/lib/mailkick.rb

@@ -21,9 +21,7 @@ module Mailkick
 
   def self.discover_services
     Service.subclasses.each do |service|
-      if service.discoverable?
-        services << service.new
-      end
+      services << service.new if service.discoverable?
     end
   end
 
@@ -67,9 +65,7 @@ module Mailkick
       parts << "user_id = ? and user_type = ?"
       binds.concat [user.id, user.class.name]
     end
-    if parts.any?
-      relation = relation.where(parts.join(" OR "), *binds)
-    end
+    relation = relation.where(parts.join(" OR "), *binds) if parts.any?
 
     relation =
       if options[:list]
@@ -91,5 +87,5 @@ module Mailkick
   end
 end
 
-ActionMailer::Base.send :include, Mailkick::Mailer
+ActionMailer::Base.send(:prepend, Mailkick::Mailer)
 ActiveRecord::Base.send(:extend, Mailkick::Model) if defined?(ActiveRecord)

data/lib/mailkick/mailer.rb

@@ -1,13 +1,7 @@
 module Mailkick
   module Mailer
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :mail, :mailkick
-      end
-    end
-
-    def mail_with_mailkick(headers = {}, &block)
-      message = mail_without_mailkick(headers, &block)
+    def mail(headers = {}, &block)
+      message = super
 
       Mailkick::Processor.new(message).process
 

data/lib/mailkick/service/mailgun.rb

@@ -3,8 +3,8 @@
 module Mailkick
   class Service
     class Mailgun < Mailkick::Service
-      def initalize(options = {})
-        require 'mailgun'
+      def initialize(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)
@@ -15,15 +15,15 @@ module Mailkick
       end
 
       def unsubscribes
-        fetch(@mailgun_events.get({event: 'unsubscribed'}), 'unsubscribe')
+        fetch(@mailgun_events.get(event: "unsubscribed"), "unsubscribe")
       end
 
       def spam_reports
-        fetch(@mailgun_events.get({event: 'complained'}), 'spam')
+        fetch(@mailgun_events.get(event: "complained"), "spam")
       end
 
       def bounces
-        fetch(@mailgun_events.get({event: 'failed'}), 'bounce')
+        fetch(@mailgun_events.get(event: "failed"), "bounce")
       end
 
       def self.discoverable?
@@ -33,10 +33,10 @@ module Mailkick
       protected
 
       def fetch(response, reason)
-        response.to_h['items'].map do |record|
+        response.to_h["items"].map do |record|
           {
-            email: record['recipient'],
-            time: ActiveSupport::TimeZone['UTC'].at(record['timestamp']),
+            email: record["recipient"],
+            time: ActiveSupport::TimeZone["UTC"].at(record["timestamp"]),
             reason: reason
           }
         end

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Email subscriptions made easy