proclaim 0.5.6 → 0.6.0

data/app/views/layouts/proclaim/subscription_mailer.html.erb

@@ -43,55 +43,35 @@
 				padding: 0;
 			}
 
-			.mediumInsert
-			{
-				margin: 0px;
-			}
-
-			.mediumInsert.small
+			p img
 			{
 				float: left;
 				max-width: 35%;
-				min-height: 18px;
-			}
-
-			.mediumInsert img
-			{
-				margin: 0px;
-				vertical-align: top;
-				max-width: 100%;
-				border: 0px none;
-			}
-
-			.mediumInsert.small img
-			{
-				max-width: 100%;
+				margin-right: 15px;
 			}
 
-			figure.mediumInsert-images
+			p.ql-align-right
 			{
-				width: 100%;
-				margin: 0px;
-				text-align: center;
-				display: inline-block;
+				text-align: right;
 			}
 
-			figure.mediumInsert-images.small
+			p.ql-align-right img
 			{
-				padding-bottom: 18px;
-				padding-right: 30px;
+				float: right;
+				max-width: 35%;
+				margin-left: 15px;
 			}
 
-			figure.mediumInsert-images:first-child
+			p.ql-align-center img
 			{
-				margin-right: 0px;
-				width: 100%;
+				float: inherit;
+				max-width: 100%;
 			}
 
-			.medium-editor-insert-plugin p
+			p.ql-align-justify img
 			{
-				margin: 0px 0px 10px;
-				box-sizing: border-box;
+				float: inherit;
+				max-width: 100%;
 			}
 
 			td.post_body
@@ -159,8 +139,7 @@
 					<% url = root_url.gsub(/\A.*:\/\//, '').gsub(/\A(.*?)\/*\z/, '\1') %>
 
 					<% if @subscription.post %>
-						You're receiving this email because you requested to be notified if a new comment was made on <%= link_to "this post", @subscription.post %>
-						at <%= link_to url, posts_url %>.
+						You're receiving this email because you requested to be notified if a new comment was made on <%= link_to "this post", @subscription.post %> at <%= link_to url, posts_url %>.
 					<% else  %>
 						You're receiving this email because you requested to be notified if a new post was made at <%= link_to url, posts_url %>.
 					<% end %>

data/app/views/proclaim/comments/_comment.html.erb

@@ -15,16 +15,16 @@
 	%>
 
 	<%= link_to "Reply", "#", class: "reply",
-	            data: {
-	            	form: "#{render(partial: "proclaim/comments/form", locals: {comment: replyComment, target: target})}",
-	            	target: target
-	            } %>
+		data: {
+			form: "#{render(partial: "proclaim/comments/form", locals: {comment: replyComment, target: target})}",
+			target: target
+		} %>
 
 	<% if policy(comment).destroy? %>
 		<%= link_to "Edit", "#", class: "edit",
-	            data: {
-	            	form: "#{render(partial: "proclaim/comments/form", locals: {comment: comment})}"
-	            } %>
+			data: {
+				form: "#{render(partial: "proclaim/comments/form", locals: {comment: comment})}"
+			} %>
 	<% end %>
 
 	<% if policy(comment).destroy? %>

data/app/views/proclaim/comments/_form.html.erb

@@ -34,12 +34,14 @@
 	<% end %>
 
 	<%= label namespace_space+"subscription", "subscribe", "Notify me of other comments on this post" %><br />
-	<%= check_box "subscription", "subscribe", {id: namespace_space+"subscription_subscribe", class: "subscription_subscribe"}, "true", nil %><br />
+	<%= check_box_tag "subscribe", "subscribe", false, {id: namespace_space+"subscription_subscribe", class: "subscription_subscribe"} %><br />
 
-	<div class = "subscription_email" style = "display: none;">
-		<%= label namespace_space+"subscription", "email"%><br />
-		<%= text_field "subscription", "email", id: namespace_space+"subscription_email" %>
-	</div>
+	<%= f.fields_for :subscription, Proclaim::Subscription.new do |f| %>
+		<div class = "subscription_email" style = "display: none;">
+			<%= f.label :email, "Email" %><br />
+			<%= f.email_field :email %>
+		</div>
+	<% end %>
 
 	<%= f.hidden_field :post_id %>
 	<%= f.hidden_field :parent_id %>

data/app/views/proclaim/posts/_form.html.erb

@@ -1,20 +1,36 @@
 <script type="text/javascript">
 	$(document).ready(function()
 	{
+		<%
+			quill_body = @post.quill_body.html_safe
+			if quill_body.empty?
+				quill_body = '{}'
+			end
+		%>
 		<% if @post.new_record? %>
 			new Editor($(document).find("form.new_post"),
 		              $(document).find("input#post_title"),
-		              $(document).find("form.new_post h1.editable"),
+					  $(document).find("form.new_post h1.editable"),
+					  '<%= @post.title.html_safe.strip %>',
 		              $(document).find("input#post_body"),
-		              $(document).find("form.new_post div.editable"),
-		              <%= Proclaim.editor_toolbar_buttons.to_json.html_safe %>);
+		              $(document).find("input#post_quill_body"),
+					  $(document).find("form.new_post div.editable"),
+					  $(document).find("div#scrolling-container"),
+					  <%= quill_body %>,
+		              <%= Proclaim.editor_toolbar.to_json.html_safe %>,
+		              <%= Proclaim.editor_formats.to_json.html_safe %>);
 		<% else %>
 			new Editor($(document).find("form.edit_post"),
 		              $(document).find("input#post_title"),
-		              $(document).find("form.edit_post h1.editable"),
+					  $(document).find("form.edit_post h1.editable"),
+					  '<%= @post.title.html_safe.strip %>',
 		              $(document).find("input#post_body"),
-		              $(document).find("form.edit_post div.editable"),
-		              <%= Proclaim.editor_toolbar_buttons.to_json.html_safe %>);
+					  $(document).find("input#post_quill_body"),
+					  $(document).find("form.edit_post div.editable"),
+					  $(document).find("div#scrolling-container"),
+					  <%= quill_body %>,
+		              <%= Proclaim.editor_toolbar.to_json.html_safe %>,
+		              <%= Proclaim.editor_formats.to_json.html_safe %>);
 		<% end %>
 	});
 </script>
