effective_posts 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db4764899f69a68c93c3f9b69be51473a176ef1
-  data.tar.gz: 90877459ce8fb72ffceba8470d3743a86777e89c
+  metadata.gz: 07e96e05a9ae8a0c782867865c4b12641fc4f178
+  data.tar.gz: 680ad65a0e4e13be0ea6aff3a4e67145cba761fc
 SHA512:
-  metadata.gz: 32483bded255aeb0cd7c91320fc56e8ead284b3f9cd321d2f5d78c0ca4f3c2b5affc4402a94e5fe4bc9223eb0922fac17da2102d6fd58fc9545f2d20d97c5211
-  data.tar.gz: 98e933b31798a9c6a3127cb48e2a4089998ae74c1d2fe64757688598f50ed9b381d6c3c641720135899de529175c070205a1e78a015754d2f62ffb55863ee01a
+  metadata.gz: d3d2fbdbbcd54ff20a16f66bb308764a97f532bea475000638b5866470775bca8d390de9eeb1b4b344d398ac3de9aa1339052e0a201b2b919086e2ca654b9752
+  data.tar.gz: 535787d615ac93871d370ef2323dfacbcdb634f629cdf0e635ae579c5659e01f639013915076f2bbaf63d0dea56fae89366bf9f21d933529495d00562021a98c

data/app/controllers/admin/posts_controller.rb

@@ -83,6 +83,15 @@ module Admin
       redirect_to effective_posts.admin_posts_path
     end
 
+    def excerpts
+      @page_title = 'Post Excerpts'
+
+      EffectivePosts.authorized?(self, :index, Effective::Post)
+
+      @posts = Effective::Post.includes(:regions)
+    end
+
+
     private
 
     def post_params

data/app/helpers/effective_posts_helper.rb

@@ -13,23 +13,38 @@ module EffectivePostsHelper
   end
 
   # Only supported options are:
-  # :length => 200 to set the max length of the content if the ReadMore divider is not present
-  # :label => 'Read Lots More' to set the label of the 'Read More' link
-  def post_excerpt(post, options = {})
+  # :label => 'Read more' to set the label of the 'Read More' link
+  # :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, opts = {})
     content = effective_region(post, :content, :editable => false) { '<p>Default content</p>'.html_safe }
 
+    options = {
+      :label => 'Read more',
+      :omission => '...',
+      :length => 200
+    }.merge(opts)
+
     divider = content.index(Effective::Snippets::ReadMoreDivider::TOKEN)
     length = options.delete(:length)
+    omission = options.delete(:omission)
 
     if divider.present?
       content[0...divider] + readmore_link(post, options)
-    elsif length.present? && content.length > length
-      truncate_html(content, length, readmore_link(post, options))
+    elsif length.present?
+      truncate_html(content, length, omission) + readmore_link(post, options)
     else
       content
     end.html_safe
   end
 
+  def readmore_link(post, options)
+    content_tag(:p, class: 'post-read-more') do
+      link_to((options.delete(:label) || 'Read more'), effective_posts.post_path(post), options)
+    end
+  end
+
   def link_to_post_category(category, options = {})
     category = category.to_s.downcase
 
@@ -42,9 +57,4 @@ module EffectivePostsHelper
     EffectivePosts.use_category_routes ? "/#{category}/#{post.to_param}" : effective_posts.post_path(post, category: category.to_s)
   end
 
-  def readmore_link(post, options)
-    content_tag(:p, class: 'post-read-more') do
-      link_to((options.delete(:label) || 'Read more'), effective_posts.post_path(post), options)
-    end
-  end
 end

data/app/helpers/effective_truncate_html_helper.rb

@@ -10,36 +10,41 @@ module EffectiveTruncateHtmlHelper
     doc.inner_html.html_safe
   end
 
-  def truncate_html(text, max = 200, read_more = '', ellipsis = '...')
-    doc = Nokogiri::HTML::DocumentFragment.parse(text)
-    length = doc.inner_text.length
-
-    while length > max
-      element = doc
-      element = element.last_element_child while element.last_element_child.present?
-      # element is now the last nested element (i.e. an HTML node, NOT a text node) in the HTML, or doc itself if doc has no elements (text node)
+  # Truncates HTML or text to a certain inner_text character limit.
+  #
+  # If given HTML, the underlying markup may be much longer than length, but the displayed text
+  # will be no longer than (length + omission) characters.
+  def truncate_html(text, length = 200, omission = '...')
+    Nokogiri::HTML::DocumentFragment.parse(text).tap { |doc| _truncate_node(doc, length, omission) }.inner_html
+  end
 
-      if (length - element.inner_text.length) > max  # If deleting this entire node means we're still over max, do it
-        element.remove
-      else # If we truncate this node, we'll be under max
-        if element.name == 'a'
-          element.remove  # I don't want to cut a link in half
-        elsif element.children.length == 1 # There must be a text node here.  Can there be more than 1 text node?
-          textNode = element.children.first
-          textNode.content = truncate(textNode.content, length: (max - length), separator: ' ', omission: ellipsis)
-          break # Break out of our while loop, as our ellipsis might invalidate our looping condition
-        else # Unexpected, so just remove the whole thing
-          Rails.logger.info "effective_posts, Unexpected number of last_element_child children"
-          element.remove
-        end
+  def _truncate_node(node, length, omission)
+    if node.inner_text.length <= length
+      # Do nothing, we're already reached base case
+    elsif node.name == 'a'
+      node.remove # I don't want to truncate anything in a link
+    elsif node.children.blank?
+      # I need to truncate myself, and I'm certainly a text node
+      if node.text?
+        node.content = truncate(node.content, length: length, separator: ' ', omission: omission)
+      else
+        Rails.logger.info '[WARNING] effective_posts: unexpected node in children.blank? recursive condition'
+        node.remove
+      end
+    else # Go through all the children, and delete anything after the length has been reached
+      child_length = 0
+      node.children.each do |child|
+        child_length > length ? (child.remove) : (child_length += child.inner_text.length)
       end
 
-      length = doc.inner_text.length
-    end
+      # We have now removed all nodes after length, but the last node is longer than our length
+      # child_length is the inner_text length of all included nodes
+      # And we only have to truncate the last child to get under length
 
-    # Clean up any empty tags
-    doc.last_element_child.remove while doc.last_element_child.try(:inner_html) == ''
+      child = node.children.last
+      child_max_length = length - (child_length - child.inner_text.length)
 
-    (doc.inner_html + read_more.to_s).html_safe
+      _truncate_node(child, child_max_length, omission)
+    end
   end
 end

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

@@ -0,0 +1,19 @@
+%h2= @page_title
+
+- @posts.find_each do |post|
+  .row
+    .col-sm-12
+      %h2.post-title
+        %a{:href => effective_post_path(post)}
+          = simple_effective_region post, :title do
+            = post.title
+  .row
+    .col-sm-6
+      %pre= effective_region(post, :content, :editable => false)
+
+    .col-sm-6
+      %pre= post_excerpt(post)
+
+  .row
+    .col-sm-12
+      %hr

data/config/routes.rb

@@ -1,6 +1,7 @@
 EffectivePosts::Engine.routes.draw do
   namespace :admin do
     resources :posts, :except => [:show]
+    match 'posts/excerpts', :to => 'posts#excerpts', :via => [:get]
   end
 
   scope :module => 'effective' do

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,6 +176,7 @@ files:
 - app/views/admin/posts/_actions.html.haml
 - app/views/admin/posts/_form.html.haml
 - app/views/admin/posts/edit.html.haml
+- app/views/admin/posts/excerpts.html.haml
 - app/views/admin/posts/index.html.haml
 - app/views/admin/posts/new.html.haml
 - app/views/effective/posts/_post.html.haml