blocky 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b4a633bced0c43db6ac323af8492cf79c4c21da
-  data.tar.gz: 7025083b245e261e6ee8e97746fac325c0260183
+  metadata.gz: a2b133372cdb42fddfcde315ee3cf807c07f09ed
+  data.tar.gz: b0e2b556c60553e2237ec40366e8c4748dbae848
 SHA512:
-  metadata.gz: bf0b9c68fa1ed224be3aa72c0a1e8527fcf5cf27151a55d8029f8b85f98d9ed6d790b6b97cabfe158be50d39ae3262b54edc3d5eb435a1930f839b33be4e9d65
-  data.tar.gz: 4a0c368eca9a0c4110d347b97dc183c175168977e34f3073e74dd2cc27eda715306f46ac50b548dcb1f9f7684cf3796ee5446f0af1b2197963f73f02c27aafed
+  metadata.gz: 985a2a51f3473ecfa5afbc6644b896a0a4e1281dc5241e7e8bc28dc1c85fc6b3d84316e4c623c2ecae811b30d1ca25254153c2db3c2d3b14e96e5616a99cdf3c
+  data.tar.gz: b3aa84a7cf0af11e0f977e8a21ef29226b3e000817548baf74fe510a4b49c74e99732f4660b44215aa135236f346d9678a384ed6693a368c302b3faed2b08725

data/README.md

@@ -52,6 +52,14 @@ TODO: Add example for limiting access to admin users.
 
 ## Usage
 
+Include `BlockyHelper` in your `ApplicationHelper`:
+
+```ruby
+module ApplicationHelper
+  include BlockyHelper
+end
+```
+
 To create a content block, simply use the `blocky` helper
 and specify a content key in any ERB template:
 

data/app/helpers/blocky_helper.rb

@@ -1,12 +1,10 @@
 module BlockyHelper
 
   def blocky(block_name, options={})
-    controller_name = options[:global] ? nil : controller.controller_name
-    action_name     = options[:global] ? nil : controller.action_name
+    page_path = options[:global] ? nil : request.fullpath
 
     content_block = Blocky::ContentBlock.where({
-      controller: controller_name,
-      action: action_name,
+      page_path: page_path,
       name: block_name
     }).first_or_create
 

data/app/models/blocky/content_block.rb

@@ -2,15 +2,16 @@ module Blocky
   class ContentBlock < ActiveRecord::Base
     before_save :tidy_content
 
-    scope :global,   -> { where("controller IS NULL AND action IS NULL") }
-    scope :per_page, -> { where("controller IS NOT NULL AND action IS NOT NULL") }
+    scope :global,   -> { where("page_path IS NULL") }
+    scope :per_page, -> { where("page_path IS NOT NULL") }
 
     def global?
-      self.controller.nil? && self.action.nil?
+      self.page_path.nil?
     end
 
     def tidy_content
       tidy = Tidy.new({
+        char_encoding: "raw",
         doctype: "omit",
         indent: "auto",
         indent_spaces: 2,
@@ -20,7 +21,8 @@ module Blocky
         tab_size: 2,
         tidy_mark: false
       })
-      self.content = tidy.clean(self.content.strip)
+      html = tidy.clean(self.content.to_s.strip)
+      self.content = "\n" + (html.blank? ? "<p><br/></p>" : html) + "\n"
     end
 
   end

data/app/views/blocky/content_blocks/index.html.erb

@@ -25,15 +25,12 @@
           </td>
         </tr>
       <% end %>
-      <% @content_blocks.group_by{|content_block| [content_block.controller, content_block.action] }.each do |group, content_blocks| %>
+      <% @content_blocks.group_by{|content_block| content_block.page_path }.each do |page_path, content_blocks| %>
         <% content_blocks.each_with_index do |content_block, index| %>
-
-          <% page_url = main_app.url_for(controller: "/#{group[0]}", action: group[1], only_path: true) %>
-
           <tr class="per-page <%= index == 0 ? 'page-start' : '' %>">
             <td class="page">
               <% if index == 0 %>
-                <%= link_to page_url, page_url, target: "_blank" %>
+                <%= link_to page_path, page_path, target: "_blank" %>
               <% end %>
             </td>
             <td>

data/db/migrate/20140520212037_add_page_path_to_content_blocks.rb

@@ -0,0 +1,7 @@
+class AddPagePathToContentBlocks < ActiveRecord::Migration
+  def change
+    add_column :blocky_content_blocks, :page_path, :string
+    remove_column :blocky_content_blocks, :controller
+    remove_column :blocky_content_blocks, :action
+  end
+end

data/lib/blocky/version.rb

@@ -1,3 +1,3 @@
 module Blocky
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blocky
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brian Pattison
@@ -344,6 +344,7 @@ files:
 - config/jshint.json
 - config/routes.rb
 - db/migrate/20140326210255_create_blocky_content_blocks.rb
+- db/migrate/20140520212037_add_page_path_to_content_blocks.rb
 - lib/blocky.rb
 - lib/blocky/engine.rb
 - lib/blocky/version.rb