polyblock 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec215ea6c52b8c58c40be3369880eff3c60605e4
-  data.tar.gz: 5b9cc0433a80e9b47c207801b092235c380a23ba
+  metadata.gz: f4a75a7d76cfc5bc2b0419088d4c25ec536998a3
+  data.tar.gz: 072aa1504a72695350bda2f2f22b61e521c3b51d
 SHA512:
-  metadata.gz: 5e436274e70a377316bdf59a58d2d120c106020e50710863ca744c6c60c59f169612c4a43fd981d7b2845a0916d17d234adf23ae0f3d93745cf7aff96a1329f0
-  data.tar.gz: e4c8f3a1f000cfcfe4ac48b88ae32f6250a6786e46da5572db647707c4d62c7bd2165805327cc29246fdb74c68d229a6eff67c2f7db24ebd2f78e3de2692106d
+  metadata.gz: 4a82bb323b736d6a825ead87c24dccdd23c978db6645ff59ed422c9fa6c190e64d06e2bd4f5e8a7de8abfb7e72812a48f104389e3f77cb758869d153f14bc8c6
+  data.tar.gz: 11c937ea4f582e894f1106f71c0541c30fa855d9e69d55efe3121e758d487d1cd599999944b39b21d6214349316dd6f7021c79230e4a7cdf24b0fe0a3689d91f

data/app/helpers/polyblock/application_helper.rb

@@ -1,78 +1,4 @@
 module Polyblock
   module ApplicationHelper
-
-    def pb(name, options={})
-      options = {
-          # :editable => false,
-          :tag => :div,
-          :tag_options => {},
-          :condensed => false,
-          :length => 250,
-          :omission => '... (continued)'
-      }.merge(options)
-
-      # Fetch or create Polyblock
-      pb = Block.fetch_or_create(name)
-      pb_id = pb.new_record? ? Block.next_id : pb.id
-      name = pb.name if name.is_a? Block
-      random_id = Block.random_id
-
-      # Build output tag
-      content = pb.content.present? ? pb.content : "[Editable content space for Polyblock <code>#{name}</code>]"
-      tag_options = options[:tag_options].deep_merge({:id => "pb-#{pb_id}-#{random_id}", :data => {:pbid => pb_id, :pbname => name}})
-      tag_options[:contenteditable] = if options[:condensed]
-                                        'false'
-                                      elsif options.has_key?(:editable)
-                                        options[:editable] ? 'true' : '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.delete(:contenteditable) if tag_options[:contenteditable] == 'false'
-      tag_options[:class] = (tag_options.key?(:class) ? "#{tag_options[:class]} ": '') + 'polyblock'
-      tag_options[:data][:pb_exists] = pb.new_record?
-
-      # Truncation
-      if options[:condensed]
-        tag_options[:class] += " polyblock-condensed"
-        content = CGI.unescapeHTML(content.gsub('<br><br>', '<br>').gsub('&nbsp;', ' '))
-        truncate(sanitize(strip_tags(content)), :length => options[:length], :omission => options[:omission])
-      else
-        content_tag(options[:tag], content, tag_options, false)
-      end
-    end
-
-    def simple_fields_for_polyblock(name, f, options={})
-      options = {
-          :label => false,
-          :input_html => {}
-      }.merge(options)
-
-      pb = if name.is_a?(String)
-             Block.fetch_or_initialize(name)
-           elsif name.is_a?(Symbol)
-             f.object
-           else
-             nil
-           end
-
-      render :partial => 'polyblock/simple_fields_for', :locals => {:f => f, :pb => pb, :name => name, :options => options}
-    end
-
-    def polyblock_editor_bar
-      render :partial => 'polyblock/editor_bar'
-    end
-
   end
 end

data/app/helpers/polyblock/polyblocks_helper.rb

@@ -1,4 +1,78 @@
 module Polyblock
   module PolyblocksHelper
+
+    def pb(name, options={})
+      options = {
+          # :editable => false,
+          :tag => :div,
+          :tag_options => {},
+          :condensed => false,
+          :length => 250,
+          :omission => '... (continued)'
+      }.merge(options)
+
+      # Fetch or create Polyblock
+      pb = Block.fetch_or_create(name)
+      pb_id = pb.new_record? ? Block.next_id : pb.id
+      name = pb.name if name.is_a? Block
+      random_id = Block.random_id
+
+      # Build output tag
+      content = pb.content.present? ? pb.content : "[Editable content space for Polyblock <code>#{name}</code>]"
+      tag_options = options[:tag_options].deep_merge({:id => "pb-#{pb_id}-#{random_id}", :data => {:pbid => pb_id, :pbname => name}})
+      tag_options[:contenteditable] = if options[:condensed]
+                                        'false'
+                                      elsif options.has_key?(:editable)
+                                        options[:editable] ? 'true' : '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.delete(:contenteditable) if tag_options[:contenteditable] == 'false'
+      tag_options[:class] = (tag_options.key?(:class) ? "#{tag_options[:class]} ": '') + 'polyblock'
+      tag_options[:data][:pb_exists] = pb.new_record?
+
+      # Truncation
+      if options[:condensed]
+        tag_options[:class] += " polyblock-condensed"
+        content = CGI.unescapeHTML(content.gsub('<br><br>', '<br>').gsub('&nbsp;', ' '))
+        truncate(sanitize(strip_tags(content)), :length => options[:length], :omission => options[:omission])
+      else
+        content_tag(options[:tag], content, tag_options, false)
+      end
+    end
+
+    def simple_fields_for_polyblock(name, f, options={})
+      options = {
+          :label => false,
+          :input_html => {}
+      }.merge(options)
+
+      pb = if name.is_a?(String)
+             Block.fetch_or_initialize(name)
+           elsif name.is_a?(Symbol)
+             f.object
+           else
+             nil
+           end
+
+      render :partial => 'polyblock/simple_fields_for', :locals => {:f => f, :pb => pb, :name => name, :options => options}
+    end
+
+    def polyblock_editor_bar
+      render :partial => 'polyblock/editor_bar'
+    end
+
   end
 end

data/lib/polyblock/engine.rb

@@ -1,11 +1,11 @@
 require "ckeditor"
 
 module Polyblock
-  class Engine < ::Rails::Engine
+  class Engine < Rails::Engine
     isolate_namespace Polyblock
     initializer 'polyblock_engine.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
-        helper Polyblock::ApplicationHelper
+        helper Polyblock::PolyblocksHelper
       end
     end
   end

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyblock
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2548,7 +2548,6 @@ files:
 - test/dummy/tmp/cache/assets/development/sprockets/ffb79443786077c55e033012dcb39372
 - test/dummy/tmp/cache/assets/development/sprockets/ffdb359321552b05439e0337844f817d
 - test/dummy/tmp/cache/assets/development/sprockets/fffa8f692e900a66d630702707280ecc
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/polyblock/blocks.yml
 - test/helpers/polyblock/polyblocks_helper_test.rb
 - test/integration/navigation_test.rb
@@ -4922,7 +4921,6 @@ test_files:
 - test/dummy/tmp/cache/assets/development/sprockets/ffb79443786077c55e033012dcb39372
 - test/dummy/tmp/cache/assets/development/sprockets/ffdb359321552b05439e0337844f817d
 - test/dummy/tmp/cache/assets/development/sprockets/fffa8f692e900a66d630702707280ecc
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/polyblock/blocks.yml
 - test/helpers/polyblock/polyblocks_helper_test.rb
 - test/integration/navigation_test.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-36572