browsercms 3.5.0.rc3 → 3.5.0

data/app/controllers/cms/sections_controller.rb

@@ -1,85 +1,75 @@
-class Cms::SectionsController < Cms::BaseController
+module Cms
+  class SectionsController < Cms::BaseController
 
-  before_filter :load_parent, :only => [:new, :create]
-  before_filter :load_section, :only => [:edit, :update, :destroy, :move]
-  before_filter :set_toolbar_tab
-  
-  helper_method :public_groups
-  helper_method :cms_groups
+    before_filter :load_parent, :only => [:new, :create]
+    before_filter :load_section, :only => [:edit, :update, :destroy, :move]
+    before_filter :set_toolbar_tab
 
-  def index
-    redirect_to cms.sitemap_path
-  end
+    helper_method :public_groups
+    helper_method :cms_groups
 
-  def show
-    redirect_to cms.sitemap_path
-  end
-  
-  def new
-    @section = @parent.build_section
-    @section.groups = @parent.groups
-  end
-  
-  def create
-    @section = Cms::Section.new(params[:section])
-    @section.parent = @parent
-    @section.groups = @section.parent.groups unless current_user.able_to?(:administrate)
-    if @section.save
-      flash[:notice] = "Section '#{@section.name}' was created"
-      redirect_to @section
-    else
-      render :action => 'new'
-    end    
-  end
+    def index
+      redirect_to cms.sitemap_path
+    end
 
-  def edit
-  end
-  
-  def update
-    params[:section].delete('group_ids') if params[:section] &&  !current_user.able_to?(:administrate)
-    @section.attributes = params[:section]
-    if @section.save
-      flash[:notice] = "Section '#{@section.name}' was updated"
-      redirect_to @section
-    else
-      render :action => 'edit'
-    end      
-  end
-  
-  def destroy
-    respond_to do |format|
-      if @section.deletable? && @section.destroy
-        message = "Section '#{@section.name}' was deleted."
-        format.html { flash[:notice] = message; redirect_to(sitemap_url) }
-        format.json { render :json => {:success => true, :message => message } }
+    def show
+      redirect_to cms.sitemap_path
+    end
+
+    def new
+      @section = @parent.build_section
+      @section.groups = @parent.groups
+    end
+
+    def create
+      @section = Cms::Section.new(params[:section])
+      @section.parent = @parent
+      @section.groups = @section.parent.groups unless current_user.able_to?(:administrate)
+      if @section.save
+        flash[:notice] = "Section '#{@section.name}' was created"
+        redirect_to @section
       else
-        message = "Section '#{@section.name}' could not be deleted"
-        format.html { flash[:error] = message; redirect_to(sitemap_url) }
-        format.json { render :json => {:success => false, :message => message } }
+        render :action => 'new'
       end
     end
-  end  
-  
-  def move
-    if params[:section_id]
-      @move_to = Section.find(params[:section_id])
-    else
-      @move_to = Section.root.first
+
+    def edit
+    end
+
+    def update
+      params[:section].delete('group_ids') if params[:section] && !current_user.able_to?(:administrate)
+      @section.attributes = params[:section]
+      if @section.save
+        flash[:notice] = "Section '#{@section.name}' was updated"
+        redirect_to @section
+      else
+        render :action => 'edit'
+      end
     end
-  end
 
-  # Generates XML for Browsing files/pages/etc.
-  # @todo This MIGHT best live in the FCKeditor module, since it's XML format is highly coupled to that module's needs.
-  def file_browser              
-    @section = Cms::Section.find_by_name_path(params[:CurrentFolder])
-    if request.post? && params[:NewFile]
-      handle_file_browser_upload
-    else
-      render_file_browser
+    def destroy
+      respond_to do |format|
+        if @section.deletable? && @section.destroy
+          message = "Section '#{@section.name}' was deleted."
+          format.html { flash[:notice] = message; redirect_to(sitemap_url) }
+          format.json { render :json => {:success => true, :message => message} }
+        else
+          message = "Section '#{@section.name}' could not be deleted"
+          format.html { flash[:error] = message; redirect_to(sitemap_url) }
+          format.json { render :json => {:success => false, :message => message} }
+        end
+      end
     end
