browsercms 3.1.5 → 3.3.0.beta

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.
   #
-  # To Do list example:
+  # Todo list example:
   #
   #   class TodoList < ActiveRecord::Base
   #     has_many :todo_items, :order => "position"

data/lib/browsercms.rb

@@ -1,14 +1,18 @@
+require 'cms/engine'
 require 'cms/extensions'
-require 'cms/init'
 require 'cms/routes'
 require 'cms/caching'
-require 'cms/addressable'
-require 'cms/error_pages'
 
 #Load libraries that are included with CMS
 require 'acts_as_list'
 ActiveRecord::Base.send(:include, ActsAsList)
 
-#Include CMS Behaviors
-ActiveRecord::Base.send(:include, Cms::Acts::ContentBlock)
-require 'cms/behaviors'
+require 'cms/acts'
+require 'cms/authentication'
+require 'cms/behaviors'
+require 'cms/domain_support'
+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'

data/lib/cms/acts.rb

@@ -0,0 +1,7 @@
+# Requires all files in the Acts As directory
+#
+# This adds the ContentBlock behavior to all Active Record objects.
+Dir["#{File.dirname(__FILE__)}/acts/*.rb"].each do |b| 
+  require File.join("cms", "acts", File.basename(b, ".rb"))
+end
+ActiveRecord::Base.send(:include, Cms::Acts::ContentBlock)

data/lib/cms/authentication.rb

@@ -0,0 +1,4 @@
+# Require all files in the cms/authentication directory
+Dir["#{File.dirname(__FILE__)}/authentication/*.rb"].each do |b|
+  require File.join("cms", "authentication", File.basename(b, ".rb"))
+end

data/lib/cms/authentication/controller.rb

@@ -105,7 +105,7 @@ module Cms
         #
         # We can return to this location by calling #redirect_back_or_default.
         def store_location
-          session[:return_to] = request.request_uri
+          session[:return_to] = request.fullpath
         end
 
         # Redirect to the URI stored by the most recent store_location call or

data/lib/cms/behaviors.rb

@@ -22,7 +22,7 @@
 # ClassMethods module and including the InstanceMethods module into the Article class.
 # Each Behavior typically has one macro method which takes an options Hash, which of course
 # varies from Behavior to Behavior.  The macro method will also sometimes call other
-# macro methods, like before_fitler, named_scope, etc. to modify the model.
+# macro methods, like before_fitler, scope, etc. to modify the model.
 # Consult the documentation for each module for specific details as to what
 # the Behavior does.
 module Cms::Behaviors; end

data/lib/cms/behaviors/archiving.rb

@@ -12,8 +12,8 @@ module Cms
           @is_archivable = true
           include InstanceMethods
 
-          named_scope :archived, :conditions => {:archived => true}
-          named_scope :not_archived, :conditions => {:archived => false}        
+          scope :archived, :conditions => {:archived => true}
+          scope :not_archived, :conditions => {:archived => false}        
         end
       end
       module InstanceMethods

data/lib/cms/behaviors/attaching.rb

@@ -1,36 +1,34 @@
 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
@@ -86,6 +84,7 @@ module Cms
         end
 
         def process_attachment
+          Rails.logger.warn "Processing attachment (#{attachment_file})"
           if attachment.nil? && attachment_file.blank?
             unless attachment_file_path.blank?
               errors.add(:attachment_file, "You must upload a file")
@@ -94,30 +93,22 @@ 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
-            handle_setting_attachment_path
+            Rails.logger.warn "After attachment (#{attachment.temp_file})"
+
+            set_attachment_file_path
             if attachment.file_path.blank?
               errors.add(:attachment_file_path, "File Name is required for attachment")
               return false
             end
-            handle_setting_attachment_section
-            unless attachment.section
+            set_attachment_section
+            if attachment.section_id.blank?
               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
 
@@ -125,26 +116,18 @@ module Cms
           @attachment_file = nil
           @attachment_file_path = nil
           @attachment_section_id = nil
-          @attachment_section = nil
+          @attachment_section = nil            
         end
 
-        # 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
+        # Override this method if you would like to override the way the section is set
+        def set_attachment_section
           if !attachment_file.blank?
             attachment.section = Section.root.first
           end
         end
 
-        def use_default_attachment_path
+        # Override this method if you would like to override the way file_path is set
+        def set_attachment_file_path
           if !attachment_file.blank?
             attachment.file_path = "/attachments/#{File.basename(attachment_file.original_filename).to_s.downcase}"
           end
@@ -157,12 +140,14 @@ module Cms
         end
 
         def update_attachment_if_changed
