browsercms 3.3.4 → 3.4.0.rc1

data/app/controllers/browsercms/application_controller.rb

@@ -0,0 +1,4 @@
+module Browsercms
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/controllers/cms/application_controller.rb

@@ -1,4 +1,5 @@
-class Cms::ApplicationController < ApplicationController
+module Cms
+class ApplicationController < ::ApplicationController
   include Cms::Authentication::Controller
   include Cms::ErrorHandling
   include Cms::DomainSupport
@@ -11,7 +12,8 @@ class Cms::ApplicationController < ApplicationController
   helper Cms::PageHelper
   helper Cms::MenuHelper
   helper Cms::RenderingHelper
-  
+  helper Cms::UiElementsHelper
+
   protected
     def escape_javascript(javascript)
       (javascript || '').gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
@@ -65,4 +67,5 @@ class Cms::ApplicationController < ApplicationController
       request.url.sub(/#{cms_domain_prefix}\./,'')
     end
   
+end
 end

data/app/controllers/cms/attachments_controller.rb

@@ -1,4 +1,5 @@
-class Cms::AttachmentsController < Cms::BaseController
+module Cms
+class AttachmentsController < Cms::BaseController
   def show
     @attachment = Attachment.find(params[:id])
     @attachment = @attachment.as_of_version(params[:version]) if params[:version]
@@ -8,4 +9,5 @@ class Cms::AttachmentsController < Cms::BaseController
       :disposition => "inline"
     )     
   end
+end
 end

data/app/controllers/cms/base_controller.rb

@@ -1,4 +1,5 @@
-class Cms::BaseController < Cms::ApplicationController
+module Cms
+class BaseController < Cms::ApplicationController
   
   before_filter :redirect_to_cms_site
   before_filter :login_required
@@ -10,4 +11,5 @@ class Cms::BaseController < Cms::ApplicationController
 #  verify :method => :put, :only => [:update]
 #  verify :method => :delete, :only => [:destroy]
     
+end
 end

data/app/controllers/cms/cache_controller.rb

@@ -1,4 +1,5 @@
-class Cms::CacheController < Cms::BaseController
+module Cms
+class CacheController < Cms::BaseController
   layout 'cms/administration'
   
   check_permissions :administrate  
@@ -20,3 +21,4 @@ class Cms::CacheController < Cms::BaseController
     end
 
 end
+end

data/app/controllers/cms/categories_controller.rb

@@ -1,5 +1,7 @@
-class Cms::CategoriesController < Cms::ContentBlockController
-  def show
-    redirect_to cms_categories_url
+module Cms
+  class CategoriesController < Cms::ContentBlockController
+    def show
+      redirect_to categories_path
+    end
   end
-end
+end

data/app/controllers/cms/category_types_controller.rb

@@ -1,5 +1,7 @@
-class Cms::CategoryTypesController < Cms::ContentBlockController
-  def show
-    redirect_to cms_category_types_url
+module Cms
+  class CategoryTypesController < Cms::ContentBlockController
+    def show
+      redirect_to category_types_path
+    end
   end
 end

data/app/controllers/cms/connectors_controller.rb

@@ -1,4 +1,5 @@
-class Cms::ConnectorsController < Cms::BaseController
+module Cms
+class ConnectorsController < Cms::BaseController
   
   before_filter :set_toolbar_tab
   before_filter :load_page, :only => [:new, :create]
@@ -61,3 +62,4 @@ class Cms::ConnectorsController < Cms::BaseController
       @toolbar_tab = :content_library
     end
 end
+end

data/app/controllers/cms/content_block_controller.rb

@@ -1,6 +1,8 @@
+require 'cms/category_type'
 # This is not called directly
 # This is the base class for other content blocks
-class Cms::ContentBlockController < Cms::BaseController
+module Cms
+class ContentBlockController < Cms::BaseController
   
   layout :determine_layout
   
@@ -64,14 +66,14 @@ class Cms::ContentBlockController < Cms::BaseController
   
   def publish
     do_command("published") { @block.publish! }
-    redirect_to_first params[:_redirect_to], block_path
+    redirect_to_first params[:_redirect_to], block_path(@block)
   end
   
   def revert_to
     do_command("reverted to version #{params[:version]}") do
       revert_block(params[:version])
     end
-    redirect_to_first params[:_redirect_to], block_path
+    redirect_to_first params[:_redirect_to], block_path(@block)
   end
   
   def version
@@ -101,7 +103,7 @@ class Cms::ContentBlockController < Cms::BaseController
     # methods that are used to detemine what content block type we are dealing with
 
     def content_type_name
-      self.class.name.sub(/Controller/,'').demodulize.singularize
+      self.class.name.sub(/Controller/,'').singularize
     end
 
     def content_type
@@ -112,8 +114,8 @@ class Cms::ContentBlockController < Cms::BaseController
       content_type.model_class
     end
   
-    def model_name
-      model_class.name.underscore.to_sym
+    def model_form_name
+      content_type.model_class_form_name
     end
   
     # methods for loading one or a collection of blocks
@@ -122,12 +124,11 @@ class Cms::ContentBlockController < Cms::BaseController
       options = {}
       if params[:section_id] && params[:section_id] != 'all'
         options[:include] = { :attachment =>  :section_node }
-        options[:conditions] = ["section_nodes.ancestry = ?", Section.find(params[:section_id]).ancestry_path]
+        options[:conditions] = ["#{Namespacing.prefix("section_nodes")}.ancestry = ?", Section.find(params[:section_id]).ancestry_path]
       end
       options[:page] = params[:page]    
       options[:order] = model_class.default_order if model_class.respond_to?(:default_order)
       options[:order] = params[:order] unless params[:order].blank?
-
       scope = model_class.respond_to?(:list) ? model_class.list : model_class
       @blocks = scope.searchable? ? scope.search(params[:search]).paginate(options) : scope.paginate(options)
       check_permissions
@@ -146,17 +147,20 @@ class Cms::ContentBlockController < Cms::BaseController
   
     # path related methods - available in the view as helpers
   
-    def new_block_path(options={})
-      cms_new_url_for(@block, options)
+    def new_block_path(block, options={})
+      cms_new_path_for(block, options)
     end
   
-    def block_path(action=nil)
-      path = [:cms, @block]
-      action ? path.unshift(action) : path
+    def block_path(block, action=nil)
+      path = []
+      path << engine_for(block)
+      path << action if action
+      path.concat path_elements_for(block)
+      path
     end
   
     def blocks_path(options={})
-      cms_index_url_for(@block, options)
+      cms_index_path_for(@block.class, options)
     end
 
     # This is the partial that will be used in the form
@@ -167,7 +171,7 @@ class Cms::ContentBlockController < Cms::BaseController
     # new related methods
   
     def build_block
-      @block = model_class.new(params[model_name])
+      @block = model_class.new(params[model_form_name])
       check_permissions
     end
 
@@ -190,7 +194,7 @@ class Cms::ContentBlockController < Cms::BaseController
       if @block.class.connectable? && @block.connected_page
         redirect_to @block.connected_page.path
       else
-        redirect_to_first params[:_redirect_to], block_path
+        redirect_to_first params[:_redirect_to], block_path(@block)
       end
     end
 
@@ -206,12 +210,12 @@ class Cms::ContentBlockController < Cms::BaseController
     # update related methods
     def update_block
       load_block
-      @block.update_attributes(params[model_name])
+      @block.update_attributes(params[model_form_name])
     end
 
     def after_update_on_success
-      flash[:notice] = "#{content_type_name.titleize} '#{@block.name}' was updated"
-      redirect_to_first params[:_redirect_to], block_path
+      flash[:notice] = "#{content_type_name.demodulize.titleize} '#{@block.name}' was updated"
+      redirect_to_first params[:_redirect_to], block_path(@block)
     end
 
     def after_update_on_failure
@@ -236,9 +240,9 @@ class Cms::ContentBlockController < Cms::BaseController
     def do_command(result)
       load_block
       if yield
-        flash[:notice] = "#{content_type_name.titleize} '#{@block.name}' was #{result}"
+        flash[:notice] = "#{content_type_name.demodulize.titleize} '#{@block.name}' was #{result}"
       else
-        flash[:error] = "#{content_type_name.titleize} '#{@block.name}' could not be #{result}"
+        flash[:error] = "#{content_type_name.demodulize.titleize} '#{@block.name}' could not be #{result}"
       end
     end
 
@@ -284,3 +288,4 @@ class Cms::ContentBlockController < Cms::BaseController
     end
 
 end
+end

data/app/controllers/cms/content_controller.rb

@@ -1,4 +1,5 @@
-class Cms::ContentController < Cms::ApplicationController
+module Cms
+class ContentController < Cms::ApplicationController
   include Cms::ContentRenderingSupport
 
   skip_before_filter :redirect_to_cms_site
@@ -51,6 +52,7 @@ class Cms::ContentController < Cms::ApplicationController
   
   # ----- Before Filters -------------------------------------------------------
   def construct_path
+  # @paths = params[:cms_page_path] || params[:path] || []
     @path = "/#{params[:path]}"
     @paths = @path.split("/")
   end
@@ -94,15 +96,19 @@ class Cms::ContentController < Cms::ApplicationController
     end    
   end
 
-  def try_to_stream_file
-    split = @paths.last.to_s.split('.')
+  # Determines if the current request is file that needs to be streamed.
+  # Any URL with a . in it is considered a file.
+  def is_file?
+    split = request.url.split('.')
     ext = split.size > 1 ? split.last.to_s.downcase : nil
-    
-    #Only try to stream cache file if it has an extension
-    unless ext.blank?
+    !ext.blank?
+  end
+
+  def try_to_stream_file
+    if is_file?
       
       #Check access to file
-      @attachment = Attachment.find_live_by_file_path(@path)
+      @attachment = Attachment.find_live_by_file_path(request.fullpath)
       if @attachment
         raise Cms::Errors::AccessDenied unless current_user.able_to_view?(@attachment)
 
@@ -174,4 +180,5 @@ class Cms::ContentController < Cms::ApplicationController
   
   
   
+end
 end

data/app/controllers/cms/content_types_controller.rb

@@ -1,7 +1,9 @@
-class Cms::ContentTypesController < Cms::BaseController
+module Cms
+class ContentTypesController < Cms::BaseController
 
   def index
     @content_types = ContentType.find(:all, :order => 'name')
   end
   
 end
+end

data/app/controllers/cms/dashboard_controller.rb

@@ -1,10 +1,12 @@
-class Cms::DashboardController < Cms::BaseController
+module Cms
+class DashboardController < Cms::BaseController
       
   def index
-    @unpublished_pages = Page.unpublished.all(:order => "pages.updated_at desc")
+    @unpublished_pages = Page.unpublished.all(:order => "updated_at desc")
     @unpublished_pages = @unpublished_pages.select { |page| current_user.able_to_publish?(page) }
     @incomplete_tasks = current_user.tasks.incomplete.all(
       :include => :page, 
-      :order => "tasks.due_date desc, pages.name")
+      :order => "#{Task.table_name}.due_date desc, #{Page.table_name}.name")
   end
 end
+end

data/app/controllers/cms/dynamic_views_controller.rb

@@ -1,66 +1,73 @@
-class Cms::DynamicViewsController < Cms::BaseController
-  
-  layout 'cms/administration'
-  check_permissions :administrate  
-  
-  before_filter :set_menu_section
-  before_filter :load_view, :only => [:show, :edit, :update, :destroy]
-    
-  helper_method :dynamic_view_type
-  
-  def index
-    @views = dynamic_view_type.paginate(:page => params[:page], :order => "name")
-  end
-  
-  def new
-    @view = dynamic_view_type.new_with_defaults
-  end
-  
-  def create
-    @view = dynamic_view_type.new(params[dynamic_view_type.name.underscore])
-    if @view.save
-      flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was created"
-      redirect_to cms_index_path_for(dynamic_view_type.name.underscore.pluralize)
-    else
-      render :action => "new"
+module Cms
+  class DynamicViewsController < Cms::BaseController
+
+    layout 'cms/administration'
+    check_permissions :administrate
+
+    before_filter :set_menu_section
+    before_filter :load_view, :only => [:show, :edit, :update, :destroy]
+
+    helper_method :dynamic_view_type
+
+    def index
+      @views = dynamic_view_type.paginate(:page => params[:page], :order => "name")
     end
-  end
-  
-  def show
-    redirect_to [:edit, :cms, @view]
-  end
-  
-  def update
-    if @view.update_attributes(params[dynamic_view_type.name.underscore])
-      flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was updated"
+
+    def new
+      @view = dynamic_view_type.new_with_defaults
+    end
+
+    def create
+      @view = dynamic_view_type.new(params[dynamic_view_type.resource_collection_name])
+      if @view.save
+        flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was created"
+        redirect_to cms_index_path_for(dynamic_view_type)
+      else
+        render :action => "new"
+      end
+    end
+
+    def show
+      redirect_to [:edit, @view]
+    end
+
+    def update
+      if @view.update_attributes(params[ActionController::RecordIdentifier.singular_class_name(dynamic_view_type)])
+        flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was updated"
+        redirect_to cms_index_path_for(dynamic_view_type.name.underscore.pluralize)
+      else
+        render :action => "edit"
+      end
+    end
+
+    def destroy
+      @view.destroy
+      flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was deleted"
       redirect_to cms_index_path_for(dynamic_view_type.name.underscore.pluralize)
-    else
-      render :action => "edit"
     end
-  end
-  
-  def destroy
-    @view.destroy
-    flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was deleted"
-    redirect_to cms_index_path_for(dynamic_view_type.name.underscore.pluralize)    
-  end
-  
-  protected
+
+    protected
     def dynamic_view_type
       @dynamic_view_type ||= begin
-        uri = request.request_uri.sub(/\?.*/, '')
-        type = uri.split('/')[2].classify.constantize
+        url = request.path.sub(/\?.*/, '')
+        type_name = url.split('/')[2].classify
+        begin
+          type = "Cms::#{type_name}".constantize
+        rescue NameError
+          type = type_name.constantize rescue nil
+        end
         raise "Invalid Type" unless type.ancestors.include?(DynamicView)
         type
       end
     end
-  
+
     def set_menu_section
       @menu_section = dynamic_view_type.name.underscore.pluralize
-    end  
-    
+    end
+
     def load_view
       @view = dynamic_view_type.find(params[:id])
     end
-  
+
+  end
 end

data/app/controllers/cms/email_messages_controller.rb

@@ -1,4 +1,5 @@
-class Cms::EmailMessagesController < Cms::BaseController
+module Cms
+class EmailMessagesController < Cms::BaseController
   layout 'cms/administration'
   
   check_permissions :administrate
@@ -11,4 +12,5 @@ class Cms::EmailMessagesController < Cms::BaseController
     @message = EmailMessage.find(params[:id])
   end
   
+end
 end