@@ -36,24 +52,20 @@
 		<%=
 			fake_form_field @post, :title do
 				content_tag :h1, @post.title, class: "post_title editable",
-				            data: {
-				            	placeholder: "Post Title",
-				            	disable_return: "true",
-				            	disable_toolbar: "true",
-				            }
+				            contenteditable: true, placeholder: "Post Title"
 			end
 		%>
 
-		<%=
-			fake_form_field @post, :body do
-				content_tag :div, @post.body.html_safe, class: "post_body editable",
-				            data: {
-				            	placeholder: "Post Body",
-				            	image_upload_path: cache_image_path,
-				            	image_delete_path: discard_image_path,
-				            }
-			end
-		%>
+		<div id="scrolling-container">
+			<%=
+				fake_form_field @post, :body do
+					content_tag :div, '', class: "post_body editable",
+								data: {
+									placeholder: "Post Body",
+								}
+				end
+			%>
+		</div>
 
 		<div class = "post_information" style = "margin-bottom: 30px;">
 			<% if @post.published? %>
@@ -68,6 +80,7 @@
 
 		<%= f.hidden_field :title %>
 		<%= f.hidden_field :body %>
+		<%= f.hidden_field :quill_body %>
 
 		<% if @post.published? and not @post.new_record? %>
 			This post has already been published

data/app/views/proclaim/posts/show.html.erb

@@ -12,7 +12,19 @@
 		                    'a.edit',
 		                    'a.delete',
 		                    'input.subscription_subscribe',
-		                    'div.subscription_email')
+							'div.subscription_email');
+
+		<%
+			quill_body = @post.quill_body.html_safe
+			if quill_body.empty?
+				quill_body = '{}'
+			end
+		%>
+		new Quill('div.post_body', {
+			scrollingContainer: 'div#scrolling-container',
+			theme: 'bubble',
+			readOnly: true,
+		}).setContents(<%= quill_body %>)
 	});
 </script>
 
@@ -32,8 +44,9 @@
 <div class = "post">
 	<h1 class = "post_title"><%= content_for :proclaim_title %></h1>
 
-	<div class = "post_body show">
-		<%= @post.body.html_safe %>
+	<div id="scrolling-container">
+		<div class = "post_body show">
+		</div>
 	</div>
 
 	<div class = "post_information">

data/app/views/proclaim/subscription_mailer/welcome_email.html.erb

@@ -9,15 +9,11 @@
 		<td class = "post_body">
 			<% if @subscription.post %>
 				<p>
-					You signed up to be notified of any new comments on
-					<%= link_to "this post", @subscription.post %>.
+					You signed up to be notified of any new comments on <%= link_to "this post", @subscription.post %>.
 				</p>
 			<% else %>
 				<p>
-					You signed up to receive a notification each time a new post is
-					made at
-					<%= link_to root_url.gsub(/\A.*:\/\//, '').gsub(/\A(.*?)\/*\z/, '\1'),
-					            posts_url %>.
+					You signed up to receive a notification each time a new post is made at <%= link_to root_url.gsub(/\A.*:\/\//, '').gsub(/\A(.*?)\/*\z/, '\1'), posts_url %>.
 				</p>
 
 				<p>Thanks for subscribing!</p>

data/config/initializers/friendly_id.rb

@@ -18,6 +18,12 @@ FriendlyId.defaults do |config|
 
   config.reserved_words = %w(new edit index session login logout users admin
     stylesheets assets javascripts images)
+    
+  # This adds an option to treat reserved words as conflicts rather than exceptions.
+  # When there is no good candidate, a UUID will be appended, matching the existing
+  # conflict behavior.
+
+  # config.treat_reserved_as_conflict = true
 
   #  ## Friendly Finders
   #
@@ -52,6 +58,10 @@ FriendlyId.defaults do |config|
   #
   # config.slug_column = 'slug'
   #
+  # By default, slug has no size limit, but you can change it if you wish.
+  #
+  # config.slug_limit = 255
+  #
   # When FriendlyId can not generate a unique ID from your base method, it appends
   # a UUID, separated by a single dash. You can configure the character used as the
   # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
@@ -59,16 +69,25 @@ FriendlyId.defaults do |config|
   #
   # config.sequence_separator = '-'
   #
+  # Note that you must use the :slugged addon **prior** to the line which
+  # configures the sequence separator, or else FriendlyId will raise an undefined
+  # method error.
+  #
   #  ## Tips and Tricks
   #
   #  ### Controlling when slugs are generated
   #
   # As of FriendlyId 5.0, new slugs are generated only when the slug field is
   # nil, but if you're using a column as your base method can change this
-  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # behavior by overriding the `should_generate_new_friendly_id?` method that
   # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
   # more like 4.0.
+  # Note: Use(include) Slugged module in the config if using the anonymous module.
+  # If you have `friendly_id :name, use: slugged` in the model, Slugged module
+  # is included after the anonymous module defined in the initializer, so it
+  # overrides the `should_generate_new_friendly_id?` method from the anonymous module.
   #
+  # config.use :slugged
   # config.use Module.new {
   #   def should_generate_new_friendly_id?
   #     slug.blank? || <your_column_name_here>_changed?

data/config/routes.rb

@@ -1,14 +1,10 @@
 Proclaim::Engine.routes.draw do
 	resources :posts
-
-	resources :images, only: [:create, :destroy]
-	post 'images/cache' => 'images#cache', as: :cache_image
-	post 'images/discard' => 'images#discard', as: :discard_image
-
 	resources :comments, only: [:create, :update, :destroy]
 
 	# Subscription administration is authenticated via tokens
 	resources :subscriptions, param: :token, except: [:edit, :update]
 
 	root 'posts#index'
+	default_url_options Rails.application.config.action_mailer.default_url_options
 end

data/db/migrate/20141108222616_create_proclaim_posts.rb

@@ -1,15 +1,22 @@
-class CreateProclaimPosts < ActiveRecord::Migration
+class CreateProclaimPosts < ActiveRecord::Migration[5.2]
 	def change
 		create_table :proclaim_posts do |t|
 			t.belongs_to :author, index: true
 
 			t.string :title, null: false, default: ""
 			t.text :body, null: false, default: ""
+			t.text :quill_body, null: false, default: ""
 
 			t.string :state, null: false, default: "draft", index: true
+			t.string :slug
 
 			t.datetime :published_at
 			t.timestamps null: false
 		end
+
+		# This ensures that even if two clients try to create the same
+		# post slug at exactly the same time, the database won't accept
+		# one of them (Rails would have)
+		add_index :proclaim_posts, :slug, unique: true
 	end
 end

data/db/migrate/20141114235359_create_proclaim_comments.rb

@@ -1,4 +1,4 @@
-class CreateProclaimComments < ActiveRecord::Migration
+class CreateProclaimComments < ActiveRecord::Migration[5.2]
 	def change
 		create_table :proclaim_comments do |t|
 			t.belongs_to :post, index: true

data/db/migrate/20141115022230_create_proclaim_comment_hierarchies.rb

@@ -1,4 +1,4 @@
-class CreateProclaimCommentHierarchies < ActiveRecord::Migration
+class CreateProclaimCommentHierarchies < ActiveRecord::Migration[5.2]
 	def change
 		create_table :proclaim_comment_hierarchies, :id => false do |t|
 			# ID of the parent/grandparent/great-grandparent/etc. comments

data/db/migrate/20141210234057_create_proclaim_subscriptions.rb

@@ -1,17 +1,18 @@
-class CreateProclaimSubscriptions < ActiveRecord::Migration
+class CreateProclaimSubscriptions < ActiveRecord::Migration[5.2]
 	def change
 		create_table :proclaim_subscriptions do |t|
-			t.belongs_to :post, index: true
+			t.belongs_to :comment, index: true
+			t.string :name, null: false, default: ""
 			t.string :email
 
 			t.timestamps null: false
 		end
 
-		add_foreign_key :proclaim_subscriptions, :proclaim_posts, column: :post_id
+		add_foreign_key :proclaim_subscriptions, :proclaim_comments, column: :comment_id
 
 		# This ensures that even if two clients try to create the same
 		# subscription at exactly the same time, the database won't accept
 		# one of them (Rails would have)
-		add_index :proclaim_subscriptions, [:post_id, :email], :unique => true
+		add_index :proclaim_subscriptions, [:comment_id, :email], :unique => true
 	end
 end

data/db/migrate/20150213015321_create_friendly_id_slugs.rb

@@ -1,4 +1,4 @@
-class CreateFriendlyIdSlugs < ActiveRecord::Migration
+class CreateFriendlyIdSlugs < ActiveRecord::Migration[5.2]
 	def change
 		create_table :friendly_id_slugs do |t|
 			t.string   :slug,           :null => false

data/lib/generators/proclaim/install_generator.rb

@@ -20,4 +20,4 @@ module Proclaim
 			end
 		end
 	end
-end
+end

data/lib/generators/proclaim/templates/initialize_proclaim.rb

@@ -3,58 +3,60 @@ Proclaim.setup do |config|
 	# `current_author_method` and `authentication_method`. For example, setting
 	# `author_class = "Admin"` changes the default `current_author_method` to be
 	# `:current_admin`, etc.
-	#config.author_class = "User"
+	# config.author_class = "User"
 
 	# Method to obtain the name of the author. This should be a method on the
 	# author class.
-	#config.author_name_method = :name
+	# config.author_name_method = :name
 
 	# Method to obtain the currently-authenticated user. Should return nil if
 	# no user is currently authenticated.
-	#config.current_author_method = :current_user
+	# config.current_author_method = :current_user
 
 	# Method to verify that a user is authenticated, and if not, will redirect
 	# to some sort of authentication page.
-	#config.authentication_method = :authenticate_user!
+	# config.authentication_method = :authenticate_user!
 
 	# Maximum length for the excerpts shown on the posts index.
-	#config.excerpt_length = 500
+	# config.excerpt_length = 500
 
 	# Buttons to display on post editor toolbar
-	#config.editor_toolbar_buttons = ['bold', 'italic', 'underline', 'anchor',
-	#                                 'header1', 'header2', 'quote']
-
-	# Whitelist of HTML tags to be supported by the editor
-	#config.editor_whitelist_tags = %w(h1 h2 h3 h4 h5 h6
-	#                                  div p blockquote
-	#                                  ul ol li
-	#                                  a b strong i u
-	#                                  img figure
-	#                                  pre sup sub br)
-
-	# Whitelist of HTML attributes to be supported by the editor
-	#config.editor_whitelist_attributes = %w(class id style href title src alt
-	#                                        align draggable)
+	# config.editor_toolbar = [
+	# 	['bold', 'italic', 'underline', 'strike', 'code'],
+	# 	[{ 'header': 1 }, { 'header': 2 }],
+	# 	['code-block'],
+	# 	[{ 'align': []}],
+	# 	[{ 'list': 'ordered'}, { 'list': 'bullet'}],
+	# 	['link', 'image', 'video', 'formula']
+	# ]
+
+	# Formats to allow in the editor (can be a superset of the toolbar)
+	# config.editor_formats = [
+	# 	'align', 'blockquote', 'bold', 'code', 'code-block', 'formula', 'header',
+	# 	'image', 'italic', 'link', 'list', 'strike', 'underline', 'video'
+	# ]
 
 	# Email address to use in the "from" field of all emails
-	#config.mailer_sender = '"My Blog" <blog@example.com>'
+	# config.mailer_sender = '"My Blog" <blog@example.com>'
 
-	# Secret key to use for subscription tokens. Changing this will invalidate
-	# any tokens already generated.
-	#config.secret_key = nil
+	# The secret key used by Proclaim for subscription tokens. Changing this will
+	# invalidate any tokens already generated, making it impossible to unsubscribe from
+	# old links. Proclaim will use the `secret_key_base` as its `secret_key` by default.
+	# You can change it below and use your own secret key.
+	# config.secret_key = '<%= SecureRandom.hex(64) %>'
 
 	# Register a callback to be called when a post is published
-	#config.after_post_published do |post|
+	# config.after_post_published do |post|
 	#	puts "A post was just published!"
-	#end
+	# end
 
 	# Register a callback to be called when a new comment is created
-	#config.after_new_comment do |comment|
+	# config.after_new_comment do |comment|
 	#	puts "A new comment was just made!"
-	#end
+	# end
 
 	# Register a callback to be called when a new subscription is created
-	#config.after_new_subscription do |subscription|
+	# config.after_new_subscription do |subscription|
 	#	puts "A new subscription was just created!"
-	#end
+	# end
 end