mailkick 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ceddc58f9f600bae3a7d185763f7ef36e1f369e
-  data.tar.gz: 83f27d1562f61034bcb2370db0ca2fa7fe6b7f5e
+  metadata.gz: 35835a6f8e9f1d62977205c3b4b381dc13baecf7
+  data.tar.gz: 528cb1cf61a126560de37a2b6dabccc6bc56283a
 SHA512:
-  metadata.gz: dbf8ce2d36210c93295a26b0ba813fe51ca0a4c978b38263fe33e2fac0bd78229e96974e06c16eb6ca769611f4694159f0e69737ae629bd8b8c4969c03d8fb84
-  data.tar.gz: e21bb468323465d717abf90114460de7450e4448ab5cb9bcfa8e8d5d7a806b279c9f9731d8d4fd5043a8fc9e14b3b8eee1287494cff3f90451c0b08873e53d3a
+  metadata.gz: 635af4e2bfdb8d2dab9c70f2f7f9d5a88c903d42882b9234455d3bc82c7896bd5bb7521a7209b714b2795e7798ad01a2d5f7db40da99ba9cdd00d4c2560931e2
+  data.tar.gz: dd7bc1dad73ea07ebead206ceba06a48b5a9989f2691f911f238cc2ba33355bc67c5ea8c08885ccae184acbe01062bcbb40a3075924f9e924ba1fd0acdab203a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1
+
+- Fixed tokens with `+` in them
+
 ## 0.1.0
 
 - Fixed secret token for Rails 4.1

data/app/controllers/mailkick/subscriptions_controller.rb

@@ -7,12 +7,12 @@ module Mailkick
 
     def unsubscribe
       Mailkick.opt_out(@options)
-      redirect_to subscription_path(params[:id])
+      redirect_to subscription_path(url_token)
     end
 
     def subscribe
       Mailkick.opt_in(@options)
-      redirect_to subscription_path(params[:id])
+      redirect_to subscription_path(url_token)
     end
 
     protected
@@ -41,14 +41,20 @@ module Mailkick
     helper_method :opted_out?
 
     def subscribe_url
-      subscribe_subscription_path(params[:id])
+      subscribe_subscription_path(url_token)
     end
     helper_method :subscribe_url
 
     def unsubscribe_url
-      unsubscribe_subscription_path(params[:id])
+      unsubscribe_subscription_path(url_token)
     end
     helper_method :unsubscribe_url
 
+    private
+
+    def url_token
+      @url_token ||= CGI::escape(params[:id])
+    end
+
   end
 end

data/lib/mailkick/engine.rb

@@ -5,7 +5,7 @@ module Mailkick
     initializer "mailkick" do |app|
       Mailkick.discover_services
       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
+      Mailkick.secret_token ||= secrets.respond_to?(:secret_key_base) ? secrets.secret_key_base : secrets.secret_token
       ActiveSupport.on_load :action_mailer do
         helper Mailkick::UrlHelper
       end

data/lib/mailkick/processor.rb

@@ -20,7 +20,7 @@ module Mailkick
 
       parts = message.parts.any? ? message.parts : [message]
       parts.each do |part|
-        part.body.raw_source.gsub!(/%7B%7BMAILKICK_TOKEN%7D%7D/, token)
+        part.body.raw_source.gsub!(/%7B%7BMAILKICK_TOKEN%7D%7D/, CGI::escape(token))
       end
     end
 

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Email subscriptions made easy
 test_files: []
-has_rdoc: