caboose-cms 0.9.228 → 0.9.229

data/app/models/caboose/block_cache.rb

@@ -1,105 +0,0 @@
-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 children_where(h)
-      arr = []      
-      self.children.each do |b|
-        matches = true
-        h.each do |k,v|
-          if b.send(k) != v
-            matches = false
-            break
-          end
-        end
-        arr << b if matches
-      end
-      return nil if arr.count == 0
-      return arr
-    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

@@ -1,22 +0,0 @@
-
-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

@@ -1,53 +0,0 @@
-
-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_cache.rb

@@ -1,12 +0,0 @@
-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

@@ -1,137 +0,0 @@
-
-module Caboose
-  class PageCacher
-    
-    def self.refresh
-      PageCache.where(:refresh => true).all.each do |pc|
- #       self.delay(:queue => 'caboose_cache').cache(pc.page_id)
-      end
-      
-      # Make sure all pages are cached
-      query = ["select id from pages where id not in (select distinct(page_id) from page_cache)"]
-      rows = ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
-      if rows
-#        rows.each{ |row| self.delay(:queue => 'caboose_cache').cache(row['id'].to_i) }
-      end
-    end
-    
-    def self.cache_all
-      query = ["select id from pages order by id"]
-      rows = ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
-      if rows
-  #      rows.each{ |row| self.delay(:queue => 'caboose_cache').cache(row['id'].to_i) }
-      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.site.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.refresh = false
-      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)
-      return if bt.nil?      
-      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)
-      return if bt.nil?
-      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")
-          if    File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{full_name}.html.erb"     )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{full_name}.html.erb")
-          elsif File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.name}.html.erb"       )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.name}.html.erb")
-          elsif File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.field_type}.html.erb" )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{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 = (f && f.to_s.strip.length > 0 ? 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(')
-        f.gsub!(/block.children.where\(([^\)]*?)\)\.all/, 'block.children_where(\1)')                
-                
-        #@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/views/caboose/pages/admin_new_old.html.erb

@@ -1,46 +0,0 @@
-<h1>New Page</h1>
-<p>Parent: <%= @parent ? @parent.title : "Home" %></p>
-
-<form action='/admin/pages' method='post' id='new_page_form' onsubmit="add_page(); return false;">
-<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
-<input type='hidden' name='parent_id' value='<%= @parent_id %>' />
-<p><input type='text' name='title' placeholder='Title' style="width: 400px;" /></p>
-<p><select name='block_type_id'>
-  <option value=''>-- Select a layout --</option>
-  <% cat_ids = Caboose::BlockTypeCategory.layouts.collect{ |cat| cat.id } %>
-  <% Caboose::BlockType.includes(:block_type_site_memberships).where("block_type_category_id in (?) and block_type_site_memberships.site_id = ?", cat_ids, @site.id).reorder(:description).all.each do |bt| %>    
-    <option value="<%= bt.id %>"><%= bt.description %></option>
-  <% end %>
-</select></p>
-<div id='message'></div>
-<p>
-<input type='button' value='< Back' onclick="window.location='/admin/pages';" />
-<input type='submit' value='Add Page' />
-</p>
-</form>
-
-<% content_for :caboose_js do %>
-<%= javascript_include_tag "caboose/model/all" %>
-<script type='text/javascript'>
-
-var modal = false;
-$(document).ready(function() {
-  modal = new CabooseModal(420);
-});
-
-function add_page()
-{
-  modal.autosize("<p class='loading'>Adding page...</p>");
-  $.ajax({
-    url: '/admin/pages',
-    type: 'post',
-    data: $('#new_page_form').serialize(),    
-    success: function(resp) {
-      if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
-      if (resp.redirect) parent.window.location = resp.redirect
-    }
-  });
-}
-
-</script>
-<% end %>

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

@@ -1,64 +0,0 @@
- 
-<h1>Edit Workout</h1>
-
-<p><select name='day' onchange="window.location='/workouts/'+this.value+'/edit';">
-<% @workouts.each do |w| %>
-  <% 
-  text = "Day #{w.day}" + (w.name.nil? ? "" : " - #{w.name}")
-  selected = w.day == @workout.day ? " selected='true'" : ''
-  %>
-  <option value="<%= w.day %>"<%= selected %>><%= text %></option>
-<% end %>
-</select></p>
-<hr />
-<div id='workout_<%= @workout.id %>_container'></div>
-
-<h2>Sets</h2>        
-<div id='set_listing_container'></div>
-<h2>New Set</h2>
-<div id='set_new_container'></div>
-
-<% content_for :css do %>
-<%= stylesheet_link_tag "workouts", :media => "all" %>
-<% end %>
-<% content_for :js do %>
-<%= javascript_include_tag "model.form.set" %>
-<script type="text/javascript">    
-$(document).ready(function() {
-
-new Controller({
-
-  init: function()
-  {
-    var workout = new Model({
-      name: 'Workout',
-      id: <%= @workout.id %>,
-      attributes: [
-        { name: 'name'            , type: 'text'      , value: <%= raw @workout.name.to_json %> },
-        { name: 'description'     , type: 'textarea'  , value: <%= raw @workout.description.to_json %>, width: 400, height: 200 }
-      ]
-    });
-    
-  var set = new Model({
-    name: 'Set',
-    id: 'new',
-    form: 'Model.Form.Set',
-    post_add: function() { 
-      set.listing();
-      $('#'+set.message).empty();
-    },    
-    listing_url: '/sets/listing?workout_id=<%= @workout.id %>',
-    attributes: [
-      { name: 'workout_id'  , type: 'hidden' , value: <%= @workout.id %> }, 
-      { name: 'category_id' , type: 'select' , value: -1, options_url: '/workouts/category-options' },
-      { name: 'movement_id' , type: 'select' , value: -1, options_url: '/movements/options' },
-      { name: 'qty'         , type: 'text'   , value:  1, show_reminder: false, css: { width: 40, textAlign: 'right' } },
-      { name: 'reps'        , type: 'text'   , value: 10, show_reminder: false, css: { width: 40, textAlign: 'right' } },
-      { name: 'per_unit'    , type: 'text'   , value: '', show_reminder: false, css: { width: 40, textAlign: 'right' } },
-      { name: 'hold_time'   , type: 'text'   , value: '', show_reminder: false, css: { width: 40, textAlign: 'right' } }
-    ]
-  });
-
-});
-</script>
-<% end %>