proclaim 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ed66630af32fc0c1e8ef5217eb3cb511b60cfd34e9198fb1b8f1f12ae8054ff
-  data.tar.gz: a69c720636b0d4d86ea43bbd60294af073ad86561a165094cff5bad6a9c69960
+  metadata.gz: 26d5c8a84089609896acf5ec9d4217133f38e7610d5928bb787344ca708f034f
+  data.tar.gz: d2a9d27c63d5594e85db0d0f77a5540305d9590c92094e9026a10328e824ee2d
 SHA512:
-  metadata.gz: 89c16c4398abd72ff076c6abcb6cc8389477a8f0c623e979d4bef670cc69f668c3393e5caccd5a4c401240d2534748bea2eae88ddab01e939317a6659bc592ff
-  data.tar.gz: fe9c5f4aa15fd2aafa5a3b01869986b452b16bccace9676459876bb493990d494fb642bd8926ee5e538a8855aeb8b5dffba8bdd2d7e0a97f99fa3fac1d7397e6
+  metadata.gz: 9e03292d0337594913998faa19610a6c386a01647ed36ae1848241d73670eb8e2f94ac1795290f3aa33ca14b1b10f10c75114be6e1e46fc75700c3407794d3f2
+  data.tar.gz: bdd25c22095e91b41e494c9113735e859f992b6c7ba0e1e6767e100f7cb7fcd4f9fec926f6947b7c11d43424e745e71a7b15eef5ba0724561cd30e877cb77c9e

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

@@ -1,9 +1,11 @@
 class Editor
 	constructor: (@form, @titleFormField, @titleEditableItem, @titleContents,
+		          @subtitleFormField, @subtitleEditableItem, @subtitleContents,
 		          @bodyFormField, @quillBodyFormField, @bodyEditableItem,
 		          @bodyScrollingContainer, @bodyContents, @toolbar, @formats) ->
 		if (@form.length == 1) and (@titleFormField.length == 1) and
