caboose-cms 0.4.53 → 0.4.54

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzhlMzNkYzE1YTRiM2FmY2RhZTBlODVjYTEyY2VjZTM4YWNiYWZjNA==
+    NTJhY2JkMjI5NDA5ZWJiYmM4NDQ1MzAwYTc4YWY5MWZjMmMxODFjZQ==
   data.tar.gz: !binary |-
-    ZGI2ZGYyNDJhZTEwNjU3ZDhjODM2NTQxMGFkOGNhZDllMzQ0NDg4Mw==
+    YzBhMWFjNjNmZDQ5MzE3ZDA1OTZkMzU3Y2NjMTcyMGE4Y2VmZDRjZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmQ2MWY0YThkYzA1YWJlNjI2MThiYjMyOTZkYjQ3NzcyYTY5ZTA5ZmE5YWRh
-    MDNmOGRiMzE2ZTBiNzIzODFiMTUzN2UwNmQ3MjZjZTI5ZjFmMDQ4M2RkYWI0
-    NTAwYmQ4MTFkZTU5OWEyZjI2MDQ3NWJmMDgzNDY4YzdlMGRlYzk=
+    YzNkZDk0N2ZiM2Q2MmZmZTY3NDhjN2I0ZTgwY2Y3MDFlMWMzOGM0MzNjMzNk
+    YzQyZWRjOWIyMzhkYjM2ZTdjMzY5MjM5YmE2YWI1ODczMGRhMmI1ZDAzZGE4
+    ZGQyNDg0MmIzYjQ5NDZiNDBkMDYzYzhlNWE5MDM0ODQwZmU1Mjc=
   data.tar.gz: !binary |-
-    Nzk1ZTBhZWY1NTc4MzM5YmVjNDRkM2VjYjIxOWI1NzI4ZmMyNGVmM2IxOGNj
-    YWE0MGJhMWE0M2RlMjk3M2JiMDExZDNmYjQwOGIxYTkzNjZkOTY0OTUzY2Ji
-    OTFjOWVkN2M4YjhiMzMyN2ZmYWZjNTBkYmFjOGI5Njc1MDIzYzQ=
+    ODMzZjg5Y2YzYTk1MTAzNTg4ZmFkYTljMjExNmVmOThjN2I3YzBiN2ZiMTY3
+    YjI4Y2EyZWU3YmFmNjAzMWUxNGRmNWMzZWUwNGZhMzUwM2M4NDlmYzc0NjBh
+    ZWI1ZGJkMGFlOTVjY2VkY2U1NzdjOThlMTI2MDUyMjlkMWY5Yzk=

data/app/controllers/caboose/blocks_controller.rb

@@ -47,8 +47,8 @@ module Caboose
         end
       end
       render :json => blocks
-    end
-    
+    end        
+      
     def admin_tree_helper(b)
       arr = []
       b.children.each do |b2|

data/app/controllers/caboose/pages_controller.rb

@@ -355,14 +355,15 @@ module Caboose
           resp.attributes['content_format'] = { 'text' => value }
           
         when 'meta_robots'
-          if (value.include?('index') && value.include?('noindex'))
+          arr = value.split(',').collect { |v| v.strip }
+          if arr.include?('index') && arr.include?('noindex')
             resp.error = "You can't have both index and noindex"
             save = false
-          elsif (value.include?('follow') && value.include?('nofollow'))
+          elsif arr.include?('follow') && arr.include?('nofollow')
             resp.error = "You can't have both follow and nofollow"
             save = false
-          else
-            page.meta_robots = value.join(', ')
+          else            
+            page.meta_robots = arr.join(', ')
             resp.attributes['meta_robots'] = { 'text' => page.meta_robots }
           end
           

data/app/models/caboose/block.rb

@@ -125,6 +125,7 @@ class Caboose::Block < ActiveRecord::Base
       #return erb.result(locals.instance_eval { binding })
       
       #eval("def render_my_function\n#{block.block_type.render_function}\nend\n\n, :locals => options2)
+      #Caboose.log(block.id)
       str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
     else
       #view = ActionView::Base.new(ActionController::Base.view_paths, options2, )      
@@ -231,5 +232,12 @@ class Caboose::Block < ActiveRecord::Base
       }
     }
   end
+  
+  def log_helper(prefix = '')
+    puts "#{prefix}#{self.id}"
+    self.children.each do |b|
+      b.log_helper("#{prefix}-")
+    end
+  end
 
 end

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

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

data/app/views/caboose/pages/admin_edit_seo.html.erb

@@ -18,7 +18,7 @@ $(document).ready(function() {
   m = new ModelBinder({
     name: 'Page',
     id: <%= @page.id %>,
-    update_url: '/pages/<%= @page.id %>',
+    update_url: '/admin/pages/<%= @page.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [      
       { name: 'seo_title'         , nice_name: 'SEO Title'            , type: 'text'      , value: <%= raw Caboose.json(@page.seo_title)        %>, width: 580 },        

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

@@ -21,6 +21,7 @@
     b = @page.block
     b.create_children
   end
+  #b.log_helper
   str = b.render(b, {     
     :view => self,
     :controller_view_content => yield,

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.53
+  version: 0.4.54
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails