caboose-cms 0.5.37 → 0.5.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmFhNzEwZGI4NTgzZWY3Y2I3ODE4MmE2ODM0NjgxMzRlMTM3YWYyNQ==
+    NjlkZmI4M2ZiZDk5ZjBiZDA1OTcyNDE5NWMzZjlkZWJkMWIyOTgyZA==
   data.tar.gz: !binary |-
-    ZDIxMGZjZjc1MmI2ZTRjNTg1Y2U4NDU0MWQ4MzIxZWM0N2RhZGQ1NQ==
+    YWRjYTVhMjMzZjA3Zjc0MjI1NWM0MzNkYjFiNGI5Mjg2MWU1YjFhZg==
 SHA512:
   metadata.gz: !binary |-
-    Zjg2N2VlNjM3MTcyYmMxM2M2MzdiYzRmZjBlOTA0ODAxMzgwM2QzYjFjMDAx
-    YmZlOGMwNzI4OWE5ZWFiMDQzZjAwY2UzMzZjZWZmZDZkZGEyYTNmMTc4MjNl
-    YmZhYjhjMGMzZmMxNTA1NGFhYmE0MDZhZGE4M2Q4ZGZjMzE5Mjc=
+    NmViNzcwZWQ2OWYwYmNhZjk1YTdiYTY0Njc5YjY4NzYxZWVlOWI1MTRmM2E0
+    NzUwOTg1YjkwN2E5YWNmNTQ2MDNhNmQxMGFlMjY4ZTk2NGQ2MjIwZWI1OGYx
+    NzBiYzI5YzE3NDY2MDBhOTI5ZWRiNGJjNTFkYThkZTc5YzQ2M2U=
   data.tar.gz: !binary |-
-    NTllNjhlMTNmMjQyMWEyYmE0MmVjZmQwNDM1MjgxMzk0MDIyMTQ4NjAxZWI5
-    Y2QyZmYwMzhjNzQ2YTJmMjZlZmZlMTFhZWIwNGVmZGVmYzRjNTEyZmEwMDdh
-    NzBjZWQ5Y2ExYjBkZTVjMWE3OTg0YzAzYzA1MTVlMWU5ZmNiNzM=
+    ZGIwMTgzMWY1YjQwMTQzYzhiMDQ4ZWNlNjIxN2YzZDZmNTBiMDMxZTQ2YjEx
+    ZTVlYzA5ZjM3NDc4MTMwZTQ4NmE2YjA5Yzk1YzQ4YWUxYjhmOTlkOGFlYWNl
+    ZTY4YmU1ZmZkNGU3NjFlNGQyZmZkOTYzNzlkODIyZDEyN2U0MjI=

data/app/controllers/caboose/application_controller.rb

@@ -6,13 +6,14 @@ module Caboose
     helper_method :logged_in?
     helper :all
     
-    @find_page = true
+    @find_page = true    
     
-    def before_before_action
-      
+    def before_before_action            
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
       
+      @use_page_cache = !request.fullpath.starts_with?('/admin')
+      
       # Get the site we're working with      
       domain = Domain.where(:domain => request.host_with_port).first
       @site = domain ? domain.site : nil

data/app/controllers/caboose/pages_controller.rb

@@ -5,14 +5,14 @@ module Caboose
     helper :application
     
     def before_action
-      @page = Page.page_with_uri(request.host_with_port, '/admin')
+      @page = Page.page_with_uri(request.host_with_port, '/admin')      
     end    
 
     # GET /pages/:id
     def show
       
       # Find the page with an exact URI match 
-      page = Page.page_with_uri(request.host_with_port, request.fullpath, false)
+      page = Page.page_with_uri(request.host_with_port, request.fullpath, false)            
       
       # Make sure we're not under construction
       d = Caboose::Domain.where(:domain => request.host_with_port).first        

data/app/models/caboose/block.rb

@@ -33,21 +33,20 @@ class Caboose::Block < ActiveRecord::Base
   before_save :caste_value
   
   def caste_value
-    if self.block_type.nil?
+    if self.block_type_id.nil?
       bt = Caboose::BlockType.where(:field_type => 'text').first
       if bt.nil?
         bt = Caboose::BlockType.create(:name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
       end      
       self.block_type_id = bt.id
     end
-    if self.block_type.field_type.nil?
-      self.block_type.field_type = 'text'      
-    end
-    v = self.value
-    case self.block_type.field_type      
-      when 'checkbox'
-        self.value = v ? (v == 1 || v == '1' || v == true ? 1 : 0) : 0        
-    end
+    #if self.block_type_id.field_type.nil?
+    #  self.block_type.field_type = 'text'      
+    #end        
+    #if self.block_type.field_type == 'checkbox'
+    #  v = self.value
+    #  self.value = v ? (v == 1 || v == '1' || v == true ? 1 : 0) : 0        
+    #end
   end
   
   def full_name
@@ -137,19 +136,10 @@ class Caboose::Block < ActiveRecord::Base
     end
     options2[:block] = block
 
-    view = options2[:view]
-    view = ActionView::Base.new(ActionController::Base.view_paths) if view.nil?    
-    if block.block_type.use_render_function && block.block_type.render_function            
-      #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)
-      #Caboose.log(block.id)
+    view = options2[:view]     
+    view = ActionView::Base.new(ActionController::Base.view_paths) if view.nil?
       
+    if block.block_type.use_render_function && block.block_type.render_function
       begin
         str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
       rescue Exception => ex
@@ -209,7 +199,7 @@ class Caboose::Block < ActiveRecord::Base
       rescue Exception => ex        
         str = "<p class='note error'>#{self.block_message(block, ex)}</p>"
       end                    
-    end
+    end    
     return str
   end
   

data/app/models/caboose/block_cache.rb

@@ -0,0 +1,89 @@
+module Caboose
+  class BlockCache
+    
+    attr_accessor :id,
+      :page_id, 
+      :parent_id,
+      :block_type_id,
+      :block_type_field_type,
+      :sort_order,
+      :name,
+      :value,
+      :file,
+      :image,
+      :children        
+    
+    def child_value(name)
+      b = self.child(name)
+      return nil if b.nil? 
+      return b.image if b.block_type_field_type == 'image'
+      return b.file  if b.block_type_field_type == 'file'
+      return b.value
+    end
+    
+    def child(name)
+      self.children.each do |kid|
+        return kid if kid.name == name
+      end
+      return nil    
+    end
+                                              
+    #def render(block, options = nil)                    
+    #  block = self.child(block) if block && block.is_a?(String)
+    #  eval("CabooseBlockRendering::render_block_type_#{block.block_type_id}(block)")
+    #end
+     
+    def initialize(b)
+      self.id                     = b.id                    
+      self.page_id                = b.page_id
+      self.parent_id              = b.parent_id 
+      self.block_type_id          = b.block_type_id
+      self.block_type_field_type  = b.block_type ? b.block_type.field_type : nil
+      self.sort_order             = b.sort_order
+      self.name                   = b.name
+      self.value                  = b.value
+      self.file                   = BlockCacheFile.new(b.file)
+      self.image                  = BlockCacheImage.new(b.image)
+      self.children = b.children.collect{ |b2| BlockCache.new(b2) }
+    end
+    
+    def page            
+      return $page
+    end
+    
+    def marshal_dump
+      [
+        self.id,
+        self.page_id, 
+        self.parent_id,
+        self.block_type_id,
+        self.block_type_field_type,
+        self.sort_order,
+        self.name,
+        self.value,
+        Marshal.dump(self.file),
+        Marshal.dump(self.image),
+        self.children.collect{ |b| Marshal.dump(b) }
+      ]      
+    end
+
+    def marshal_load array
+      self.id,
+      self.page_id, 
+      self.parent_id,
+      self.block_type_id,
+      self.block_type_field_type,
+      self.sort_order,
+      self.name,
+      self.value,
+      self.file,
+      self.image,
+      self.children = array
+      
+      self.file = Marshal.load(self.file)
+      self.image = Marshal.load(self.image)
+      self.children = self.children.collect{ |kid| Marshal.load(kid) }
+    end
+    
+  end
+end

data/app/models/caboose/block_cache_file.rb

@@ -0,0 +1,22 @@
+
+module Caboose
+  class BlockCacheFile
+        
+    def initialize(file)
+      @_url = file.url
+    end
+    
+    def url(style = nil)
+      return @_url      
+    end
+    
+    def marshal_dump
+      [@_url]
+    end
+    
+    def marshal_load array
+      @url = array.first
+    end
+    
+  end
+end

data/app/models/caboose/block_cache_image.rb

@@ -0,0 +1,53 @@
+
+module Caboose
+  class BlockCacheImage
+        
+    def initialize(image)
+      @urls = {}
+      image.styles.each do |style|                  
+        @urls[style[0].to_s] = image.url(style[0])
+      end      
+      #puts "--------------------------------------------"
+      #puts "Caboose::BlockCacheImage.initialize"
+      #puts "urls = #{@urls.inspect}"
+      #puts "--------------------------------------------"
+    end
+    
+    def url(style = nil)
+      #puts "--------------------------------------------"
+      #puts "Caboose::BlockCacheImage.url"
+      #puts "urls = #{@urls.inspect}"
+      #puts "--------------------------------------------"
+      
+      return @urls['thumb'] if style.nil?
+      return @urls[style.to_s]
+    end
+    
+    def marshal_dump
+      arr = []
+      if @urls && @urls.count > 0
+        @urls.each do |k,v|                    
+          arr << k
+          arr << v
+        end
+      end      
+      return arr
+    end
+    
+    def marshal_load arr
+      @urls = {}
+      i = 0
+      count = arr.count
+      while i<count
+        k = arr[i]
+        @urls[k] = arr[i+1]
+        i = i + 2        
+      end      
+      #puts "--------------------------------------------"
+      #puts "Caboose::BlockCacheImage.marshal_load"
+      #puts "urls = #{@urls.inspect}"
+      #puts "--------------------------------------------"
+    end
+    
+  end
+end

data/app/models/caboose/page.rb

@@ -8,6 +8,7 @@ class Caboose::Page < ActiveRecord::Base
   has_many :page_permissions  
   has_many :blocks, :order => 'sort_order'
   has_many :page_tags, :class_name => 'Caboose::PageTag', :dependent => :delete_all, :order => 'tag'
+  has_one :page_cache
   attr_accessible :id      ,        
     :site_id               ,
     :parent_id             ,

data/app/models/caboose/page_cache.rb

@@ -0,0 +1,12 @@
+module Caboose
+  class PageCache < ActiveRecord::Base
+    self.table_name = "page_cache"
+    
+    belongs_to :page
+    attr_accessible :id,
+      :page_id,
+      :render_function,
+      :block      
+        
+  end
+end

data/app/models/caboose/page_cacher.rb

@@ -0,0 +1,115 @@
+
+module Caboose
+  class PageCacher
+    
+    def self.cache_all
+      Page.reorder(:id).all.each do |p|
+        puts "Caching #{p.title}..."
+        self.cache(p)
+      end      
+    end
+      
+    def self.cache(page_id)    
+      p = (page_id.is_a?(Integer) ? Page.where(:id => page_id).first : page_id)
+      return if p.nil?
+      return if p.site_id.nil?
+      return if p.block.nil?
+            
+      @render_functions = {} if @render_functions.nil?
+      @page_render_functions = {} if @page_render_functions.nil?      
+      @page_render_functions[p.id] = []
+      @dups = {}
+                  
+      self.cache_helper(p.site, p, p.block)
+
+      arr = @page_render_functions[p.id].collect do |bt_id|                        
+        "<% def render_block_type_#{bt_id}(block, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site) %>#{@render_functions[bt_id]}<% end %>"         
+      end                  
+      
+      dups = []
+      @dups.each{ |bt_id, arr| dups << "#{bt_id} => [#{arr.join(',')}]" }
+      dups = dups.join(', ')
+        
+      str = arr.join("\n\n")      
+      str << "<%\n"      
+      str << "def dup_id(bt_id)\n"
+      str << "  dups = {#{dups}}\n"
+      str << "  dups.each do |bt_id2, arr|\n"
+      str << "    return bt_id2 if arr.include?(bt_id)\n"
+      str << "  end\n"
+      str << "  return bt_id\n"
+      str << "end\n"            
+      str << "def render_block_type(block, child_block, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site)\n"
+      str << "  b = child_block && child_block.is_a?(String) ? block.child(child_block) : child_block\n"      
+      str << "  send(\"render_block_type_\#\{dup_id(b.block_type_id)\}\", b, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site)\n"
+      str << "end\n\n"            
+      str << "render_block_type_#{p.block.block_type_id}(@block, @page, @view, @controller_view_content, @modal, @empty_text, @editing, @css, @js, @csrf_meta_tags, @csrf_meta_tags2, @logged_in_user, @site)\n"      
+      str << "%>\n"      
+            
+      pc = PageCache.where(:page_id => p.id).first
+      pc = PageCache.new(:page_id => p.id) if pc.nil?
+      pc.render_function = str
+      pc.block = Marshal.dump(BlockCache.new(p.block))
+      pc.save              
+    end
+    
+    def self.cache_helper(site, p, block)
+      return if block.nil?
+      self.cache_helper2(site, p, block.block_type)            
+      block.children.each{ |b2| self.cache_helper(site, p, b2) }
+    end
+    
+    def self.cache_helper2(site, p, bt)      
+      self.add_block_type(site, p, bt)
+      bt.children.each{ |bt2| self.cache_helper2(site, p, bt2) }
+    end
+            
+    def self.add_block_type(site, p, bt)
+      if !@render_functions.has_key?(bt.id)
+        f = ''        
+        if bt.use_render_function && bt.render_function
+          f = bt.render_function          
+        else
+          full_name = bt.full_name
+          full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
+          if    File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{full_name}.html.erb"     )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{full_name}.html.erb")
+          elsif File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{bt.name}.html.erb"       )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{bt.name}.html.erb")
+          elsif File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{bt.field_type}.html.erb" )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{bt.field_type}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{full_name}.html.erb"      )) then f = Rails.root.join("app/views/caboose/blocks/_#{full_name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{bt.name}.html.erb"        )) then f = Rails.root.join("app/views/caboose/blocks/_#{bt.name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{bt.field_type}.html.erb"  )) then f = Rails.root.join("app/views/caboose/blocks/_#{bt.field_type}.html.erb")
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{full_name}.html.erb"       ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{full_name}.html.erb"
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{bt.name}.html.erb"         ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{bt.name}.html.erb"
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{bt.field_type}.html.erb"   ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{bt.field_type}.html.erb"
+          end
+          f = File.read(f)
+        end
+        f.gsub!(/block\.partial\((.*?),(.*?)\)/ , 'render :partial => \1')
+        f.gsub!(/block\.render\((.*?),(.*?)\)/  , 'render_block_type(block, \1, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site)')        
+        f.gsub!(/\=\s*render_block_type\(/      , 'render_block_type(')
+        f.gsub!(/\=\s*raw render_block_type\(/  , 'render_block_type(')        
+                
+        #@render_functions[bt.id] = "<% def render_block_type_#{bt.id}(block, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site) %>#{f}<% end %>"
+          
+        @render_functions[bt.id] = f
+      end
+      
+      is_dup = false
+      f = @render_functions[bt.id]
+      @render_functions.each do |bt_id, f2|
+        if f == f2 && @page_render_functions[p.id].include?(bt_id)
+          @dups[bt_id] = [] if !@dups.has_key?(bt_id)
+          @dups[bt_id] << bt.id if !@dups[bt_id].include?(bt.id)
+          is_dup = true
+          break
+        end
+      end
+      
+      if !is_dup        
+        @page_render_functions[p.id] = [] if !@page_render_functions.has_key?(p.id)
+        @page_render_functions[p.id] << bt.id if !@page_render_functions[p.id].include?(bt.id)
+      end
+    end
+    
+  end
+end

data/app/models/caboose/schema.rb

@@ -54,6 +54,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :repeat_start  , 
         :repeat_end        
       ],
+      #Caboose::PageCache => [:block],
       Caboose::Variant => [:quantity]
     }
   end
@@ -342,6 +343,12 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :fb_description        , :string  , { :limit => 156 }],
         [ :gp_description        , :string  , { :limit => 156 }]
       ],
+      Caboose::PageCache => [
+        [ :page_id               , :integer ],
+        [ :render_function       , :text    ],
+        [ :block                 , :binary  ],
+        [ :refresh               , :boolean , { :default => false }]        
+      ],
       Caboose::PagePermission => [
         [ :role_id , :integer  ],
         [ :page_id , :integer  ],

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

@@ -0,0 +1,12 @@
+<%
+text = block.value
+if text.nil? || text.strip.length == 0
+  text = empty_text ? "<p>#{empty_text}</p>" : "" 
+end
+
+%>
+<% if editing %>
+  <div id='block_<%= block.id %>'><%= raw text %></div>
+<% else %>
+  <%= raw text %>
+<% end %>

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

@@ -1,4 +1,3 @@
-
 <% if @page && @page.title != 'Access Denied' %>
 <% content_for :js do %>
 <%= javascript_include_tag "caboose/application" %>
@@ -26,7 +25,7 @@
     b.create_children
   end
   #b.log_helper
-  str = b.render(b, {
+  options = {    
     :page => @page,
     :view => self,
     :controller_view_content => yield,
@@ -36,11 +35,38 @@
     :css => '|CABOOSE_CSS|',
     :js => '|CABOOSE_JAVASCRIPT|',
     :csrf_meta_tags => '|CABOOSE_CSRF|',
-    :csrf_meta_tags2 => '|CABOOSE_CSRF|',    
+    :csrf_meta_tags2 => '|CABOOSE_CSRF|',
     :logged_in_user => @logged_in_user,
     :site => @site
-  })       
+  }
+    
+  str = nil    
+  if @use_page_cache
+    pc = Caboose::PageCache.where(:page_id => @page.id).first  
+    if pc # If the page is cached, send it to the user    
+           
+      require_dependency "#{Caboose.root}/app/models/caboose/block_cache.rb"
+      require_dependency "#{Caboose.root}/app/models/caboose/block_cache_file.rb"
+      require_dependency "#{Caboose.root}/app/models/caboose/block_cache_image.rb"
+    
+      @block = Marshal.load(pc.block)    
+      @view                    = options[:view                    ]
+      @controller_view_content = options[:controller_view_content ]
+      @modal                   = options[:modal                   ]
+      @empty_text              = options[:empty_text              ]
+      @editing                 = options[:editing                 ]
+      @css                     = options[:css                     ]
+      @js                      = options[:js                      ]
+      @csrf_meta_tags          = options[:csrf_meta_tags          ]
+      @csrf_meta_tags2         = options[:csrf_meta_tags2         ]
+      
+      str = render(:inline => pc.render_function)            
+    end
+  end
   
+  # Render the blocks if we don't have it cached    
+  str = b.render(b, options) if str.nil?
+        
   protocol = request.protocol
   css = yield(:css)
   css.gsub!("<link href=\"//", "<link href=\"#{protocol}")
@@ -52,18 +78,6 @@
   str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)  
   
   %><%= raw str %><%
-    
-  #b = @page.block
-  #
-  #raw b.render(b, {
-  #    :controller_view_content => yield,
-  #    :modal => false,
-  #    :empty_text => '',
-  #    :editing => defined?(@editing) ? @editing : false,
-  #    :css => yield(:css),
-  #    :js => yield(:js),
-  #    :csrf_meta_tags => csrf_meta_tags
-  #  })      
 
 end
 %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.37'
+  VERSION = '0.5.38'
 end

data/lib/tasks/caboose.rake

@@ -2,6 +2,11 @@ require "caboose/version"
 
 namespace :caboose do
 
+  desc "Cache pages"
+  task :cache_pages => :environment do    
+    Caboose::PageCacher.cache_all    
+  end
+  
   desc "Run rspec tests on Caboose"
   task :test => :environment do    
     system("rspec #{Caboose::root}/spec")    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.37
+  version: 0.5.38
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -518,6 +518,9 @@ files:
 - app/models/caboose/asset.rb
 - app/models/caboose/authenticator.rb
 - app/models/caboose/block.rb
+- app/models/caboose/block_cache.rb
+- app/models/caboose/block_cache_file.rb
+- app/models/caboose/block_cache_image.rb
 - app/models/caboose/block_type.rb
 - app/models/caboose/block_type_category.rb
 - app/models/caboose/block_type_icons.rb
@@ -548,6 +551,8 @@ files:
 - app/models/caboose/order_pdf.rb
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
+- app/models/caboose/page_cache.rb
+- app/models/caboose/page_cacher.rb
 - app/models/caboose/page_permission.rb
 - app/models/caboose/page_tag.rb
 - app/models/caboose/pager.rb
@@ -623,6 +628,7 @@ files:
 - app/views/caboose/blocks/_render_function.html.erb
 - app/views/caboose/blocks/_richtext.html.erb
 - app/views/caboose/blocks/_ruby_block.rb
+- app/views/caboose/blocks/_select.html.erb
 - app/views/caboose/blocks/_selector_switch_one.html.erb
 - app/views/caboose/blocks/_selector_switch_three.html.erb
 - app/views/caboose/blocks/_selector_switch_two.html.erb