notifykit 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9abdc992aa8847d18c5096510e9fb61e631c070e
-  data.tar.gz: bd54e885f1d91aac8f10e6aadb7c4ba6a2e03e52
+  metadata.gz: d96baaa9ac5a0a64a5f914b4a31daa06a06e2fcc
+  data.tar.gz: 39ac9eda71d9fe5bcfebd394d792f8d5b125b30a
 SHA512:
-  metadata.gz: 14913d6cce4148e6bfbed2bced02f9ab3ba2a23cc994bea89ecb52d3a18e63390c0dbf880e9cd897cec1c168987bb0d3b38981efc030d3f9f8dfa97b510cd5c0
-  data.tar.gz: 79ed46946aaf92416f05abe70ea4319a7db188e1bc026a39d2f96836c16f64bfa8dfba3e326056490dcc5b603a9c95525d58486d491b5465df1d3f0260e4e372
+  metadata.gz: f3156b96771dbd2806f606571727d8ad0ae82680f3c21fc9019ca478864c4ec975b7d93cfd7db6f43ea6b5b82d711c4bd25d86143090ce5e9f73ba2172626f7b
+  data.tar.gz: 151d51d7e9c410424d61f8f80b51ec646ebaff300b6a250854e297a14e95fb6519ea7e37e60f5e43fb12a15d50104d465c70540a2bf7874c1671c4635e5ce5fa

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Changes
+
+Version 0.2.0
+-------------
+Adjust notifications_controller to allow certain actions without logging in:
+  - Mark as read
+  - Click
+  - Unsubscribe
+
+
+Version 0.1.0
+-------------
+Initial release of notifykit, support for notifications and mailers and tracking
+

data/lib/generators/notifykit/templates/app/controllers/notifications_controller.rb

@@ -1,6 +1,7 @@
 class NotificationsController < ::ApplicationController
-  before_filter :require_login
-  before_filter :require_notification
+  before_filter :require_login, except: [:click, :read, :unsubscribe]
+  before_filter :require_notification, except: [:click, :read, :unsubscribe]
+  before_filter :require_trackable, only: [:click, :read, :unsubscribe]
 
   include NotificationsHelper
 
@@ -22,12 +23,12 @@ class NotificationsController < ::ApplicationController
   end
 
   def click
-    notification.click
+    trackable.click
 
     # To prevent a bare redirect, validate that the redirect url
     # was generated when the email was sent
     target_url = params[:r]
-    target_url = root_url if notification.email_urls.blank? || !notification.email_urls.split("\n").index(target_url)
+    target_url = root_url if trackable.email_urls.blank? || !trackable.email_urls.split("\n").index(target_url)
 
     respond_to do |format|
       format.json { head :no_content }
@@ -36,12 +37,12 @@ class NotificationsController < ::ApplicationController
   end
 
   def read
-    notification.read
+    trackable.read
     respond_with_no_content
   end
 
   def unsubscribe
-    notification.unsubscribe
+    trackable.unsubscribe
 
     # TODO you may want to improve the unsubscribe logic here
     respond_to do |format|
@@ -74,22 +75,32 @@ class NotificationsController < ::ApplicationController
     notification
   end
 
+  def require_trackable
+    trackable
+  end
+
   def notification
     return @notification if defined?(@notification)
     @notification = current_user.notifications.where(token: params[:token]).first || raise(ActiveRecord::RecordNotFound)
   end
 
+  def trackable
+    return @trackable if defined?(@trackable)
+    @trackable = Notification.where(token: params[:token]).first || raise(ActiveRecord::RecordNotFound)
+  end
+
   def respond_with_no_content
     respond_to do |format|
       format.json { head :no_content }
-      format.html {
+      format.html { redirect_to root_url }
+      format.gif {
         send_data Notifykit.tracking_pixel, :filename => 'blank.gif', :type => 'image/gif', :disposition => 'inline'
       }
     end
   end
 
   def append_tracking_params(url)
-    return url if notification.do_not_track
+    return url if trackable.do_not_track
     query = []
     query << "utm_campaign=#{utm_campaign}" unless url =~ /utm_campaign/
     query << "utm_medium=#{utm_medium}" unless url =~ /utm_medium/
@@ -103,7 +114,7 @@ class NotificationsController < ::ApplicationController
   end
 
   def utm_campaign
-    notification.kind
+    trackable.kind
   end
 
   def utm_medium

data/lib/generators/notifykit/templates/spec/controllers/notifications_controller_spec.rb

@@ -25,13 +25,13 @@ describe NotificationsController do
 
     it "redirects the if there is no user" do
       controller.stub(:current_user).and_return(nil)
-      get :read, valid_params
+      get :view, valid_params
       response.should be_redirect
     end
 
     it "returns success if there is a user" do
       controller.stub(:current_user).and_return(user)
-      get :read, valid_params
+      get :view, valid_params
       response.should be_success
     end
   end
@@ -51,14 +51,14 @@ describe NotificationsController do
       expect {
         notification.user = User.create(email: "another@example.com")
         notification.save
-        get :read, valid_params
+        get :view, valid_params
       }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it "returns success if there is a notification" do
       expect {
         notification.save
-        get :read, valid_params
+        get :view, valid_params
         response.should be_success
       }.not_to raise_error
     end
@@ -68,6 +68,7 @@ describe NotificationsController do
     before(:each) do
       controller.stub(:current_user).and_return(user)
       controller.stub(:notification).and_return(notification)
+      controller.stub(:trackable).and_return(notification)
     end
 
     describe "recent" do
@@ -122,7 +123,7 @@ describe NotificationsController do
       it "should mark the notification as read" do
         notification.should_receive(:read)
         get :read, valid_params
-        response.should be_success
+        response.should redirect_to(root_url)
       end
     end
 
@@ -175,7 +176,7 @@ describe NotificationsController do
     before(:each) do
       notification.email_urls = target_url
       controller.stub(:current_user).and_return(user)
-      controller.stub(:notification).and_return(notification)
+      controller.stub(:trackable).and_return(notification)
     end
 
     it "should set the utm source" do

data/lib/notifykit/version.rb

@@ -1,3 +1,3 @@
 module Notifykit
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifykit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeff Rafter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - FEATURES.md
 - Gemfile
 - LICENSE.txt