-  end
-  
-  protected
+
+    def move
+      if params[:section_id]
+        @move_to = Section.find(params[:section_id])
+      else
+        @move_to = Section.root.first
+      end
+    end
+
+    protected
     def load_parent
       @parent = Cms::Section.find(params[:section_id])
       raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@parent)
@@ -90,33 +80,6 @@ class Cms::SectionsController < Cms::BaseController
       raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@section)
     end
 
-    def handle_file_browser_upload
-      begin
-        case params[:Type].downcase
-        when "file"
-          FileBlock.create!(:section => @section, :file => params[:NewFile])
-        when "image" 
-          ImageBlock.create!(:section => @section, :file => params[:NewFile])
-        end
-        result = "0"
-      rescue Exception => e
-        result = "1,'#{escape_javascript(e.message)}'"
-      end  
-      render :text => %Q{<script type="text/javascript">window.parent.frames['frmUpload'].OnUploadCompleted(#{result});</script>}, :layout => false      
-    end
-    
-    def render_file_browser
-      @files = case params[:Type].downcase
-               when "file"
-                 FileBlock.by_section(@section)
-               when "image" 
-                 ImageBlock.by_section(@section)
-               else
-                 @section.pages
-               end
-       render 'cms/sections/file_browser', :layout => false, :format=>:xml
-    end
-
     def public_groups
       @public_groups ||= Cms::Group.public.all(:order => "#{Cms::Group.table_name}.name")
     end
@@ -128,4 +91,5 @@ class Cms::SectionsController < Cms::BaseController
     def set_toolbar_tab
       @toolbar_tab = :sitemap
     end
-end
+  end
+end

data/app/models/cms/abstract_file_block.rb

@@ -7,7 +7,7 @@ module Cms
     validates_presence_of :name
 
     scope :by_section, lambda { |section| {
-        :include => {:attachment => :section_node},
+        :include => {:attachments => :section_node},
         :conditions => ["#{SectionNode.table_name}.ancestry = ?", section.node.ancestry_path]}
     }
 
@@ -17,6 +17,11 @@ module Cms
       file.parent
     end
 
+    # Exists here so FileBrowser can polymorphically call file_size on Page, Images, Files, etc.
+    def file_size
+      file.size.round_bytes
+    end
+
     def path
       file.url
     end

data/app/models/cms/category.rb

@@ -7,6 +7,8 @@ module Cms
 
     include DefaultAccessible
 
+    attr_accessible :category_type
+
     validates_presence_of :category_type_id, :name
     validates_uniqueness_of :name, :scope => :category_type_id
 

data/app/models/cms/connector.rb

@@ -1,10 +1,11 @@
 module Cms
   class Connector < ActiveRecord::Base
-    include DefaultAccessible
 
     belongs_to :page, :class_name => 'Cms::Page'
     belongs_to :connectable, :polymorphic => true
-    attr_accessible :connectable
+
+    include DefaultAccessible
+    attr_accessible :connectable, :page_version, :connectable_version, :container # Need to be explicit due to seed data loading
 
     acts_as_list :scope => "#{Connector.table_name}.page_id = \#{page_id} and #{Cms::Connector.table_name}.page_version = \#{page_version} and #{Cms::Connector.table_name}.container = '\#{container}'"
     alias :move_up :move_higher

data/app/models/cms/content_type.rb

@@ -1,7 +1,7 @@
 module Cms
   class ContentType < ActiveRecord::Base
 
-    attr_accessible :name, :group_name
+    attr_accessible :name, :group_name, :content_type_group
 
     attr_accessor :group_name
     belongs_to :content_type_group, :class_name => 'Cms::ContentTypeGroup'

data/app/models/cms/page.rb

@@ -17,6 +17,7 @@ class Cms::Page < ActiveRecord::Base
   has_many :tasks
 
   include Cms::DefaultAccessible
+  attr_accessible :name, :path, :template_file_name, :hidden, :cacheable # Needs to be explicit so seed data will work.
 
   scope :named, lambda { |name| {:conditions => ["#{table_name}.name = ?", name]} }
   scope :with_path, lambda { |path| {:conditions => ["#{table_name}.path = ?", path]} }
@@ -210,8 +211,9 @@ class Cms::Page < ActiveRecord::Base
     super(version)
   end
 
+  # Pages have no size (for the purposes of FCKEditor)
   def file_size
-    "?"
+    "NA"
   end
 
   def public?

data/app/models/cms/section.rb

@@ -12,7 +12,7 @@ module Cms
     VISIBLE_NODE_TYPES = [SECTION, PAGE, LINK]
 
     include DefaultAccessible
-    attr_accessible :allow_groups, :group_ids
+    attr_accessible :allow_groups, :group_ids, :name, :path, :root, :hidden
 
     include Cms::Addressable
     include Cms::Addressable::NodeAccessors

data/app/models/cms/view_context.rb

@@ -43,6 +43,10 @@ module Cms
       @controller.instance_variable_get("@template").content_for(name, content, &block)
     end
 
+    # Returns the routes for the Cms::Engine for view that need to access them.
+    def cms
+      Cms::Engine.routes.url_helpers
+    end
   end
 
 

data/app/views/cms/file_blocks/render.html.erb

@@ -1,5 +1,5 @@
 <div id="file_block_<%= @content_block.id %>" class="file_block">
   <%= image_tag "cms/icons/file_types/#{@content_block.file.icon}.png", :alt=>@content_block.file.icon %>
   <%= link_to @content_block.name, attachment_path_for(@content_block.file) %>
-  <%= @content_block.file.data_file_size.round_bytes %>
+  <%= @content_block.file_size %>
 </div>

data/app/views/portlets/email_page/render.html.erb

@@ -1,5 +1,5 @@
 <div class="email-page-portlet">
-  <%= form_for @email_message, :url => handler_path(@portlet, "deliver") do |f| %>
+  <%= form_for @email_message, :url => cms.portlet_handler_path(@portlet, "deliver"), :method=>'post' do |f| %>
     <%= hidden_field_tag :email_page_portlet_url, @email_page_portlet_url %>
     <%= f.cms_error_messages %>
     <p>

data/bin/bcms

@@ -109,6 +109,12 @@ TEXT
     puts "BrowserCMS has been installed. Run rake db:install to add the tables then restart your server."
   end
 
+  desc 'install_db', "Adds just migrations and seed data to the project."
+  def install_db
+    install_migrations
+    install_cms_seed_data
+  end
+
   private
 
   def prefix_cms_tables

data/config/routes.rb

@@ -46,7 +46,6 @@ Cms::Engine.routes.draw do
       put :complete
     end
   end
-  match '/sections/file_browser.xml', :to => 'sections#file_browser', :format => "xml", :as=>'file_browser'
   resources :sections do
     resources :links, :pages
   end
@@ -66,7 +65,7 @@ Cms::Engine.routes.draw do
   match '/content_library', :to=>'html_blocks#index', :as=>'content_library'
   content_blocks :html_blocks
   content_blocks :portlets
-  post '/portlet/:id/:handler', :to=>"portlet#execute_handler", :as=>"handler"
+  post '/portlet/:id/:handler', :to=>"portlet#execute_handler", :as=>"portlet_handler"
 
   content_blocks :file_blocks
   content_blocks :image_blocks

data/doc/release_notes.md

@@ -1,64 +1,4 @@
-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
-==========
-
-* Fixed issue where named page routes couldn't be found in portlet views
-* Fixed issue where page routes can't be created in seed data.
-* Confirmed that X-Sendfile works
-
-X-Sendfile
-----------
-
-One way to improve the performance of BrowserCMS is to enable X-Sendfile. Used in conjunction with Web servers like Apache and Nginx, X-Sendfile will allow web servers to handle serving files that have been uploaded into the CMS. Web servers are very well optimized for sending static files, and doing so takes load off the Ruby processes reducing bottlenecks.
-
-To enable X-Sendfile in your application, uncomment one of the following two lines depending on which web server you are using.
-
-```
-# In config/environments/production.rb
-config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-```
-
-You will then need to configure your web server to handle X-Sendfile requests. See documentation for [Apache](https://tn123.org/mod_xsendfile/) and [Nginx](http://wiki.nginx.org/XSendfile) for details.
-
-v3.5.0.rc1
+v3.5.0
 ======
 
 This release includes a number of new features, including:
@@ -104,7 +44,54 @@ To better support deploying BrowserCMS to Heroku, we have put together a new gui
 
 As a side note, the CMS should work with Postgresql as well, based on our testing with Heroku (which uses Postgres by default).
 
-Notable Fixes
+Admin Links
+==========
+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
+```
+
+X-Sendfile
+----------
+
+One way to improve the performance of BrowserCMS is to enable X-Sendfile. Used in conjunction with Web servers like Apache and Nginx, X-Sendfile will allow web servers to handle serving files that have been uploaded into the CMS. Web servers are very well optimized for sending static files, and doing so takes load off the Ruby processes reducing bottlenecks.
+
+To enable X-Sendfile in your application, uncomment one of the following two lines depending on which web server you are using.
+
+```
+# In config/environments/production.rb
+config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+```
+
+You will then need to configure your web server to handle X-Sendfile requests. See documentation for [Apache](https://tn123.org/mod_xsendfile/) and [Nginx](http://wiki.nginx.org/XSendfile) for details.
+
+Other Notable Fixes
 -------------
 
 * [#493] Add Mobile capability
@@ -114,8 +101,13 @@ Notable Fixes
 * [#508] Remove fancy file upload (probably unused and wasn't working anyway)
 * [#519] Better support for Amazon/AWS S3
 * [#521] Remove SITE_DOMAIN constant in favor of more conventional rails configuration methods
+* 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.
+* Fixed issue where named page routes couldn't be found in portlet views
+* Fixed issue where page routes can't be created in seed data.
+* Confirmed that X-Sendfile works
 
-See the [detailed changelog](https://github.com/browsermedia/browsercms/compare/v3.4.0...v3.5.0.rc1) for more info.
+See the [detailed changelog](https://github.com/browsermedia/browsercms/compare/v3.4.0...v3.5.0) for more info.
 
 v3.4.2
 ======

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.rc3"
+  VERSION = "3.5.0"
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.5.0.rc3
-  prerelease: 6
+  version: 3.5.0
+  prerelease: 
 platform: ruby
 authors:
 - BrowserMedia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -573,7 +573,6 @@ files:
 - app/views/cms/sections/_section.html.erb
 - app/views/cms/sections/destroy.js.rjs
 - app/views/cms/sections/edit.html.erb
-- app/views/cms/sections/file_browser.xml.builder
 - app/views/cms/sections/index.html.erb
 - app/views/cms/sections/new.html.erb
 - app/views/cms/sessions/new.html.erb
@@ -761,9 +760,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1483783289705216682
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/views/cms/sections/file_browser.xml.builder

@@ -1,14 +0,0 @@
-xml.instruct!
-xml.tag! 'Connector', "command" => params["Command"], "resourceType" => params["Type"] do
-  xml.tag! 'CurrentFolder', "path" => params[:CurrentFolder], "url" => params[:CurrentFolder]
-  xml.tag! 'Folders' do
-    for section in @section.sections do
-      xml.tag! 'Folder', "name" => section.name
-    end
-  end
-  xml.tag! 'Files' do
-    for file in @files do
-      xml.tag! 'File', "name" => file.name, "url" => file.path, "size" => file.file_size
-    end
-  end
-end