proclaim 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5010df73f9c56158e2848567ff36f237e84416b8
-  data.tar.gz: eb2c9683b06d54f40af0ca609af12c8f0794fae4
+SHA256:
+  metadata.gz: 8ed66630af32fc0c1e8ef5217eb3cb511b60cfd34e9198fb1b8f1f12ae8054ff
+  data.tar.gz: a69c720636b0d4d86ea43bbd60294af073ad86561a165094cff5bad6a9c69960
 SHA512:
-  metadata.gz: 830649b8fad5fc8c4206b1cc96b9ea6730d839a1c4a5638e1601c9327ecd947315d647b1b85ad10275d52e2a463fa4c704e16282c6b7045720247f177218e6b8
-  data.tar.gz: 9f55f501b0639edda86983c4bcef68531df58edd279cf13d5922977510f4cf989bed9991e3f17a4b64acb5146deccf6145ae49eea6f66a29ae113d494a6ea9ce
+  metadata.gz: 89c16c4398abd72ff076c6abcb6cc8389477a8f0c623e979d4bef670cc69f668c3393e5caccd5a4c401240d2534748bea2eae88ddab01e939317a6659bc592ff
+  data.tar.gz: fe9c5f4aa15fd2aafa5a3b01869986b452b16bccace9676459876bb493990d494fb642bd8926ee5e538a8855aeb8b5dffba8bdd2d7e0a97f99fa3fac1d7397e6

data/Rakefile

@@ -10,56 +10,23 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Proclaim'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load 'rails/tasks/engine.rake'
 
+load 'rails/tasks/statistics.rake'
 
-
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
   t.verbose = false
-  if ENV["TEST"].nil?
-    t.pattern = 'test/**/*_test.rb'
-  else
-    t.pattern = ENV["TEST"]
-  end
-end
-
-namespace :test do
-  Rails::TestTask.new(:generators) do |t|
-    t.pattern = "test/lib/generators/**/*_test.rb"
-  end
-
-  Rails::TestTask.new(:units) do |t|
-    t.pattern = 'test/{models,helpers,unit,policies}/**/*_test.rb'
-  end
-
-  Rails::TestTask.new(:functionals) do |t|
-    t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
-  end
-
-  Rails::TestTask.new(:integration) do |t|
-    t.pattern = 'test/integration/**/*_test.rb'
-  end
-
-  namespace :integration do
-    Rails::TestTask.new(:js) do |t|
-      t.pattern = 'test/integration/with_javascript/**/*_test.rb'
-    end
-
-    Rails::TestTask.new(:no_js) do |t|
-      t.pattern = 'test/integration/without_javascript/**/*_test.rb'
-    end
-  end
 end
 
 task default: :test

data/app/assets/config/proclaim_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts/proclaim .js
+//= link_directory ../stylesheets/proclaim .css

data/app/assets/javascripts/proclaim.js

@@ -2,17 +2,17 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
-//= require medium-editor
-//= require medium-editor-insert-plugin.all
+//= require rails-ujs
+//= require activestorage
 //= require rails-timeago
+//= require katex
+//= require quill
 //= require_tree .

data/app/assets/javascripts/proclaim/{comments_handler.js.coffee → comments_handler.coffee}

@@ -51,12 +51,12 @@ class CommentsHandler
 		$(document).off "change", @subscribeCheckboxClass
 
 	# Disable the form until the new comment has been processed
-	handleCommentStarted: (event, xhr, settings) =>
+	handleCommentStarted: (event) =>
 		form = $(event.target)
 		form.find(":input").prop("disabled", true);
 		form.before('<div class = "loading" style = "width: 100px;"></div>')
 
-	handleCommentFinished: (event, xhr, status) =>
+	handleCommentFinished: (event) =>
 		form = $(event.target)
 		target = $(form.data("target"))
 		form.find(":input").prop("disabled", false);
@@ -65,19 +65,22 @@ class CommentsHandler
 		if status == "success"
 			@removeForm form
 
-	handleCommentSuccess: (event, data, status, xhr) =>
-		if data.html.length == 0
+	handleCommentSuccess: (event) =>
+		# As of rails-ujs, need to pull response out of detail instead of event handler
+		# args
+		html = event.detail[0].html
+		if html.length == 0
 			console.error("Invalid comment HTML!")
 			return
 
 		form = $(event.target)
 
 		if form.hasClass("edit_comment")
-			form.closest(@discussionClass).replaceWith(data.html)
+			form.closest(@discussionClass).replaceWith(html)
 		else
 			target = $(form.data("target"))
 			if target.length == 1
-				target.append(data.html)
+				target.append(html)
 			else
 				console.error("Invalid comment target!")
 				return
@@ -85,7 +88,10 @@ class CommentsHandler
 			# Hide form, but don't remove so events can still be emitted
 			@removeForm form, true
 
-	handleCommentFailure: (event, xhr, status, error) =>
+	handleCommentFailure: (event) =>
+		# As of rails-ujs, need to pull xhr out of detail instead of event handler args
+		xhr = event.detail[2]
+
 		$(event.target).siblings("div.error").remove()
 		errorMessage = "<div class='error'>"
 		errorMessage += "<strong>The following errors have prevented this comment from being saved:</strong>"
@@ -96,7 +102,7 @@ class CommentsHandler
 		errorMessage += "</div>"
 		$(event.target).before(errorMessage)
 
-	handleDeleteCommentSuccess: (event, data, status, xhr) =>
+	handleDeleteCommentSuccess: (event) =>
 		commentContainer = $(event.target).closest(@discussionClass)
 		if commentContainer.length == 1
 			commentContainer.fadeOut ->
@@ -104,7 +110,7 @@ class CommentsHandler
 		else
 			console.error("No comment container for removal!")
 
-	handleDeleteCommentFailure: (event, xhr, status, error) =>
+	handleDeleteCommentFailure: (event) =>
 		console.error("Unable to delete comment!")
 
 	showNewCommentForm: (event) =>
@@ -116,7 +122,7 @@ class CommentsHandler
 			return
 
 		# Ensure form isn't already shown. If it is, don't show it again
-		if target.children(@commentFormClass).length == 0
+		if target.children(@commentFormClass).length == 0 or ! target.children(@commentFormClass).is(":visible")
 			form = $(event.target).data("form")
 			if form.length == 0
 				console.error("Invalid comment form data!")

data/app/assets/javascripts/proclaim/editor.coffee

@@ -0,0 +1,55 @@
+class Editor
+	constructor: (@form, @titleFormField, @titleEditableItem, @titleContents,
+		          @bodyFormField, @quillBodyFormField, @bodyEditableItem,
+		          @bodyScrollingContainer, @bodyContents, @toolbar, @formats) ->
+		if (@form.length == 1) and (@titleFormField.length == 1) and
+		   (@titleEditableItem.length == 1) and (@bodyFormField.length == 1) and
+		   (@bodyEditableItem.length == 1) and (@bodyScrollingContainer.length == 1)
+			@bodyEditor = new Quill(@bodyEditableItem.get(0), {
+				placeholder: @bodyEditableItem.data("placeholder"),
+				scrollingContainer: @bodyScrollingContainer.get(0),
+				theme: 'bubble',
+				formats: @formats,
+				modules: {
+					toolbar: @toolbar,
+				}
+			})
+			@bodyEditor.setContents(@bodyContents)
+
+			@cleanBindings()
+			@addBindings()
+		else
+			console.error("Invalid length for editable items or form fields!")
+
+	addBindings: ->
+		@form.on "submit", @updateFormFields
+		@titleEditableItem.on "paste", @stripFormatting
+		@titleEditableItem.on "keypress", @disallowNewlines
+
+	cleanBindings: ->
+		@form.off "submit"
+		@titleEditableItem.off "paste"
+		@titleEditableItem.off "keypress"
+
+	updateFormFields: (event) =>
+		@titleFormField.val(@titleEditableItem.text())
+		@quillBodyFormField.val(JSON.stringify(@bodyEditor.getContents()))
+		@bodyFormField.val(@bodyEditableItem.children('div.ql-editor').html())
+
+	stripFormatting: (event) =>
+		event.stopPropagation()
+		event.preventDefault()
+
+		clipboardData = event.clipboardData || window.clipboardData || event.originalEvent.clipboardData
+		pastedData = clipboardData.getData('Text')
+
+		# Strip formatting out by setting HTML and then using the resulting text
+		event.currentTarget.innerHTML = pastedData
+		event.currentTarget.innerHTML = event.currentTarget.innerText
+
+	disallowNewlines: (event) =>
+		return event.which != 13;
+
+
+# Make available to other scripts
+@Editor = Editor

data/app/assets/stylesheets/{proclaim.css.scss → proclaim.scss}

@@ -3,17 +3,16 @@
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
  *= require font-awesome
- *= require medium-editor/medium-editor
- *= require medium-editor/themes/mani
- *= require medium-editor-insert-plugin
+ *= require katex
+ *= require quill.bubble
  *= require_tree .
  *= require_self
  */
@@ -22,7 +21,7 @@ div.loading
 {
 	width: 100%;
 	height: 32px;
-	background-image: image_url("ajax_loader.gif");
+	background-image: image-url("proclaim/ajax_loader.gif");
 	background-repeat: no-repeat;
 	background-position: center;
 }

data/app/assets/stylesheets/proclaim/{posts.css.scss → posts.scss}

@@ -9,6 +9,14 @@ h1.post_title
 	padding-bottom: 10px;
 	font-weight: bold;
 	border-bottom: solid 1px #ddd;
+
+	&:empty:before
+	{
+		content: attr(placeholder);
+		display: block; /* For Firefox */
+		font-style: italic;
+		color: rgba(0,0,0,0.6);
+	}
 }
 
 div.post_information
@@ -67,48 +75,75 @@ input.datetime_picker
 	}
 }
 
-.mediumInsert
-{
-	margin: -1em 0 0 0;
-}
-
 div.post_body
 {
 	width: calc(100% - 80px);
 	margin: 0 auto;
+	height: auto;
+	min-height: 100%;
 }
 
-div.post_body.show .mediumInsert
+div.post_body.editable:after
 {
-	margin-left: 0px !important;
+	top: 0;
+}
 
-	.mediumInsert-images img
+h1.post_title.editable
+{
+	margin-bottom: 20px;
+	&:after
 	{
-		margin: 1em 0 0 0;
+		position: relative;
+		text-align: center;
 	}
 }
 
