browsercms 3.3.4 → 3.4.0.rc1

data/browsercms.gemspec

@@ -9,39 +9,26 @@ Gem::Specification.new do |s|
   s.summary = %q{BrowserCMS is a a general purpose, open source Web Content Management System (CMS), written using Ruby on Rails.}
   s.description = %q{Web Content Management in Rails.}
   s.email = %q{github@browsermedia.com}
-  s.executables = ["browsercms", "bcms", "bcms-upgrade"]
   s.extra_rdoc_files = [
       "LICENSE.txt",
       "README.markdown"
   ]
   s.required_ruby_version = '>= 1.9.2'
 
-  s.files = Dir["rails/*.rb"]
-  s.files += Dir["browsercms.gemspec"]
-  s.files += Dir[".yardopts"]
-  s.files += Dir["doc/app/**/*"]
-  s.files += Dir["doc/guides/html/**/*"]
-  s.files += Dir["app/**/*"]
-  s.files += Dir["db/migrate/[0-9]*_*.rb"]
-  s.files += Dir["db/demo/**/*"]
-  s.files += Dir["db/seeds.rb"]
-  s.files += Dir["lib/**/*"]
+  s.files         = `git ls-files`.split("\n")
+  s.files         -= Dir['test/dummy/*']
   s.files -= Dir["lib/tasks/cucumber.rake"]
   s.files -= Dir["lib/tasks/cms.rake"]
-  s.files += Dir["public/stylesheets/cms/**/*"]
-  s.files += Dir["public/javascripts/jquery*"]
-  s.files += Dir["public/javascripts/cms/**/*"]
-  s.files += Dir["public/bcms/**/*"]
-  s.files += Dir["public/site/**/*"]
-  s.files += Dir["public/images/cms/**/*"]
-  s.files += Dir["public/themes/**/*"]
-  s.files -= Dir['test/dummy/*']
+  s.files -= Dir["lib/tasks/core_tasks.rake"]
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_dependency('rails', "~> 3.0.7")
+  s.add_dependency('rails', "~> 3.1.0 ")
   s.add_dependency "ancestry", "~> 1.2.4"
 
   # Required only for bcms-upgrade
   s.add_dependency('term-ansicolor')
+  s.add_dependency("jquery-rails")
 
 end
 

data/config/cucumber.yml

@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/config/database.jdbcmysql.yml

@@ -0,0 +1,30 @@
+development:
+  adapter: jdbcmysql
+  encoding: utf8
+  database: browsercms_development
+  username: root
+  password:
+
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: jdbcmysql
+  encoding: utf8
+  database: browsercms_test
+  username: root
+  password:
+
+  
+production:
+  adapter: mysql
+  encoding: utf8
+  database: devcms
+  username: devcms
+  password: RUzwPU4e
+  socket: /var/lib/mysql/mysql.sock
+
+test_sqlite3:
+  adapter: sqlite3
+  database: db/test.sqlite3

data/config/database.mysql.yml

@@ -0,0 +1,27 @@
+# Do not edit the database.yml file directory. BrowserCMS test suites run against multiple databases, so
+# make changes to the correct 'source' db file. In this case, edit: config/database.mysql.yml instead.
+
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  pool: 5
+  database: browsercms_development
+  username: root
+  password:
+  socket: /tmp/mysql.sock
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test: &test
+  adapter: mysql2
+  encoding: utf8
+  database: browsercms_test
+  username: root
+  password:
+  socket: /tmp/mysql.sock
+
+
+cucumber:
+  <<: *test

data/config/database.postgres.yml

@@ -0,0 +1,25 @@
+development:
+  adapter: postgresql
+  database: browsercms_development
+  username: postgres
+  password: 
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: postgresql
+  database: browsercms_test
+  username: postgres
+  password: 
+
+production:
+  adapter: postgresql
+  database: browsercms_production
+  username: postgres
+  password: 
+
+
+test_sqlite3:
+  adapter: sqlite3
+  database: db/test.sqlite3

data/config/database.sqlite3.yml

@@ -0,0 +1,11 @@
+# Do not edit the database.yml file directory. BrowserCMS test suites run against multiple databases, so
+# make changes to the correct 'source' db file. In this case, edit: config/database.sqlite3.yml instead.
+development:
+  adapter: sqlite3
+  database: ":memory:"
+
+
+test:
+  adapter: sqlite3
+  database: "db/test.sqlite3"
+

data/config/environment.rb

@@ -0,0 +1,6 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Browsercms::Application.initialize!
+

data/config/initializers/query_reviewer_patch.rb

@@ -0,0 +1,12 @@
+# If we are using QueryReviewer, we need to patch it to avoid the sitemap blowing up.
+if defined?(QueryReviewer)
+
+  QueryReviewer::SqlQuery.class_eval do
+    # Hack to prevent nil pointer errors from occuring on pages when queryanalyzer is on.
+    def table
+      return @subqueries.first.table unless @subqueries.empty?
+      "fake_table"
+    end
+
+  end
+end

data/config/initializers/rack_1_2_1_patch.rb

@@ -0,0 +1,12 @@
+# TODO: Can be removed after updating to rack 1.3.0
+# Avoids this issue: http://stackoverflow.com/questions/3622394/ruby-1-9-2-strange-warning-when-running-cucumber-specs
+module Rack
+  module Utils
+    def escape(s)
+      CGI.escape(s.to_s)
+    end
+    def unescape(s)
+      CGI.unescape(s)
+    end
+  end
+end

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

data/config/routes.rb

@@ -0,0 +1,101 @@
+# These routes make up what will be found under /cms
+# There are other routes that will be added at the root of the site (i.e. /) which can
+#   be found in lib/cms/route_extensions.rb
+Cms::Engine.routes.draw do
+  match '/dashboard', :to=>"dashboard#index", :as=>'dashboard'
+  match '/', :to => 'home#index', :as=>'home'
+  match '/sitemap', :to=>"section_nodes#index", :as=>'sitemap'
+  match '/content_library', :to=>"html_blocks#index", :as=>'content_library'
+  match '/administration', :to=>"users#index", :as=>'administration'
+  match '/logout', :to=>"sessions#destroy", :as=>'logout'
+  get '/login', :to=>"sessions#new", :as=>'login'
+  post '/login', :to=>"sessions#create"
+
+  match '/toolbar', :to=>"toolbar#index", :as=>'toolbar'
+  match '/content_types', :to=>"content_types#index", :as=>'content_types'
+
+  resources :connectors do
+    member do
+      put :move_up
+      put :move_down
+      put :move_to_bottom
+      put :move_to_top
+    end
+  end
+  resources :links
+
+  resources :pages do
+    member do
+      put :archive
+      put :hide
+      put :publish
+      get :versions
+    end
+    collection do
+      put :publish
+    end
+    resources :tasks
+  end
+  get '/pages/:id/version/:version', :to=>'pages#version', :as=>'version_cms_page'
+  put '/pages/:id/revert_to/:version', :to=>'pages#revert_to', :as=>'revert_to_cms_page'
+  resources :tasks do
+    member do
+      put :complete
+    end
+    collection 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
+
+  resources :section_nodes do
+    member do
+      put :move_before
+      put :move_after
+      put :move_to_beginning
+      put :move_to_end
+      put :move_to_root
+    end
+  end
+  match '/attachments/:id', :to => 'attachments#show', :as=>'attachment'
+
+  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"
+
+  content_blocks :file_blocks
+  content_blocks :image_blocks
+  content_blocks :category_types
+  content_blocks :categories
+  content_blocks :tags
+
+  match '/administration', :to => 'users#index', :as=>'administration'
+
+  resources :users do
+    member do
+      get :change_password
+      put :update_password
+      put :disable
+      put :enable
+    end
+  end
+  resources :email_messages
+  resources :groups
+  resources :redirects
+  resources :page_partials, :controller => 'dynamic_views'
+  resources :page_templates, :controller => 'dynamic_views'
+  resources :page_routes do
+    resources :conditions, :controller => "page_route_conditions"
+    resources :requirements, :controller => "page_route_requirements"
+  end
+  get 'cache', :to=>'cache#show', :as=>'cache'
+  delete 'cache', :to=>'cache#destroy'
+
+  match "/routes", :to => "routes#index", :as=>'routes'
+
+end
+

data/db/browsercms.seeds.rb

@@ -0,0 +1,64 @@
+require 'cms/data_loader'
+extend Cms::DataLoader
+
+if %w[development test dev local].include?(Rails.env)
+  pwd = "cmsadmin"
+else
+  pwd = (0..8).inject("") { |s, i| s << (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a).rand }
+end
+Cms::User.current = create_user(:cmsadmin, :login => "cmsadmin", :first_name => "CMS", :last_name => "Administrator", :email => "cmsadmin@example.com", :password => pwd, :password_confirmation => pwd)
+
+[["Cms::CategoryType", "Categorization"], ["Cms::Category","Categorization"], ["Cms::Tag", "Categorization"],
+ ["Cms::HtmlBlock", "Core"], ["Cms::Portlet", "Core"], ["Cms::FileBlock", "Core"], ["Cms::ImageBlock", "Core"]
+].each do |type|
+  create_content_type(type[0].to_sym, :name=>type[0], :group_name=>type[1])
+end
+create_permission(:administrate, :name => "administrate", :full_name => "Administer CMS", :description => "Allows users to administer the CMS, including adding users and groups.")
+create_permission(:edit_content, :name => "edit_content", :full_name => "Edit Content", :description => "Allows users to Add, Edit and Delete both Pages and Blocks. Can Save (but not Publish) and Assign them as well.")
+create_permission(:publish_content, :name => "publish_content", :full_name => "Publish Content", :description => "Allows users to Save and Publish, Hide and Archive both Pages and Blocks.")
+
+create_group_type(:guest_group_type, :name => "Guest", :guest => true)
+create_group_type(:registered_public_user, :name => "Registered Public User")
+create_group_type(:cms_user, :name => "CMS User", :cms_access => true)
+group_types(:cms_user).permissions<<permissions(:edit_content)
+group_types(:cms_user).permissions<<permissions(:publish_content)
+
+create_group(:guest, :name => 'Guest', :code => 'guest', :group_type => group_types(:guest_group_type))
+create_group(:content_admin, :name => 'Cms Administrators', :code => 'cms-admin', :group_type => group_types(:cms_user))
+create_group(:content_editor, :name => 'Content Editors', :code => 'content-editor', :group_type => group_types(:cms_user))
+users(:cmsadmin).groups << groups(:content_admin)
+users(:cmsadmin).groups << groups(:content_editor)
+
+groups(:content_admin).permissions<<permissions(:administrate)
+groups(:content_editor).permissions<<permissions(:edit_content)
+groups(:content_editor).permissions<<permissions(:publish_content)
+
+create_site(:default, :name => "Default", :domain => "example.com")
+create_section(:root, :name => "My Site", :path => "/", :root => true)
+create_section(:system, :name => "system", :parent => sections(:root), :path => "/system", :hidden => true)
+
+Cms::Group.all.each { |g| g.sections = Cms::Section.all }
+
+create_page(:home, :name => "Home", :path => "/", :section => sections(:root), :template_file_name => "default.html.erb", :cacheable => true)
+create_page(:not_found, :name => "Page Not Found", :path => "/system/not_found", :section => sections(:system), :template_file_name => "default.html.erb", :publish_on_save => true, :hidden => true, :cacheable => true)
+create_page(:access_denied, :name => "Access Denied", :path => "/system/access_denied", :section => sections(:system), :template_file_name => "default.html.erb", :publish_on_save => true, :hidden => true, :cacheable => true)
+create_page(:server_error, :name => "Server Error", :path => "/system/server_error", :section => sections(:system), :template_file_name => "default.html.erb", :publish_on_save => true, :hidden => true, :cacheable => true)
+
+create_html_block(:page_not_found, :name => "Page Not Found", :content => "<p>The page you tried to access does not exist on this server.</p>", :publish_on_save => true)
+pages(:not_found).create_connector(html_blocks(:page_not_found), "main")
+pages(:not_found).publish!
+
+create_html_block(:access_denied, :name => "Access Denied", :content => "<p>You have tried to reach a resource or page which you do not have permission to view.</p>", :publish_on_save => true)
+pages(:access_denied).create_connector(html_blocks(:access_denied), "main")
+pages(:access_denied).publish!
+
+create_html_block(:server_error, :name => "Server Error", :content => "<p>The server encountered an unexpected condition that prevented it from fulfilling the request.</p>", :publish_on_save => true)
+pages(:server_error).create_connector(html_blocks(:server_error), "main")
+pages(:server_error).publish!
+pages(:home).publish!
+
+unless Cms::DataLoader.silent_mode
+  puts "*************************************************"
+  puts "* YOUR CMS username/password is: cmsadmin/#{pwd}"
+  puts "*************************************************"
+end

data/db/migrate/20080815014337_browsercms_3_0_0.rb

@@ -1,21 +1,21 @@
 class Browsercms300 < ActiveRecord::Migration
   def self.up
-    create_table "users", :force => true do |t|
-      t.column :login,                     :string, :limit => 40
-      t.column :first_name,                :string, :limit => 40
-      t.column :last_name,                 :string, :limit => 40
-      t.column :email,                     :string, :limit => 40
-      t.column :crypted_password,          :string, :limit => 40
-      t.column :salt,                      :string, :limit => 40
-      t.column :created_at,                :datetime
-      t.column :updated_at,                :datetime
-      t.column :expires_at,                :datetime
-      t.column :remember_token,            :string, :limit => 40
+    create_table prefix(:users), :force => true do |t|
+      t.column :login, :string, :limit => 40
+      t.column :first_name, :string, :limit => 40
+      t.column :last_name, :string, :limit => 40
+      t.column :email, :string, :limit => 40
+      t.column :crypted_password, :string, :limit => 40
+      t.column :salt, :string, :limit => 40
+      t.column :created_at, :datetime
+      t.column :updated_at, :datetime
+      t.column :expires_at, :datetime
+      t.column :remember_token, :string, :limit => 40
       t.column :remember_token_expires_at, :datetime
     end
-    add_index :users, :login, :unique => true
+    add_index prefix(:users), :login, :unique => true
 
-    create_versioned_table :dynamic_views do |t|
+    create_content_table :dynamic_views do |t|
       t.string :type
       t.string :name
       t.string :format
@@ -24,7 +24,7 @@ class Browsercms300 < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_versioned_table :pages do |t|
+    create_content_table :pages do |t|
       t.string :name
       t.string :title
       t.string :path
@@ -36,34 +36,31 @@ class Browsercms300 < ActiveRecord::Migration
       t.boolean :hidden, :default => false
     end
 
-    create_table :content_type_groups do |t|
+    create_table prefix(:content_type_groups) do |t|
       t.string :name
       t.timestamps
     end
-    ContentTypeGroup.create!(:name => "Core")
 
-    create_table :content_types do |t|
+    create_table prefix(:content_types) do |t|
       t.string :name
       t.belongs_to :content_type_group
       t.integer :priority, :default => 2
       t.timestamps
     end
 
-    create_table :category_types do |t|
+    create_table prefix(:category_types) do |t|
       t.string :name
       t.timestamps
     end
-    ContentType.create!(:name => "CategoryType", :group_name => "Categorization")
 
-    create_table :categories do |t|
+    create_table prefix(:categories) do |t|
       t.belongs_to :category_type
       t.belongs_to :parent
       t.string :name
       t.timestamps
     end
-    ContentType.create!(:name => "Category", :group_name => "Categorization")
 
-    create_table :connectors do |t|
+    create_table prefix(:connectors) do |t|
       t.integer :page_id
       t.integer :page_version
       t.integer :connectable_id
@@ -78,9 +75,8 @@ class Browsercms300 < ActiveRecord::Migration
       t.string :name
       t.string :content, :limit => 64.kilobytes + 1
     end
-    ContentType.create!(:name => "HtmlBlock", :group_name => "Core", :priority => 1)
 
-    create_table :sections do |t|
+    create_table prefix(:sections) do |t|
       t.string :name
       t.string :path
       t.boolean :root, :default => false
@@ -88,7 +84,7 @@ class Browsercms300 < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table :portlets do |t|
+    create_table prefix(:portlets) do |t|
       t.string :type
       t.string :name
       t.boolean :archived, :default => false
@@ -96,20 +92,19 @@ class Browsercms300 < ActiveRecord::Migration
       t.integer :created_by_id, :updated_by_id
       t.timestamps
     end
-    create_table :portlet_attributes do |t|
+    create_table prefix(:portlet_attributes) do |t|
       t.integer :portlet_id
       t.string :name
       t.text :value
     end
-    ContentType.create!(:name => "Portlet", :group_name => "Core", :priority => 1)
 
-    create_table :redirects do |t|
+    create_table prefix(:redirects) do |t|
       t.string :from_path
       t.string :to_path
       t.timestamps
     end
 
-    create_versioned_table :attachments do |t|
+    create_content_table :attachments do |t|
       t.string :file_path
       t.string :file_location
       t.string :file_extension
@@ -118,60 +113,58 @@ class Browsercms300 < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_versioned_table :file_blocks do |t|
+    create_content_table :file_blocks do |t|
       t.string :type
       t.string :name
       t.integer :attachment_id
       t.integer :attachment_version
     end
-    ContentType.create!(:name => "FileBlock", :group_name => "Core")
-    ContentType.create!(:name => "ImageBlock", :group_name => "Core")
 
-    create_table :group_types do |t|
+    create_table prefix(:group_types) do |t|
       t.string :name
       t.boolean :guest, :default => false
       t.boolean :cms_access, :default => false
       t.timestamps
     end
-    create_table :groups do |t|
+    create_table prefix(:groups) do |t|
       t.string :name
       t.string :code
       t.integer :group_type_id
       t.timestamps
     end
-    create_table :user_group_memberships do |t|
+    create_table prefix(:user_group_memberships) do |t|
       t.integer :user_id
       t.integer :group_id
     end
 
-    create_table :permissions do |t|
+    create_table prefix(:permissions) do |t|
       t.string :name
       t.string :full_name
       t.string :description
       t.string :for_module
       t.timestamps
     end
-    create_table :group_permissions do |t|
+    create_table prefix(:group_permissions) do |t|
       t.integer :group_id
       t.integer :permission_id
     end
-    create_table :group_type_permissions do |t|
+    create_table prefix(:group_type_permissions) do |t|
       t.integer :group_type_id
       t.integer :permission_id
     end
-    create_table :group_sections do |t|
+    create_table prefix(:group_sections) do |t|
       t.integer :group_id
       t.integer :section_id
     end
 
-    create_table :sites do |t|
+    create_table prefix(:sites) do |t|
       t.string :name
       t.string :domain
       t.boolean :the_default
       t.timestamps
     end
 
-    create_table :section_nodes do |t|
+    create_table prefix(:section_nodes) do |t|
       t.integer :section_id
       t.string :node_type
       t.integer :node_id
@@ -179,20 +172,19 @@ class Browsercms300 < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_versioned_table :links do |t|
+    create_content_table :links do |t|
       t.string :name
       t.string :url
       t.boolean :new_window, :default => false
       t.timestamps
     end
 
-    create_table :tags do |t|
+    create_table prefix(:tags) do |t|
       t.string :name
       t.timestamps
     end
-    ContentType.create!(:name => "Tag", :group_name => "Categorization")
 
-    create_table :taggings do |t|
+    create_table prefix(:taggings) do |t|
       t.integer :tag_id
       t.integer :taggable_id
       t.string :taggable_type
@@ -200,7 +192,7 @@ class Browsercms300 < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table :email_messages do |t|
+    create_table prefix(:email_messages) do |t|
       t.string :sender
       t.text :recipients
       t.text :subject
@@ -212,7 +204,7 @@ class Browsercms300 < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table :tasks do |t|
+    create_table prefix(:tasks) do |t|
       t.integer :assigned_by_id
       t.integer :assigned_to_id
       t.integer :page_id
@@ -222,14 +214,14 @@ class Browsercms300 < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table :page_routes do |t|
+    create_table prefix(:page_routes) do |t|
       t.string :name
       t.string :pattern
       t.belongs_to :page
       t.text :code
       t.timestamps
-    end                 
-    create_table :page_route_options do |t|
+    end
+    create_table prefix(:page_route_options) do |t|
       t.belongs_to :page_route
       t.string :type
       t.string :name
@@ -239,36 +231,36 @@ class Browsercms300 < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :page_route_options
-    drop_table :page_routes
-    drop_table :tasks
-    drop_table :email_messages
-    drop_table :taggings
-    drop_table :tags
+    drop_table prefix(:page_route_options)
+    drop_table prefix(:page_routes)
+    drop_table prefix(:tasks)
+    drop_table prefix(:email_messages)
+    drop_table prefix(:taggings)
+    drop_table prefix(:tags)
     drop_versioned_table :links
-    drop_table :section_nodes
-    drop_table :sites
-    drop_table :group_sections
-    drop_table :group_type_permissions
-    drop_table :group_permissions
-    drop_table :permissions
-    drop_table :user_group_memberships
-    drop_table :groups
-    drop_table :group_types
+    drop_table prefix(:section_nodes)
+    drop_table prefix(:sites)
+    drop_table prefix(:group_sections)
+    drop_table prefix(:group_type_permissions)
+    drop_table prefix(:group_permissions)
+    drop_table prefix(:permissions)
+    drop_table prefix(:user_group_memberships)
+    drop_table prefix(:groups)
+    drop_table prefix(:group_types)
     drop_versioned_table :file_blocks
-    drop_table :attachments
-    drop_table :redirects
-    drop_table :portlet_attributes
-    drop_table :portlets
-    drop_table :sections
+    drop_versioned_table :attachments
+    drop_table prefix(:redirects)
+    drop_table prefix(:portlet_attributes)
+    drop_table prefix(:portlets)
+    drop_table prefix(:sections)
     drop_versioned_table :html_blocks
-    drop_table :connectors
-    drop_table :categories
-    drop_table :category_types
-    drop_table :content_types
-    drop_table :content_type_groups
+    drop_table prefix(:connectors)
+    drop_table prefix(:categories)
+    drop_table prefix(:category_types)
+    drop_table prefix(:content_types)
+    drop_table prefix(:content_type_groups)
     drop_versioned_table :pages
     drop_versioned_table :dynamic_views
-    drop_table "users"
+    drop_table prefix(:users)
   end
 end