mailkick 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c9afb6da6d15f00f76bb8a7845e9d2df1bb32a913a0fa322542a5ddfe1b043e
-  data.tar.gz: 99c7f94c67e663efa0cdf66cb3d62dff7dc89b214524696bd1e0ee50d43a3ffb
+  metadata.gz: f9cc5e031a75a29b20c985acb8b16922338dab5e65a1df97818facd9a94c75e3
+  data.tar.gz: 433257564c2918ad55eeb41efc5219e86720d2d29bca3808ff084ba76a085524
 SHA512:
-  metadata.gz: dc3f3beb97c4d4a93bc9776318a1052b8954878fc4a971ca7bca813b936baf9198140e4f4b562e505405ce819a77547873bd0ae2375bb663a53d155208868bef
-  data.tar.gz: a0ce5ec53014a34326743d3331c5d43748a922fd1d0bc1bc84c65b26371e524d64f2e6f0e88a47d58dc2a946722a21cab8fc6ae96c8170e4cbbb10639aa875ec
+  metadata.gz: 1c28e41447543e5498ca2f91fa66e1e0cf1dce16160d76d73b883be236f8a5d36091c2e768d3f5668702a371759891e1a3a5187f4a440cb35b313f9021734908
+  data.tar.gz: 1fe58111dc7a26644d68a425be18824a660cf16c4305207c8b63ae8916609381d376a72bd449b4e21b02fe1541e571a210b0086d7947b764e619ed67a3f8a5dd

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.3.0 (2024-01-18)
+
+- Added support for one-click unsubscribe headers (RFC 8058)
+
+## 1.2.2 (2023-10-30)
+
+- Fixed error when secret key base set with `SECRET_KEY_BASE_DUMMY`
+
 ## 1.2.1 (2023-07-24)
 
 - Fixed issue with inheritance

data/README.md

@@ -2,7 +2,7 @@
 
 Email subscriptions for Rails
 
-- Add one-click unsubscribe links to your emails
+- Add one-click unsubscribe links and headers to your emails
 - Fetch bounces and spam reports from your email service
 
 :postbox: Check out [Ahoy Email](https://github.com/ankane/ahoy_email) for analytics
@@ -81,6 +81,16 @@ rails generate mailkick:views
 
 which copies the view into `app/views/mailkick`.
 
+## Unsubscribe Headers
+
+For one-click unsubscribe headers ([RFC 8058](https://datatracker.ietf.org/doc/html/rfc8058)), create `config/initializers/mailkick.rb` with:
+
+```ruby
+Mailkick.headers = true
+```
+
+Headers will automatically be added to emails that call `mailkick_unsubscribe_url`.
+
 ## Bounces and Spam Reports
 
 Fetch bounces, spam reports, and unsubscribes from your email service. Create `config/initializers/mailkick.rb` with a method to handle opt outs.

data/app/controllers/mailkick/subscriptions_controller.rb

@@ -1,6 +1,7 @@
 module Mailkick
   class SubscriptionsController < ActionController::Base
     protect_from_forgery with: :exception
+    skip_forgery_protection only: [:unsubscribe]
 
     before_action :set_subscription
 
@@ -12,7 +13,13 @@ module Mailkick
 
       Mailkick::Legacy.opt_out(legacy_options) if Mailkick::Legacy.opt_outs?
 
-      redirect_to subscription_path(params[:id])
+      if request.post? && params["List-Unsubscribe"] == "One-Click"
+        # must not redirect according to RFC 8058
+        # could render show action instead
+        render plain: "Unsubscribe successful"
+      else
+        redirect_to subscription_path(params[:id])
+      end
     end
 
     def subscribe

data/config/routes.rb

@@ -6,7 +6,7 @@ end
 
 Mailkick::Engine.routes.draw do
   resources :subscriptions, only: [:show] do
-    get :unsubscribe, on: :member
+    match :unsubscribe, on: :member, via: [:get, :post]
     get :subscribe, on: :member
   end
 end

data/lib/mailkick/engine.rb

@@ -20,7 +20,7 @@ module Mailkick
           end
 
         token = creds.respond_to?(:secret_key_base) ? creds.secret_key_base : creds.secret_token
-        Mailkick.message_verifier.rotate(token, serializer: Marshal)
+        Mailkick.message_verifier.rotate(token, serializer: Marshal) if token
       end
     end
   end

data/lib/mailkick/url_helper.rb

@@ -2,7 +2,12 @@ module Mailkick
   module UrlHelper
     def mailkick_unsubscribe_url(subscriber, list, **options)
       token = Mailkick.generate_token(subscriber, list)
-      mailkick.unsubscribe_subscription_url(token, **options)
+      url = mailkick.unsubscribe_subscription_url(token, **options)
+      if Mailkick.headers && headers["List-Unsubscribe"].nil?
+        headers["List-Unsubscribe-Post"] ||= "List-Unsubscribe=One-Click"
+        headers["List-Unsubscribe"] = "<#{url}>"
+      end
+      url
     end
   end
 end

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/mailkick.rb

@@ -24,12 +24,13 @@ require_relative "mailkick/version"
 require_relative "mailkick/engine" if defined?(Rails)
 
 module Mailkick
-  mattr_accessor :services, :mount, :process_opt_outs_method
+  mattr_accessor :services, :mount, :process_opt_outs_method, :headers
   mattr_reader :secret_token
   mattr_writer :message_verifier
   self.services = []
   self.mount = true
   self.process_opt_outs_method = ->(_) { raise "process_opt_outs_method not defined" }
+  self.headers = false
 
   def self.fetch_opt_outs
     services.each(&:fetch_opt_outs)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Email subscriptions for Rails