mailkick 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58457207d32f0dd9a131524e0a6461133c0fb702
-  data.tar.gz: ef4854e607a9a99da6513dfa823bb23b2c2f0162
+  metadata.gz: c525505d8fffda960f43cf7f5c85aaf205944a23
+  data.tar.gz: 14e99877ab0212660002d48d792ce0f6f82ae4df
 SHA512:
-  metadata.gz: 253736c9f9387dd4703188189ace226a6aab066591a2a0091cfdc81e9dacc3d078219551b8a088974d0c6376e1ab472d9267a588a4951b463a38abb68b2b9264
-  data.tar.gz: 800b46251c5dc872ff2ae6eb95a437eb9dfe5ccc5fec8a23751d3f0a23fbc6b484b7ebea813eafbba2928821e64a2306278a74d86bdedb6c242d73f49ebe38b1
+  metadata.gz: 9a3c6a9d51ed34fee50fea39685bb49ad8d7ad944867b3b746683e46be1866349af57b6985d10295bee57d15bc321bb19d054258f8437e7cbd5edea999a1222b
+  data.tar.gz: 1b89dd17826de70c82947e41b9a2d7e85f4857e6c1496e9bc3c2ce9577b197957f35be4cafb25463b6f2042522b06f013dbbb7d9463b40a031c4c6a9ea88d1cf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.5
+
+- Fixed bug with subscriptions page
+
 ## 0.0.4
 
 - Added `email_key` option to `mailkick_user`

data/README.md

@@ -129,7 +129,7 @@ Mailkick.services = [
 ]
 ```
 
-## Multiple Lists
+## Multiple Lists [beta]
 
 You may want to split your emails into multiple categories, like sale emails and order reminders.
 
@@ -177,6 +177,11 @@ More great gems for email
 - [Roadie](https://github.com/Mange/roadie) - inline CSS
 - [Letter Opener](https://github.com/ryanb/letter_opener) - preview email in development
 
+## TODO
+
+- Make it easy to customize controller
+- Subscribe to events
+
 ## Reference
 
 Change how the user is determined

data/app/controllers/mailkick/subscriptions_controller.rb

@@ -6,12 +6,12 @@ module Mailkick
     end
 
     def unsubscribe
-      Mailkick.opt_out(email: @email, user: @user, list: @list)
+      Mailkick.opt_out(@options)
       redirect_to subscription_path(params[:id])
     end
 
     def subscribe
-      Mailkick.opt_in(email: @email, user: @user, list: @list)
+      Mailkick.opt_in(@options)
       redirect_to subscription_path(params[:id])
     end
 
@@ -25,25 +25,28 @@ module Mailkick
           # on the unprobabilistic chance user_type is compromised, not much damage
           @user = user_type.constantize.find(user_id)
         end
-        @options = {}
-        @options[:list] = @list if @list
+        @options = {
+          email: @email,
+          user: @user,
+          list: @list
+        }
       rescue ActiveSupport::MessageVerifier::InvalidSignature
         render text: "Subscription not found", status: :bad_request
       end
     end
 
-    def opted_out?(options = {})
-      Mailkick.opted_out?(@options.merge(options))
+    def opted_out?
+      Mailkick.opted_out?(@options)
     end
     helper_method :opted_out?
 
-    def subscribe_url(options = {})
-      subscribe_subscription_path(params[:id], options)
+    def subscribe_url
+      subscribe_subscription_path(params[:id])
     end
     helper_method :subscribe_url
 
-    def unsubscribe_url(options = {})
-      unsubscribe_subscription_path(params[:id], options)
+    def unsubscribe_url
+      unsubscribe_subscription_path(params[:id])
     end
     helper_method :unsubscribe_url
 

data/app/helpers/mailkick/url_helper.rb

@@ -1,9 +1,9 @@
 module Mailkick
   module UrlHelper
 
-    def mailkick_unsubscribe_url(options = {})
+    def mailkick_unsubscribe_url
       Mailkick::Engine.routes.url_helpers.url_for(
-        Rails.application.config.action_mailer.default_url_options.merge(options).merge(
+        Rails.application.config.action_mailer.default_url_options.merge(
           controller: "mailkick/subscriptions",
           action: "unsubscribe",
           id: "{{MAILKICK_TOKEN}}"

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Andrew Kane