+          logger.debug {"UPDATE ATTACHMENT if changed" }
           if attachment
             attachment.archived = archived if self.class.archivable?
             if respond_to?(:revert_to_version) && revert_to_version
               attachment.revert_to(revert_to_version.attachment_version)
             elsif new_record? || attachment.changed? || attachment.temp_file
-              attachment.save
+              saved_attach = attachment.save
+              logger.warn "Attachment was saved = #{saved_attach}"
             end
             self.attachment_version = attachment.draft.version
           end
@@ -188,16 +173,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/categorizing.rb

@@ -15,7 +15,7 @@ module Cms
           
           belongs_to :category
           
-          named_scope :in_category, lambda{|cat| {:conditions => ["category_id = ?", cat.id]}}
+          scope :in_category, lambda{|cat| {:conditions => ["category_id = ?", cat.id]}}
           
         end
       end

data/lib/cms/behaviors/connecting.rb

@@ -22,7 +22,9 @@ module Cms
           attr_accessor :updated_by_page
 
           after_create :connect_to_page
-          after_save :update_connected_pages
+          after_save :update_connected_pages, :unless=>:skip_callbacks
+
+
         end
       end
       module ClassMethods
@@ -39,12 +41,11 @@ module Cms
       module InstanceMethods
 
         def connected_pages
-          return @connected_pages if @connected_pages
-          @connected_pages = Page.connected_to(self)
+          Page.currently_connected_to(self)
         end
 
         def connected_page_count
-          Page.connected_to(self).count
+          Page.currently_connected_to(self).count
         end
 
         def content_block_type
@@ -67,33 +68,47 @@ module Cms
             connected_page.create_connector(self, connect_to_container)
           end
           true
-        end        
-      
+        end
+
+        #
+        # After blocks are updated, all pages they are connected to should also be updated,
+        # connecting the page to the new version of the block, as well as putting the pages into
+        # draft status if necessary.
+        #
         def update_connected_pages
           # If this is versioned, then we need make new versions of all the pages this is connected to
-          if self.class.versioned? 
+          if self.class.versioned?
             #logger.info "..... Updating connected pages for #{self.class} #{id} v#{version}"
 
             #Get all the pages the previous version of this connectable was connected to
-            draft_version = draft.version            
-            Page.connected_to(:connectable => self, :version => (draft_version - 1)).all.each do |p|
+            draft_version = draft.version
+            connected_pages = Page.connected_to(:connectable => self, :version => (draft_version - 1)).all
+#            puts "Found #{connected_pages}"
+            connected_pages.each do |p|
               # This is needed in the case of updating page,
               # which updates this object, so as not to create a loop
-              if p != updated_by_page              
+              if p != updated_by_page
                 #This just creates a new version of the page
                 action = deleted? ? "Deleted" : "Edited"
                 p.update_attributes(:version_comment => "#{self.class.name} ##{id} was #{action}")
 
                 #The previous step will copy over a connector pointing to the previous version of this connectable
                 #We need to change that to point at the new version of this connectable
-                p.connectors.for_page_version(p.draft.version).for_connectable(self).each do |con|
+                connectors_for_page = p.connectors
+#                puts "cfp #{connectors_for_page}"
+                page_draft_version = p.draft.version
+                cnn = connectors_for_page.for_page_version(page_draft_version)
+#                puts "Connectors for page version #{page_draft_version} are #{cnn.all}"
+                connectors = cnn.for_connectable(self)
+#                puts "Found connectors #{connectors.all}"
+                connectors.each do |con|
                   con.update_attribute(:connectable_version, draft_version)
                 end
               end
             end
           end
           true
-        end        
+        end
       end
     end
   end

data/lib/cms/behaviors/dynamic_attributes.rb

@@ -127,10 +127,10 @@ module Cms
           include InstanceMethods
 
           # Provide default options
-          options[:class_name] ||= self.class_name + 'Attribute'
+          options[:class_name] ||= self.model_name + 'Attribute'
           options[:table_name] ||= options[:class_name].tableize
           options[:relationship_name] ||= options[:class_name].tableize.to_sym
-          options[:foreign_key] ||= self.class_name.foreign_key
+          options[:foreign_key] ||= self.model_name.foreign_key
           options[:base_foreign_key] ||= self.name.underscore.foreign_key
           options[:name_field] ||= 'name'
           options[:value_field] ||= 'value'
@@ -178,7 +178,8 @@ module Cms
             unless private_method_defined? :method_missing_without_dynamic_attributes
 
               # Carry out delayed actions before save
-              after_validation_on_update :save_modified_dynamic_attributes
+              after_validation :save_modified_dynamic_attributes
+#              after_validation_on_update :save_modified_dynamic_attributes
 
               # Make attributes seem real
               alias_method :method_missing_without_dynamic_attributes, :method_missing
