caboose-cms 0.3.4 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODVkYTdlZTk0ZWE0ZGYwOGZhMjZmNTVhY2FiYjBlMmU3OWJmZTllZQ==
+    YjNjZmIxOGIyMjg5YmNhMWMyNDJiZDZmODRmYWEyZmM5ZjI3Njk2Yw==
   data.tar.gz: !binary |-
-    NjE4NWNhNTU3MmQ3YjEzZDY2ZDYyMDU2NjNhMmEzNWFjYzU0MTk2Zg==
+    ZDFhNTNkZmE0MGEzZThhODBmZTE3ODYyNGY0ZWY5ODc4YmE5MjQxNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjQ1NzI1ZWQ1MDhlN2ExNDBlN2VmZmIzMDgzZDI0ZjEzZGY2ODlkNGU5YjFl
-    MjAyNmY2MjNmZjUzZTQxNzNiYTk1YWU4MWNhOTgyZjQ1YzA1ZmVkNjk0OGUy
-    MTYzNTkwM2UxMjliMjQ0YjBjOTljOGQwN2YxOGE0ZjQ2ZjE2YmE=
+    ZDg2MTU0OTRhM2NlNGU3ZjE5MjI4MDBkZWQwMjZiOWE3YzEwOTVlYzI5ZWRi
+    MTExMzI1OGU2YzZiMDA2OGVlNjYwZWNmZTcwYjIxOGE5OGEyNmE2M2Q0OTFk
+    MWZmMzM3MGQwNzFjYmRhZWI0OGEzM2ZjYjQwMDZiZjdjY2ZkMjg=
   data.tar.gz: !binary |-
-    OGFmYjEyNDJmNzY5ZGJmNmQ4NjVkNTJiZDFlNThkMzA0MjAyMDdjOWY3YzBk
-    MTlmZmZjMDE3ZjkzYjY3MjhhZDBhZjRlODEzZTA5MTEyM2JhMTY1ZmU4MDY3
-    MjEyYzU2NzJlMmMzYmRhNmUwMjExNGYwZmQ0NzUzYjkzZWM2OTE=
+    YWU4NjVkOWJhODQxOTNjOWViODQ2OWYzOGJjNDg5NTg1Yjg3NmU5M2VkYTBl
+    NTE0YTViNWRlOGVlODg4NDNlMmRjYTBkMWU1Njg1N2UzNTNmNWY4OWY1Yjg1
+    ZmRiOWRlNmIwZjU1YjcxNTY4YTQxMDYxMDk2NWFhZTBiNmUwY2Q=

data/app/controllers/caboose/pages_controller.rb

@@ -35,7 +35,9 @@ module Caboose
         return
       end
 
-      page.content = Caboose.plugin_hook('page_content', page.content)
+      #page.content = Caboose.plugin_hook('page_content', page.content)
+      page = Caboose.plugin_hook('page_content', page)
+      
       @page = page
       @user = user
       @editmode = !params['edit'].nil? && user.is_allowed('pages', 'edit') ? true : false

data/app/models/caboose/page.rb

@@ -44,6 +44,7 @@ class Caboose::Page < ActiveRecord::Base
   end
   
   def content
+    return "" if self.blocks.nil? || self.blocks.count == 0
     self.blocks.collect { |b| b.render }.join("\n")     
   end
     

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - William Barry