browsercms 3.4.0.rc2 → 3.4.0

data/features/step_definitions/content_pages_steps.rb

@@ -1,6 +1,6 @@
 module PageDiagnosticSteps
   def should_see_a_page_titled(page_title)
-    assert page.has_css?("title", :text=>page_title), "Expected a page with a title '#{page_title}'."
+    assert page.has_css?("title", :text => page_title), "Expected a page with a title '#{page_title}'."
     assert page.has_content?(page_title)
   end
 end
@@ -12,7 +12,7 @@ Then /^I should see a page titled "([^"]*)"$/ do |page_title|
 end
 
 When /^the page header should be "([^"]*)"$/ do |h1|
-  assert page.has_css?("h1", :text=>h1), "Expected to see <h1>#{h1}</h1> on the page."
+  assert page.has_css?("h1", :text => h1), "Expected to see <h1>#{h1}</h1> on the page."
 end
 
 When /^I am not logged in$/ do
@@ -28,7 +28,7 @@ end
 
 Given /^there is a LoginPortlet on the homepage$/ do
   cms_page = Cms::Page.with_path("/").first
-  portlet = LoginPortlet.create!(:name=>"Login Portlet")
+  portlet = LoginPortlet.create!(:name => "Login Portlet")
   cms_page.add_content(portlet, :main)
   cms_page.publish!
 end
@@ -54,8 +54,8 @@ end
 
 When /^login as an authorized user$/ do
   visit "/cms/login"
-  fill_in 'login', :with=>"privileged"
-  fill_in 'password', :with=>"password"
+  fill_in 'login', :with => "privileged"
+  fill_in 'password', :with => "password"
   click_button 'LOGIN'
 end
 When /^I click the Select Existing Content button$/ do
@@ -99,7 +99,7 @@ Given /^there is a homepage$/ do
   if page
     @homepage = page
   else
-    @homepage = Factory(:public_page, :path=>"/", :name=>"Home Page")
+    @homepage = Factory(:public_page, :path => "/", :name => "Home Page")
   end
 end
 
@@ -108,7 +108,7 @@ Then /^I should see the CMS 404 page$/ do
 end
 
 Given /^an archived page at "([^"]*)" exists$/ do |path|
-  page = Factory(:page, :archived=>true, :path=>path)
+  page = Factory(:page, :archived => true, :path => path)
   assert page.archived?
 end
 
@@ -147,3 +147,24 @@ Given /^I am adding a page to the root section$/ do
   section = Cms::Section.root.first
   visit "/cms/sections/#{section.id}/pages/new"
 end
+When /^I am adding a link on the sitemap$/ do
+  section = Cms::Section.root.first
+  visit "/cms/sections/#{section.id}/links/new"
+end
+When /^I edit that link$/ do
+  link = Cms::Link.first
+  visit "/cms/links/#{link.id}/edit"
+end
+
+Given /^the following link exists:$/ do |table|
+  table.hashes.each do |row|
+    section = Cms::Section.with_path(row.delete('section')).first
+    row['section_id'] = section.id
+    Factory(:link, row)
+  end
+end
+
+When /^I change the link name to "([^"]*)"$/ do |new_name|
+  fill_in "Name", :with=>new_name
+  click_on "Save And Publish"
+end

data/features/step_definitions/manage_user_steps.rb

@@ -0,0 +1,22 @@
+When /^fill valid fields for a new user named "([^"]*)"$/ do |username|
+  fill_in "Username", :with=>username
+  fill_in "Email", :with=>"#{username}@example.com"
+  fill_in "First Name", :with=>"Mr."
+  fill_in "Last Name", :with=>"Blank"
+  fill_in "Password", :with=>"abc123"
+  fill_in "Confirm Password", :with=>"abc123"
+  click_on "Save"
+end
+Given /^the following content editor exists:$/ do |table|
+    table.hashes.each do |row|
+      row['login'] = row.delete('username')
+      Factory(:content_editor, row)
+    end
+end
+When /^I login as:$/ do |table|
+  user = table.hashes.first
+  visit '/cms/login'
+  fill_in 'login', :with => user['login']
+  fill_in 'password', :with => user['password']
+  click_button 'LOGIN'
+end

data/features/step_definitions/task_steps.rb

@@ -0,0 +1,4 @@
+When /^I assign the home page as a task$/ do
+  home_page = Cms::Page.with_path("/").first
+  visit "/cms/pages/#{home_page.id}/tasks/new"
+end

data/features/step_definitions/upgrade_module_steps.rb

@@ -54,10 +54,12 @@ When /^the engine should be created$/ do
 
 end
 Given /^I am working on a BrowserCMS v3.3.x project named "([^"]*)"$/ do |project_name|
-  cd ".."
   run_simple "rails _3.0.9_ new #{project_name} --skip-bundle"
   cd project_name
+  append_to_file "Gemfile", "gem \"browsercms\", \"3.3.3\""
+  self.project_name = project_name
 end
+
 Then /^a Gemfile should be created$/ do
   steps %Q{
   Then a file named "Gemfile" should exist

data/features/support/async_support.rb

@@ -0,0 +1,17 @@
+module AsyncSupport
+  def eventually
+    timeout = 5
+    polling_interval = 0.1
+    time_limit = Time.now + timeout
+    loop do
+      begin
+        yield
+      rescue StandardError => error
+      end
+      return if error.nil?
+      raise error if Time.now >= time_limit
+      sleep polling_interval
+    end
+  end
+end
+World(AsyncSupport)

data/features/support/command_line_helpers.rb

@@ -32,14 +32,32 @@ module CommandLineHelpers
   end
 
   # Given the name of the migration (i.e. create_something.rb) find the EXACT migration file (which will include a timestamp)
-  # @param [String] partial_file_name Include the .rb at the end
+  #   Example:
+  #   find_migration_with_name("create_something.rb")
+  #
+  # @param [String] partial_file_name - Must include the .rb at the end
   # @parem [String] The absolute path to the migration file
   def find_migration_with_name(partial_file_name)
-    file_pattern = "#{@aruba_dir}/#{project_name}/db/migrate/*#{partial_file_name}"
-    files = Dir.glob(file_pattern)
+    files, file_pattern = migrations_named(partial_file_name)
     fail "Couldn't find a migration file matching this pattern (#{file_pattern})'" if files.empty?
     File.absolute_path(files.first)
   end
+
+  def migration_exists?(partial_file_name)
+    files, fp = migrations_named(partial_file_name)
+    files.size > 0
+  end
+
+  def migrations_named(name)
+    file_pattern = "#{@aruba_dir}/#{project_name}/db/migrate/*#{name}"
+    files = Dir.glob(file_pattern)
+    return files, file_pattern
+  end
+
+
+  def verify_seed_data_requires_browsercms_seeds
+    check_file_content('db/seeds.rb', "\nrequire File.expand_path('../browsercms.seeds.rb', __FILE__)\n", true)
+  end
 end
 World(CommandLineHelpers)
 

data/lib/cms/acts/content_page.rb

@@ -15,7 +15,24 @@
 module Cms
   module Acts
 
+    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
+    end
     module ContentPage
 
       def self.included(base)
@@ -26,6 +43,12 @@ module Cms
         base.helper Cms::PageHelper
         base.helper Cms::RenderingHelper
         base.helper Cms::MenuHelper
+        base.helper Cms::Acts::PageHelper
+      end
+
+      # Allows a Controller method to set a page title for an action.
+      def page_title=(title)
+        @page_title = title
       end
 
       # Before filter that determines if the current user can access a specific section.

data/lib/cms/commands/actions.rb

@@ -13,7 +13,7 @@ module Cms
       end
 
       def include_cms_module
-        inject_into_file "lib/#{current_project}/engine.rb", :after=>"isolate_namespace #{module_class}\n" do
+        inject_into_file "lib/#{current_project}/engine.rb", :after => "isolate_namespace #{module_class}\n" do
           "\t\tinclude Cms::Module\n"
         end
       end
@@ -27,11 +27,66 @@ module Cms
         current_project.classify
       end
 
+      # Runs `bundle install` inside the correct project directory (unless --skip_bundle was passed to the command)
+      def run_bundle_install
+        inside current_project do
+          run "bundle install" unless options[:skip_bundle]
+        end
+      end
+
+      def comment_out_rails_in_gemfile
+        gsub_file "Gemfile", /gem ["|']rails["|'],/, "# Use BrowserCMS dependency on Rails instead\n# gem 'rails',"
+      end
+
+      def update_browsercms_gem_version
+        gsub_file "Gemfile", /gem ["|']browsercms.*$/, "gem \"browsercms\", \"#{Cms::VERSION}\""
+      end
+
+      def install_migrations
+        rake 'cms:install:migrations'
+      end
+
+      def install_cms_seed_data
+        # Copy from Gem
+        copy_file File.expand_path(File.join(__FILE__, "../../../../db/browsercms.seeds.rb")), "db/browsercms.seeds.rb"
+        append_to_file('db/seeds.rb', "\nrequire File.expand_path('../browsercms.seeds.rb', __FILE__)\n")
+      end
+
       # Adds a route as the last file of the project.
       # Assumes we are inside the rails app.
       def add_route_to_end(route)
         inject_into_file 'config/routes.rb', "\n  #{route}\n", {:before => /^end$/}
       end
+
+      # Find the first migration within the current project given a partial name:
+      #   i.e. create_turtles
+      # Might find 20120314204817_create_turtles.rb
+      #
+      # @param [String] name Partial file name. Don't include the .rb at the end
+      # @return [String] Full path to the file, so you can do file manipulation on it.
+      def migration_with_name(name)
+        file_pattern = "db/migrate/*#{name}.rb"
+        files = Dir.glob(file_pattern)
+        fail "Couldn't find a migration file matching this pattern (#{file_pattern})'" if files.empty?
+        File.absolute_path(files.first)
+      end
+
+      # Returns a list of all models in the current project.
+      # @return [Array<String>] List of file names matching the models
+      def find_custom_blocks
+        file_pattern = "app/models/*.rb"
+        model_files = Dir.glob(file_pattern)
+        block_files = model_files.map do |f|
+          content = IO.read(f)
+          puts "Found\n#{content}"
+          if content.match(/acts_as_content_block/)
+            File.basename(f, ".rb")
+          else
+            nil
+          end
+        end
+        block_files.compact
+      end
     end
   end
 end

data/lib/cms/engine.rb

@@ -2,6 +2,16 @@ require 'rails'
 require 'cms/module'
 require 'cms/init'
 require 'browsercms'
+
+# Gem name is different than file name
+# Must be required FIRST, so that our assets paths appear before its do.
+# This allows app/assets/ckeditor/config.js to set CMS specific defaults.
+require 'ckeditor-rails'
+
+# Explicitly require this, so that CMS projects do not need to add it to their Gemfile
+# Especially while upgrading
+require 'jquery-rails'
+
 module Cms
 
   # Configuring BrowserCMS as an engine. This seems to work, but could probably be cleaned up.
@@ -23,7 +33,7 @@ module Cms
 
     initializer 'browsercms.add_core_routes', :after => 'action_dispatch.prepare_dispatcher' do |app|
       Rails.logger.debug "Adding Cms::Routes to ActionDispatch"
-      ::Cms::Engine.add_cms_routes_method
+      ActionDispatch::Routing::Mapper.send :include, Cms::RouteExtensions
     end
 
     initializer 'browsercms.add_load_paths', :after => 'action_controller.deprecated_routes' do |app|
@@ -31,8 +41,8 @@ module Cms
       ::Cms::Engine.add_cms_load_paths
     end
 
-    def self.add_cms_routes_method
-      ActionDispatch::Routing::Mapper.send :include, Cms::RouteExtensions
+    initializer "browsercms.precompile_assets" do |app|
+      app.config.assets.precompile += ['cms/application.css']
     end
 
     def self.add_cms_load_paths

data/lib/cms/extensions/active_record/connection_adapters/abstract/schema_statements.rb

@@ -107,10 +107,16 @@ module ActiveRecord
         add_column "#{table_name.to_s.singularize}_versions".to_sym, column_name, type, options
       end
 
+      def remove_content_column(table_name, column_name)
+        remove_column table_name, column_name
+        remove_column "#{table_name.to_s.singularize}_versions".to_sym, column_name
+      end
+
       # Will namespace the content table
       def content_table_exists?(table_name)
         table_exists?(Cms::Namespacing.prefixed_table_name(table_name))
       end
+
     end
   end
 end

data/lib/cms/upgrades/v3_4_0.rb

@@ -0,0 +1,32 @@
+module Cms
+  module Upgrades
+
+    # Commands specifically for upgrading to version 3.4.0 of BrowserCMS
+    module V3_4_0
+
+      def generate_rails_3_4_0_migration
+        generate "migration", "update_version_id_columns"
+        blocks = find_custom_blocks
+        migration = migration_with_name("update_version_id_columns")
+        text = <<TEXT
+models = %w{#{blocks.join(' ')}}
+models.each do |model_name|
+  standardize_version_id_column(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, "include Cms::Upgrades::V3_4_0::SchemaStatements\n", :after => "Migration\n"
+      end
+
+      module SchemaStatements
+
+        def standardize_version_id_column(model_name)
+          rename_column(prefix("#{model_name}_versions"), "#{model_name}_id", :original_record_id) if column_exists?(prefix("#{model_name}_versions"), "#{model_name}_id")
+        end
+      end
+    end
+
+
+  end
+end

data/lib/cms/version.rb

@@ -2,5 +2,5 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.4.0.rc2"
+  VERSION = "3.4.0"
 end

data/lib/generators/cms/install/install_generator.rb

@@ -1,5 +1,3 @@
-require 'generators/browser_cms/cms/cms_generator'
-
 module Cms
 
   # A generic generator for installing BrowserCMS modules into a project. This will do the following:

data/lib/tasks/db.rake

@@ -8,6 +8,14 @@ namespace :db do
   desc "Drop, create and migrate the database"
   task :redo => ["db:drop", "db:create", "db:migrate"]
 
+  namespace :seed do
+
+    desc "Load the seed data from db/browsercms.seeds.rb"
+    task :browsercms => :environment do
+      load File.join("db", "browsercms.seeds.rb")
+    end
+  end
+
   namespace :fixtures do
     desc 'Dumps all models into fixtures.'
     task :dump => :environment do

data/test/dummy/app/assets/javascripts/content_page.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/test/dummy/app/assets/stylesheets/content_page.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/test/dummy/app/controllers/content_page_controller.rb

@@ -0,0 +1,13 @@
+class ContentPageController < ApplicationController
+
+  include Cms::Acts::ContentPage
+  layout 'templates/subpage'
+
+  def index
+
+  end
+
+  def custom_page
+    self.page_title = "My Custom Page"
+  end
+end

data/test/dummy/app/helpers/content_page_helper.rb

@@ -0,0 +1,2 @@
+module ContentPageHelper
+end

data/test/dummy/app/views/content_page/custom_page.html.erb

@@ -0,0 +1,3 @@
+<%= content_for :main do %>
+Some Custom Content
+<% end %>