refinerycms 0.9.5.10 → 0.9.5.11

data/vendor/plugins/refinery/lib/refinery/html_truncation_helper.rb

@@ -25,53 +25,50 @@ module Refinery::HtmlTruncationHelper
 
   # Like the Rails _truncate_ helper but doesn't break HTML tags, entities, and optionally. words.
   def truncate(text, *args)
+    return super unless args.include?(:preserve_html_tags)
     return if text.nil?
+
     options = args.extract_options!
-    unless (options[:preserve_html_tags] == true)
-      return super
-    else
-      max_length = options[:length] || 30
-      omission = options[:omission] || "..."
-      # use :link => link_to('more', post_path), or something to that effect
-  
-      doc = Hpricot(text.to_s)
-      omission_length = Hpricot(omission).inner_text.mb_chars.length
-      content_length = doc.inner_text.mb_chars.length
-      actual_length = max_length - omission_length
+    max_length = options[:length] || 30
+    omission = options[:omission] || "..."
+    # use :link => link_to('more', post_path), or something to that effect
 
-      if content_length > max_length
-        truncated_doc = doc.truncate(actual_length)
-    
-        if (options[:preserve_full_words] || false)
-          word_length = actual_length - (truncated_doc.inner_html.mb_chars.length - truncated_doc.inner_html.rindex(' '))
-          truncated_doc = doc.truncate(word_length)
-        end
+    doc = Hpricot(text.to_s)
+    omission_length = Hpricot(omission).inner_text.mb_chars.length
+    content_length = doc.inner_text.mb_chars.length
+    actual_length = max_length - omission_length
 
-        last_child = truncated_doc.children.last
+    if content_length > max_length
+      truncated_doc = doc.truncate(actual_length)
+  
+      if (options[:preserve_full_words] || false)
+        word_length = actual_length - (truncated_doc.inner_html.mb_chars.length - truncated_doc.inner_html.rindex(' '))
+        truncated_doc = doc.truncate(word_length)
+      end
+
+      last_child = truncated_doc.children.last
+      if last_child.inner_html.nil?
+        truncated_doc.inner_html + omission + options[:link] if options[:link]
+      else
+        last_child.inner_html = last_child.inner_html.gsub(/\W.[^\s]+$/, "") + omission
+        last_child.inner_html += options[:link] if options[:link]
+        truncated_doc
+      end
+    else
+      if options[:link]
+        last_child = doc.children.last
         if last_child.inner_html.nil?
-          truncated_doc.inner_html + omission + options[:link] if options[:link]
+          doc.inner_html + options[:link]
         else
-          last_child.inner_html = last_child.inner_html.gsub(/\W.[^\s]+$/, "") + omission
-          last_child.inner_html += options[:link] if options[:link]
-          truncated_doc
-        end
+          last_child.inner_html = last_child.inner_html.gsub(/\W.[^\s]+$/, "") + options[:link]
+          doc
+        end      
       else
-        if options[:link]
-          last_child = doc.children.last
-          if last_child.inner_html.nil?
-            doc.inner_html + options[:link]
-          else
-            last_child.inner_html = last_child.inner_html.gsub(/\W.[^\s]+$/, "") + options[:link]
-            doc
-          end      
-        else
-          text.to_s
-        end
+        text.to_s
       end
     end
   end
-
-
+  
 end
 
 module HpricotTruncator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.10
+  version: 0.9.5.11
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +13:00
+date: 2009-11-19 00:00:00 +13:00
 default_executable: refinery
 dependencies: []