browsercms 3.0.6 → 3.1.0

data/public/stylesheets/cms/application.css

@@ -107,8 +107,8 @@ width: 160px;
 }
 
 #search_term {
-  width: 134px;
-  height: 20px;
+  width: 132px;
+  height: 18px;
 * width: 130px;
   border: 1px solid #B9B9B9;
   border-right: none;

data/public/stylesheets/cms/form_layout.css

@@ -177,6 +177,7 @@ float: left;
 }
 
 .file_fields div.file_inputs {
+    padding-bottom: 2px;
     position:relative;
 }
 
@@ -188,7 +189,7 @@ float: left;
     display:inline;
     margin-left: 140px;
 }
-.file_fields input.file {
+.file_fields input.fancy_file {
 opacity: 0;
 filter: alpha(opacity=0);
 position: relative;
@@ -276,8 +277,3 @@ margin: 8px 0;
 .checkboxes .instructions {
   margin-left: 0;
 }
-#file_block_attachment_file, #image_block_attachment_file { 
-height: 30px; 
-margin-left: 364px;
-* margin-left: 352px;
-}

data/rails_generators/content_block/templates/migration.rb

@@ -23,7 +23,7 @@ class <%= migration_name %> < ActiveRecord::Migration
       CategoryType.create!(:name => "<%= @category_type %>")
     end<% end %>
     <% if @attachment_section %>unless Section.with_path('/<%= file_name.pluralize %>').exists?
-      Section.create!(:name => "<%= @attachment_section %>", :parent => Section.system.first, :path => '/<%= file_name.pluralize %>', :group_ids => Group.all(&:id))
+      Section.create!(:name => "<%= @attachment_section %>", :parent => Section.system.first, :path => '/<%= file_name.pluralize %>', :allow_groups=>:all)
     end<% end %>
     ContentType.create!(:name => "<%= class_name %>", :group_name => "<%= class_name %>")
   end

data/rails_generators/portlet/USAGE

@@ -4,7 +4,7 @@ Description:
 
     Attribute pairs are column_name:sql_type arguments specifying the
     model's attributes. By default, portlets include name:string and template:text
-    attributes, so don't specify them.
+    attributes, so do not specify them.
 
     This generates a portlet class in app/portlets, a form in app/view/portlets and
     a default view to render the portlet in app/view/portlets, and a unit test in
@@ -17,6 +17,7 @@ Example:
 
         A portlet to find and display a list of recent Article blocks.
             Portlet:            app/portlets/list_recent_articles_portlet.rb
+            Helper:             app/portlets/helpers/list_recent_articles_portlet_helper.rb
             Form View:          app/views/portlets/list_recent_articles/_form.html.erb
             Default Template:   app/views/portlets/list_recent_articles/render.html.erb
             Unit Test:          test/unit/portlets/list_recent_articles_portlet_test.rb
@@ -29,6 +30,7 @@ Example with attributes:
 
         A portlet to display a specific number of articles, as specified in the admin UI.
             Portlet:            app/portlets/find_top_x_articles_portlet.rb
+            Helper:             app/portlets/helpers/find_top_x_articles_portlet_helper.rb
             Form View:          app/views/portlets/find_top_x_articles/_form.html.erb
             Default Template:   app/views/portlets/find_top_x_articles/render.html.erb
             Unit Test:          test/unit/portlets/find_top_x_articles_portlet_test.rb

data/rails_generators/portlet/portlet_generator.rb

@@ -16,6 +16,10 @@ class PortletGenerator < Rails::Generator::NamedBase
       m.directory File.join('app/portlets', class_path)
       m.template 'portlet.rb', File.join('app/portlets', class_path, "#{portlet_file_name}.rb")
 
+      # Create the helper
+      m.directory File.join('app/portlets/helpers')
+      m.template 'portlet_helper.rb', File.join('app/portlets/helpers', class_path, "#{portlet_file_name}_helper.rb")
+
       # Create the edit form for the content type
       m.directory File.join('app/views/portlets', file_name)
       m.template '_form.html.erb', File.join('app/views/portlets/', file_name, "_form.html.erb")

data/rails_generators/portlet/templates/_form.html.erb

@@ -2,5 +2,4 @@
 <% for attribute in attributes -%>
 <%%= f.cms_text_field :<%= attribute.name %> %>
 <% end -%>
-<%%= f.cms_drop_down :handler, ActionView::Template.template_handler_extensions, :default => "erb" %>
-<%%= f.cms_text_area :template, :default_value => @block.class.default_template %>
+<%%= f.cms_template_editor :template %>

data/rails_generators/portlet/templates/portlet.rb

@@ -1,5 +1,8 @@
 class <%= class_name %>Portlet < Portlet
-    
+
+  # Mark this as 'true' to allow the portlet's template to be editable via the CMS admin UI.
+  enable_template_editor false
+     
   def render
     # Your Code Goes Here
   end

data/rails_generators/portlet/templates/portlet_helper.rb

@@ -0,0 +1,5 @@
+##
+# All methods from this helper will be available in the render.html.erb for <%= class_name %>Portlet
+module <%= class_name %>PortletHelper
+  
+end

data/rails_generators/template/USAGE

@@ -0,0 +1,10 @@
+Description:
+    Generates a basic page template in the project.
+
+Example:
+    `./script/generate template subpage`
+
+        A page template in html format using erb.
+            Template:            app/views/layouts/templates/subpage.html.erb
+
+

data/rails_generators/template/template_generator.rb

@@ -0,0 +1,18 @@
+class TemplateGenerator < Rails::Generator::NamedBase
+
+  def manifest
+    record do |m|
+
+      template_name = "#{file_name}"
+
+      m.directory File.join('app/views/layouts/templates')
+      m.template 'template.erb', File.join('app/views/layouts/templates', "#{template_name}.html.erb")
+
+    end
+  end
+
+  protected
+  def banner
+    "Usage: #{$0} #{spec.name} template_name"
+  end
+end

data/rails_generators/template/templates/template.erb

@@ -0,0 +1,3 @@
+<%
+    require 'templates'
+%><%= Templates.default_body %>

data/templates/blank.rb

@@ -5,7 +5,13 @@ else
   run "rm public/index.html"
 end
 
-gem "browsercms"
+# Loads the version, so we can explicitly set in the generated cms project.
+template_root = File.dirname(File.expand_path(template))
+require File.join(template_root, '..', 'lib', 'cms', 'version.rb')
+gem "browsercms", :version=>Cms::VERSION
+
+generate :jdbc if defined?(JRUBY_VERSION)
+
 if Gem.win_platform?
   puts "        rake  db:create"
   `rake.cmd db:create`
@@ -22,6 +28,10 @@ environment 'config.action_controller.page_cache_directory = RAILS_ROOT + "/publ
 initializer 'browsercms.rb', <<-CODE
 Cms.attachment_file_permission = 0640
 CODE
+
+require File.join(template_root, '..', 'app', 'models', 'templates.rb')
+file 'app/views/layouts/templates/default.html.erb', Templates.default_body
+
 if Gem.win_platform?
   puts "        rake  db:migrate"
   `rake.cmd db:migrate`

data/templates/demo.rb

@@ -5,7 +5,13 @@ else
   run "rm public/index.html"
 end
 
-gem "browsercms"
+# Loads the version, so we can explicitly set in the generated cms project.
+template_root = File.dirname(File.expand_path(template))
+require File.join(template_root, '..', 'lib', 'cms', 'version.rb')
+gem "browsercms", :version=>Cms::VERSION
+
+generate :jdbc if defined?(JRUBY_VERSION)
+
 if Gem.win_platform?
   puts "        rake  db:create"
   `rake.cmd db:create`
@@ -20,6 +26,10 @@ environment 'SITE_DOMAIN="localhost:3000"', :env => "production"
 environment 'config.action_view.cache_template_loading = false', :env => "production"
 environment 'config.action_controller.page_cache_directory = RAILS_ROOT + "/public/cache/"', :env => "production"
 generate :browser_cms_demo_site
+
+require File.join(template_root, '..', 'app', 'models', 'templates.rb')
+file 'app/views/layouts/templates/default.html.erb', Templates.default_body
+
 if Gem.win_platform?
   puts "        rake  db:migrate"
   `rake.cmd db:migrate`

data/templates/module.rb

@@ -1,5 +1,10 @@
 run "rm public/index.html"
-gem "browsercms"
+
+# Loads the version, so we can explicitly set in the generated cms project.
+template_root = File.dirname(File.expand_path(template))
+require File.join(template_root, '..', 'lib', 'cms', 'version.rb')
+gem "browsercms", :version=>Cms::VERSION
+
 rake "db:create"
 route "map.routes_for_browser_cms"
 generate :browser_cms
@@ -27,6 +32,10 @@ CODE
 module_name = File.basename(root).match(/bcms_(.+)/)[1]
 gem_name = "bcms_#{module_name}"
 
+file "public/bcms/#{module_name}/README", <<-CODE
+Use this directory to add public files that should copied from the gem into the project.
+CODE
+
 file "#{File.basename(root)}.gemspec", <<-CODE
 SPEC = Gem::Specification.new do |spec| 
   spec.name = "#{gem_name}"
@@ -43,6 +52,7 @@ SPEC = Gem::Specification.new do |spec|
   spec.files += Dir["lib/#{gem_name}.rb"]
   spec.files += Dir["lib/#{gem_name}/*"]
   spec.files += Dir["rails/init.rb"]
+  spec.files += Dir["public/bcms/#{module_name}/**/*"]
   spec.has_rdoc = true
   spec.extra_rdoc_files = ["README"]
 end
@@ -68,6 +78,7 @@ file "rails/init.rb", <<-CODE
 gem_root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 Cms.add_to_rails_paths gem_root
 Cms.add_generator_paths gem_root, "db/migrate/[0-9]*_*.rb"
+Cms.add_generator_paths gem_root, "public/bcms/#{module_name}/**/*"
 CODE
 
 file "LICENSE.txt", <<-CODE
@@ -239,7 +250,7 @@ Library.
 CODE
 
 file "COPYRIGHT.txt", <<-CODE
-All BrowserCMS code is Copyright (C) 1998-2009 by BrowserMedia, LLC.
+All BrowserCMS code is Copyright (C) 1998-2010 by BrowserMedia, LLC.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -261,7 +272,7 @@ according to the terms of the GNU Lesser Public License or a compatible
 license, including:
 
 - jQuery - Copyright (C) 2009 John Resig
-- FCKEditor - Copyright (C) 2003-2009 Frederico Caldeira Knabben
+- CKEditor - Copyright (C) 2003-2009 Frederico Caldeira Knabben
 CODE
 
 file "GPL.txt", <<-CODE
@@ -942,4 +953,4 @@ Public License instead of this License.  But first, please read
 CODE
  
 git :add => "."
-git :commit => "-a -m 'New Module'"
+git :commit => "-a -m 'New Module'"

data/test/functional/cms/dashboard_controller_test.rb

@@ -13,5 +13,4 @@ class Cms::DashboardControllerTest < ActionController::TestCase
     assert_response :success
     assert_select "title", "Dashboard"
   end
-  
-end
+end

data/test/functional/tests/pretend_controller_test.rb

@@ -0,0 +1,54 @@
+require 'test_helper'
+
+class Tests::PretendControllerTest < ActionController::TestCase
+  include Cms::ControllerTestHelper
+
+  test "open" do
+    get :open
+    assert_response :success
+    assert_select 'h1', "Open Page"
+  end
+
+  test "restricted members section should give standard CMS error page when not logged in" do
+    restricted_section = Factory(:section, :path=>"/members")
+
+    get :restricted
+    assert_response 403
+    assert_select 'h1', "Access Denied"
+  end
+
+  test "restricted page should be visible to cmsadmins" do
+    restricted_section = Factory(:section, :path=>"/members")
+    login_as_cms_admin
+
+    get :restricted
+    assert_response :success
+    assert_select "h1", Tests::PretendController::RESTRICTED_H1
+  end
+
+
+  # Matches content_controller_test
+  test "not-found when not logged in" do
+    get :not_found
+    assert_response :missing
+    assert_select "title", "Not Found"
+    assert_select "h1", "Page Not Found"
+  end
+
+  # See content_controller_tests for similar behavio
+  test "Throwing NotFound while logged in as admin will render error rather than 404 page." do
+    login_as_cms_admin
+
+    get :not_found
+
+    assert_response :error, "Unlike ContentController Acts::ContentPage will have an error rather than 404 page."
+    assert_select "title", "Error: ActiveRecord::RecordNotFound"
+  end
+
+  test "error" do
+    get :error
+    assert_response :error
+    assert_select "title", "Server Error"
+    assert_select "p", "The server encountered an unexpected condition that prevented it from fulfilling the request.", "Default CMS server error content"
+  end
+end

data/test/integration/cms/ckeditor_test.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__) + '/../../test_helper')
+
+class CkeditorTest < ActionController::IntegrationTest
+  include Cms::IntegrationTestHelper
+
+  def setup
+    login_as_cms_admin
+  end
+
+  def test_ckeditor_select
+    get new_cms_html_block_url
+    assert_response :success
+    
+    assert_tag :tag => "select",
+               :attributes => { :id => "dhtml_selector", 
+                                :onchange =>  "toggleEditor('html_block_content', this)"}, 
+               :child => { :tag => "option", :content =>  "Rich Text" }
+  end
+  def test_ckeditor_js_added
+    get new_cms_html_block_url
+    assert_response :success
+    
+    assert_tag :tag => "script",
+               :attributes => { :src => /^\/bcms\/ckeditor\/ckeditor.js.*/} 
+  end
+
+end

data/test/integration/cms/password_management_test.rb

@@ -0,0 +1,56 @@
+require File.join(File.dirname(__FILE__) + '/../../test_helper')
+
+class PasswordManagementTest < ActionController::IntegrationTest
+
+  def setup  
+    @group = Factory(:group, :name => "Member")
+
+    @section = Factory(:section, :parent => root_section, :name => "Passwords", :path => "/passwords", :allow_groups=>:all)
+    @section.save
+
+    @user = Factory(:user, :email => "dexter@miamidade.gov")
+    @user.groups << @group
+    @user.save!
+
+    @forgot_password_page = Factory(:page, :section => @section, :name => "Forgot password", :path => "/passwords")
+    @reset_password_page = Factory(:page, :section => @section, :name => "Reset password", :path => "/passwords/reset")
+
+    @forgot_password_portlet = ForgotPasswordPortlet.create!(:name => "Forgot Password",
+                                                             :template => ForgotPasswordPortlet.default_template,
+                                                             :connect_to_page_id => @forgot_password_page.id,
+                                                             :connect_to_container => "main",
+                                                             :publish_on_save => true)
+
+    @reset_password_portlet = ResetPasswordPortlet.create!(:name => "Reset Password",
+                                                           :template => ResetPasswordPortlet.default_template,
+                                                           :connect_to_page_id => @reset_password_page.id,
+                                                           :connect_to_container => "main",
+                                                           :publish_on_save => true)
+
+    @forgot_password_page.publish!
+    @reset_password_page.publish!
+    ActionMailer::Base.deliveries = []
+  end
+
+  def test_forgot_password
+    get "/passwords"
+    assert_response :success
+    
+    post "/passwords", :email => User.last.email
+    assert_response :success    
+    assert flash[:forgot_password][:notice]
+    assert ActionMailer::Base.deliveries.empty?
+  end
+
+  def test_reset_password
+    test_forgot_password
+    token = User.last.reset_token    
+    get "/passwords/reset?token=#{token}"
+    assert_response :success
+    
+    post "/passwords/reset", :token => token
+    assert_response :success    
+    assert flash[:reset_password][:notice]
+  end
+
+end

data/test/test_helper.rb

@@ -159,3 +159,17 @@ module Cms::ControllerTestHelper
     output.instance_variable_get("@contents")
   end
 end
+
+module Cms::IntegrationTestHelper
+  def login_as(user, password = "password")
+    get cms_login_url
+    assert_response :success
+    post cms_login_url, :login => user.login, :password => password
+    assert_response :redirect
+    assert flash[:notice]
+  end
+
+  def login_as_cms_admin
+    login_as(User.first, "cmsadmin")
+  end
+end

data/test/unit/helpers/form_builder_test.rb

@@ -1,9 +1,17 @@
 require File.join(File.dirname(__FILE__), '../../test_helper')
 
+silence_warnings do
+
+  class Block < Struct.new(:id, :name)
+  end
+end
+
 class FormBuilderTest < ActionView::TestCase
+  tests ActionView::Helpers::FormHelper
 
-  def setup
 
+  def setup
+    @block = Block.new
   end
 
   def teardown
@@ -11,7 +19,18 @@ class FormBuilderTest < ActionView::TestCase
   end
 
 
-  test "Text field includes instructions" do
+  test "cms_text_area with a fairly weak and semi-pointless test" do
+
+    self.expects(:block_path).returns("/")
+    self.expects(:protect_against_forgery?).returns(false).at_least_once
     
+    self.expects(:render).at_least_once
+    self.expects(:next_tabindex).returns({})
+
+    form_for (@block) do |f|
+      f.cms_text_area(:name)
+    end
   end
+
+
 end