mailkick 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7342fb3956753b14f1345a70153ac76cc6cc73290a7b4c1d9e3f9a1b29e6a216
-  data.tar.gz: 06a13e7037c2ab1ffcab78f93f7a99272aa00b59f3388878ad10498d7ed73e70
+  metadata.gz: 7a36d760e07c5d02d2a0a685c4ced2e9075eb0e272f7814b08fd477fd282a9a0
+  data.tar.gz: 6038e41c31a36c14fd7438fc870531773fb6098d0932e72b4d187dc9c51ef634
 SHA512:
-  metadata.gz: 2d0a3d927fee65871caf6b37d79e83663e45c382396e941e03651ec36de13e19680107f9582e4e9010f65454361d32e16b77787d8e0657857029ff05b3e2e510
-  data.tar.gz: 72698be727b60185179d2004af23531cf3812fabf6e68a8ad0d4da4b0119804bc3591dd60aa1f7a5c92b1d3d0c896f5329572a6e331985724f00c8778abb6623
+  metadata.gz: f1f4229e0f2191437d1cda0ef791683908cbc9d5a98519ba8fd00f9250b6f64f9aa0f9ec0df8be05c62506bf6d7e407bf610643d7f2faf979c066d8e977f7efc
+  data.tar.gz: b2801fbe7e9bb5de9d3eda275e7b162b68ccf5ff3ad352cb5b4462a3e617edb44cae177652d3c7ecda70f7dd35abc2755cc958219e761510270f32605f7eae91

data/.gitignore

@@ -22,3 +22,4 @@ tmp
 mkmf.log
 *.log
 *.sqlite
+*.lock

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.1
+
+- Fixed `Secret should not be nil` error in Rails 5.2
+- Gracefully handle missing email
+- Added `user` option to `mailkick_unsubscribe_url`
+
 ## 0.3.0
 
 - Improved performance

data/app/helpers/mailkick/url_helper.rb

@@ -1,12 +1,13 @@
 module Mailkick
   module UrlHelper
-    def mailkick_unsubscribe_url(email: nil, list: nil, **options)
-      email ||= controller.message.to.first
+    def mailkick_unsubscribe_url(email: nil, user: nil, list: nil, **options)
+      email ||= controller.try(:message).try(:to).try(:first)
+
       Mailkick::Engine.routes.url_helpers.url_for(
         (ActionMailer::Base.default_url_options || {}).merge(options).merge(
           controller: "mailkick/subscriptions",
           action: "unsubscribe",
-          id: Mailkick.generate_token(email, list: list)
+          id: Mailkick.generate_token(email, user: user, list: list)
         )
       )
     end

data/lib/mailkick.rb

@@ -91,8 +91,10 @@ module Mailkick
     @message_verifier ||= ActiveSupport::MessageVerifier.new(Mailkick.secret_token)
   end
 
-  def self.generate_token(email, list: nil)
-    user = Mailkick.user_method.call(email) if Mailkick.user_method
+  def self.generate_token(email, user: nil, list: nil)
+    raise ArgumentError, "Missing email" unless email
+
+    user ||= Mailkick.user_method.call(email) if Mailkick.user_method
     message_verifier.generate([email, user.try(:id), user.try(:class).try(:name), list])
   end
 end

data/lib/mailkick/engine.rb

@@ -7,7 +7,7 @@ module Mailkick
 
       Mailkick.secret_token ||= begin
         creds =
-          if app.respond_to?(:credentials)
+          if app.respond_to?(:credentials) && app.credentials.secret_key_base
             app.credentials
           elsif app.respond_to?(:secrets)
             app.secrets

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/mailkick_test.rb

@@ -4,9 +4,9 @@ class MailkickTest < Minitest::Test
   def test_unsubscribe_url
     message = UserMailer.welcome.deliver_now
     html_body = message.html_part.body.to_s
-    assert_includes html_body, "BAhbCUkiFXRlc3RAZXhhbXBsZS5vcmcGOgZFVDAwMA==--f435e91ba90e1732d3e999af1f2126dcc8182a5d"
+    assert_includes html_body, "unsubscribe"
     text_body = message.text_part.body.to_s
-    assert_includes text_body, "BAhbCUkiFXRlc3RAZXhhbXBsZS5vcmcGOgZFVDAwMA==--f435e91ba90e1732d3e999af1f2126dcc8182a5d"
+    assert_includes text_body, "unsubscribe"
   end
 
   def test_opt_out

data/test/test_helper.rb

@@ -16,5 +16,3 @@ end
 
 ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
 ActionMailer::Base.delivery_method = :test
-
-Mailkick.secret_token = "test123"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport