trusty-cms 3.3.2 → 3.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/INSTALL.md +4 -11
  4. data/app/models/site.rb +1 -1
  5. data/coverage/index.html +1 -1
  6. data/db/migrate/001_create_radiant_tables.rb +1 -1
  7. data/db/migrate/002_insert_initial_data.rb +1 -1
  8. data/db/migrate/004_rename_filter_column.rb +1 -1
  9. data/db/migrate/005_add_virtual_column_to_page.rb +1 -1
  10. data/db/migrate/006_remove_user_login_index.rb +1 -1
  11. data/db/migrate/007_remove_virtual_column_from_page.rb +1 -1
  12. data/db/migrate/008_add_virtual_column_to_page_again.rb +1 -1
  13. data/db/migrate/009_add_content_type_field_to_layout.rb +1 -1
  14. data/db/migrate/010_create_sites.rb +1 -1
  15. data/db/migrate/011_add_order_to_sites.rb +1 -1
  16. data/db/migrate/012_create_extension_meta.rb +1 -1
  17. data/db/migrate/013_add_notes_field_to_user.rb +1 -1
  18. data/db/migrate/014_rename_config_default_parts_key.rb +1 -1
  19. data/db/migrate/015_add_optimistic_locking.rb +1 -1
  20. data/db/migrate/016_add_sessions.rb +1 -1
  21. data/db/migrate/017_rename_created_by_updated_by_columns.rb +1 -1
  22. data/db/migrate/018_add_description_and_keywords_to_pages.rb +1 -1
  23. data/db/migrate/020_add_session_info_to_users.rb +1 -1
  24. data/db/migrate/021_remove_session_expire_from_users.rb +1 -1
  25. data/db/migrate/022_add_admin_fields_to_sites.rb +1 -1
  26. data/db/migrate/023_add_sites.rb +1 -1
  27. data/db/migrate/024_site_abbreviation.rb +1 -1
  28. data/db/migrate/025_recreate_non_unique_index_on_snippets_name.rb +1 -1
  29. data/db/migrate/026_add_site_id_to_pages.rb +1 -1
  30. data/db/migrate/027_add_base_domain_to_sites.rb +1 -1
  31. data/db/migrate/028_create_assets.rb +1 -1
  32. data/db/migrate/029_create_paperclip_attributes.rb +1 -1
  33. data/db/migrate/030_create_user_observer.rb +1 -1
  34. data/db/migrate/031_create_page_attachments.rb +1 -1
  35. data/db/migrate/032_rename_users.rb +1 -1
  36. data/db/migrate/20081203140407_add_indexes.rb +1 -1
  37. data/db/migrate/20090226140109_add_user_language.rb +1 -1
  38. data/db/migrate/20090929164633_rename_developer_role_to_designer.rb +1 -1
  39. data/db/migrate/20091003095744_change_user_language_to_locale.rb +1 -1
  40. data/db/migrate/20100805154952_add_page_fields.rb +1 -1
  41. data/db/migrate/20100805155020_convert_page_metas.rb +1 -1
  42. data/db/migrate/20100810151922_add_field_name_index.rb +1 -1
  43. data/db/migrate/20110513205050_asset_uuid.rb +1 -1
  44. data/db/migrate/20110606111250_update_configuration.rb +1 -1
  45. data/db/migrate/20110609101438_dimensions.rb +1 -1
  46. data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb +1 -1
  47. data/db/migrate/20111016150725_extend_page_part_content_limit.rb +1 -1
  48. data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb +1 -1
  49. data/db/migrate/20160527141249_add_password_reset_to_users.rb +1 -1
  50. data/db/migrate/20161027141250_add_position_to_pages.rb +1 -1
  51. data/lib/generators/extension/templates/migration.rb +1 -1
  52. data/lib/generators/extension_migration/templates/migration.rb +1 -1
  53. data/lib/generators/extension_model/templates/migration.rb +1 -1
  54. data/lib/tasks/database.rake +5 -6
  55. data/lib/trusty_cms.rb +1 -1
  56. data/spec/dummy/log/test.log +10454 -0
  57. data/spec/dummy/tmp/cache/747/A70/TrustyCms%3A%3AConfig +0 -0
  58. data/spec/dummy/tmp/cache/85C/FA0/TrustyCms.cache_mtime +0 -0
  59. data/trusty_cms.gemspec +1 -1
  60. data/vendor/extensions/multi-site-extension/lib/multi_site/page_extensions.rb +3 -1
  61. metadata +2 -4
  62. data/CHANGELOG.md +0 -754
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2afe1e335218fdc9543278f43aa02d37fbb02d09799891e44ec9df52c39c60d1
4
- data.tar.gz: 7ec6e36c084504e083f391016e5176f524bce3c123199bdec8221348d85d122c
3
+ metadata.gz: 4ec33c7376f2114c2019e102b4931f82c0ce94b1257c3f20c4d4ed99a3fd1e6c
4
+ data.tar.gz: b83b1835c8557c8cf863c1db8587fcd255e8ba6e6a4d011fe3cf6b68533e5042
5
5
  SHA512:
6
- metadata.gz: 499c64b11f93824feec2f5fc4712d7416f66f7ec06e0ac99f6b65570b2220197cd3a43c05156cfdb371ae3fb9734691aada7d37bae1d95b0bac244f91bab36c0
7
- data.tar.gz: 800fc065a9a07c5b33020e7ece0e327455b05ff0b00ab644e588bbb067f9b6bb0b04f76fab9e6b080ae25db203bcfffc48d8691752c6528986b21e2732b4d4f8
6
+ metadata.gz: e3d5e48bd8a20914b861e56c75e16f756ed8c31d6b6f4a97b19c80533e01e3e4d5db7ae6e631d09ab860a1f0c3af589ac938ded6ef288445d426a3aaae89000a
7
+ data.tar.gz: 1ae1bda8cfc08013eb5c258059ad62be1701bd4fea1fbab1465d85850207c2041c058fea8deca1ae11d6beb878b47659342a43514c0033cfe867591c81aff28b
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (3.3.2)
4
+ trusty-cms (3.3.3)
5
5
  RedCloth (= 4.3.2)
6
6
  acts_as_list (~> 0.9.5)
7
7
  acts_as_tree (~> 2.6.1)
data/INSTALL.md CHANGED
@@ -2,22 +2,15 @@
2
2
 
3
3
  From within the directory containing your TrustyCMS instance:
4
4
 
5
- 1. Create a new Rails 5.0 application (i.e. `rails new [project_name]`)
5
+ 1. Create a new Rails 5.2 application (i.e. `rails new [project_name]`)
6
6
 
7
7
  2. Add the following gems to your Gemfile:
8
8
  - gem 'trusty-cms'
9
9
  - gem 'rails-observers'
10
10
 
11
- 3. Add any additional CMS dependencies. TrustyCMS currently supports:
11
+ 3. Run `bundle install`
12
12
 
13
- * gem 'trusty-clipped-extension'
14
- * gem 'trusty-snippets-extension'
15
- * gem 'trusty-layouts-extension'
16
- * gem 'trusty-multi-site-extension'
17
-
18
- 4. Run `bundle install`
19
-
20
- 5. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
13
+ 4. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
21
14
  - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
22
15
 
23
- 6. Run `bundle exec rake db:setup`, then `bundle exec rake db:bootstrap`.
16
+ 5. Run `bundle exec rake db:setup`, then `bundle exec rake db:bootstrap`.
data/app/models/site.rb CHANGED
@@ -51,7 +51,7 @@ class Site < ActiveRecord::Base
51
51
 
52
52
  after_create :create_homepage
53
53
  after_save :reload_routes
54
-
54
+
55
55
  # Returns the fully specified web address for the supplied path, or the root of this site if no path is given.
56
56
 
57
57
  def url(path = "/")
data/coverage/index.html CHANGED
@@ -14,7 +14,7 @@
14
14
  <img src="./assets/0.10.2/loading.gif" alt="loading"/>
15
15
  </div>
16
16
  <div id="wrapper" style="display:none;">
17
- <div class="timestamp">Generated <abbr class="timeago" title="2018-04-24T10:24:00-04:00">2018-04-24T10:24:00-04:00</abbr></div>
17
+ <div class="timestamp">Generated <abbr class="timeago" title="2018-04-30T15:15:45-04:00">2018-04-30T15:15:45-04:00</abbr></div>
18
18
  <ul class="group_tabs"></ul>
19
19
 
20
20
  <div id="content">
@@ -1,4 +1,4 @@
1
- class CreateRadiantTables < ActiveRecord::Migration[5.1]
1
+ class CreateRadiantTables < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table "config", :force => true do |t|
4
4
  t.column "key", :string, :limit => 40, :default => "", :null => false
@@ -1,4 +1,4 @@
1
- class InsertInitialData < ActiveRecord::Migration[5.1]
1
+ class InsertInitialData < ActiveRecord::Migration[5.2]
2
2
 
3
3
  # Historical. We no longer rely on this migration to insert the initial data into
4
4
  # the database. Instead we recommend `rake db:bootstrap`.
@@ -1,4 +1,4 @@
1
- class RenameFilterColumn < ActiveRecord::Migration[5.1]
1
+ class RenameFilterColumn < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  rename_column :page_parts, :filter, :filter_id
4
4
  rename_column :snippets, :filter, :filter_id
@@ -1,4 +1,4 @@
1
- class AddVirtualColumnToPage < ActiveRecord::Migration[5.1]
1
+ class AddVirtualColumnToPage < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column "pages", "virtual", :boolean, :null => false, :default => false
4
4
  end
@@ -1,4 +1,4 @@
1
- class RemoveUserLoginIndex < ActiveRecord::Migration[5.1]
1
+ class RemoveUserLoginIndex < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  remove_index "users", :name => "login"
4
4
  end
@@ -1,4 +1,4 @@
1
- class RemoveVirtualColumnFromPage < ActiveRecord::Migration[5.1]
1
+ class RemoveVirtualColumnFromPage < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  remove_column "pages", "virtual"
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddVirtualColumnToPageAgain < ActiveRecord::Migration[5.1]
1
+ class AddVirtualColumnToPageAgain < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column "pages", "virtual", :boolean, :null => false, :default => false
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddContentTypeFieldToLayout < ActiveRecord::Migration[5.1]
1
+ class AddContentTypeFieldToLayout < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column "layouts", "content_type", :string, :limit => 40
4
4
  end
@@ -1,4 +1,4 @@
1
- class CreateSites < ActiveRecord::Migration[5.1]
1
+ class CreateSites < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :sites do |t|
4
4
  t.column :name, :string
@@ -1,4 +1,4 @@
1
- class AddOrderToSites < ActiveRecord::Migration[5.1]
1
+ class AddOrderToSites < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :sites, :position, :integer, :default => 0
4
4
  end
@@ -1,4 +1,4 @@
1
- class CreateExtensionMeta < ActiveRecord::Migration[5.1]
1
+ class CreateExtensionMeta < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table 'extension_meta', :force => true do |t|
4
4
  t.column 'name', :string
@@ -1,4 +1,4 @@
1
- class AddNotesFieldToUser < ActiveRecord::Migration[5.1]
1
+ class AddNotesFieldToUser < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column "users", "notes", :text
4
4
  end
@@ -1,4 +1,4 @@
1
- class RenameConfigDefaultPartsKey < ActiveRecord::Migration[5.1]
1
+ class RenameConfigDefaultPartsKey < ActiveRecord::Migration[5.2]
2
2
 
3
3
  def self.up
4
4
  rename_config_key 'default.parts', 'defaults.page.parts'
@@ -1,4 +1,4 @@
1
- class AddOptimisticLocking < ActiveRecord::Migration[5.1]
1
+ class AddOptimisticLocking < ActiveRecord::Migration[5.2]
2
2
 
3
3
  def self.up
4
4
  [:pages, :layouts, :snippets, :users].each do |table|
@@ -1,4 +1,4 @@
1
- class AddSessions < ActiveRecord::Migration[5.1]
1
+ class AddSessions < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :sessions do |t|
4
4
  t.column :session_id, :string
@@ -1,4 +1,4 @@
1
- class RenameCreatedByUpdatedByColumns < ActiveRecord::Migration[5.1]
1
+ class RenameCreatedByUpdatedByColumns < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  %w{pages snippets layouts users}.each do |table|
4
4
  rename_column table, :created_by, :created_by_id
@@ -1,4 +1,4 @@
1
- class AddDescriptionAndKeywordsToPages < ActiveRecord::Migration[5.1]
1
+ class AddDescriptionAndKeywordsToPages < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :pages, :description, :string
4
4
  add_column :pages, :keywords, :string
@@ -1,4 +1,4 @@
1
- class AddSessionInfoToUsers < ActiveRecord::Migration[5.1]
1
+ class AddSessionInfoToUsers < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :users, :session_token, :string
4
4
  add_column :users, :session_expire, :datetime
@@ -1,4 +1,4 @@
1
- class RemoveSessionExpireFromUsers < ActiveRecord::Migration[5.1]
1
+ class RemoveSessionExpireFromUsers < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  remove_column :users, :session_expire
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddAdminFieldsToSites < ActiveRecord::Migration[5.1]
1
+ class AddAdminFieldsToSites < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :sites, :created_by_id, :integer
4
4
  add_column :sites, :created_at, :datetime
@@ -1,4 +1,4 @@
1
- class AddSites < ActiveRecord::Migration[5.1]
1
+ class AddSites < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  [:layouts, :snippets, :users].each do |table|
4
4
  add_column table, :site_id, :integer
@@ -1,4 +1,4 @@
1
- class SiteAbbreviation < ActiveRecord::Migration[5.1]
1
+ class SiteAbbreviation < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :sites, :abbreviation, :string
4
4
  end
@@ -1,4 +1,4 @@
1
- class RecreateNonUniqueIndexOnSnippetsName < ActiveRecord::Migration[5.1]
1
+ class RecreateNonUniqueIndexOnSnippetsName < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  remove_index :snippets, :name => "name"
4
4
  add_index :snippets, [:name, :site_id ], :name => "name_site_id", :unique => true
@@ -1,4 +1,4 @@
1
- class AddSiteIdToPages < ActiveRecord::Migration[5.1]
1
+ class AddSiteIdToPages < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :pages, :site_id, :integer, required: true
4
4
  add_index :pages, :site_id
@@ -1,4 +1,4 @@
1
- class AddBaseDomainToSites < ActiveRecord::Migration[5.1]
1
+ class AddBaseDomainToSites < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :sites, :base_domain, :string
4
4
  end
@@ -1,4 +1,4 @@
1
- class CreateAssets < ActiveRecord::Migration[5.1]
1
+ class CreateAssets < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :assets do |t|
4
4
  t.string :caption, :title
@@ -1,4 +1,4 @@
1
- class CreatePaperclipAttributes < ActiveRecord::Migration[5.1]
1
+ class CreatePaperclipAttributes < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :assets, :asset_file_name, :string
4
4
  add_column :assets, :asset_content_type, :string
@@ -1,4 +1,4 @@
1
- class CreateUserObserver < ActiveRecord::Migration[5.1]
1
+ class CreateUserObserver < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :assets, :created_by, :integer
4
4
  add_column :assets, :updated_by, :integer
@@ -1,4 +1,4 @@
1
- class CreatePageAttachments < ActiveRecord::Migration[5.1]
1
+ class CreatePageAttachments < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  # See if a page_attachments table from the original 'page_attachments' extension already exists
4
4
  # If so, rename the table to old_page_attachments so they can be migrated later
@@ -1,4 +1,4 @@
1
- class RenameUsers < ActiveRecord::Migration[5.1]
1
+ class RenameUsers < ActiveRecord::Migration[5.2]
2
2
 
3
3
  def self.up
4
4
  rename_column :assets, :created_by, :created_by_id
@@ -1,4 +1,4 @@
1
- class AddIndexes < ActiveRecord::Migration[5.1]
1
+ class AddIndexes < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_index :pages, :class_name, :name => 'pages_class_name'
4
4
  add_index :pages, :parent_id, :name => 'pages_parent_id'
@@ -1,4 +1,4 @@
1
- class AddUserLanguage < ActiveRecord::Migration[5.1]
1
+ class AddUserLanguage < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :users, :language, :string
4
4
  end
@@ -1,4 +1,4 @@
1
- class RenameDeveloperRoleToDesigner < ActiveRecord::Migration[5.1]
1
+ class RenameDeveloperRoleToDesigner < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  rename_column 'users', 'developer', 'designer'
4
4
  end
@@ -1,4 +1,4 @@
1
- class ChangeUserLanguageToLocale < ActiveRecord::Migration[5.1]
1
+ class ChangeUserLanguageToLocale < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  rename_column 'users', 'language', 'locale'
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddPageFields < ActiveRecord::Migration[5.1]
1
+ class AddPageFields < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :page_fields do |t|
4
4
  t.integer :page_id
@@ -1,4 +1,4 @@
1
- class ConvertPageMetas < ActiveRecord::Migration[5.1]
1
+ class ConvertPageMetas < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  remove_column :pages, :keywords
4
4
  remove_column :pages, :description
@@ -1,4 +1,4 @@
1
- class AddFieldNameIndex < ActiveRecord::Migration[5.1]
1
+ class AddFieldNameIndex < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  remove_index :page_fields, :page_id
4
4
  add_index :page_fields, [:page_id, :name, :content]
@@ -1,4 +1,4 @@
1
- class AssetUuid < ActiveRecord::Migration[5.1]
1
+ class AssetUuid < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :assets, :uuid, :string
4
4
  Asset.reset_column_information
@@ -1,4 +1,4 @@
1
- class UpdateConfiguration < ActiveRecord::Migration[5.1]
1
+ class UpdateConfiguration < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  if TrustyCms.config.table_exists?
4
4
 
@@ -1,4 +1,4 @@
1
- class Dimensions < ActiveRecord::Migration[5.1]
1
+ class Dimensions < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :assets, :original_width, :integer
4
4
  add_column :assets, :original_height, :integer
@@ -1,4 +1,4 @@
1
- class AddAllowedChildrenCacheToPages < ActiveRecord::Migration[5.1]
1
+ class AddAllowedChildrenCacheToPages < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  add_column :pages, :allowed_children_cache, :text
4
4
  end
@@ -1,4 +1,4 @@
1
- class ExtendPagePartContentLimit < ActiveRecord::Migration[5.1]
1
+ class ExtendPagePartContentLimit < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  if ActiveRecord::Base.connection.adapter_name =~ /m[sy]sql/i
4
4
  # Make sure text longer than 64kB is not cropped in MySQL and MSSQL
@@ -1,4 +1,4 @@
1
- class ChangePagesAllowedChildrenCacheToText < ActiveRecord::Migration[5.1]
1
+ class ChangePagesAllowedChildrenCacheToText < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  change_column :pages, :allowed_children_cache, :text
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddPasswordResetToUsers < ActiveRecord::Migration[5.1]
1
+ class AddPasswordResetToUsers < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  add_column :users, :password_reset_token, :string
4
4
  add_column :users, :password_reset_sent_at, :datetime
@@ -1,4 +1,4 @@
1
- class AddPositionToPages < ActiveRecord::Migration[5.1]
1
+ class AddPositionToPages < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  unless column_exists? :pages, :position
4
4
  add_column :pages, :position, :integer
@@ -1,4 +1,4 @@
1
- class Create<%= class_name %>Schema < ActiveRecord::Migration[5.1]
1
+ class Create<%= class_name %>Schema < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
 
4
4
  end
@@ -1,4 +1,4 @@
1
- class <%= class_name.underscore.camelize %> < ActiveRecord::Migration[5.1]
1
+ class <%= class_name.underscore.camelize %> < ActiveRecord::Migration[5.2]
2
2
  def self.up<% attributes.each do |attribute| %>
3
3
  <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end -%>
4
4
  <%- end %>
@@ -1,4 +1,4 @@
1
- class <%= migration_name %> < ActiveRecord::Migration[5.1]
1
+ class <%= migration_name %> < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :<%= table_name %> do |t|
4
4
  <% for attribute in attributes -%>
@@ -28,7 +28,7 @@ namespace :db do
28
28
  # that's not a setup anyone would recommend.
29
29
  #
30
30
  ActiveRecord::Base.connection.tables.each do |table|
31
- ActiveRecord::Migration[5.1].drop_table table
31
+ ActiveRecord::Migration[5.2].drop_table table
32
32
  end
33
33
  Rake::Task["db:migrate"].invoke
34
34
  else
@@ -46,8 +46,6 @@ namespace :db do
46
46
  :admin_password => ENV['ADMIN_PASSWORD'],
47
47
  :database_template => ENV['DATABASE_TEMPLATE']
48
48
  )
49
- Rake::Task['db:migrate:extensions'].invoke
50
- Rake::Task['trusty_cms:extensions:update_all'].invoke
51
49
  puts %{
52
50
  Your TrustyCms application is ready to use. Run `rails s -e production` to
53
51
  start the server. Your site will then be running at http://localhost:3000
@@ -64,15 +62,16 @@ To add more extensions just add them to your Gemfile and run `bundle install`.
64
62
 
65
63
  desc "Migrate the database through all available migration scripts (looks for db/migrate/* in trusty-cms, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false."
66
64
  task :migrate => [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
67
- ActiveRecord::Migration[5.1].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
65
+ ActiveRecord::Migration[5.2].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
68
66
  Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
69
67
  end
70
68
 
71
69
  namespace :migrate do
72
70
  desc "Migrates the database through steps defined in the core trusty-cms distribution. Usual db:migrate options can apply."
73
71
  task :trusty_cms => :environment do
74
- ActiveRecord::Migration[5.1].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
75
- Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
72
+ ActiveRecord::Migration[5.2].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
73
+ Rake::Task['railties:install:migrations'].invoke if !Rails.env.test?
74
+ Rake::Task['db:migrate'].invoke
76
75
  end
77
76
  end
78
77
  end
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = '3.3.2'
5
+ VERSION = '3.3.3'
6
6
  end
7
7
  end