polyblock 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0fb6298e64061cd2c8bbebc406534db1ec825f2
-  data.tar.gz: f0732510ca23e09e814814d91f8afa9059bb864c
+  metadata.gz: 2c0b2a91024ad5e1bb738464dfba70f5f86eab39
+  data.tar.gz: c355af45e8d74a354c23264c647889c7f8540cc0
 SHA512:
-  metadata.gz: 5a5ec3f86b480599dda3cc90b633f3de05c58b8e7cedb498e82063a01c5ab1ae16358baf0e9691b51714b64ec875dd9c0e246ab565bab207920c45eed7f4be18
-  data.tar.gz: 41f74a239a3f7c6c7ace39a64b2a44b4250bf9c87b1ccce0b73cf77763e7bfaa12c79381862201dff2f08d747893a182be4c22455a54c9e7192d0bde23820f23
+  metadata.gz: 4eea0556cae530fc6c0d2f5bf7b3289e6615f3759b73e57408f9d18d8d403d5b157a41176e5a69b8dea9853864a8799c51764c1d32bc6a3ae804e7f93aa29d2e
+  data.tar.gz: 756dad9394f0a238bddbca849b9f31675d4d8508ca8e338e7ed0473f18767d67b19c38fba501d87f3ce3609c5be4f566574b67199bd8eaa4075c2c0689df2b06

data/app/models/polyblock/block.rb

@@ -3,10 +3,6 @@ require 'json'
 module Polyblock
   class Block < ActiveRecord::Base
     attr_accessor :settings
-    belongs_to :contentable, :polymorphic => true
-
-    before_save :strip_html_if_necessary
-
     DEFAULTS = {
       :association => {
           :class_name => "Polyblock::Block",
@@ -19,6 +15,9 @@ module Polyblock
       :default_text => "[Editable content space for Polyblock <code>#{name}</code>]"
     }
 
+    belongs_to :contentable, :polymorphic => true
+    before_save :strip_html_if_necessary
+
     def self.import(pbs)
       outputs = pbs.map do |pb|
         block = fetch_or_initialize pb[:name]

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/polyblock/view_helpers.rb

@@ -18,7 +18,7 @@ module Polyblock
       random_id = Block.random_id
 
       # Build output tag
-      content = pb.content.present? ? pb.content : pb.settings.default_text
+      content = pb.content.present? ? pb.content : pb.settings[:default_text]
       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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyblock
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails