browsercms 3.5.2 → 3.5.3

data/app/controllers/cms/toolbar_controller.rb

@@ -3,9 +3,9 @@ module Cms
 
     layout "cms/toolbar"
 
-    helper MobileHelper
+    helper Cms::MobileHelper
 
-    def index
+    def index      
       if params[:page_toolbar] != "0"
         @mode = params[:mode]
         @page_toolbar_enabled = true

data/app/helpers/cms/rendering_helper.rb

@@ -12,9 +12,14 @@ module Cms
       render :partial => 'cms/attachments/attachment_table', :locals => { :block => content, :can_delete => false }
     end
 
+    # Determines if a user is currently editing this page
+    def is_editing_page?(page)
+      logged_in? && @mode == "edit" && current_user.able_to_edit?(page)
+    end
+    
     def render_connector_and_connectable(connector, connectable)
       logger.debug "Rendering #{connectable} "
-      if logged_in? && @mode == "edit" && current_user.able_to_edit?(connector.page)
+      if is_editing_page?(connector.page)
         render(:partial => 'cms/pages/edit_connector', :locals => { :connector => connector, :connectable => connectable})
       else
         render_connectable(connectable)

data/app/models/cms/portlet.rb

@@ -138,6 +138,14 @@ module Cms
     end
 
     #----- Portlet Action Related Methods ----------------------------------------
+    
+    # Used by portlets to set a custom title, typically in the render body.
+    # For example, this allows a page with a single portlet that might display a content block to set the page name to 
+    # that block name.
+    def page_title(new_title)
+      controller.current_page.title = new_title
+    end
+    
     def instance_name
       "#{self.class.name.demodulize.underscore}_#{id}"
     end

data/app/views/cms/content/show.html.erb

@@ -1,7 +1,13 @@
-<% page_title @page.page_title %>
-
 <%= content_for :html_head do %>
   <meta name="generator" content="BrowserCMS <%= Cms.version %>"/>
+  <% if is_editing_page?(current_page) %>
+  <%= javascript_include_tag 'cms/core_library' %>
+  <% if  @authenticity_token_loaded.nil? && protect_against_forgery? %><script type="text/javascript">
+    jQuery(function($){
+      $.cms.authenticity_token = '<%= form_authenticity_token %>'
+    })
+  </script><% end %><% @authenticity_token_loaded = true %>
+  <% end %>
 <% end %>
 <% if @show_toolbar %>
   <% flash.keep %>

data/app/views/cms/pages/_edit_connector.html.erb

@@ -16,12 +16,4 @@
           :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: 0; position: absolute; top: -1px; right: 10px;" %>
   </div>
     <%= render_connectable connectable %>
-</div>
-<%= content_for :html_head do %>
-    <%= javascript_include_tag 'cms/core_library' %>
-    <% if  @authenticity_token_loaded.nil? && protect_against_forgery? %><script type="text/javascript">
-      jQuery(function($){
-        $.cms.authenticity_token = '<%= form_authenticity_token %>'
-      })
-    </script><% end %><% @authenticity_token_loaded = true %>
-<% end %>
+</div>

data/db/migrate/20100117144038_browsercms314.rb

@@ -0,0 +1,20 @@
+require 'cms/upgrades/v3_4_0'
+
+# Retroactively fix for changes that were merged into 3.1.5/3.3.0/3.4.0. 
+# This originally was for 3.4.0, but needs to be run prior to 3.1.5 migrations.
+class Browsercms314 < ActiveRecord::Migration
+  include Cms::Upgrades::V3_4_0::SchemaStatements
+  
+  def change
+    standardize_foreign_keys_from_versions_tables_to_original_table
+    
+  end
+  
+  private
+  def standardize_foreign_keys_from_versions_tables_to_original_table
+    models = %w[attachment dynamic_view file_block html_block link page ]
+    models.each do |model|
+      standardize_version_id_column(model)
+    end
+  end
+end

data/db/migrate/20100117144039_browsercms315.rb

@@ -69,7 +69,7 @@ class Browsercms315 < ActiveRecord::Migration
 
     all_nodes_but_root = Cms::SectionNode.find(:all, :conditions=>["section_id IS NOT NULL"])
     all_nodes_but_root.each do |sn|
-      parent_node = Cms::SectionNode.find(:first, :conditions => ["node_id = ? and node_type = 'Section'", sn.section_id])
+      parent_node = Cms::SectionNode.find(:first, :conditions => ["node_id = ? and (node_type = 'Section' or node_type = 'Cms::Section')", sn.section_id])
       sn.temp_parent_id = parent_node.id
       sn.save!
     end

data/db/migrate/20111130221145_browsercms340.rb

@@ -12,7 +12,6 @@ class Browsercms340 < ActiveRecord::Migration
 
     update_sitemap
     update_files
-    standardize_foreign_keys_from_versions_tables_to_original_table
   end
 
   private
@@ -53,10 +52,5 @@ class Browsercms340 < ActiveRecord::Migration
     end
   end
 
-  def standardize_foreign_keys_from_versions_tables_to_original_table
-    models = %w[attachment dynamic_view file_block html_block link page ]
-    models.each do |model|
-      standardize_version_id_column(model)
-    end
-  end
+
 end

data/db/migrate/20120717182827_browsercms353.rb

@@ -0,0 +1,19 @@
+require 'cms/upgrades/v3_5_0'
+
+class Browsercms353 < ActiveRecord::Migration
+  def change
+    namespace_templates
+    
+    # Some older projects may have AbstractFileBlock rather than File/ImageBlock connectors
+    v3_5_0_update_connector_namespaces("Cms", "AbstractFileBlock")
+    
+  end
+  
+  private
+  
+  def namespace_templates
+    ["PageTemplate", "PagePartial"].each do |view|
+      Cms::DynamicView.update_all("type = 'Cms::#{view}'", "type = '#{view}'" )
+    end
+  end
+end

data/doc/release_notes.md

@@ -1,3 +1,18 @@
+v3.5.3
+======
+
+Bug fixes, with some improvements for upgrading projects from older versions of the CMS.
+
+* [#461] Allow portlets to easily set the page title. This makes it easy for one portlet to render multiple different content blocks, and change the displayed <title> attribute to match the name of the block. For example:
+	
+	def render
+	  @block = Product.find(params[:id])
+	  page_title @block.name
+	end 
+* [#536] Fix bug to make PortletHelpers available in the render.html.erb.
+* [#534] Bug Fix - Ensure image/file blocks can be deleted from the content library.
+* Migrations - Add another migration to handle Rails 2->3 updates (v3.1.4) which should retroactivealy added before v315.
+
 v3.5.2
 ======
 

data/lib/cms/acts/content_page.rb

@@ -15,23 +15,18 @@
 module Cms
   module Acts
 
+    # Override some of the behavior defined in Cms::PageHelper so templates display correctly Rails Controllers
     module PageHelper
 
-      # By default, the Name of the controller (minus 'Controller' will be the page name.)
-      # Unless @page_title is set in the controller action
-      def page_title(title=nil)
-        if title
-          @page_title = title
-        end
-        return controller.class.name.gsub("Controller", "").titleize unless @page_title
-        @page_title
-      end
-
-
       # Do not show the toolbar on Acts::As::ContentPages
       def cms_toolbar
         ""
       end
+      
+      # If we are showing an error page, use that. Otherwise, just a blank page object that has a default title.
+      def current_page
+        super ? super : OpenStruct.new(page_title: controller.class.name.gsub("Controller", ""))
+      end
     end
     module ContentPage
 

data/lib/cms/behaviors/attaching.rb

@@ -120,7 +120,10 @@ module Cms
         def validates_attachment_presence(name, options = {})
           message = options[:message] || "Must provide at least one #{name}"
           validate(options) do |record|
-            record.errors.add(:attachment, message) unless record.attachments.any? { |a| a.attachment_name == name.to_s }
+            return if record.deleted?
+            unless record.attachments.any? { |a| a.attachment_name == name.to_s }
+              record.errors.add(:attachment, message)
+            end
           end
         end
 

data/lib/cms/behaviors/rendering.rb

@@ -130,6 +130,8 @@ module Cms
         # Create, Instantiate and Initialize the view
         action_view = Cms::ViewContext.new(@controller, assigns_for_view)
 
+        add_content_helpers_if_defined(action_view)
+
         # Determine if this content should render from a file system template or inline (i.e. database based template)
         if respond_to?(:inline_options) && self.inline_options && self.inline_options.has_key?(:inline)
           options = self.inline_options
@@ -152,6 +154,18 @@ module Cms
       end
 
       protected
+
+      # Add the helper class for this particular object, if its defined
+      # This is mostly for portlets, and should not fail if no helper is defined.
+      def add_content_helpers_if_defined(action_view)
+        begin
+          helper_module = self.class.helper_class
+          action_view.extend(helper_module)
+        rescue NameError => error
+          logger.debug "No helper class named '#{error.missing_name}' was found. This isn't necessarily an error as '#{self.class}' doesn't NEED a separate helper.'"
+        end
+      end
+
       def copy_instance_variables_from_controller!
         if @controller.respond_to?(:instance_variables_for_rendering)
           @controller.instance_variables_for_rendering.each do |iv|

data/lib/cms/upgrades/v3_5_0.rb

@@ -21,8 +21,14 @@ module Cms
           table_prefix = module_name.underscore
           model_name = model_class_name.underscore
 
-          rename_table model_name.pluralize, "#{table_prefix}_#{model_name.pluralize}"
-          rename_table "#{model_name}_versions", "#{table_prefix}_#{model_name}_versions"
+          old_content_table = model_name.pluralize
+          new_content_table = "#{table_prefix}_#{model_name.pluralize}"
+          rename_table old_content_table, new_content_table if have_not_renamed(old_content_table, new_content_table)
+
+
+          old_versions_table = "#{model_name}_versions"
+          new_versions_table = "#{table_prefix}_#{model_name}_versions"
+          rename_table old_versions_table, new_versions_table if have_not_renamed(old_versions_table, new_versions_table)
           v3_5_0_standardize_version_id_column(table_prefix, model_name)
           v3_5_0_namespace_model_data(module_name, model_class_name)
           v3_5_0_update_connector_namespaces(module_name, model_class_name)
@@ -53,6 +59,21 @@ module Cms
         def v3_5_0_namespace_model(module_name, model_class_name)
           "#{module_name}::#{model_class_name}"
         end
+
+        private
+
+        # If we already renamed these tables, they should be skipped
+        def have_not_renamed(old_table, new_table)
+          unless table_exists?(old_table)
+            puts "Table #{old_table} does not exist. Skipping rename."
+            return false
+          end
+          unless !table_exists?(new_table)
+            puts "Table #{new_table} already exists. Skipping rename."
+            return false
+          end
+          true
+        end
       end
 
       # Add additional methods to ActiveRecord::Migration when this file is required.
@@ -71,13 +92,7 @@ module Cms
         # @return [String] path to location where an attachment should be (based on id)
         def path_for_attachment(attachment)
           new_id_dir = "#{Paperclip::Interpolations.id_partition(AttachmentWrapper.new(attachment), nil)}/original"
-          "#{new_id_dir}/#{attachment.data_fingerprint}"
-        end
-
-        # @return [String] Path to where an attachment should be
-        def path_to_attachment(attachment)
-          loc = path_for_attachment(attachment)
-          file_in_attachments_dir(loc)
+          File.join(attachments_dir, new_id_dir, fingerprint_for_file_location(attachment))
         end
 
         # For a given class with an Attachment association (pre-3.5.0), migrate its attachment data to match the new
@@ -161,18 +176,19 @@ module Cms
         def migrate_attachments_file_location(model_class)
           model_class.unscoped.each do |attachment|
             from = File.join(attachments_dir, attachment.file_location)
-            to = path_to_attachment(attachment)
+            to = path_for_attachment(attachment)
             move_attachment_file(from, to)
 
-            new_fingerprint = attachment.file_location.split("/").last
+            new_fingerprint = fingerprint_for_file_location(attachment)
             model_class.unscoped.update_all({:data_fingerprint => new_fingerprint}, :id => attachment.id)
           end
         end
 
-        def file_in_attachments_dir(file_name)
-          File.join(Cms::Attachment.configuration.attachments_root, file_name)
+        # Given a CMS <3.5 file_location, figure out the fingerprint, which should just be the file name.
+        def fingerprint_for_file_location(attachment)
+          attachment.file_location.split("/").last
         end
-
+        
         def move_attachment_file(old_location, new_location)
           if File.exists?(old_location)
             FileUtils.mkdir_p(File.dirname(new_location), :verbose => false)
@@ -182,10 +198,15 @@ module Cms
           end
         end
 
+        # Return the location of the attachment's upload directory.
         def attachments_dir
-          Cms::Attachment.configuration.attachments_root
+          Cms::Attachments::Serving.send_attachments_with.attachments_storage_location
         end
-
+        
+        # def attachments_dir
+        #           Cms::Attachment.configuration.attachments_root
+        #         end
+        
         # Allows us to use the Paperclip interpolations logic directly
         class AttachmentWrapper
           def initialize(attachment)

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.5.2"
+  VERSION = "3.5.3"
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -637,10 +637,12 @@ files:
 - db/browsercms.seeds.rb
 - db/migrate/20080815014337_browsercms_3_0_0.rb
 - db/migrate/20091109175123_browsercms_3_0_5.rb
+- db/migrate/20100117144038_browsercms314.rb
 - db/migrate/20100117144039_browsercms315.rb
 - db/migrate/20100705083859_browsercms_3_3_0.rb
 - db/migrate/20111130221145_browsercms340.rb
 - db/migrate/20120329144406_browsercms350.rb
+- db/migrate/20120717182827_browsercms353.rb
 - db/schema.rb
 - db/seeds.rb
 - doc/design/blue_button.psd
@@ -773,7 +775,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1523236011724183372
+      hash: -3887349942334149807
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24