trusty-cms 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2afe1e335218fdc9543278f43aa02d37fbb02d09799891e44ec9df52c39c60d1
-  data.tar.gz: 7ec6e36c084504e083f391016e5176f524bce3c123199bdec8221348d85d122c
+  metadata.gz: 4ec33c7376f2114c2019e102b4931f82c0ce94b1257c3f20c4d4ed99a3fd1e6c
+  data.tar.gz: b83b1835c8557c8cf863c1db8587fcd255e8ba6e6a4d011fe3cf6b68533e5042
 SHA512:
-  metadata.gz: 499c64b11f93824feec2f5fc4712d7416f66f7ec06e0ac99f6b65570b2220197cd3a43c05156cfdb371ae3fb9734691aada7d37bae1d95b0bac244f91bab36c0
-  data.tar.gz: 800fc065a9a07c5b33020e7ece0e327455b05ff0b00ab644e588bbb067f9b6bb0b04f76fab9e6b080ae25db203bcfffc48d8691752c6528986b21e2732b4d4f8
+  metadata.gz: e3d5e48bd8a20914b861e56c75e16f756ed8c31d6b6f4a97b19c80533e01e3e4d5db7ae6e631d09ab860a1f0c3af589ac938ded6ef288445d426a3aaae89000a
+  data.tar.gz: 1ae1bda8cfc08013eb5c258059ad62be1701bd4fea1fbab1465d85850207c2041c058fea8deca1ae11d6beb878b47659342a43514c0033cfe867591c81aff28b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.3.2)
+    trusty-cms (3.3.3)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (~> 2.6.1)

data/INSTALL.md

@@ -2,22 +2,15 @@
 
 From within the directory containing your TrustyCMS instance:
 
-1. Create a new Rails 5.0 application (i.e. `rails new [project_name]`)
+1. Create a new Rails 5.2 application (i.e. `rails new [project_name]`)
 
 2. Add the following gems to your Gemfile:
   - gem 'trusty-cms'
   - gem 'rails-observers'
 
-3. Add any additional CMS dependencies. TrustyCMS currently supports:
+3. Run `bundle install`
 
-* gem 'trusty-clipped-extension'
-* gem 'trusty-snippets-extension'
-* gem 'trusty-layouts-extension'
-* gem 'trusty-multi-site-extension'
-
-4. Run `bundle install`
-
-5. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
+4. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
    - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
 
-6. Run `bundle exec rake db:setup`, then `bundle exec rake db:bootstrap`.
+5. Run `bundle exec rake db:setup`, then `bundle exec rake db:bootstrap`.

data/app/models/site.rb

@@ -51,7 +51,7 @@ class Site < ActiveRecord::Base
 
   after_create :create_homepage
   after_save :reload_routes
-  
+
   # Returns the fully specified web address for the supplied path, or the root of this site if no path is given.
 
   def url(path = "/")

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.10.2/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2018-04-24T10:24:00-04:00">2018-04-24T10:24:00-04:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2018-04-30T15:15:45-04:00">2018-04-30T15:15:45-04:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">

data/db/migrate/001_create_radiant_tables.rb

@@ -1,4 +1,4 @@
-class CreateRadiantTables < ActiveRecord::Migration[5.1]
+class CreateRadiantTables < ActiveRecord::Migration[5.2]
   def self.up
     create_table "config", :force => true do |t|
       t.column "key", :string, :limit => 40, :default => "", :null => false

data/db/migrate/002_insert_initial_data.rb

@@ -1,4 +1,4 @@
-class InsertInitialData < ActiveRecord::Migration[5.1]
+class InsertInitialData < ActiveRecord::Migration[5.2]
 
   # Historical. We no longer rely on this migration to insert the initial data into
   # the database. Instead we recommend `rake db:bootstrap`.

data/db/migrate/004_rename_filter_column.rb

@@ -1,4 +1,4 @@
-class RenameFilterColumn < ActiveRecord::Migration[5.1]
+class RenameFilterColumn < ActiveRecord::Migration[5.2]
   def self.up
     rename_column :page_parts, :filter, :filter_id
     rename_column :snippets, :filter, :filter_id

data/db/migrate/005_add_virtual_column_to_page.rb

@@ -1,4 +1,4 @@
-class AddVirtualColumnToPage < ActiveRecord::Migration[5.1]
+class AddVirtualColumnToPage < ActiveRecord::Migration[5.2]
   def self.up
     add_column "pages", "virtual", :boolean, :null => false, :default => false
   end

data/db/migrate/006_remove_user_login_index.rb

@@ -1,4 +1,4 @@
-class RemoveUserLoginIndex < ActiveRecord::Migration[5.1]
+class RemoveUserLoginIndex < ActiveRecord::Migration[5.2]
   def self.up
     remove_index "users", :name => "login"
   end

data/db/migrate/007_remove_virtual_column_from_page.rb

@@ -1,4 +1,4 @@
-class RemoveVirtualColumnFromPage < ActiveRecord::Migration[5.1]
+class RemoveVirtualColumnFromPage < ActiveRecord::Migration[5.2]
   def self.up
     remove_column "pages", "virtual"
   end

data/db/migrate/008_add_virtual_column_to_page_again.rb

@@ -1,4 +1,4 @@
-class AddVirtualColumnToPageAgain < ActiveRecord::Migration[5.1]
+class AddVirtualColumnToPageAgain < ActiveRecord::Migration[5.2]
   def self.up
     add_column "pages", "virtual", :boolean, :null => false, :default => false
   end

data/db/migrate/009_add_content_type_field_to_layout.rb

@@ -1,4 +1,4 @@
-class AddContentTypeFieldToLayout < ActiveRecord::Migration[5.1]
+class AddContentTypeFieldToLayout < ActiveRecord::Migration[5.2]
   def self.up
     add_column "layouts", "content_type", :string, :limit => 40
   end

data/db/migrate/010_create_sites.rb

@@ -1,4 +1,4 @@
-class CreateSites < ActiveRecord::Migration[5.1]
+class CreateSites < ActiveRecord::Migration[5.2]
   def self.up
     create_table :sites do |t|
       t.column :name, :string

data/db/migrate/011_add_order_to_sites.rb

@@ -1,4 +1,4 @@
-class AddOrderToSites < ActiveRecord::Migration[5.1]
+class AddOrderToSites < ActiveRecord::Migration[5.2]
   def self.up
     add_column :sites, :position, :integer, :default => 0
   end

data/db/migrate/012_create_extension_meta.rb

@@ -1,4 +1,4 @@
-class CreateExtensionMeta < ActiveRecord::Migration[5.1]
+class CreateExtensionMeta < ActiveRecord::Migration[5.2]
   def self.up
     create_table 'extension_meta', :force => true do |t|
       t.column 'name', :string

data/db/migrate/013_add_notes_field_to_user.rb

@@ -1,4 +1,4 @@
-class AddNotesFieldToUser < ActiveRecord::Migration[5.1]
+class AddNotesFieldToUser < ActiveRecord::Migration[5.2]
   def self.up
     add_column "users", "notes", :text
   end

data/db/migrate/014_rename_config_default_parts_key.rb

@@ -1,4 +1,4 @@
-class RenameConfigDefaultPartsKey < ActiveRecord::Migration[5.1]
+class RenameConfigDefaultPartsKey < ActiveRecord::Migration[5.2]
 
   def self.up
     rename_config_key 'default.parts', 'defaults.page.parts'

data/db/migrate/015_add_optimistic_locking.rb

@@ -1,4 +1,4 @@
-class AddOptimisticLocking < ActiveRecord::Migration[5.1]
+class AddOptimisticLocking < ActiveRecord::Migration[5.2]
 
   def self.up
     [:pages, :layouts, :snippets, :users].each do |table|

data/db/migrate/016_add_sessions.rb

@@ -1,4 +1,4 @@
-class AddSessions < ActiveRecord::Migration[5.1]
+class AddSessions < ActiveRecord::Migration[5.2]
   def self.up
     create_table :sessions do |t|
       t.column :session_id, :string

data/db/migrate/017_rename_created_by_updated_by_columns.rb

@@ -1,4 +1,4 @@
-class RenameCreatedByUpdatedByColumns < ActiveRecord::Migration[5.1]
+class RenameCreatedByUpdatedByColumns < ActiveRecord::Migration[5.2]
   def self.up
     %w{pages snippets layouts users}.each do |table|
       rename_column table, :created_by, :created_by_id

