browsercms 3.5.0.rc2 → 3.5.0.rc3

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

@@ -1,8 +1,11 @@
+<%
+	# Using cms. prefix on the links here so this view can be used by models from engines.
+%>
 <div class="first">
   <h3>Users</h3>
   <ul>
-    <li<%= ' class="open"' if @menu_section == 'users' %>><%= link_to "Users", users_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'groups' %>><%= link_to "Groups", groups_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'users' %>><%= link_to "Users", cms.users_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'groups' %>><%= link_to "Groups", cms.groups_path %></li>
   </ul>
 </div>
 <div class="bottom_cap bottom_pad"></div>
@@ -11,9 +14,9 @@
 <div>
   <h3>Templates</h3>
   <ul>  
-    <li<%= ' class="open"' if @menu_section == 'page_partials' %>><%= link_to "Page Partials", page_partials_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'page_templates' %>><%= link_to "Page Templates", page_templates_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'page_routes' %>><%= link_to "Page Routes", page_routes_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'page_partials' %>><%= link_to "Page Partials", cms.page_partials_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'page_templates' %>><%= link_to "Page Templates", cms.page_templates_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'page_routes' %>><%= link_to "Page Routes", cms.page_routes_path %></li>
   </ul>
 </div>
 <div class="bottom_cap bottom_pad"></div>
@@ -22,9 +25,12 @@
 <div>
   <h3>Tools</h3>
   <ul>  
-    <li<%= ' class="open"' if @menu_section == 'caching' %>><%= link_to "Page Caching", cache_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'redirects' %>><%= link_to "Redirects", redirects_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'email_messages' %>><%= link_to "Email Messages", email_messages_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'caching' %>><%= link_to "Page Caching", cms.cache_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'redirects' %>><%= link_to "Redirects", cms.redirects_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'email_messages' %>><%= link_to "Email Messages", cms.email_messages_path %></li>
+	<% Rails.application.config.cms.tools_menu.each do |menu_item| %>
+	<li <%= ' class="open"' if @menu_section == menu_item[:menu_section] %>><%= link_to(menu_item[:name], self.send(menu_item[:engine]).send(menu_item[:route_name])) %></li>
+	<% end %>
   </ul>
 </div>
 <div class="bottom_cap"></div>

data/doc/release_notes.md

@@ -1,3 +1,41 @@
+v3.5.0.rc3
+==========
+
+* Add new migration methods to make it easier for modules to namespace their blocks.
+* Allow modules to add new links to the Admin tab without overriding views. 
+
+In an engine, you can do the following:
+
+```
+# In lib/bcms_your_module/engine.rb
+initializer 'bcms_your_module.add_menu_item' do |app|
+  app.config.cms.tools_menu << {:menu_section => 'widgets', 
+								:name => 'List of Widgets', 
+								:engine=>'bcms_your_module', 
+								:route_name => 'widgets_path'
+							}
+end
+
+# In app/controllers/bcms_your_module/widget_controller.rb
+class BcmsYourModule::WidgetsController < Cms::BaseController
+
+  layout 'cms/administration'
+  check_permissions :administrate
+  
+  def index
+	@menu_section = 'widgets'
+	# Do something interesting
+  end
+end
+
+# In config/routes.rb
+BcmsYourModule::Engine.routes.draw do
+  get '/widgets' => 'widgets#index', :as =>:widgets
+end
+```
+
+
+
 v3.5.0.rc2
 ==========
 

data/lib/cms/engine.rb

@@ -21,6 +21,9 @@ module Cms
 
     config.cms = ActiveSupport::OrderedOptions.new
     config.cms.attachments = ActiveSupport::OrderedOptions.new
+    
+    # Allows additional menu items to be added to the 'Tools' menu on the Admin tab.
+    config.cms.tools_menu = ActiveSupport::OrderedOptions.new
 
     # Make sure we use our rails model template (rather then its default) when `rails g cms:content_block` is run.
     config.app_generators do |g|
@@ -56,6 +59,8 @@ module Cms
       # I.e.
       #   config.cms.site_domain = "www.browsercms.org"
       app.config.cms.site_domain = "localhost:3000"
+      
+      app.config.cms.tools_menu = []
     end
 
     initializer 'browsercms.add_core_routes', :after => 'action_dispatch.prepare_dispatcher' do |app|

data/lib/cms/upgrades/v3_4_0.rb

@@ -15,7 +15,7 @@ models.each do |model_name|
 end
 TEXT
         insert_into_file migration, text, :after => "def up\n"
-        insert_into_file migration, "require 'cms/upgrades/v3_4_0'\n", :before=>"class"
+        insert_into_file migration, "require 'cms/upgrades/v3_4_0'\n", :before => "class"
         insert_into_file migration, "include Cms::Upgrades::V3_4_0::SchemaStatements\n", :after => "Migration\n"
       end
 
@@ -27,6 +27,5 @@ TEXT
       end
     end
 
-
   end
 end

data/lib/cms/upgrades/v3_5_0.rb

@@ -8,6 +8,53 @@ module Cms
         gsub_file "config/environments/production.rb", /config.action_controller.page_cache_directory.+$/, ""
       end
 
+      # Technically these updates are for v3_4_0, but I want to avoid having to change existing migrations
+      #
+      # These migrations are designed to make it easy for modules to write migrations for their content blocks with minimal code.
+      module Retroactive_v3_4_0Updates
+        # Applys table namespacing and other fixes to blocks that need upgrading from < 3.4.0 to 3.5.
+        #
+        # @param [String] module_name I.e. module table_prefix (i.e. BcmsWhatever)
+        # @param [String] model_class_name I.e. 'Slide' or 'NewsArticle'
+        def v3_5_0_apply_namespace_to_block(module_name, model_class_name)
+          puts "Applying namespace '#{module_name}' to model '#{model_class_name}'"
+          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"
+          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)
+        end
+
+        def v3_5_0_standardize_version_id_column(table_prefix, model_name)
+          if column_exists?("#{table_prefix}_#{model_name}_versions", "#{model_name}_id")
+            rename_column("#{table_prefix}_#{model_name}_versions", "#{model_name}_id", :original_record_id)
+          end
+        end
+
+        def v3_5_0_namespace_model_data(module_name, model_class_name)
+          found = Cms::ContentType.named(model_class_name).first
+          if found
+            found.name = v3_5_0_namespace_model(module_name, model_class_name)
+            found.save!
+          end
+        end
+
+        def v3_5_0_update_connector_namespaces(module_name, model_class_name)
+          namespaced_class = v3_5_0_namespace_model(module_name, model_class_name)
+          Cms::Connector.where(:connectable_type => model_class_name).each do |connector|
+            connector.connectable_type = namespaced_class
+            connector.save!
+          end
+        end
+
+        def v3_5_0_namespace_model(module_name, model_class_name)
+          "#{module_name}::#{model_class_name}"
+        end
+      end
+
       # Add additional methods to ActiveRecord::Migration when this file is required.
       module FileStorageUpdates
 
@@ -32,6 +79,7 @@ module Cms
           loc = path_for_attachment(attachment)
           file_in_attachments_dir(loc)
         end
+
         # For a given class with an Attachment association (pre-3.5.0), migrate its attachment data to match the new
         # table structure.
         def migrate_attachment_for(klass)
@@ -152,4 +200,7 @@ module Cms
     end
   end
 end
-ActiveRecord::Migration.send(:include, Cms::Upgrades::V3_5_0::FileStorageUpdates) if defined?(ActiveRecord::Migration)
+if defined?(ActiveRecord::Migration)
+  ActiveRecord::Migration.send(:include, Cms::Upgrades::V3_5_0::FileStorageUpdates)
+  ActiveRecord::Migration.send(:include, Cms::Upgrades::V3_5_0::Retroactive_v3_4_0Updates)
+end

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.5.0.rc2"
+  VERSION = "3.5.0.rc3"
 
   # 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.0.rc2
+  version: 3.5.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails