mailkick 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf0541ba51746a50f8a286d7acd0bed58660b4b
-  data.tar.gz: 796d78becdc4f302b06dd1eb7bf44df154fd9e6f
+  metadata.gz: 90d458c1e23507be111eeb1e9de2ecfa430bbea1
+  data.tar.gz: bd18b0a3b32a5bd69ad8a73409c5d42bb7c6435e
 SHA512:
-  metadata.gz: da32468a31c92c6e674eb1b397827d155c01bd918ade637c9145702b92c35ebb39c916eee01c680efad85ac1b2d298ad2b4b9bb2033bd1d04dfab67baca8e58c
-  data.tar.gz: 11cbb1e1b2cce5d3763cb11517892d010240ad24e467ff3a2f9b9d8f1d69a1320ab8efd777093edaf328ba1241495bf2f50303d39e82b5333e35dd49b8b130bd
+  metadata.gz: 7ccb7874c79601b112b15242802a760d75a97cc16c07ec7b1163fbfd6bfb609b011cf26d6d443ef2edda5ff13850a016ca62073adbff703024dfc52fda776eb9
+  data.tar.gz: fd76e86747549847fcfe4359aba508e575c8b36c7eacba58f254209a012759b34fa34c044aa7c27d22f428fc6ff011f41208511f6d8207067753f5c0aa9d4439

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.5
+
+- Use `safely`
+- Only discover services if not manually set
+- Added `mount` option
+
 ## 0.1.4
 
 - Use `Module#prepend` instead of `alias_method_chain`

data/app/controllers/mailkick/subscriptions_controller.rb

@@ -1,6 +1,6 @@
 module Mailkick
   class SubscriptionsController < ActionController::Base
-    before_filter :set_email
+    before_action :set_email
 
     def show
     end

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  mount Mailkick::Engine => "/mailkick"
+  mount Mailkick::Engine => "/mailkick" if Mailkick.mount
 end
 
 Mailkick::Engine.routes.draw do

data/lib/mailkick/engine.rb

@@ -3,7 +3,7 @@ module Mailkick
     isolate_namespace Mailkick
 
     initializer "mailkick" do |app|
-      Mailkick.discover_services
+      Mailkick.discover_services unless Mailkick.services.any?
       secrets = app.respond_to?(:secrets) ? app.secrets : app.config
       Mailkick.secret_token ||= secrets.respond_to?(:secret_key_base) ? secrets.secret_key_base : secrets.secret_token
       ActiveSupport.on_load :action_mailer do

data/lib/mailkick/mailer.rb

@@ -3,7 +3,7 @@ module Mailkick
     def mail(headers = {}, &block)
       message = super
 
-      Mailkick::Processor.new(message).process
+      Safely.safely { Mailkick::Processor.new(message).process }
 
       message
     end

data/lib/mailkick/service/mandrill.rb

@@ -10,9 +10,12 @@ module Mailkick
         "unsub" => "unsubscribe"
       }
 
+      # TODO remove ENV["MANDRILL_APIKEY"]
       def initialize(options = {})
         require "mandrill"
-        @mandrill = ::Mandrill::API.new(options[:api_key] || ENV["MANDRILL_APIKEY"])
+        @mandrill = ::Mandrill::API.new(
+          options[:api_key] || ENV["MANDRILL_APIKEY"] || ENV["MANDRILL_API_KEY"]
+        )
       end
 
       # TODO paginate
@@ -26,8 +29,9 @@ module Mailkick
         end
       end
 
+      # TODO remove ENV["MANDRILL_APIKEY"]
       def self.discoverable?
-        !!(defined?(::Mandrill::API) && ENV["MANDRILL_APIKEY"])
+        !!(defined?(::Mandrill::API) && (ENV["MANDRILL_APIKEY"] || ENV["MANDRILL_API_KEY"]))
       end
     end
   end

data/lib/mailkick/version.rb

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

data/lib/mailkick.rb

@@ -9,11 +9,13 @@ require "mailkick/service/mandrill"
 require "mailkick/service/sendgrid"
 require "mailkick/service/mailgun"
 require "set"
+require "safely/core"
 
 module Mailkick
-  mattr_accessor :services, :user_method, :secret_token
+  mattr_accessor :services, :user_method, :secret_token, :mount
   self.services = []
   self.user_method = proc { |email| User.where(email: email).first rescue nil }
+  self.mount = true
 
   def self.fetch_opt_outs
     services.each(&:fetch_opt_outs)

data/mailkick.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "safely_block", ">= 0.1.1"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: safely_block
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Email subscriptions made easy
 test_files: []
-has_rdoc: