browsercms 3.3.2 → 3.3.3

data/lib/browsercms.rb

@@ -2,6 +2,8 @@ require 'cms/engine'
 require 'cms/extensions'
 require 'cms/routes'
 require 'cms/caching'
+require 'cms/addressable'
+require 'cms/error_pages'
 
 #Load libraries that are included with CMS
 require 'acts_as_list'
@@ -15,4 +17,4 @@ require 'cms/date_picker'
 require 'cms/content_rendering_support'
 
 # This shouldn't be necessary, except for the need to get into the loadpath for testing.
-require 'command_line'
+require 'command_line'

data/lib/cms/addressable.rb

@@ -0,0 +1,83 @@
+# Represents any object which exists in a Sitemap.
+#
+# Can have parents (using SectionNodes) and children.
+module Addressable
+
+  # Returns a list of all Addressable objects that are ancestors to this record.
+  # @param [Hash] options
+  # @option [Symbol] :include_self If this object should be included in the Array
+  # @return [Array<Addressable]
+  #
+  def ancestors(options={})
+    ancestor_nodes = node.ancestors
+    ancestors = ancestor_nodes.collect { |node| node.node }
+    ancestors << self if options[:include_self]
+    ancestors
+  end
+
+  def parent
+    @parent if @parent
+    node ? node.section : nil
+  end
+
+  def cache_parent(section)
+    @parent = section
+  end
+
+  def parent=(sec)
+    if node
+      node.move_to_end(sec)
+    else
+      build_section_node(:node => self, :section => sec)
+    end
+  end
+
+  # Computes the name of the partial used to render this object in the sitemap.
+  def partial_for
+    self.class.name.underscore
+  end
+
+  # Pages/Links/Attachments use their parent to determine access
+  module LeafNode
+    def access_status
+      parent.status
+    end
+  end
+
+  module NodeAccessors
+    def node
+      section_node
+    end
+
+    def node=(n)
+      self.section_node = n
+    end
+  end
+  # These exist for backwards compatibility to avoid having to change tests.
+  # I want to get rid of these in favor of parent and parent_id
+  module DeprecatedPageAccessors
+    include LeafNode
+    include NodeAccessors
+
+    def build_node(opts)
+      build_section_node(opts)
+    end
+
+    def section_id
+      section ? section.id : nil
+    end
+
+    def section_id=(sec_id)
+      self.section = Section.find(sec_id)
+    end
+
+    def section
+      parent
+    end
+
+    def section=(sec)
+      self.parent = sec
+
+    end
+  end
+end

data/lib/cms/behaviors/attaching.rb

@@ -1,34 +1,36 @@
 module Cms
   module Behaviors
     module Attaching
-      SANITIZATION_REGEXES = [ [/\s/, '_'], [/[&+()]/, '-'], [/[=?!'"{}\[\]#<>%]/, ''] ]
-      
+      SANITIZATION_REGEXES = [[/\s/, '_'], [/[&+()]/, '-'], [/[=?!'"{}\[\]#<>%]/, '']]
+
       def self.included(model_class)
         model_class.extend(MacroMethods)
       end
-      module MacroMethods      
+
+      module MacroMethods
         def belongs_to_attachment?
           !!@belongs_to_attachment
         end
+
         def belongs_to_attachment(options={})
           @belongs_to_attachment = true
           include InstanceMethods
-          before_validation :process_attachment  
+          before_validation :process_attachment
           before_save :update_attachment_if_changed
           after_save :clear_attachment_ivars
-          belongs_to :attachment, :dependent => :destroy 
-          
+          belongs_to :attachment, :dependent => :destroy
+
           validates_each :attachment_file do |record, attr, value|
             if record.attachment && !record.attachment.valid?
               record.attachment.errors.each do |err_field, err_value|
                 if err_field.to_sym == :file_path
                   record.errors.add(:attachment_file_path, err_value)
-                else  
+                else
                   record.errors.add(:attachment_file, err_value)
                 end
-              end      
+              end
             end
-          end       
+          end
         end
       end
       module InstanceMethods
@@ -93,22 +95,30 @@ module Cms
             unless attachment_section_id.blank?
               errors.add(:attachment_file, "You must upload a file")
               return false
-            end              
+            end
           else
             build_attachment if attachment.nil?
             attachment.temp_file = attachment_file
-            Rails.logger.warn "After attachment (#{attachment.temp_file})"
-
-            set_attachment_file_path
+            handle_setting_attachment_path
             if attachment.file_path.blank?
               errors.add(:attachment_file_path, "File Name is required for attachment")
               return false
             end
-            set_attachment_section
-            if attachment.section_id.blank?
+            handle_setting_attachment_section
+            unless attachment.section
               errors.add(:attachment_file, "Section is required for attachment")
               return false
             end
+
+          end
+        end
+
+        # Define at :set_attachment_path if you would like to override the way file_path is set
+        def handle_setting_attachment_path
+          if self.respond_to? :set_attachment_path
+            set_attachment_path
+          else
+            use_default_attachment_path
           end
         end
 
@@ -116,18 +126,26 @@ module Cms
           @attachment_file = nil
           @attachment_file_path = nil
           @attachment_section_id = nil
-          @attachment_section = nil            
+          @attachment_section = nil
         end
 
-        # Override this method if you would like to override the way the section is set
-        def set_attachment_section
+        # Implement a :set_attachment_section method  if you would like to override the way the section is set
+        def handle_setting_attachment_section
+          if self.respond_to? :set_attachment_section
+            set_attachment_section
+          else
+            use_default_attachment_section
+          end
+        end
+
+        # Default behavior for assigning a section, if a block does not define its own.
+        def use_default_attachment_section
           if !attachment_file.blank?
             attachment.section = Section.root.first
           end
         end
 
-        # Override this method if you would like to override the way file_path is set
-        def set_attachment_file_path
+        def use_default_attachment_path
           if !attachment_file.blank?
             attachment.file_path = "/attachments/#{File.basename(attachment_file.original_filename).to_s.downcase}"
           end
@@ -173,16 +191,16 @@ module Cms
             (published? && live_version?) ? attachment_file_path : "/cms/attachments/#{attachment_id}?version=#{attachment_version}"
           else
             nil
-          end  
+          end
         end
-        
+
         # Forces this record to be changed, even if nothing has changed
         # This is necessary if just the section.id has changed, for example
         def dirty!
           # Seems like a hack, is there a better way?
           self.updated_at = Time.now
-        end          
-        
+        end
+
       end
     end
   end

data/lib/cms/behaviors/connecting.rb

@@ -41,7 +41,8 @@ module Cms
       module InstanceMethods
 
         def connected_pages
-          Page.currently_connected_to(self)
+          return @connected_pages if @connected_pages
+          @connected_pages = Page.connected_to(self)
         end
 
         def connected_page_count

data/lib/cms/behaviors/publishing.rb

@@ -125,15 +125,24 @@ module Cms
         end    
             
         def status
-          live? ? :published : :draft
-        end        
+          return @status if @status
+          @status = live? ? :published : :draft
+        end
 
         def status_name
           status.to_s.titleize
         end
 
         def live?
-          self.class.versioned? ? live_version.version == draft.version && published? : true
+          if self.class.versioned?
+            if (respond_to?(:latest_version) && self.latest_version)
+              version == latest_version && published?
+            else
+              live_version.version == draft.version && published?
+            end
+          else
+            true
+          end
         end
         
       end

data/lib/cms/behaviors/versioning.rb

@@ -39,7 +39,8 @@ module Cms
           extend ClassMethods
           include InstanceMethods
 
-          has_many :versions, :class_name  => version_class_name, :foreign_key => version_foreign_key
+          has_many :versions, :class_name => version_class_name, :foreign_key => version_foreign_key
+          after_save :update_latest_version
 
           before_validation :initialize_version
           before_save :build_new_version
@@ -93,7 +94,7 @@ module Cms
 
         def versioned_columns
           @versioned_columns ||= (version_class.new.attributes.keys -
-                  (%w[  id lock_version position version_comment created_at updated_at created_by_id updated_by_id type  ] + [version_foreign_key]))
+              (%w[id lock_version position version_comment created_at updated_at created_by_id updated_by_id type] + [version_foreign_key]))
         end
       end
       module InstanceMethods
@@ -101,6 +102,15 @@ module Cms
           self.version = 1 if new_record?
         end
 
+        # Used in migrations and as a callback.
+        def update_latest_version
+          #Rails 3 could use update_column here instead
+          if respond_to? :latest_version
+            sql = "UPDATE #{self.class.table_name} SET latest_version = #{draft.version} where id = #{self.id}"
+            connection.execute sql
+            self.latest_version = draft.version # So we don't need to #reload this object. Probably marks it as dirty though, which could have weird side effects.
+          end
+        end
 
         def build_new_version_and_add_to_versions_list_for_saving
           # First get the values from the draft
@@ -304,7 +314,7 @@ module Cms
         end
 
         def as_of_draft_version
-          as_of_version(draft.version)
+          build_object_from_version(draft)
         end
 
         # Find a Content Block as of a specific version.
@@ -314,27 +324,7 @@ module Cms
         def as_of_version(version)
           v = find_version(version)
           raise ActiveRecord::RecordNotFound.new("version #{version.inspect} does not exist for <#{self.class}:#{id}>") unless v
-          obj = self.class.new
-
-          (self.class.versioned_columns + [:version, :created_at, :created_by_id, :updated_at, :updated_by_id]).each do |a|
-            obj.send("#{a}=", v.send(a))
-          end
-          obj.id = id
-          obj.lock_version = lock_version
-
-          # Need to do this so associations can be loaded
-          obj.instance_variable_set("@persisted", true)
-          obj.instance_variable_set("@new_record", false)
-
-          # Callback to allow us to load other data when an older version is loaded
-          obj.after_as_of_version if obj.respond_to?(:after_as_of_version)
-
-          # Last but not least, clear the changed attributes
-          if changed_attrs = obj.send(:changed_attributes)
-            changed_attrs.clear
-          end
-
-          obj
+          build_object_from_version(v)
         end
 
         def revert
@@ -377,6 +367,35 @@ module Cms
           return false
         end
 
+        private
+
+        # Given a ::Version object of a given type, create an original object from its attributes.
+        #
+        # @param [Class#name::Version] version_of_object (i.e. HtmlBlock::Version)
+        # @return [Class#name] i.e. HtmlBlock
+        def build_object_from_version(version_of_object)
+          obj = self.class.new
+
+          (self.class.versioned_columns + [:version, :created_at, :created_by_id, :updated_at, :updated_by_id]).each do |a|
+            obj.send("#{a}=", version_of_object.send(a))
+          end
+          obj.id = id
+          obj.lock_version = lock_version
+
+          # Need to do this so associations can be loaded
+          obj.instance_variable_set("@persisted", true)
+          obj.instance_variable_set("@new_record", false)
+
+          # Callback to allow us to load other data when an older version is loaded
+          obj.after_as_of_version if obj.respond_to?(:after_as_of_version)
+
+          # Last but not least, clear the changed attributes
+          if changed_attrs = obj.send(:changed_attributes)
+            changed_attrs.clear
+          end
+
+          obj
+        end
       end
     end
 

data/lib/cms/content_rendering_support.rb

@@ -14,18 +14,18 @@ module Cms
 
     def handle_not_found_on_page(exception)
       logger.warn "Page Not Found"
-      handle_error_with_cms_page('/system/not_found', exception, :not_found)
+      handle_error_with_cms_page(Cms::ErrorPages::NOT_FOUND_PATH, exception, :not_found)
     end
 
     def handle_access_denied_on_page(exception)
       logger.warn "Access Denied"
-      handle_error_with_cms_page('/system/access_denied', exception, :forbidden)
+      handle_error_with_cms_page(Cms::ErrorPages::FORBIDDEN_PATH, exception, :forbidden)
     end
 
     def handle_server_error_on_page(exception)
       logger.warn "Exception: #{exception.message}\n"
       logger.warn "#{exception.backtrace.join("\n")}\n"
-      handle_error_with_cms_page('/system/server_error', exception, :internal_server_error)
+      handle_error_with_cms_page(Cms::ErrorPages::SERVER_ERROR_PATH, exception, :internal_server_error)
     end
 
     private

data/lib/cms/error_pages.rb

@@ -0,0 +1,8 @@
+module Cms
+  module ErrorPages
+
+    NOT_FOUND_PATH = '/system/not_found'
+    FORBIDDEN_PATH = '/system/access_denied'
+    SERVER_ERROR_PATH = '/system/server_error'
+  end
+end

data/lib/cms/version.rb

@@ -1,6 +1,6 @@
 ##
-# Allows the precise version of BrowserCMS to be determined problematically.
+# Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

data/lib/generators/browser_cms/cms/cms_generator.rb

@@ -22,6 +22,7 @@ module BrowserCms
         # Migrations/seed data
         'db/migrate/20080815014337_browsercms_3_0_0.rb',
         'db/migrate/20091109175123_browsercms_3_0_5.rb',
+        'db/migrate/20100117144039_browsercms315.rb',
         'db/migrate/20100705083859_browsercms_3_3_0.rb',
         'db/seeds.rb'
         ]

data/lib/generators/cms/upgrade_module/templates/GPL.txt

@@ -671,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

data/lib/tasks/data.rake

@@ -0,0 +1,43 @@
+def create_pages(root)
+  (1..20).each do |i|
+    Page.create!(:name=>"Page #{i}", :path=>"#{root.path}/page-#{i}", :section=>root, :template_file_name=>"default.html.erb", :publish_on_save=>true)
+  end
+end
+
+def reset_root_user_password
+  u = User.find(1)
+  u.password= "cmsadmin"
+  u.password_confirmation = "cmsadmin"
+  u.save!
+
+  puts "Reset #{u.login}'s password to '#{u.password}'."
+end
+
+namespace :cms do
+
+  task "load"  do
+    sh "mysql -u root browsercms_development --password= < db/backups/backup.sql"
+  end
+
+  task "correct" => :environment do
+    ActiveRecord::Base.connection.execute("UPDATE portlets SET type = 'DynamicPortlet' where type != 'DynamicPortlet'")
+    ct = ["'CategoryType'", "'Category'", "'HtmlBlock'", "'Portlet'", "'FileBlock'", "'ImageBlock'", "'Tag'"].join(",")
+    ActiveRecord::Base.connection.execute("DELETE FROM content_types where name not in (#{ct})")
+    reset_root_user_password
+  end
+
+  desc "Load a CMS site backup (a .sql file must be called db/backups/backup.sql) for testing."
+  task "load:backup" => ['db:drop','db:create', 'cms:load', 'cms:correct', 'db:migrate']
+
+  desc "Load some sample pages for performance tuning"
+  task "load:pages" => :environment do
+    root = Section.root.first
+    create_pages(root)
+    (21..40).each do |i|
+      sec = Section.create! :name=>"Section #{i}", :path=>"/section-#{i}/", :parent=>root
+      create_pages(sec)
+    end
+
+  end
+
+end