browsercms 3.3.2 → 3.3.3

data/app/models/section_node.rb

@@ -1,10 +1,33 @@
+require 'ancestry'
+
 class SectionNode < ActiveRecord::Base
-  belongs_to :section
-  belongs_to :node, :polymorphic => :true
+  has_ancestry
+
+  # This is the parent section for this node
+  # For backwards compatiblity
+  def parent_section
+    self.parent ? self.parent.node : nil
+  end
+
+  alias :section :parent_section
 
-  acts_as_list :scope => :section
+  # For backwards compatiblity
+  def section=(new_section)
+    self.parent = new_section.node
+  end
+
+  # The item this node links to
+  belongs_to :node, :polymorphic => :true, :inverse_of => :section_node
+
+  acts_as_list
+  # For acts_as_list. Specifies that position should be unique within a section.
+  def scope_condition
+    ancestry ? "ancestry = '#{ancestry}'" : 'ancestry IS NULL'
+  end
 
   scope :of_type, lambda{|types| {:conditions => ["section_nodes.node_type IN (?)", types]}}
+  scope :in_order, :order => "position asc"
+  scope :fetch_nodes, :include => :node
 
   def visible?
     return false unless node
@@ -27,27 +50,29 @@ class SectionNode < ActiveRecord::Base
   def page?
     node_type == 'Page'
   end
-  
-  def move_to(sec, pos)
+
+  # @param [Section] section
+  # @param [Integer] position
+  def move_to(section, position)
     #logger.info "Moving Section Node ##{id} to Section ##{sec.id} Position #{pos}"
     transaction do
-      if section != sec
+      if self.parent != section.node
         remove_from_list
-        self.section = sec
+        self.parent = section.node
         save
       end
       
-      if pos < 0
-        pos = 0
+      if position < 0
+        position = 0
       else
         #This helps prevent the position from getting out of whack
         #If you pass in a really high number for position, 
         #this just corrects it to the right number
-        node_count = SectionNode.count(:conditions => {:section_id => section_id})
-        pos = node_count if pos > node_count
+        node_count = SectionNode.count(:conditions => {:ancestry => ancestry})
+        position = node_count if position > node_count
       end
       
-      insert_at_position(pos)
+      insert_at_position(position)
     end
   end
   
@@ -77,17 +102,9 @@ class SectionNode < ActiveRecord::Base
     #1.0/0 == Infinity
     move_to(sec, 1.0/0)
   end
-  
-  def ancestors()
-    ancestors = []
-    fn = lambda do |sn|
-      ancestors << sn.section
-      if sn.section && !sn.section.root?
-        fn.call(sn.section.node)
-      end
-    end
-    fn.call(self)
-    ancestors.reverse
+
+
+  def ancestry_path
+    path_ids.join "/"
   end
-  
 end

data/app/views/cms/blocks/index.html.erb

@@ -50,7 +50,6 @@
 <% page_title "Content Library / List #{content_type.display_name_plural}" %>
 <% @toolbar_title = "List #{content_type.display_name_plural}" %>
 <%= render :partial => 'cms/blocks/toolbar' %>
-
 <div class="roundedcorners">
 <table id="blocks" class="data">
   <thead>
@@ -90,8 +89,9 @@
        col_ct += 1 if content_type.model_class.publishable? %>
     <% @blocks.each do |b| %>
       <% block = b.class.versioned? ? b.as_of_draft_version : b %>
-      <tr id="<%= block.class.name.underscore %>_<%= block.id %>" class="<%= block.class.name.underscore %> <%= block.class.publishable? && !block.published? ? 'draft' : 'published' %> <%= 'non-editable' unless current_user.able_to_edit?(block) %> <%= 'non-publishable' unless current_user.able_to_publish?(block) %>">
-	<td class="first"></td>
+
+    <%= block_row_tag(block) %>
+    <td class="first"></td>
         <% content_type.columns_for_index.each_with_index do |column, i| %>
           <td class="<%= column[:label].gsub(' ', '').underscore %>">
             <div<%= ' class="dividers"' if (i + 3 < col_ct) %>>
@@ -105,7 +105,7 @@
           </td>      
         <% end %>
         <% if content_type.model_class.respond_to?(:updated_at) %><td class="updated"><div class="dividers"><%= block.updated_at.to_s(:date) %></div></td><% end %>
-        <% if content_type.model_class.connectable? %><td class="used"><div class="dividers"><%= block.connected_pages.count %></div></td><% end %>
+        <% if content_type.model_class.connectable? %><td class="used"><div class="dividers"><%= block.connected_pages.size %></div></td><% end %>
         <% if content_type.model_class.publishable? %><td class="block_status"><%= status_icon(block.status) %> <div><%= block.status %></div></td><% end %>
 	<td class="last"></td>
       </tr>

data/app/views/cms/file_blocks/_form.html.erb

@@ -3,7 +3,7 @@
    root.full_path = root.name
    @sections = []
    @sections << root
-   @sections += root.all_children_with_name
+   @sections += root.master_section_list
    @sections.each {|s| s.full_path = "/" + s.full_path unless s == root }
   @block.attachment_file_path = @block.attachment.file_path if @block.attachment_file_path.blank? && !@block.new_record?
 %>

data/app/views/cms/image_blocks/_form.html.erb

@@ -3,7 +3,7 @@
    root.full_path = root.name
    @sections = []
    @sections << root
-   @sections += root.all_children_with_name
+   @sections += root.master_section_list
    @sections.each {|s| s.full_path = "/" + s.full_path unless s == root }
   @block.attachment_file_path = @block.attachment.file_path if @block.attachment_file_path.blank? && !@block.new_record?
 %>

data/app/views/cms/section_nodes/_link.html.erb

@@ -1,11 +1,14 @@
-<ul id="section_node_<%= section_node.id %>" class="section_node<%= " rootlet" if root %>" style="display: <%= display ? "''" : "none" %>">
+<% first_level =  in_first_level?(node)
+ %>
+<%= sitemap_ul_tag(node) %>
   <li>
     <%= render :partial => "node", :locals => {
         :node => node, 
         :node_type => "link", 
-        :icon => action_icon(root ? :root_link : :link),
+        :icon => action_icon(first_level ? :root_link : :link),
         :published_status_icon => status_icon(node.status),
-        :published_status_label => node.published? ? "Published" : "Draft"
+        :published_status_label => node.published? ? "Published" : "Draft",
+        :parent => parent
       } %>
   </li>
 </ul>

data/app/views/cms/section_nodes/_node.html.erb

@@ -4,13 +4,22 @@
   published_status_icon = defined?(published_status_icon) ? published_status_icon : nil
   published_status_label = defined?(published_status_label) ? published_status_label : nil
 
+  editable_class = ""
+  case node_type
+  when "section"
+    editable_class = "non-editable" unless @modifiable_sections.include?(node)
+  else
+    editable_class = "non-editable" unless defined?(parent) && @modifiable_sections.include?(parent)
+  end
+
+  node_type_class = node_type == "section" && node.root? ? 'root' : ''
 %>
 <div class="roundedcorners">
   <table class="section_node <%= node_type %> <%= "movable" if current_user.able_to?(:publish_content) %>" width="100%" cellspacing="0" cellpadding="0">
     <tr><td colspan="4" class="drop-before"></td></tr>
     <tr<%= ' class="doubled"' if access_icon && hidden %>>
-      <td id="<%= node_type %>_<%= node.id %>" class="<%= node_type == "section" && node.root? ? 'root' : '' %> <%= node_type %> node <%= 'non-editable' unless current_user.able_to_edit?(node) %>">
-	      <%= raw icon %>
+      <td id="<%= node_type %>_<%= node.id %>" class="<%= node_type_class %> <%= node_type %> node <%= editable_class %>">
+	      <%= icon.html_safe %>
 	      <div><%= h(node.name) %></div>
       </td>
       <td class="sitemap_hidden divided">

data/app/views/cms/section_nodes/_page.html.erb

@@ -1,14 +1,20 @@
-<% status = node.archived? ? :archived : node.status %>
-<ul id="section_node_<%= section_node.id %>" class="section_node<%= " rootlet" if root %>" style="display: <%= display ? "''" : "none" %>">
+<%
+   page = node
+   status_icon = page.archived? ? :archived : page.status
+       first_level = in_first_level?(node)
+
+%>
+<%= sitemap_ul_tag(node) %>
   <li>
     <%= render :partial => "node", :locals => {
         :node => node, 
         :node_type => "page", 
-        :icon => action_icon(root ? :root_page : :page),
-        :hidden => node.hidden?,
-        :access_icon => status_icon(node.section ? node.section.status : ''),
-        :published_status_icon => status_icon(status),
-        :published_status_label => status.to_s.titleize
+        :icon => action_icon(first_level ? :root_page : :page),
+        :hidden => page.hidden?,
+        :access_icon => status_icon(access_icon),
+        :published_status_icon => status_icon(status_icon),
+        :published_status_label => status_icon.to_s.titleize,
+        :parent => parent
       } %>
   </li>
 </ul>

data/app/views/cms/section_nodes/_section.html.erb