-		   (@titleEditableItem.length == 1) and (@bodyFormField.length == 1) and
+		   (@titleEditableItem.length == 1) and (@subtitleFormField.length == 1) and
+		   (@subtitleEditableItem.length == 1)and (@bodyFormField.length == 1) and
 		   (@bodyEditableItem.length == 1) and (@bodyScrollingContainer.length == 1)
 			@bodyEditor = new Quill(@bodyEditableItem.get(0), {
 				placeholder: @bodyEditableItem.data("placeholder"),
@@ -25,14 +27,19 @@ class Editor
 		@form.on "submit", @updateFormFields
 		@titleEditableItem.on "paste", @stripFormatting
 		@titleEditableItem.on "keypress", @disallowNewlines
+		@subtitleEditableItem.on "paste", @stripFormatting
+		@subtitleEditableItem.on "keypress", @disallowNewlines
 
 	cleanBindings: ->
 		@form.off "submit"
 		@titleEditableItem.off "paste"
 		@titleEditableItem.off "keypress"
+		@subtitleEditableItem.off "paste"
+		@subtitleEditableItem.off "keypress"
 
 	updateFormFields: (event) =>
 		@titleFormField.val(@titleEditableItem.text())
+		@subtitleFormField.val(@subtitleEditableItem.text())
 		@quillBodyFormField.val(JSON.stringify(@bodyEditor.getContents()))
 		@bodyFormField.val(@bodyEditableItem.children('div.ql-editor').html())
 

data/app/assets/stylesheets/proclaim/posts.scss

@@ -3,12 +3,15 @@
   They will automatically be included in application.css.
 */
 
+div.post_title
+{
+	border-bottom: solid 1px #ddd;
+}
+
 h1.post_title
 {
 	text-align: center;
-	padding-bottom: 10px;
 	font-weight: bold;
-	border-bottom: solid 1px #ddd;
 
 	&:empty:before
 	{
@@ -19,6 +22,39 @@ h1.post_title
 	}
 }
 
+h1.post_title.editable
+{
+	margin-bottom: 20px;
+	&:after
+	{
+		position: relative;
+		text-align: center;
+	}
+}
+
+h2.post_subtitle
+{
+	text-align: center;
+
+	&:empty:before
+	{
+		content: attr(placeholder);
+		display: block; /* For Firefox */
+		font-style: italic;
+		color: rgba(0,0,0,0.6);
+	}
+}
+
+h2.post_subtitle.editable
+{
+	margin-bottom: 20px;
+	&:after
+	{
+		position: relative;
+		text-align: center;
+	}
+}
+
 div.post_information
 {
 	border-top: solid 1px #ddd;
@@ -88,16 +124,6 @@ div.post_body.editable:after
 	top: 0;
 }
 
-h1.post_title.editable
-{
-	margin-bottom: 20px;
-	&:after
-	{
-		position: relative;
-		text-align: center;
-	}
-}
-
 /* Specify our own scrolling container */
 div.scrolling-container {
 	height: 100%;

data/app/controllers/proclaim/posts_controller.rb

@@ -17,6 +17,11 @@ module Proclaim
 		def show
 			authorize @post
 
+			# Don't track traffic if it's a logged-in user
+			unless current_author
+				@post.punch(request)
+			end
+
 			# If an old id or a numeric id was used to find the record, then
 			# the request path will not match the post_path, and we should do
 			# a 301 redirect that uses the current friendly id.
@@ -99,12 +104,16 @@ module Proclaim
 
 		# Only allow a trusted parameter "white list" through.
 		def post_params
-			# Ensure post title is sanitized of all HTML
+			# Ensure post title and subtitle are sanitized of all HTML
 			if params[:post].include? :title
 				params[:post][:title] = HTMLEntities.new.decode(Rails::Html::FullSanitizer.new.sanitize(params[:post][:title]))
 			end
 
-			params.require(:post).permit(:title, :body, :quill_body)
+			if params[:post].include? :subtitle
+				params[:post][:subtitle] = HTMLEntities.new.decode(Rails::Html::FullSanitizer.new.sanitize(params[:post][:subtitle]))
+			end
+
+			params.require(:post).permit(:title, :subtitle, :body, :quill_body)
 		end
 	end
 end

data/app/models/proclaim/post.rb

@@ -40,7 +40,7 @@ module Proclaim
 		validates_presence_of :published_at, if: :published?
 		validates :published_at, absence: true, unless: :published?
 
-		validates_presence_of :title, :body, :quill_body, :author
+		validates_presence_of :title, :subtitle, :body, :quill_body, :author
 		validate :verifyBodyHtml
 
 		after_validation :move_friendly_id_error_to_title
@@ -48,25 +48,14 @@ module Proclaim
 		# Using after_commit since we use deliver_later and re-load them from the database
 		after_commit :notifyBlogSubscribersIfPublished, on: [:create, :update]
 
-		# Only save the slug history if the post is published
-		def create_slug
-			# No real reason to keep a slug history unless it's been published
-			unless published?
-				slugs.destroy_all
-			end
-
-			super
-		end
+		# Track views
+		acts_as_punchable
 
 		attr_writer :excerpt_length
 		def excerpt_length
 			@excerpt_length ||= Proclaim.excerpt_length
 		end
 
-		def body_plaintext
-			HTMLEntities.new.decode(Rails::Html::FullSanitizer.new.sanitize(body.gsub(/\r\n?/, ' ')))
-		end
-
 		def excerpt
 			document = Nokogiri::HTML.fragment(body)
 
@@ -86,8 +75,32 @@ module Proclaim
 			end
 		end
 
+		def feature_image
+			document = Nokogiri::HTML.fragment(body)
+			return nil if document.children.empty?
+
+			first_element_images = document.children.first.css("img")
+			return nil if first_element_images.empty?
+
+			return first_element_images.first.attr "src"
+		end
+
 		private
 
+		# Only save the slug history if the post is published
+		def create_slug
+			# No real reason to keep a slug history unless it's been published
+			unless published?
+				slugs.destroy_all
+			end
+
+			super
+		end
+
+		def body_plaintext
+			HTMLEntities.new.decode(Rails::Html::FullSanitizer.new.sanitize(body.gsub(/\r\n?/, ' ')))
+		end
+
 		def should_generate_new_friendly_id?
 			title_changed? || super
 		end

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

@@ -10,8 +10,11 @@
 		<% 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.post_title.editable"),
 					  '<%= @post.title.html_safe.strip %>',
+		              $(document).find("input#post_subtitle"),
+					  $(document).find("form.new_post h2.post_subtitle.editable"),
+					  '<%= @post.subtitle.html_safe.strip %>',
 		              $(document).find("input#post_body"),
 		              $(document).find("input#post_quill_body"),
 					  $(document).find("form.new_post div.editable"),
@@ -22,8 +25,11 @@
 		<% 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.post_title.editable"),
 					  '<%= @post.title.html_safe.strip %>',
+		              $(document).find("input#post_subtitle"),
+					  $(document).find("form.edit_post h2.post_subtitle.editable"),
+					  '<%= @post.subtitle.html_safe.strip %>',
 		              $(document).find("input#post_body"),
 					  $(document).find("input#post_quill_body"),
 					  $(document).find("form.edit_post div.editable"),
@@ -49,12 +55,21 @@
 	<% end %>
 
 	<div class = "post">
-		<%=
-			fake_form_field @post, :title do
-				content_tag :h1, @post.title, class: "post_title editable",
-				            contenteditable: true, placeholder: "Post Title"
-			end
-		%>
+		<div class = "post_title">
+			<%=
+				fake_form_field @post, :title do
+					content_tag :h1, @post.title, class: "post_title editable",
+								contenteditable: true, placeholder: "Post Title"
+				end
+			%>
+
+			<%=
+				fake_form_field @post, :subtitle do
+					content_tag :h2, @post.subtitle, class: "post_subtitle editable",
+								contenteditable: true, placeholder: "Post Subtitle"
+				end
+			%>
+		</div>
 
 		<div id="scrolling-container">
 			<%=
@@ -79,6 +94,7 @@
 		</div>
 
 		<%= f.hidden_field :title %>
+		<%= f.hidden_field :subtitle %>
 		<%= f.hidden_field :body %>
 		<%= f.hidden_field :quill_body %>
 

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

@@ -42,7 +42,10 @@
 </div>
 
 <div class = "post">
-	<h1 class = "post_title"><%= content_for :proclaim_title %></h1>
+	<div class = "post_title">
+		<h1 class = "post_title"><%= content_for :proclaim_title %></h1>
+		<h2 class = "post_subtitle"><%= @post.subtitle %></h2>
+	</div>
 
 	<div id="scrolling-container">
 		<div class = "post_body show">

data/db/migrate/20190615232009_create_punches_table.rb

@@ -0,0 +1,21 @@
+class CreatePunchesTable < ActiveRecord::Migration[4.2]
+	def self.up
+		create_table :punches do |t|
+			t.integer :punchable_id, :null => false
+			t.string :punchable_type, :null => false, :limit => 20
+			t.datetime :starts_at, :null => false
+			t.datetime :ends_at, :null => false
+			t.datetime :average_time, :null => false
+			t.integer :hits, :null => false, :default=>1
+		end
+
+		add_index :punches, [:punchable_type, :punchable_id], :name => :punchable_index, :unique => false
+		add_index :punches, :average_time, :unique => false
+	end
+
+	def self.down
+		remove_index :punches, :name => :punchable_index
+		remove_index :punches, :average_time
+		drop_table :punches
+	end
+end

data/db/migrate/20190617014907_add_subtitle_to_posts.rb

@@ -0,0 +1,5 @@
+class AddSubtitleToPosts < ActiveRecord::Migration[5.2]
+	def change
+		add_column :proclaim_posts, :subtitle, :string, null: false, default: ""
+	end
+end

data/lib/proclaim/engine.rb

@@ -10,6 +10,7 @@ require 'aasm'
 require 'rails-timeago'
 require 'pundit'
 require 'premailer'
+require 'punching_bag'
 
 module Proclaim
 	class Engine < ::Rails::Engine

data/lib/proclaim/version.rb

@@ -1,3 +1,3 @@
 module Proclaim
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proclaim
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Kyle Fazzari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-08 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: punching_bag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -407,6 +421,8 @@ files:
 - db/migrate/20141115022230_create_proclaim_comment_hierarchies.rb
 - db/migrate/20141210234057_create_proclaim_subscriptions.rb
 - db/migrate/20150213015321_create_friendly_id_slugs.rb
+- db/migrate/20190615232009_create_punches_table.rb
+- db/migrate/20190617014907_add_subtitle_to_posts.rb
 - lib/generators/proclaim/install_generator.rb
 - lib/generators/proclaim/templates/README
 - lib/generators/proclaim/templates/initialize_proclaim.rb
@@ -513,7 +529,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="