-figure.mediumInsert-images
-{
-	text-align: center;
+/* Specify our own scrolling container */
+div.scrolling-container {
+	height: 100%;
+	min-height: 100%;
+	overflow-y: auto;
 }
 
-.medium-editor-insert-plugin p
+.ql-editor
 {
-	margin: 0px 0px 10px;
-	box-sizing: border-box;
-}
+	overflow-y: visible;
 
-div.post_body.editable:after
-{
-	top: 0;
-}
+	p
+	{
+		img
+		{
+			float: left;
+			max-width: 30%;
+			margin-right: 15px;
+		}
+	}
 
-h1.post_title.editable
-{
-	&:after
+	p.ql-align-right
 	{
-		position: relative;
-		text-align: center;
+		img
+		{
+			float: right;
+			max-width: 30%;
+			margin-left: 15px;
+		}
+	}
+
+	p.ql-align-center
+	{
+		img
+		{
+			float: inherit;
+			max-width: 100%;
+		}
+	}
+
+	p.ql-align-justify
+	{
+		img
+		{
+			float: inherit;
+			max-width: 100%;
+		}
 	}
 }

data/app/controllers/proclaim/application_controller.rb

@@ -1,77 +1,81 @@
-class Proclaim::ApplicationController < ApplicationController
-	include Pundit
+module Proclaim
+	class ApplicationController < ::ApplicationController
+		protect_from_forgery with: :exception
 
-	rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
+		include Pundit
 
-	private
+		rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
-	def user_not_authorized
-		flash[:error] = "You are not authorized to perform this action."
-		redirect_to(request.referrer || root_path)
-	end
+		private
 
-	def authenticate_author
-		begin
-			send(Proclaim.authentication_method)
-		rescue NoMethodError
-			raise "Proclaim doesn't know how to authenticate users! Please" \
-			      " ensure that `Proclaim.authentication_path` is valid."
+		def user_not_authorized
+			flash[:error] = "You are not authorized to perform this action."
+			redirect_to(request.referrer || root_path)
 		end
-	end
 
-	def current_author
-		begin
-			send(Proclaim.current_author_method)
-		rescue NoMethodError
-			raise "Proclaim doesn't know how to get the current author! Please" \
-			      " ensure that `Proclaim.current_author_method` is valid."
+		def authenticate_author
+			begin
+				send(Proclaim.authentication_method)
+			rescue NoMethodError
+				raise "Proclaim doesn't know how to authenticate users! Please" \
+					" ensure that `Proclaim.authentication_method` is valid."
+			end
 		end
-	end
 
-	def pundit_user
-		current_author
-	end
+		def current_author
+			begin
+				send(Proclaim.current_author_method)
+			rescue NoMethodError
+				raise "Proclaim doesn't know how to get the current author! Please" \
+					" ensure that `Proclaim.current_author_method` is valid."
+			end
+		end
 
-	def image_id_and_name_from_url(url)
-		match = url.match(/([^\/]*?)\/([^\/]*)\z/)
+		def pundit_user
+			current_author
+		end
 
-		return match[1], match[2]
-	end
+		def image_id_and_name_from_url(url)
+			match = url.match(/([^\/]*?)\/([^\/]*)\z/)
 
-	def cache_name_from_url(url)
-		url.match(/[^\/]*?\/[^\/]*\z/)
-	end
+			return match[1], match[2]
+		end
 
-	def handleJsonRequest(object, options = {})
-		operation = options[:operation] || true
-		successJson = options[:success_json] || true
-		failureJson = options[:failure_json] || lambda {object.errors.full_messages}
-		unauthorizedStatus = options[:unauthorized_status] || :unauthorized
+		def cache_name_from_url(url)
+			url.match(/[^\/]*?\/[^\/]*\z/)
+		end
 
-		begin
-			authorize object
+		def handleJsonRequest(object, options = {})
+			operation = options[:operation] || true
+			successJson = options[:success_json] || true
+			failureJson = options[:failure_json] || lambda {object.errors.full_messages}
+			unauthorizedStatus = options[:unauthorized_status] || :unauthorized
 
-			yield if block_given?
-			return if performed? # Don't continue if the block rendered
+			begin
+				authorize object
 
-			respond_to do |format|
-				if (operation == true) or (operation.respond_to?(:call) and operation.call)
-					if successJson.respond_to? :call
-						successJson = successJson.call
-					end
+				yield if block_given?
+				return if performed? # Don't continue if the block rendered
 
-					format.json { render json: successJson }
-				else
-					if failureJson.respond_to? :call
-						failureJson = failureJson.call
-					end
+				respond_to do |format|
+					if (operation == true) or (operation.respond_to?(:call) and operation.call)
+						if successJson.respond_to? :call
+							successJson = successJson.call
+						end
 
-					format.json { render json: failureJson, status: :unprocessable_entity }
+						format.json { render json: successJson }
+					else
+						if failureJson.respond_to? :call
+							failureJson = failureJson.call
+						end
+
+						format.json { render json: failureJson, status: :unprocessable_entity }
+					end
+				end
+			rescue Pundit::NotAuthorizedError
+				respond_to do |format|
+					format.json { render json: true, status: unauthorizedStatus }
 				end
-			end
-		rescue Pundit::NotAuthorizedError
-			respond_to do |format|
-				format.json { render json: true, status: unauthorizedStatus }
 			end
 		end
 	end