effective_posts 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d28952399f3ca899b39e4ebf35db0c27f156e61b
-  data.tar.gz: 243b57d1bd9ad4f1b221c4e0ceace0d44a238c30
+  metadata.gz: 3db4764899f69a68c93c3f9b69be51473a176ef1
+  data.tar.gz: 90877459ce8fb72ffceba8470d3743a86777e89c
 SHA512:
-  metadata.gz: 57a3333735eaa584289c39677672fb36fff21daa625d12436fd063c64395fc65e798ed29e7682f6720f62fdeee814f5474eb7e390175f760e65cad5cbcc28317
-  data.tar.gz: 2d1a7c0d4b272de5d3d4e469a440e32cfc9295d493803b9dda06b9e9eb6c6683612447a1a3469be83775c034c581414a1b9d5f2e75d9e88c7b1152f709851ae7
+  metadata.gz: 32483bded255aeb0cd7c91320fc56e8ead284b3f9cd321d2f5d78c0ca4f3c2b5affc4402a94e5fe4bc9223eb0922fac17da2102d6fd58fc9545f2d20d97c5211
+  data.tar.gz: 98e933b31798a9c6a3127cb48e2a4089998ae74c1d2fe64757688598f50ed9b381d6c3c641720135899de529175c070205a1e78a015754d2f62ffb55863ee01a

data/app/helpers/effective_posts_helper.rb

@@ -12,8 +12,11 @@ module EffectivePostsHelper
     ].compact.join(' ').html_safe
   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 = {})
-    content = effective_region(post, :content) { '<p>Default content</p>'.html_safe }
+    content = effective_region(post, :content, :editable => false) { '<p>Default content</p>'.html_safe }
 
     divider = content.index(Effective::Snippets::ReadMoreDivider::TOKEN)
     length = options.delete(:length)
@@ -21,7 +24,7 @@ module EffectivePostsHelper
     if divider.present?
       content[0...divider] + readmore_link(post, options)
     elsif length.present? && content.length > length
-      truncate_html(content, length, '...', readmore_link(post, options))
+      truncate_html(content, length, readmore_link(post, options))
     else
       content
     end.html_safe

data/app/helpers/effective_truncate_html_helper.rb

@@ -1,6 +1,3 @@
-# Modified from
-# http://blog.madebydna.com/all/code/2010/06/04/ruby-helper-to-cleanly-truncate-html.html
-
 module EffectiveTruncateHtmlHelper
   def chunk_html(text, max_length = 2, _ellipsis = '...', read_more = nil)
     doc = Nokogiri::HTML::DocumentFragment.parse text
@@ -13,65 +10,36 @@ module EffectiveTruncateHtmlHelper
     doc.inner_html.html_safe
   end
 
-  def truncate_html(text, max_length = 200, ellipsis = '...', read_more = nil)
-    ellipsis_length = ellipsis.to_s.length
-    doc = Nokogiri::HTML::DocumentFragment.parse text
-    content_length = doc.inner_text.length
-    actual_length = max_length - ellipsis_length
-
-    if content_length > actual_length
-      truncated_node = doc.truncate_html(actual_length)
-
-      last_node = truncated_node
-      while last_node.respond_to?(:children) && last_node.children.present?
-        last_node = last_node.children.reverse.find { |node| node.try(:name) != 'a' } # Find the last non-A node
+  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)
+
+      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
       end
 
-      if read_more.present?
-        read_more_node = Nokogiri::HTML::DocumentFragment.parse(read_more.to_s)
-        last_node.add_next_sibling(read_more_node)
-      end
-
-      if ellipsis.present?
-        ellipsis_node = Nokogiri::XML::Text.new(ellipsis.to_s, doc)
-        last_node.add_next_sibling(ellipsis_node)
-      end
-
-      truncated_node.inner_html
-    else
-      text.to_s
-    end.html_safe
-  end
-end
-
-module NokogiriTruncator
-  module NodeWithChildren
-    def truncate_html(max_length)
-      return self if inner_text.length <= max_length
-      truncated_node = dup
-      truncated_node.children.remove
-
-      children.each do |node|
-        remaining_length = max_length - truncated_node.inner_text.length
-        break if remaining_length <= 10
-        truncated_node.add_child node.truncate_html(remaining_length)
-      end
-      truncated_node
+      length = doc.inner_text.length
     end
-  end
-
-  module TextNode
-    include ActionView::Helpers::TextHelper
 
-    def truncate_html(max_length)
-      truncated = truncate(content, length: max_length, separator: ' ', omission: '')
+    # Clean up any empty tags
+    doc.last_element_child.remove while doc.last_element_child.try(:inner_html) == ''
 
-      # Nokogiri::XML::Text.new(truncate(content.to_s, :length => (max_length-1)), parent)
-      Nokogiri::XML::Text.new(truncated, parent)
-    end
+    (doc.inner_html + read_more.to_s).html_safe
   end
 end
-
-Nokogiri::HTML::DocumentFragment.send(:include, NokogiriTruncator::NodeWithChildren)
-Nokogiri::XML::Element.send(:include, NokogiriTruncator::NodeWithChildren)
-Nokogiri::XML::Text.send(:include, NokogiriTruncator::TextNode)

data/lib/effective_posts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails