polyblock 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b896b2db331f79aec0f8f740c19cb8f80bbc2da
-  data.tar.gz: 6c3a7c607fdb10424957605bd756a13b385f3b04
+  metadata.gz: 3e15bd6a1718d05d6cef2e91692323079359a61a
+  data.tar.gz: a2dac4b8736b97ace57edd442ac633e3d169cd93
 SHA512:
-  metadata.gz: 5ff400fcc4336d56e4254982f52ab08ac79068d0d4fbe0424d6f32656f1e2b802dcd59f72f407e450551faf730f2c2c20d5f79fa5c94918d9b0a561df507581b
-  data.tar.gz: d535a91e242c24b98f6bceff990a4343f94b84291b99f6c1eb677043404113a20ad2efb363868bb459f1a23ade0e8f46faab790379d7a5498e25d009ce583796
+  metadata.gz: d9f1d977fc6f9dda1df215a27acc540e80e5669610b0d3ca7533b641a215750c7c7e29838bf8f27baa5806f6f5e243b10848d8b78598f1b043ad722f44887272
+  data.tar.gz: 561a7e70973088d85c3ebbfc1ad24ba3b5507fb154dbeaeb9bc3a856b9893f2589b70ec3a4b0dff654fb44deeca5a09aa05a8599ac33d778cfa7497fcbdcff1c

data/app/helpers/polyblock/application_helper.rb

@@ -1,7 +1,15 @@
 module Polyblock
   module ApplicationHelper
 
-    def pb(name, tag = :div, tag_options={})
+    def pb(name, options={})
+      options = {
+          :tag => :div,
+          :tag_options => {},
+          :condensed => false,
+          :length => 250,
+          :omission => '... (continued)'
+      }.merge(options)
+
       # Fetch or create Polyblock
       if name.is_a? Polyblock::Block
         pb = name
@@ -11,18 +19,24 @@ module Polyblock
       else
         matches = Polyblock::Block.where :name => name
         pb_exists = matches.any?
-        pb = if pb_exists then matches.first() else Polyblock::Block.new({:name => name}) end
-        pb_id = if pb_exists then pb.id else Polyblock::Block.count + 1 end
+        pb = pb_exists ? matches.first : Polyblock::Block.new({:name => name})
+        pb_id = pb_exists ? pb.id : Polyblock::Block.count + 1
       end
 
       # Build output tag
-      pb.content ||= pb.present? ? pb.content : "<p>This block is content managed by Polyblock!<br />Edit \"#{name}\" to add content here.</p>"
-      tag_options = tag_options.deep_merge({:id => "pb-#{pb_id}", :data => {:pbid => pb_id}})
-      tag_options[:contenteditable] = if !respond_to?(:can?) or can?(:manage, pb) then "true" else "false" end
+      content = pb_exists ? pb.content : "<p>This block is content managed by Polyblock!<br />Edit \"#{name}\" to add content here.</p>"
+      tag_options = options[:tag_options].deep_merge({:id => "pb-#{pb_id}", :data => {:pbid => pb_id}})
+      tag_options[:contenteditable] = (!respond_to?(:can?) || can?(:manage, pb)) ? "true" : "false"
       tag_options[:class] = (tag_options.has_key?(:class) ? "#{tag_options[:class]} ":"") + "polyblock"
       tag_options[:data][:pb_exists] = pb_exists
 
-      content_tag(tag, pb.content, tag_options, false)
+      # Truncation
+      if options[:condensed]
+        content = CGI.unescapeHTML(content.gsub("<br><br>", "<br>").gsub('&nbsp;', ' '))
+        content = truncate(sanitize(strip_tags(content)), :length => options[:length], :omission => options[:omission]).html_safe
+      end
+
+      content_tag(options[:tag], content, tag_options, false)
     end
 
     def simple_fields_for_polyblock(name, f)

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyblock
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - MacKinley Smith