@@ -1,12 +1,28 @@
-<ul id="section_node_<%= section_node.id %>" class="section_node<%= " rootlet" if root %>" style="display: <%= display ? "''" : "none" %>">
+<%
+   children = child_hash[key].keys
+   section_node = key
+   access_status = access_status(node, @public_sections)
+   first_level = in_first_level?(node)
+%>
+<%= sitemap_ul_tag(node) %>
   <li>
     <%= render :partial => "node", :locals => {
-        :node => node, 
-        :node_type => "section", 
-        :icon => "#{section_icons(node)} #{action_icon(root ? :root_folder : :folder, :class => "folder")}",
-        :hidden => node.hidden?,
-        :access_icon => status_icon(node.status),
-      } %>
-    <%= render :partial => "section_node", :collection => node.child_nodes.all(:order => 'position'), :locals => {:display => false} %>    
+            :node => node,
+            :node_type => "section",
+            :icon => "#{section_icons(section_node, children)} #{action_icon(first_level ? :root_folder : :folder, :class => "folder")}",
+            :hidden => node.hidden?,
+            :access_icon => status_icon(access_status),
+            :parent => parent
+    } %>
+    <% children.each do |child_section_node| %>
+        <%= render :partial => child_section_node.node.partial_for,
+                   :locals => {:access_icon => access_status,
+                               :node => child_section_node.node,
+                               :parent => node,
+                               :child_hash => child_hash[key],
+                               :key => child_section_node
+                   } %>
+    <% end %>
+
   </li>
 </ul>

data/app/views/cms/section_nodes/index.html.erb

@@ -20,12 +20,24 @@
   <ul id="root_<%= @section.id %>" class="root" style="padding-left: 0">
     <li>
       <%= render :partial => "node", :locals => {
-          :node => @section, 
-          :node_type => "section", 
-          :icon => action_icon(:home),
-          :display => true
-        } %>
+              :node => @section,
+              :node_type => "section",
+              :icon => action_icon(:home),
+              :display => true
+      } %>
     </li>
   </ul>
-  <%= render :partial => "section_node", :collection => @section.child_nodes.all(:order => 'position'), :locals => {:display => true, :root => true} %>    
+  <%
+     access_status = access_status(@section, @public_sections)
+     @sitemap[@root_section_node].keys.each do |child_section_node| %>
+      <%= render :partial => child_section_node.node.partial_for,
+                 :locals => {:access_icon => access_status,
+                             :node => child_section_node.node,
+                             :parent => @section,
+                             :child_hash => @sitemap[@root_section_node],
+                             :key => child_section_node
+                 }
+      %>
+  <% end %>
 </div>
+

data/app/views/cms/shared/_pagination.html.erb

@@ -8,8 +8,8 @@
     <%= collection.total_entries %>
   </div>
   <div class="links">
-    <%= link_to "&nbsp;", first_page_path, :id => "first_page_link" %>
-    <%= link_to "&nbsp;", previous_page_path, :id => "previous_page_link" %>
+    <%= link_to "&nbsp;".html_safe, first_page_path, :id => "first_page_link" %>
+    <%= link_to "&nbsp;".html_safe, previous_page_path, :id => "previous_page_link" %>
     <span>
       <% url = URI.parse(current_page_path) %>
       <%= form_tag url.path, :method => :get, :class => "current_page" do %>
@@ -24,8 +24,8 @@
         </strong>
       <% end %> 
     </span>
-    <%= link_to "&nbsp;", next_page_path, :id => "next_page_link" %>
-    <%= link_to "&nbsp;", last_page_path, :id => "last_page_link" %>
+    <%= link_to "&nbsp;".html_safe, next_page_path, :id => "next_page_link" %>
+    <%= link_to "&nbsp;".html_safe, last_page_path, :id => "last_page_link" %>
   </div>
   <br clear="all"/>
 </div>

data/app/views/portlets/reset_password/render.html.erb

@@ -1,5 +1,3 @@
-<%= error_message_on :user, :password %>
-
 <% if flash_scope = flash[:reset_password] -%>
   <% if flash_scope[:error] -%>
     <span class="reset-password-error"><%= flash_scope[:error] %></span>

data/browsercms.gemspec

@@ -1,5 +1,3 @@
-# This file is now managed directly, rather than generated by Jeweler.
-#
 require File.dirname(__FILE__) + "/lib/cms/version.rb"
 
 Gem::Specification.new do |s|
@@ -7,9 +5,7 @@ Gem::Specification.new do |s|
   s.name = %q{browsercms}
   s.version = Cms::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BrowserMedia"]
-  s.date = %q{2011-03-15}
   s.summary = %q{BrowserCMS is a a general purpose, open source Web Content Management System (CMS), written using Ruby on Rails.}
   s.description = %q{Web Content Management in Rails.}
   s.email = %q{github@browsermedia.com}
@@ -42,6 +38,7 @@ Gem::Specification.new do |s|
   s.files -= Dir['test/dummy/*']
 
   s.add_dependency('rails', "~> 3.0.7")
+  s.add_dependency "ancestry", "~> 1.2.4"
 
   # Required only for bcms-upgrade
   s.add_dependency('term-ansicolor')

data/db/migrate/20100117144039_browsercms315.rb

@@ -0,0 +1,94 @@
+class Browsercms315 < ActiveRecord::Migration
+  def self.up
+    generate_ancestry_from_section_id
+    update_latest_version_cache
+
+    INDEXES.each do |index|
+      add_index *index
+    end
+  end
+
+  def self.down
+    # This migration is not reversible since it removes the original section_id column.
+  end
+
+  # Add some very commonly used indexes to improve the site performance as the # of pages/content grows (i.e. several thousand pages)
+  INDEXES = [
+      [:pages, :deleted],
+      [:pages, :path],
+      [:pages, :version],
+      [:page_versions, :page_id],
+      [:groups, :code],
+      [:groups, :group_type_id],
+      [:group_types, :cms_access],
+      [:group_sections, :section_id],
+      [:group_sections, :group_id],
+      [:users, :expires_at],
+      [:user_group_memberships, :group_id],
+      [:user_group_memberships, :user_id],
+      [:group_permissions, :group_id],
+      [:group_permissions, :permission_id],
+      [:group_permissions, [:group_id, :permission_id]],
+      [:section_nodes, :node_type],
+      [:section_nodes, :ancestry],
+      [:connectors, :page_id],
+      [:connectors, :page_version],
+      [:html_blocks, :deleted],
+      [:html_block_versions, :html_block_id],
+      [:html_block_versions, :version],
+      [:portlet_attributes, :portlet_id],
+      [:portlets, :name],
+      [:sections, :path],
+      [:redirects, :from_path],
+      [:connectors, :connectable_version],
+      [:connectors, :connectable_type],
+      [:content_types, :content_type_group_id],
+      [:content_types, :name],
+      [:file_block_versions, :file_block_id],
+      [:file_block_versions, :version],
+      [:file_blocks, :deleted],
+      [:file_blocks, :type],
+      [:attachment_versions, :attachment_id],
+      [:tasks, :page_id],
+      [:tasks, :completed_at],
+      [:tasks, :assigned_to_id],
+  ]
+
+  private
+
+  # v3.1.5 uses Ancestry to manage the parent child relationship between sections and their children.
+  # This converts the data from the old section_id to use the ancestry column.
+  def self.generate_ancestry_from_section_id
+    add_column :section_nodes, :ancestry, :string
+    add_column :section_nodes, :temp_parent_id, :integer
+
+    SectionNode.reset_column_information
+    root_section = Section.root.first
+    SectionNode.create!(:node => root_section) if root_section
+
+    all_nodes_but_root = SectionNode.find(:all, :conditions=>["section_id IS NOT NULL"])
+    all_nodes_but_root.each do |sn|
+      parent_node = SectionNode.find(:first, :conditions => ["node_id = ? and node_type = 'Section'", sn.section_id])
+      sn.temp_parent_id = parent_node.id
+      sn.save!
+    end
+    rename_column :section_nodes, :temp_parent_id, :parent_id # Ancestry works off the 'parent_id' column.
+
+    SectionNode.build_ancestry_from_parent_ids!
+    remove_column :section_nodes, :section_id
+    remove_column :section_nodes, :parent_id
+    SectionNode.reset_column_information
+  end
+
+  # Adds a 'latest_version' pointer to pages and links. Greatly reduces the number of queries the sitemap requires to determine if pages are in draft/published mode
+  def self.update_latest_version_cache
+    add_column :pages, :latest_version, :integer
+    add_column :links, :latest_version, :integer
+    Page.all.each do |p|
+      p.update_latest_version
+    end
+    Link.all.each do |link|
+      link.update_latest_version
+    end
+  end
+end

data/lib/acts_as_list.rb

@@ -7,7 +7,7 @@ module ActsAsList
   # The class that has this specified needs to have a +position+ column defined as an integer on
   # the mapped database table.
   #
-  # Todo list example:
+  # To Do list example:
   #
   #   class TodoList < ActiveRecord::Base
   #     has_many :todo_items, :order => "position"