@@ -222,6 +223,7 @@ module Cms
         # like normal attributes in the fact that the database is not touched
         # until save is called.
         def save_modified_dynamic_attributes
+          return if new_record?
           return if @save_dynamic_attr.nil?
           @save_dynamic_attr.each do |s|
             model, attr_name = s
@@ -339,7 +341,8 @@ module Cms
           kls
         end
         
-        # This overrides the attributes= defined in ActiveRecord::Base
+        # Overrides the attributes= defined in ActiveRecord::Base
+        #
         # The only difference is that this doesn't check to see if the
         # model responds_to the method before sending it
         # This is needed for Rails 2.2
@@ -349,7 +352,7 @@ module Cms
           attributes.stringify_keys!
 
           multi_parameter_attributes = []
-          attributes = remove_attributes_protected_from_mass_assignment(attributes) if guard_protected_attributes
+          attributes = sanitize_for_mass_assignment(attributes) if guard_protected_attributes
 
           attributes.each do |k, v|
             if k.include?("(")

data/lib/cms/behaviors/hiding.rb

@@ -13,8 +13,8 @@ module Cms
           extend ClassMethods
           include InstanceMethods
         
-          named_scope :hidden, :conditions => {:hidden => true}
-          named_scope :not_hidden, :conditions => {:hidden => false}        
+          scope :hidden, :conditions => {:hidden => true}
+          scope :not_hidden, :conditions => {:hidden => false}        
         end
       end
       module ClassMethods

data/lib/cms/behaviors/publishing.rb

@@ -1,5 +1,8 @@
 module Cms
   module Behaviors
+
+    # Allows content to be marked as publishable or not. In practice, this has a direct dependency on
+    # Versioning, so it may not make sense to be separated out this way.
     module Publishing
       def self.included(model_class)
         model_class.extend(MacroMethods)
@@ -22,8 +25,8 @@ module Cms
         
           after_save :publish_for_non_versioned
         
-          named_scope :published, :conditions => {:published => true}
-          named_scope :unpublished, lambda {
+          scope :published, :conditions => {:published => true}
+          scope :unpublished, lambda {
             if versioned?
               { :joins => :versions,
                 :conditions =>
@@ -64,12 +67,23 @@ module Cms
           logger.warn("Could not publish, #{e.class}: #{e.message}\n#{e.backtrace.join("\n")}")
           false
         end
-        
+
+        # Force the publishing of this block.
+        #
+        # Warning: The behavior of calling the following on an existing block:
+        #   block.save_on_publish
+        #   block.save!
+        #
+        # Is different than calling:
+        #   block.publish!
+        #
+        # And it probably shouldn't be. Try to merge the 'else' with the 'Versioning#create_or_update' method to eliminate duplication 
         def publish!
           if new_record?
             self.publish_on_save = true
             save!
           else
+            # Do this for publishing existing blocks.
             transaction do
               if self.class.versioned?
                 d = draft
@@ -81,15 +95,20 @@ module Cms
                   d.update_attributes(:published => true)
 
                   # copy values from the draft to the main record
-                  quoted_attributes = d.send(:attributes_with_quotes, false, false, self.class.versioned_columns)
+                  quoted_attributes = d.send(:arel_attributes_values, false, false, self.class.versioned_columns)
+
+                  #the values from the draft MAY have a relation of the versioned module
+                  #as opposed to the actual class itself
+                  #eg Page::Version, and not Page
+                  #so remap to the actual arel_table´
+                  #I haven't figured out why this is, but I know it happens when you call save! on Page
+                  #during seeding of data
+                  if self.class.arel_table.name != quoted_attributes.keys[0].relation.name
+                    quoted_attributes = quoted_attributes.inject({}){|hash, pair| hash[self.class.arel_table[pair[0].name]] = pair[1]; hash}
+                  end
 
                   # Doing the SQL ourselves to avoid callbacks
-                  connection.update(
-                    "UPDATE #{self.class.quoted_table_name} " +
-                    "SET #{quoted_comma_pair_list(connection, quoted_attributes)} " +
-                    "WHERE #{connection.quote_column_name(self.class.primary_key)} = #{quote_value(id)}",
-                    "#{self.class.name} Publish"
-                  )
+                  self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).arel.update(quoted_attributes)
                 end
               else
                 connection.update(
@@ -106,24 +125,15 @@ module Cms
         end    
             
         def status
-          return @status if @status
-          @status = live? ? :published : :draft
-        end
+          live? ? :published : :draft
+        end        
 
         def status_name
           status.to_s.titleize
         end
 
         def live?
-          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
+          self.class.versioned? ? live_version.version == draft.version && published? : true
         end
         
       end