proclaim 0.3.1 → 0.4.0

data/lib/proclaim/engine.rb

@@ -50,5 +50,23 @@ module Proclaim
 		config.generators do |g|
 			g.fixture_replacement :factory_girl, :dir => 'test/factories'
 		end
+
+		initializer :ensure_secret_key_presence do |app|
+			if app.respond_to?(:secrets)
+				Proclaim.secret_key ||= app.secrets.secret_key_base
+			elsif app.config.respond_to?(:secret_key_base)
+				Proclaim.secret_key ||= app.config.secret_key_base
+			end
+
+			if Proclaim.secret_key.nil?
+				raise <<-ERROR
+Proclaim.secret_key was not set. Please add the following to your Proclaim initializer:
+
+  config.secret_key = '#{SecureRandom.hex(64)}'
+
+Please ensure you restarted your application after installing Proclaim or setting the key.
+ERROR
+			end
+		end
 	end
 end

data/lib/proclaim/version.rb

@@ -1,3 +1,3 @@
 module Proclaim
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/controllers/proclaim/subscriptions_controller_test.rb

@@ -9,6 +9,60 @@ module Proclaim
 			@controller.stubs(:authenticate_user).returns(false)
 		end
 
+		test "should get index if logged in" do
+			user = FactoryGirl.create(:user)
+			sign_in user
+
+			subscription1 = FactoryGirl.create(:subscription)
+			subscription2 = FactoryGirl.create(:subscription)
+
+			get :index
+			assert_response :success
+			assert_not_nil assigns(:subscriptions)
+			assert_includes assigns(:subscriptions), subscription1
+			assert_includes assigns(:subscriptions), subscription2
+		end
+
+		test "should not get index if not logged in" do
+			get :index
+			assert_response :redirect
+			assert_match /not authorized/, flash[:error]
+		end
+
+		test "should get show if logged in" do
+			user = FactoryGirl.create(:user)
+			sign_in user
+
+			subscription = FactoryGirl.create(:subscription)
+
+			get :show, token: subscription.token
+			assert_response :success
+			assert_equal subscription, assigns(:subscription)
+		end
+
+		test "should get show if not logged in" do
+			subscription = FactoryGirl.create(:subscription)
+
+			get :show, token: subscription.token
+			assert_response :success
+			assert_equal subscription, assigns(:subscription)
+		end
+
+		test "should get new if logged in" do
+			user = FactoryGirl.create(:user)
+			sign_in user
+
+			get :new
+			assert_response :success
+			assert_not_nil assigns(:subscription)
+		end
+
+		test "should get new if not logged in" do
+			get :new
+			assert_response :success
+			assert_not_nil assigns(:subscription)
+		end
+
 		test "should create subscription if logged in" do
 			user = FactoryGirl.create(:user)
 			sign_in user
@@ -18,6 +72,7 @@ module Proclaim
 			assert_difference('Subscription.count') do
 				post :create,
 					subscription: {
+						name: newSubscription.name,
 						email: newSubscription.email
 					},
 					antispam: {
@@ -26,7 +81,7 @@ module Proclaim
 					}
 			end
 
-			assert_redirected_to :subscribed
+			assert_redirected_to subscription_path(assigns(:subscription).token)
 		end
 
 		test "should create subscription if not logged in" do
@@ -35,6 +90,7 @@ module Proclaim
 			assert_difference('Subscription.count') do
 				post :create,
 					subscription: {
+						name: newSubscription.name,
 						email: newSubscription.email
 					},
 					antispam: {
@@ -43,7 +99,7 @@ module Proclaim
 					}
 			end
 
-			assert_redirected_to :subscribed
+			assert_redirected_to subscription_path(assigns(:subscription).token)
 		end
 
 		test "should not create subscription if spammy" do
