polyblock 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27aeb630a9127e2fead39331c1bf6b2a3c0fc5d5
-  data.tar.gz: c1c7040117197373034137d871eb1b128893ba8d
+  metadata.gz: 66e4cade17cdc3aee262380e99f8e62889d41968
+  data.tar.gz: 18f162bcbd919fdbb263d401120ae8118536821b
 SHA512:
-  metadata.gz: c6c5c178a314336d52048d55b81a26f9e44ac8254663ef7a26fa324e105ebcf403d68ad0a601a309cc37514d167c95704083654276313de2a35465c7c1b78f74
-  data.tar.gz: 6c459f102065a3cd910c2857889364449f5208cad89659da111dcb108cdb7fc5b9aa7f6109c0045e267af5994f1fa357bf44b298fcdb12eb67e00fa56296de51
+  metadata.gz: c9ff55efa794027c2d4e88c47b966dd75b4e481f59e87674adda84994e9d419152590a2ee69cad047c421ea0a0b40ca564339cb9a4ffe8a1b01da0883a7ec4ab
+  data.tar.gz: 0f2379b17229975e6e953ff4990156d9d0b679cb985621b954e598cce70512b583f6496af0899ed87ee2e231550531f43a9df213b73fefd0a050546e5a0b2ae4

data/app/helpers/polyblock/application_helper.rb

@@ -32,12 +32,29 @@ module Polyblock
       # Build output tag
       content = pb_exists ? pb.content : "<p>This block is content managed by Polyblock!<br />Click to edit me!</p>"
       tag_options = options[:tag_options].deep_merge({:id => "pb-#{pb_id}", :data => {:pbid => pb_id, :pbname => name}})
-      tag_options[:contenteditable] = (!respond_to?(:can?) || can?(:manage, pb)) ? "true" : "false"
+      tag_options[:contenteditable] = if options[:condensed]
+                                        "false"
+                                      elsif respond_to?(:can?) && can?(:manage, pb)
+                                        "true"
+                                      elsif respond_to?(:user_signed_in?) && user_signed_in?
+                                        if current_user.respond_to?(:admin?) && current_user.admin?
+                                          "true"
+                                        elsif pb.contentable.present? &&
+                                            pb.contentable.respond_to?(:user_id) &&
+                                            pb.contentable.user_id == current_user.id
+                                          "true"
+                                        else
+                                          "false"
+                                        end
+                                      else
+                                        "false"
+                                      end
       tag_options[:class] = (tag_options.has_key?(:class) ? "#{tag_options[:class]} ":"") + "polyblock"
       tag_options[:data][:pb_exists] = pb_exists
 
       # Truncation
       if options[:condensed]
+        tag_options[:class] += " polyblock-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

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyblock
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails