effective_posts 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d76afd0685f5954987b398a40053792c420f9582
-  data.tar.gz: b76db481f1c1ad1ba18e3cc661bae48812472b54
+  metadata.gz: 798c18ece7296255c241ef3dc6a0be72d6c12286
+  data.tar.gz: 5fa7275c8540538729866b5c7bb86310ec7b458f
 SHA512:
-  metadata.gz: 2f8ceb1a409fa2c3451fa71ece62b9b9528a0623a7210e118439b12afafab130d3513e28b1428d109bc2ade9d12c6dd9569d3c16c9e4689e6ae466a13fb759b7
-  data.tar.gz: bdc091332a4a785b31cac4f17c7d68bbc5dc24750c041bd19474aaf605757a9800e9c68897120566db007782d238b6e90f43dfa4c20912c92e41f54510dcc411
+  metadata.gz: d16f3d4c437c38f8f04769fc12b5ce22cead35f4a5a42fe08f03000f92472b72bae71e5d5f79d0fd104b0394ace27debc1e7983d6fccddb994ba809038132275
+  data.tar.gz: b8e671fee265b638f529b1e888efd14ead13e3282012fb119998ca5f6795cb3710d7a85d235409726b0580c9249b3fc19e1adcb128bc2a8eb2d31a3101604a2b

data/app/helpers/effective_posts_helper.rb

@@ -31,7 +31,7 @@ module EffectivePostsHelper
     omission = options.delete(:omission)
 
     if divider.present?
-      content[0...divider] + readmore_link(post, options)
+      truncate_html(content, Effective::Snippets::ReadMoreDivider::TOKEN, '') + readmore_link(post, options)
     elsif length.present?
       truncate_html(content, length, omission) + readmore_link(post, options)
     else

data/app/helpers/effective_truncate_html_helper.rb

@@ -1,24 +1,47 @@
 module EffectiveTruncateHtmlHelper
-  def chunk_html(text, max_length = 2, _ellipsis = '...', read_more = nil)
-    doc = Nokogiri::HTML::DocumentFragment.parse text
-
-    if doc.children.length >= max_length
-      doc.children.last.remove while doc.children.length > max_length
-      doc.children.last.add_next_sibling Nokogiri::HTML::DocumentFragment.parse("<p>#{ read_more }</p>")
-    end
-
-    doc.inner_html.html_safe
-  end
-
   # 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
+  def truncate_html(text, length_or_content = 200, omission = '...')
+    doc = Nokogiri::HTML::DocumentFragment.parse(text)
+
+    if length_or_content.kind_of?(String)
+      content = (Nokogiri::HTML::DocumentFragment.parse(length_or_content).children.first.inner_text rescue length_or_content)
+      doc.tap { |doc| _truncate_node_to_content(doc, content, omission) }.inner_html
+    elsif length_or_content.kind_of?(Integer)
+      doc.tap { |doc| _truncate_node_to_length(doc, length_or_content, omission) }.inner_html
+    else
+      raise 'Unsupported datatype passed to second argument of truncate_html.  Expecting integer or string.'
+    end
   end
 
-  def _truncate_node(node, length, omission)
+  def _truncate_node_to_content(node, content, omission, seen = false)
+    if seen == true
+      node.remove
+    elsif node.children.blank?
+      index = node.content.index(content)
+
+      if index.present?
+        if node.parent.try(:content) == content # If my parent node just has my text in it, remove parent node too
+          node.parent.remove
+        elsif index == 0
+          node.remove
+        else
+          node.content = truncate(node.content, length: index+omission.to_s.length, separator: ' ', omission: omission)
+        end
+
+        seen = true
+      end
+    else
+      node.children.each { |child| seen = _truncate_node_to_content(child, content, omission, seen) }
+    end
+
+    seen
+  end
+
+
+  def _truncate_node_to_length(node, length, omission)
     if node.inner_text.length <= length
       # Do nothing, we're already reached base case
     elsif node.name == 'a'
@@ -26,13 +49,13 @@ module EffectiveTruncateHtmlHelper
     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)
+        node.content = truncate(node.content, length: length+omission.to_s.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
@@ -44,7 +67,7 @@ module EffectiveTruncateHtmlHelper
       child = node.children.last
       child_max_length = length - (child_length - child.inner_text.length)
 
-      _truncate_node(child, child_max_length, omission)
+      _truncate_node_to_length(child, child_max_length, omission)
     end
   end
 end

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails