caboose-cms 0.4.14 → 0.4.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTM3MDNkYTY4Nzc4Y2Y1Nzg5MjQ3ODkzYTgxMTc2MDlmYTE1OWU3ZA==
+    MWRiZTU5NzZiYWJkMDQ5MDY4ZDg3ODkwZjViYTg5NWJiZmJjMjMzOQ==
   data.tar.gz: !binary |-
-    MmFkOTdmNDFlYTIzNGFiYzc3ZWJlYWVlM2U2ZTYxZGZjZjMyYTdjMQ==
+    OWViNmIyYThiMGJhMzRiZjExZmVjNjQ3ODNkNDdlODY0ZDdmYWYzMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDkzODZiODZlNjFmNmMyNWQ4YTVjNjI2NjQyYzhmMmExOWVlNzMyOTEyOTA2
-    YTlmMjY4ZGY2NGRkYjgyNzhiOGZiZGE5NzMzYTcwNTBlMmU5OWQzZWE0MTk2
-    YmFmODI0ODczNzdhOGZiMDhmNjg3ZTJlNDI0ZjVjNWQyZDhkMTU=
+    YWJkODMxNjNlZjliYjBmOTkxNmFlNmM1NzU5YmQ1N2U5Njc5YzE3ODQxNWU3
+    YWE4MzVkNGViMmZjYjZjMmEwZjhkYjkxYzU2MTg5NDA3ZTNiODcxYjBjMjBi
+    MjYxY2QzYmQzZDQ2N2FjNzYwMmIyYjgyZmQ3NWQ2NGE3N2JkNTI=
   data.tar.gz: !binary |-
-    MmY4NGM2YjhlYTVhNmMyNjMyY2ZiZDNkMzBlNjU3ZDkzM2RjODc4MTk5MmUz
-    NDY5NmJmYTc4ZGNhNjFjYTdkNjQzMjA1ZWIyMDg5OTY4ZTc4NTc4ZTAzOWI4
-    ZWY1MDFhNmUzYTExNWUyNjNkNjJjMzJmNmM0NjFhOWQ0YjY3MGI=
+    NDQ5ODEyYjM0MzM2ZTI3OTBiMWM4NjEyODM2MmQ3MGNiNTZiMjVmYjU5Mjdl
+    NDg0MjViYTc0MGY1NWYyNTc4MmU4MmE2ZmU0M2I1MTUyZjhmMmY5Mzc4NDQy
+    ZTVlMzRhNzQ3NGRmZmI2MDk5YWZiMDdjMTQxNDJkOTdjNTMwNGQ=

data/app/models/caboose/block.rb

@@ -88,7 +88,7 @@ class Caboose::Block < ActiveRecord::Base
     end
   end
                                             
-  def render(block, options)    
+  def render(block, options)
     #Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\nblock.full_name = #{block.full_name}\noptions.class = #{options.class}\noptions = #{options}")                
     if block && block.is_a?(String)
       #Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")                                          
@@ -114,25 +114,31 @@ class Caboose::Block < ActiveRecord::Base
     end
     options2[:block] = block
 
+    view = options2[:view]
     if block.block_type.use_render_function && block.block_type.render_function            
-      str = block.render_from_function(options2)
+      #str = block.render_from_function(options2)
+      
+      #locals = OpenStruct.new(options)      
+      #locals = OpenStruct.new(options2)
+      #str = ERB.new(block_type.render_function).result(locals.instance_eval { binding })        
+      #return erb.result(locals.instance_eval { binding })
+      
+      #eval("def render_my_function\n#{block.block_type.render_function}\nend\n\n, :locals => options2)
+      str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
     else
-      view = ActionView::Base.new(ActionController::Base.view_paths)
+      #view = ActionView::Base.new(ActionController::Base.view_paths, options2, )      
+      #view = ActionView::Base.new(options2[:view].view_renderer, {}, options2[:view].controller)
+      view = options2[:view]
       begin        
         full_name = block.full_name
-        full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
-        #Caboose.log("Rendering caboose/blocks/#{full_name}")
-        str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)
+        full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0        
+        str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)        
       rescue ActionView::MissingTemplate
-        begin
-          #Caboose.log("Error rendering caboose/blocks/#{full_name}")
-          #Caboose.log("Rendering caboose/blocks/#{block.block_type.name}")
-          str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)          
+        begin          
+          str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)                    
         rescue ActionView::MissingTemplate
-          begin
-            #Caboose.log("Error rendering caboose/blocks/#{block.block_type.name}")
-            #Caboose.log("Error rendering caboose/blocks/#{block.block_type.field_type}")            
-            str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
+          begin                        
+            str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)            
           rescue Exception => ex
             Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
           end

data/app/views/caboose/blocks/_render_function.html.erb

@@ -0,0 +1 @@
+<%= raw ERB.new(block.block_type.render_function).result(self.instance_eval { binding }) %>

data/app/views/layouts/caboose/application.html.erb

@@ -15,7 +15,8 @@
 <% end %>
   <%
   b = @page.block
-  str = b.render(b, {
+  str = b.render(b, {     
+    :view => self,
     :controller_view_content => yield,
     :modal => false,
     :empty_text => '',

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.14'
+  VERSION = '0.4.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -331,6 +331,7 @@ files:
 - app/views/caboose/blocks/_layout_right_sidebar_footer.html.erb
 - app/views/caboose/blocks/_layout_right_sidebar_header.html.erb
 - app/views/caboose/blocks/_layout_right_sidebar_sidebar.html.erb
+- app/views/caboose/blocks/_render_function.html.erb
 - app/views/caboose/blocks/_richtext.html.erb
 - app/views/caboose/blocks/_text.html.erb
 - app/views/caboose/blocks/admin_edit.html.erb