@@ -52,6 +108,7 @@ module Proclaim
 			assert_no_difference('Subscription.count') do
 				post :create,
 					subscription: {
+						name: newSubscription.name,
 						email: newSubscription.email
 					},
 					antispam: {
@@ -61,33 +118,31 @@ module Proclaim
 			end
 		end
 
-		test "ensure token resolves to correct subscription" do
-			subscription1 = FactoryGirl.create(:subscription)
-			subscription2 = FactoryGirl.create(:subscription)
+		test "should delete subscription if logged in" do
+			user = FactoryGirl.create(:user)
+			sign_in user
 
-			get :unsubscribe, token: subscription1.token
-			assert_response :success
-			assert_equal subscription1, assigns(:subscription)
+			subscription = FactoryGirl.create(:subscription)
 
-			get :unsubscribe, token: subscription2.token
-			assert_response :success
-			assert_equal subscription2, assigns(:subscription)
+			assert_difference('Subscription.count', -1) do
+				delete :destroy, token: subscription.token
+			end
+
+			# If a user is logged in, deletion should take them back to the
+			# subscriptions index
+			assert_redirected_to subscriptions_path
 		end
 
-		test "ensure deletion with token actually deletes correct subscription" do
-			subscription1 = FactoryGirl.create(:subscription)
-			subscription2 = FactoryGirl.create(:subscription)
+		test "should delete subscription if not logged in" do
+			subscription = FactoryGirl.create(:subscription)
 
 			assert_difference('Subscription.count', -1) do
-				delete :destroy, token: subscription1.token
+				delete :destroy, token: subscription.token
 			end
-			assert_equal subscription2, Subscription.first
-			assert_redirected_to :unsubscribed
 
-			assert_difference('Subscription.count', -1) do
-				delete :destroy, token: subscription2.token
-			end
-			assert_redirected_to :unsubscribed
+			# If no user is logged in, deletion should take them back to the
+			# posts index
+			assert_redirected_to posts_path
 		end
 	end
 end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141222224905) do
+ActiveRecord::Schema.define(version: 20150123115226) do
 
   create_table "proclaim_comment_hierarchies", id: false, force: :cascade do |t|
     t.integer "ancestor_id",   null: false
@@ -58,8 +58,9 @@ ActiveRecord::Schema.define(version: 20141222224905) do
   create_table "proclaim_subscriptions", force: :cascade do |t|
     t.integer  "post_id"
     t.string   "email"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
+    t.string   "name",       default: "", null: false
   end
 
   add_index "proclaim_subscriptions", ["post_id", "email"], name: "index_proclaim_subscriptions_on_post_id_and_email", unique: true

data/test/factories/proclaim/subscription.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
 	factory :subscription, class: Proclaim::Subscription do
+		sequence(:name) {|n| "name#{n}"}
 		sequence(:email) {|n| "email#{n}@example.com"}
 
 		factory :post_subscription do

data/test/integration/with_javascript/post_subscription_test.rb

@@ -39,11 +39,18 @@ class PostSubscriptionTest < ActionDispatch::IntegrationTest
 			fill_in 'Email', with: "example@example.com"
 		end
 
+		# Verify that email field is shown
+		assert page.has_text?('Email')
+
 		assert_difference('Proclaim::Subscription.count', 1, "A new subscription should have been added!") do
 			@show_page.new_comment_submit_button.click
 			wait_for_ajax
 		end
 
+		# Now email field should be hidden
+		assert page.has_no_text?('Email'),
+		       "Email field should be hidden again when form is successful"
+
 		# Make sure a welcome email was sent
 		assert_equal ["example@example.com"], ActionMailer::Base.deliveries.last.to
 
@@ -270,4 +277,26 @@ class PostSubscriptionTest < ActionDispatch::IntegrationTest
 		# Make sure no email was sent
 		assert_empty ActionMailer::Base.deliveries
 	end
+
+	test "cancel button should remove email field" do
+		post = FactoryGirl.create(:published_post)
+
+		visit proclaim.post_path(post)
+
+		within('#new_comment') do
+			fill_in 'Author', with: "Comment Author"
+			fill_in 'Body', with: "Comment Body"
+			fill_in 'What is', with: @show_page.antispam_solution
+			check 'Notify me of other comments on this post'
+		end
+
+		# Verify email field is shown
+		assert page.has_text?('Email')
+
+		# Now click cancel
+		@show_page.new_comment_cancel_button.click
+
+		# Now email field should be hidden
+		assert page.has_no_text?('Email')
+	end
 end

data/test/integration/without_javascript/blog_subscription_test.rb

@@ -15,6 +15,7 @@ class BlogSubscriptionTest < ActionDispatch::IntegrationTest
 		visit proclaim.new_subscription_path
 
 		within('#new_subscription') do
+			fill_in 'Name', with: "example"
 			fill_in 'Email', with: "example@example.com"
 			fill_in 'What is', with: antispam_solution
 		end
@@ -24,13 +25,17 @@ class BlogSubscriptionTest < ActionDispatch::IntegrationTest
 			find('#new_subscription input[type=submit]').click
 		end
 
-		assert page.has_text?("Welcome"), "Should be shown the welcome page!"
+		assert page.has_text?("example"),
+		       "Should be shown subscription name"
+		assert page.has_no_text?("example@example.com"),
+		       "Should not be shown email address, in case link is compromised"
 	end
 
 	test "should be able to create new blog subscription while not logged in" do
 		visit proclaim.new_subscription_path
 
 		within('#new_subscription') do
+			fill_in 'Name', with: "example"
 			fill_in 'Email', with: "example@example.com"
 			fill_in 'What is', with: antispam_solution
 		end
@@ -40,7 +45,10 @@ class BlogSubscriptionTest < ActionDispatch::IntegrationTest
 			find('#new_subscription input[type=submit]').click
 		end
 
-		assert page.has_text?("Welcome"), "Should be shown the welcome page!"
+		assert page.has_text?("example"),
+		       "Should be shown subscription name"
+		assert page.has_no_text?("example@example.com"),
+		       "Should not be shown email address, in case link is compromised"
 	end
 
 	test "should not be able to create new blog subscription if spammy" do
@@ -50,6 +58,7 @@ class BlogSubscriptionTest < ActionDispatch::IntegrationTest
 		visit proclaim.new_subscription_path
 
 		within('#new_subscription') do
+			fill_in 'Name', with: "example"
 			fill_in 'Email', with: "example@example.com"
 			fill_in 'What is', with: "wrong answer"
 		end
@@ -63,10 +72,28 @@ class BlogSubscriptionTest < ActionDispatch::IntegrationTest
 			       "Should be shown errors since the antispam questions failed!"
 	end
 
+	test "catch missing name" do
+		visit proclaim.new_subscription_path
+
+		within('#new_subscription') do
+			# Don't fill in name
+			fill_in 'Email', with: "example@example.com"
+			fill_in 'What is', with: antispam_solution
+		end
+
+		assert_no_difference('Proclaim::Subscription.count',
+		                     "Should have caught missing name!") do
+			find('#new_subscription input[type=submit]').click
+		end
+
+		assert page.has_css?('div#error_explanation')
+	end
+
 	test "catch bad email address" do
 		visit proclaim.new_subscription_path
 
 		within('#new_subscription') do
+			fill_in 'Name', with: "example"
 			fill_in 'Email', with: "bad_email_address"
 			fill_in 'What is', with: antispam_solution
 		end

data/test/integration/without_javascript/manage_subscriptions_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class ManageSubscriptionTest < ActionDispatch::IntegrationTest
+	setup do
+		ApplicationController.any_instance.stubs(:current_user).returns(nil)
+		ApplicationController.any_instance.stubs(:authenticate_user).returns(false)
+
+		ActionMailer::Base.deliveries.clear
+	end
+
+	test "should be able to see subscribers index if logged in" do
+		user = FactoryGirl.create(:user)
+		sign_in user
+
+		blog_subscription = FactoryGirl.create(:subscription)
+		post_subscription = FactoryGirl.create(:published_post_subscription)
+
+		visit proclaim.subscriptions_path
+
+		# Verify that the blog subscription is shown
+		assert page.has_text?(blog_subscription.name),
+		       "Blog subscription name should be on the index"
+		assert page.has_text?(blog_subscription.email),
+		       "Blog subscription email should be on the index"
+
+		# Verify that the title of the post to which the post subscription belongs
+		# is shown as well
+		assert page.has_text?(post_subscription.post.title),
+		       "Post subscription's post's title should be on the index"
+
+		# Finally, verify that the post subscription is shown
+		assert page.has_text?(post_subscription.name),
+		       "Post subscription name should be on the index"
+		assert page.has_text?(post_subscription.email),
+		       "Post subscription email should be on the index"
+	end
+end