data/db/migrate/018_add_description_and_keywords_to_pages.rb

@@ -1,4 +1,4 @@
-class AddDescriptionAndKeywordsToPages < ActiveRecord::Migration[5.1]
+class AddDescriptionAndKeywordsToPages < ActiveRecord::Migration[5.2]
   def self.up
     add_column :pages, :description, :string
     add_column :pages, :keywords, :string

data/db/migrate/020_add_session_info_to_users.rb

@@ -1,4 +1,4 @@
-class AddSessionInfoToUsers < ActiveRecord::Migration[5.1]
+class AddSessionInfoToUsers < ActiveRecord::Migration[5.2]
   def self.up
     add_column :users, :session_token, :string
     add_column :users, :session_expire, :datetime

data/db/migrate/021_remove_session_expire_from_users.rb

@@ -1,4 +1,4 @@
-class RemoveSessionExpireFromUsers < ActiveRecord::Migration[5.1]
+class RemoveSessionExpireFromUsers < ActiveRecord::Migration[5.2]
   def self.up
     remove_column :users, :session_expire
   end

data/db/migrate/022_add_admin_fields_to_sites.rb

@@ -1,4 +1,4 @@
-class AddAdminFieldsToSites < ActiveRecord::Migration[5.1]
+class AddAdminFieldsToSites < ActiveRecord::Migration[5.2]
   def self.up
     add_column :sites, :created_by_id, :integer
     add_column :sites, :created_at, :datetime

data/db/migrate/023_add_sites.rb

@@ -1,4 +1,4 @@
-class AddSites < ActiveRecord::Migration[5.1]
+class AddSites < ActiveRecord::Migration[5.2]
   def self.up
     [:layouts, :snippets, :users].each do |table|
       add_column table, :site_id, :integer

data/db/migrate/024_site_abbreviation.rb

@@ -1,4 +1,4 @@
-class SiteAbbreviation < ActiveRecord::Migration[5.1]
+class SiteAbbreviation < ActiveRecord::Migration[5.2]
   def self.up
     add_column :sites, :abbreviation, :string
   end

data/db/migrate/025_recreate_non_unique_index_on_snippets_name.rb

@@ -1,4 +1,4 @@
-class RecreateNonUniqueIndexOnSnippetsName < ActiveRecord::Migration[5.1]
+class RecreateNonUniqueIndexOnSnippetsName < ActiveRecord::Migration[5.2]
   def self.up
     remove_index :snippets, :name => "name"
     add_index :snippets, [:name, :site_id ], :name => "name_site_id", :unique => true

data/db/migrate/026_add_site_id_to_pages.rb

@@ -1,4 +1,4 @@
-class AddSiteIdToPages < ActiveRecord::Migration[5.1]
+class AddSiteIdToPages < ActiveRecord::Migration[5.2]
   def self.up
     add_column :pages, :site_id, :integer, required: true
     add_index :pages, :site_id

data/db/migrate/027_add_base_domain_to_sites.rb

@@ -1,4 +1,4 @@
-class AddBaseDomainToSites < ActiveRecord::Migration[5.1]
+class AddBaseDomainToSites < ActiveRecord::Migration[5.2]
   def self.up
     add_column :sites, :base_domain, :string
   end

data/db/migrate/028_create_assets.rb

@@ -1,4 +1,4 @@
-class CreateAssets < ActiveRecord::Migration[5.1]
+class CreateAssets < ActiveRecord::Migration[5.2]
   def self.up
     create_table :assets do |t|
       t.string :caption, :title

data/db/migrate/029_create_paperclip_attributes.rb

@@ -1,4 +1,4 @@
-class CreatePaperclipAttributes < ActiveRecord::Migration[5.1]
+class CreatePaperclipAttributes < ActiveRecord::Migration[5.2]
   def self.up
     add_column :assets, :asset_file_name, :string
     add_column :assets, :asset_content_type, :string

data/db/migrate/030_create_user_observer.rb

@@ -1,4 +1,4 @@
-class CreateUserObserver < ActiveRecord::Migration[5.1]
+class CreateUserObserver < ActiveRecord::Migration[5.2]
   def self.up
     add_column :assets, :created_by, :integer
     add_column :assets, :updated_by, :integer

data/db/migrate/031_create_page_attachments.rb

@@ -1,4 +1,4 @@
-class CreatePageAttachments < ActiveRecord::Migration[5.1]
+class CreatePageAttachments < ActiveRecord::Migration[5.2]
   def self.up
     # See if a page_attachments table from the original 'page_attachments' extension already exists
     # If so, rename the table to old_page_attachments so they can be migrated later

data/db/migrate/032_rename_users.rb

@@ -1,4 +1,4 @@
-class RenameUsers < ActiveRecord::Migration[5.1]
+class RenameUsers < ActiveRecord::Migration[5.2]
   
   def self.up
     rename_column :assets, :created_by, :created_by_id

data/db/migrate/20081203140407_add_indexes.rb

@@ -1,4 +1,4 @@
-class AddIndexes < ActiveRecord::Migration[5.1]
+class AddIndexes < ActiveRecord::Migration[5.2]
   def self.up
     add_index :pages,       :class_name,            :name => 'pages_class_name'
     add_index :pages,       :parent_id,             :name => 'pages_parent_id'

data/db/migrate/20090226140109_add_user_language.rb

@@ -1,4 +1,4 @@
-class AddUserLanguage < ActiveRecord::Migration[5.1]
+class AddUserLanguage < ActiveRecord::Migration[5.2]
   def self.up
     add_column :users, :language, :string
   end

data/db/migrate/20090929164633_rename_developer_role_to_designer.rb

@@ -1,4 +1,4 @@
-class RenameDeveloperRoleToDesigner < ActiveRecord::Migration[5.1]
+class RenameDeveloperRoleToDesigner < ActiveRecord::Migration[5.2]
   def self.up
     rename_column 'users', 'developer', 'designer'
   end

data/db/migrate/20091003095744_change_user_language_to_locale.rb

@@ -1,4 +1,4 @@
-class ChangeUserLanguageToLocale < ActiveRecord::Migration[5.1]
+class ChangeUserLanguageToLocale < ActiveRecord::Migration[5.2]
   def self.up
     rename_column 'users', 'language', 'locale'
   end

data/db/migrate/20100805154952_add_page_fields.rb

@@ -1,4 +1,4 @@
-class AddPageFields < ActiveRecord::Migration[5.1]
+class AddPageFields < ActiveRecord::Migration[5.2]
   def self.up
     create_table :page_fields do |t|
       t.integer :page_id

data/db/migrate/20100805155020_convert_page_metas.rb

@@ -1,4 +1,4 @@
-class ConvertPageMetas < ActiveRecord::Migration[5.1]
+class ConvertPageMetas < ActiveRecord::Migration[5.2]
   def self.up
     remove_column :pages, :keywords
     remove_column :pages, :description

data/db/migrate/20100810151922_add_field_name_index.rb

@@ -1,4 +1,4 @@
-class AddFieldNameIndex < ActiveRecord::Migration[5.1]
+class AddFieldNameIndex < ActiveRecord::Migration[5.2]
   def self.up
     remove_index :page_fields, :page_id
     add_index :page_fields, [:page_id, :name, :content]

data/db/migrate/20110513205050_asset_uuid.rb

@@ -1,4 +1,4 @@
-class AssetUuid < ActiveRecord::Migration[5.1]
+class AssetUuid < ActiveRecord::Migration[5.2]
   def self.up
     add_column :assets, :uuid, :string
     Asset.reset_column_information

data/db/migrate/20110606111250_update_configuration.rb

@@ -1,4 +1,4 @@
-class UpdateConfiguration < ActiveRecord::Migration[5.1]
+class UpdateConfiguration < ActiveRecord::Migration[5.2]
   def self.up
     if TrustyCms.config.table_exists?
 

data/db/migrate/20110609101438_dimensions.rb

@@ -1,4 +1,4 @@
-class Dimensions < ActiveRecord::Migration[5.1]
+class Dimensions < ActiveRecord::Migration[5.2]
   def self.up
     add_column :assets, :original_width, :integer
     add_column :assets, :original_height, :integer

data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb

@@ -1,4 +1,4 @@
-class AddAllowedChildrenCacheToPages < ActiveRecord::Migration[5.1]
+class AddAllowedChildrenCacheToPages < ActiveRecord::Migration[5.2]
   def self.up
     add_column :pages, :allowed_children_cache, :text
   end

data/db/migrate/20111016150725_extend_page_part_content_limit.rb

@@ -1,4 +1,4 @@
-class ExtendPagePartContentLimit < ActiveRecord::Migration[5.1]
+class ExtendPagePartContentLimit < ActiveRecord::Migration[5.2]
   def self.up
     if ActiveRecord::Base.connection.adapter_name =~ /m[sy]sql/i
       # Make sure text longer than 64kB is not cropped in MySQL and MSSQL

data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb

@@ -1,4 +1,4 @@
-class ChangePagesAllowedChildrenCacheToText  < ActiveRecord::Migration[5.1]
+class ChangePagesAllowedChildrenCacheToText  < ActiveRecord::Migration[5.2]
   def self.up
     change_column :pages, :allowed_children_cache, :text
   end

data/db/migrate/20160527141249_add_password_reset_to_users.rb

@@ -1,4 +1,4 @@
-class AddPasswordResetToUsers < ActiveRecord::Migration[5.1]
+class AddPasswordResetToUsers < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :password_reset_token, :string
     add_column :users, :password_reset_sent_at, :datetime

data/db/migrate/20161027141250_add_position_to_pages.rb

@@ -1,4 +1,4 @@
-class AddPositionToPages < ActiveRecord::Migration[5.1]
+class AddPositionToPages < ActiveRecord::Migration[5.2]
   def self.up
     unless column_exists? :pages, :position
       add_column :pages, :position, :integer

data/lib/generators/extension/templates/migration.rb

@@ -1,4 +1,4 @@
-class Create<%= class_name %>Schema < ActiveRecord::Migration[5.1]
+class Create<%= class_name %>Schema < ActiveRecord::Migration[5.2]
   def self.up
 
   end

data/lib/generators/extension_migration/templates/migration.rb

@@ -1,4 +1,4 @@
-class <%= class_name.underscore.camelize %> < ActiveRecord::Migration[5.1]
+class <%= class_name.underscore.camelize %> < ActiveRecord::Migration[5.2]
   def self.up<% attributes.each do |attribute| %>
     <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end -%>
   <%- end %>

data/lib/generators/extension_model/templates/migration.rb

@@ -1,4 +1,4 @@
-class <%= migration_name %> < ActiveRecord::Migration[5.1]
+class <%= migration_name %> < ActiveRecord::Migration[5.2]
   def self.up
     create_table :<%= table_name %> do |t|
 <% for attribute in attributes -%>

data/lib/tasks/database.rake

@@ -28,7 +28,7 @@ namespace :db do
       # that's not a setup anyone would recommend.
       #
       ActiveRecord::Base.connection.tables.each do |table|
-        ActiveRecord::Migration[5.1].drop_table table
+        ActiveRecord::Migration[5.2].drop_table table
       end
       Rake::Task["db:migrate"].invoke
     else
@@ -46,8 +46,6 @@ namespace :db do
       :admin_password => ENV['ADMIN_PASSWORD'],
       :database_template => ENV['DATABASE_TEMPLATE']
     )
-    Rake::Task['db:migrate:extensions'].invoke
-    Rake::Task['trusty_cms:extensions:update_all'].invoke
     puts %{
 Your TrustyCms application is ready to use. Run `rails s -e production` to
 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`.
 
   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."
   task :migrate => [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
-    ActiveRecord::Migration[5.1].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+    ActiveRecord::Migration[5.2].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
   namespace :migrate do
     desc "Migrates the database through steps defined in the core trusty-cms distribution. Usual db:migrate options can apply."
     task :trusty_cms => :environment do
-      ActiveRecord::Migration[5.1].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+      ActiveRecord::Migration[5.2].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+      Rake::Task['railties:install:migrations'].invoke if !Rails.env.test?
+      Rake::Task['db:migrate'].invoke
     end
   end
 end

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '3.3.2'
+    VERSION = '3.3.3'
   end
 end