effective_posts 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b92998992d3bbc6241ed4b3f9069f4bb64534e7c
-  data.tar.gz: d15314fde411d0b8629cb6f37902a839d73eeee6
+  metadata.gz: f796cf858658cf9c8f19f2b45339e7e7fbfa64c2
+  data.tar.gz: 672b79eb37607da4c40e2d51f24da5944d6ddd92
 SHA512:
-  metadata.gz: 72f48a2d8e10798746146da15a8a3c6a6e855555969871484669c9525f37f1ec0deb52eafff337b24ae293d9085abce1657a1b6e01f945fd7eabac860dc7373f
-  data.tar.gz: 54c499bd42808da6c0950d13cb286cff353e3696c1d71cea1c267162ee41f6fc70ea65104ea58fbc14f0b88d8e8a19e9bee5d4d5c826fb3ec181bba94238ca51
+  metadata.gz: a979a1ca93aa4d29bbab5b789493d1cf1ba0f298cb31abd44fb06f4d00aa7bbdfb4817e5f38ead8181c19e4783c5352365d009fbfa12183b575adf450a530163
+  data.tar.gz: 9226681df68199551ae11afffae3103f7ce0e271bf2f3e84a677a52c38826f4731c0b525f28a28c5c68c9a9df2adb2e02b905e9a1ed6e49204748b205233d1e9

data/app/controllers/effective/posts_controller.rb

@@ -25,7 +25,7 @@ module Effective
 
       EffectivePosts.authorize!(self, :index, Effective::Post)
 
-      @page_title = (params[:page_title] || params[:category] || params[:defaults].try(:[], :category) || 'Posts').titleize
+      @page_title ||= (params[:category].present? ? params[:category] : 'Blog').titleize
     end
 
     def show
@@ -48,8 +48,8 @@ module Effective
         ].compact.join(' ')
       end
 
-      @page_title = @post.title
-      @meta_description = @post.description
+      @page_title ||= @post.title
+      @meta_description ||= @post.description
     end
 
     # Public user submit a post functionality

data/app/helpers/effective_posts_helper.rb

@@ -77,20 +77,24 @@ module EffectivePostsHelper
   # :omission => '...' passed to the final text node's truncate
   # :length => 200 to set the max inner_text length of the content
   # All other options are passed to the link_to 'Read more'
-  def post_excerpt(post, read_more_link: true, label: 'Continue reading', omission: '...', length: 200)
-    content = effective_region(post, :body, :editable => false) { '<p>Default content</p>'.html_safe }
-    description = content_tag(:p, post.description)
-
+  def post_excerpt(post, read_more_link: true, label: 'Continue reading', omission: '...', length: nil)
+    content = effective_region(post, :body, editable: false) { '<p>Default content</p>'.html_safe }
     divider = content.index(Effective::Snippets::ReadMoreDivider::TOKEN)
+    excerpt = post.excerpt.to_s
+
     read_more = (read_more_link && label.present?) ? readmore_link(post, label: label) : ''
 
-    CGI.unescapeHTML(if divider.present?
-      truncate_html(content, Effective::Snippets::ReadMoreDivider::TOKEN, '') + read_more
-    elsif length.present?
-      truncate_html(description, length, omission) + read_more
-    else
-      description
-    end).html_safe
+    html = (
+      if divider.present?
+        truncate_html(content, Effective::Snippets::ReadMoreDivider::TOKEN, '')
+      elsif length.present?
+        truncate_html(excerpt, length, omission)
+      else
+        excerpt
+      end
+    ).html_safe
+
+    (html + read_more).html_safe
   end
 
   def read_more_link(post, options = {})
@@ -110,8 +114,6 @@ module EffectivePostsHelper
     render(partial: '/effective/posts/categories', locals: { categories: (reverse ? post_categories.reverse : post_categories) })
   end
 
-
-
   ### Recent Posts
 
   def recent_posts(user: current_user, category: nil, limit: EffectivePosts.per_page)

data/app/views/admin/posts/_form.html.haml

@@ -1,12 +1,14 @@
 = effective_form_with(model: post, url: post.persisted? ? effective_posts.admin_post_path(post.id) : effective_posts.admin_posts_path) do |f|
   = f.text_field :title, hint: 'The title of your post.'
-  = f.text_field :description, hint: 'Will be used for the post excerpt and meta tags.', maxlength: 150
 
   - if Array(EffectivePosts.categories).length > 1
     = f.select :category, EffectivePosts.categories
   - else
     = f.hidden_field :category, (EffectivePosts.categories.first || 'posts')
 
+  = f.ck_editor :excerpt, hint: 'Will be used for the post excerpt on index pages.'
+  = f.text_field :description, hint: 'The content of the post meta tags.', maxlength: 150
+
   = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
 
   = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
@@ -14,7 +16,7 @@
   = f.check_box :draft, hint: 'Save this post as a draft. It will not be accessible on the website.'
 
   - unless EffectivePosts.use_fullscreen_editor
-    = f.ck_editor :body
+    = f.ck_editor :body, hint: 'The content of your post.'
 
   - if defined?(EffectiveRoles) and f.object.respond_to?(:roles) && EffectivePosts.use_effective_roles
     = f.checks :roles, EffectiveRoles.roles_collection(f.object), hint: '* leave blank for a regular public post that anyone can view'

data/app/views/effective/posts/_form.html.haml

@@ -6,6 +6,9 @@
   - else
     = f.hidden_field :category, (EffectivePosts.categories.first || 'posts')
 
+  = f.ck_editor :excerpt, hint: 'Will be used for the post excerpt on index pages.'
+  = f.text_field :description, hint: 'The content of the post meta tags.', maxlength: 150
+
   = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
 
   = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
@@ -13,6 +16,6 @@
   = f.check_box :draft, hint: 'Save this post as a draft. It will not be accessible on the website.'
 
   - unless EffectivePosts.use_fullscreen_editor
-    = f.ck_editor :body
+    = f.ck_editor :body, hint: 'The content of your post.'
 
   = f.submit 'Save'

data/db/migrate/01_create_effective_posts.rb.erb

@@ -4,6 +4,8 @@ class CreateEffectivePosts < ActiveRecord::Migration[4.2]
       t.integer :user_id
 
       t.string :title
+      t.text :excerpt
+      
       t.string :description
       
       t.string :category

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

data/lib/effective_posts.rb

@@ -56,7 +56,7 @@ module EffectivePosts
 
   def self.permitted_params
     @@permitted_params ||= [
-      :title, :description, :draft, :category, :published_at, :body, :tags, :extra,
+      :title, :excerpt, :description, :draft, :category, :published_at, :body, :tags, :extra,
       :start_at, :end_at, :location, :website_name, :website_href, roles: []
     ].compact
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails