caboose-cms 0.4.54 → 0.4.55

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTJhY2JkMjI5NDA5ZWJiYmM4NDQ1MzAwYTc4YWY5MWZjMmMxODFjZQ==
+    N2Y1MmRhNWFjNTMxMzUwMzU5YWViNWYxY2Y5ZTlmN2NlOGZiODI4Yw==
   data.tar.gz: !binary |-
-    YzBhMWFjNjNmZDQ5MzE3ZDA1OTZkMzU3Y2NjMTcyMGE4Y2VmZDRjZQ==
+    MGM2ODg1YzRlMjgxNTMzZDE5MjA0OWJlNzFmOWVkYmNhZTdjNTZmYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzNkZDk0N2ZiM2Q2MmZmZTY3NDhjN2I0ZTgwY2Y3MDFlMWMzOGM0MzNjMzNk
-    YzQyZWRjOWIyMzhkYjM2ZTdjMzY5MjM5YmE2YWI1ODczMGRhMmI1ZDAzZGE4
-    ZGQyNDg0MmIzYjQ5NDZiNDBkMDYzYzhlNWE5MDM0ODQwZmU1Mjc=
+    ZmJiYjQyZWFlMDNhOTc4YjMyN2YzZjU5MTQyNTM5Y2FhZTMyOTkyMjAxOWYw
+    OTZhZGY2YjA1ZDIxNzIxOGI0ZDAyMjVkZTk1MTA5NTk2MWZjZDA1OTc5NDc5
+    ODE5Nzk0ZDhlNzJmZDlkYzkxNzI5M2JmMDQwY2JlZjQ4Y2IwYTE=
   data.tar.gz: !binary |-
-    ODMzZjg5Y2YzYTk1MTAzNTg4ZmFkYTljMjExNmVmOThjN2I3YzBiN2ZiMTY3
-    YjI4Y2EyZWU3YmFmNjAzMWUxNGRmNWMzZWUwNGZhMzUwM2M4NDlmYzc0NjBh
-    ZWI1ZGJkMGFlOTVjY2VkY2U1NzdjOThlMTI2MDUyMjlkMWY5Yzk=
+    NDViZjhjYjcyMjBkNDg3Y2UwMWE0YWVmOTJkMTU3Yzc1OWRiNjgxNjgzYTY1
+    MjkzY2Q3Y2YxNGFiNzJhYTJlNjQ3ZjQ3ZDc1ZmJkYjBiMjZjZDQ1ODlkMDcz
+    YjEwOTk1OTQ3ZjBjNjhhZTliYTg2NTBkYTQ1M2E0ZmVhZmNmYTg=

data/app/models/caboose/block.rb

@@ -105,12 +105,36 @@ class Caboose::Block < ActiveRecord::Base
     end        
     str = ""
 
-    defaults = { :modal => false, :empty_text => '', :editing => false, :css => nil, :js => nil, :block => block }
+    defaults = {
+      :view => nil,
+      :controller_view_content => nil,
+      :modal => false,
+      :empty_text => '',
+      :editing => false,
+      :css => nil,
+      :js => nil,
+      :csrf_meta_tags => nil,
+      :csrf_meta_tags2 => nil,    
+      :logged_in_user => nil
+    }    
+    #defaults = { :modal => false, :empty_text => '', :editing => false, :css => nil, :js => nil, :block => block }
     options2 = nil
     if options.is_a?(Hash)
       options2 = defaults.merge(options)
     else
-      options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }        
+      #options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }
+      options2 = {
+        :view                    => options.view                    ? options.view                    : nil,
+        :controller_view_content => options.controller_view_content ? options.controller_view_content : nil,
+        :modal                   => options.modal                   ? options.modal                   : nil,
+        :empty_text              => options.empty_text              ? options.empty_text              : nil,
+        :editing                 => options.editing                 ? options.editing                 : nil,
+        :css                     => options.css                     ? options.css                     : nil,
+        :js                      => options.js                      ? options.js                      : nil,
+        :csrf_meta_tags          => options.csrf_meta_tags          ? options.csrf_meta_tags          : nil,
+        :csrf_meta_tags2         => options.csrf_meta_tags2         ? options.csrf_meta_tags2         : nil,
+        :logged_in_user          => options.logged_in_user          ? options.logged_in_user          : nil
+      }
     end
     options2[:block] = block
 
@@ -141,13 +165,16 @@ class Caboose::Block < ActiveRecord::Base
           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")}")
+            msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
+            Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
           end
         rescue Exception => ex          
-          Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
+          msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
+          Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
         end
       rescue Exception => ex
-        Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
+        msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
+        Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
       end        
     end
     return str

data/app/models/caboose/schema.rb

@@ -218,6 +218,16 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :user_id     , :integer ],
         [ :role        , :string  ]
       ],
+      Caboose::SmtpConfig => [
+        [ :site_id              , :integer ],
+        [ :address              , :string  , { :default => 'localhost' }],
+        [ :port                 , :integer , { :default => 25 }],
+        [ :domain               , :string ],
+        [ :user_name            , :string ],
+        [ :password             , :string ],
+        [ :authentication       , :string ], # :plain, :login, :cram_md5.
+        [ :enable_starttls_auto , :boolean , { :default => true }]
+      ],
       Caboose::Timezone => [
         [ :country_code , :string ],
         [ :name         , :string ]

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

@@ -1,8 +1,9 @@
 <%
-size = block.child('size').value
-text = block.child('text').value
+size = block.child_value('size')
+text = block.child_value('text')
+style = block.child_value('style')
 size = 1 if size.nil?
 text = (empty_text ? empty_text : "") if text.nil? || text == ""
 
-if editing %><div id='block_<%= block.id %>'><h<%= size %>><%= raw text %></h<%= size %>></div><% 
-else       %><h<%= size %> id='block_<%= block.id %>'><%= raw text %></h<%= size %>><% end %>
+if editing %><div id='block_<%= block.id %>'><h<%= size %> style='<%= style %>'><%= raw text %></h<%= size %>></div><% 
+else       %><h<%= size %> id='block_<%= block.id %>' style='<%= style %>'><%= raw text %></h<%= size %>><% end %>

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

@@ -1,7 +1,13 @@
 <div class="content_wrapper" id='block_<%= block.id %>'>          
   <div class="content_body">    
     <% if editing %><div class='sortable'><% end %>        
-    <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>
+    <% block.children.each do |b| %>
+      <% 
+      #msg = b ? (b.block_type ? "#{b.block_type.name} block (block_type_id #{b.block_type.id}, block_id #{b.id})\n" : "Block (block_id #{b.id})\n") : ''
+      #Caboose.log(msg)
+      %>
+      <%= raw block.render(b, local_assigns) %>
+    <% end %>
     <% if editing %></div><% end %>
   </div>
 </div>

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

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

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

@@ -31,11 +31,12 @@
     :css => '|CABOOSE_CSS|',
     :js => '|CABOOSE_JAVASCRIPT|',
     :csrf_meta_tags => '|CABOOSE_CSRF|',
+    :csrf_meta_tags2 => '|CABOOSE_CSRF|',    
     :logged_in_user => @logged_in_user
   })       
   str.gsub!('|CABOOSE_CSS|'        , yield(:css))
   str.gsub!('|CABOOSE_JAVASCRIPT|' , yield(:js))  
-  str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)
+  str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)  
   
   %><%= raw str %><%
     

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.54'
+  VERSION = '0.4.55'
 end

metadata

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