data/test/integration/without_javascript/unsubscribe_test.rb

@@ -9,24 +9,24 @@ class UnsubscribeTest < ActionDispatch::IntegrationTest
 	test "should be able to unsubscribe from blog" do
 		subscription = FactoryGirl.create(:subscription)
 
-		visit proclaim.unsubscribe_path(subscription.token)
+		visit proclaim.subscription_path(subscription.token)
 
 		assert_difference('Proclaim::Subscription.count', -1) do
-			click_link "unsubscribe"
+			click_button "Unsubscribe"
 		end
 
-		assert_equal proclaim.unsubscribed_path, current_path
+		assert_equal proclaim.posts_path, current_path
 	end
 
 	test "should be able to unsubscribe from post" do
 		subscription = FactoryGirl.create(:published_post_subscription)
 
-		visit proclaim.unsubscribe_path(subscription.token)
+		visit proclaim.subscription_path(subscription.token)
 
 		assert_difference('Proclaim::Subscription.count', -1) do
-			click_link "unsubscribe"
+			click_button "Unsubscribe"
 		end
 
-		assert_equal proclaim.unsubscribed_path, current_path
+		assert_equal proclaim.posts_path, current_path
 	end
 end

data/test/mailers/proclaim/subscription_mailer_test.rb

@@ -22,9 +22,13 @@ module Proclaim
 			assert_equal ["from@example.com"], mail.from
 			assert_equal 2, mail.body.parts.length # Ensure multipart: text and HTML
 
+			# Verify the email includes a greeting
+			assert_match "Hello, #{subscription.name}", get_text_part(mail)
+			assert_match "Hello, #{subscription.name}", get_html_part(mail)
+
 			# Verify the email includes an unsubscription URL
-			assert_match proclaim.unsubscribe_url(subscription.token), get_text_part(mail)
-			assert_match proclaim.unsubscribe_url(subscription.token), get_html_part(mail)
+			assert_match proclaim.subscription_url(subscription.token), get_text_part(mail)
+			assert_match proclaim.subscription_url(subscription.token), get_html_part(mail)
 		end
 
 		test "new comment notification email" do
@@ -38,8 +42,8 @@ module Proclaim
 			assert_equal 2, mail.body.parts.length # Ensure multipart: text and HTML
 
 			# Verify the email includes an unsubscription URL
-			assert_match proclaim.unsubscribe_url(subscription.token), get_text_part(mail)
-			assert_match proclaim.unsubscribe_url(subscription.token), get_html_part(mail)
+			assert_match proclaim.subscription_url(subscription.token), get_text_part(mail)
+			assert_match proclaim.subscription_url(subscription.token), get_html_part(mail)
 		end
 
 		test "new post notification email" do
@@ -53,8 +57,8 @@ module Proclaim
 			assert_equal 2, mail.body.parts.length # Ensure multipart: text and HTML
 
 			# Verify the email includes an unsubscription URL
-			assert_match proclaim.unsubscribe_url(subscription.token), get_text_part(mail)
-			assert_match proclaim.unsubscribe_url(subscription.token), get_html_part(mail)
+			assert_match proclaim.subscription_url(subscription.token), get_text_part(mail)
+			assert_match proclaim.subscription_url(subscription.token), get_html_part(mail)
 		end
 
 		test "images in new post notification email should have absolute URLs" do

data/test/models/proclaim/subscription_test.rb

@@ -27,6 +27,11 @@ module Proclaim
 			       "Post subscriptions should have unique emails!"
 		end
 
+		test "should require a name" do
+			subscription = FactoryGirl.build(:subscription, name: nil)
+			refute subscription.save, "Subscription should require a name!"
+		end
+
 		test "should not save without valid email address" do
 			subscription = FactoryGirl.build(:subscription, email: nil)
 			refute subscription.save,