trusty-cms 3.0.11 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad99e24211991dbe997a0a4b1c13e8d9be4d5ee
-  data.tar.gz: 270294971225b1bdab80236958f0e913476a8d40
+  metadata.gz: 59bd087c0c6085d8bb6c23cfd7919be17b318b78
+  data.tar.gz: 27768e8a098a1cbb8cb113b04a603f68c408f87a
 SHA512:
-  metadata.gz: cb7a17cfd775828904427f0d5018cd4640973899b5bdf22041fcf8e5f3b67d406f6d0c6f09089383bc2f27af79a5e9095b401063abdf42a12fe72869d011ed9d
-  data.tar.gz: f080140a206280c41c3c5bc828051e9d27d6d54ba0537b7c2563142b6d4840f92ca75a4007294c5ab88dd178136d199b2028c2933e1fc38f8e4b2a2fb8e4fae9
+  metadata.gz: d5e36d0f912a42bc29d6844fdfe02ea503152be1f7878e7a6c7eadaa1bfd1cda14dfee24a8529bdca349f011e487f2071aeb8b182105085d8503b531cc0bb578
+  data.tar.gz: dc3830e601705b494cd56a62a2dd8f6b5c3a29694568467745d949b94714c6a14a08bafc07444c26ba0b21f5b837b0b90f9f9179b081e7039fb9bb184fa9389d

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    trusty-cms (3.0.11)
+    trusty-cms (3.1.0)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
@@ -24,7 +24,7 @@ PATH
       rack (~> 2.0.1)
       rack-cache (~> 1.7)
       radius (~> 0.7)
-      rails (~> 5.0.1)
+      rails (~> 5.1)
       rake (< 11.0)
       rdoc (~> 5.1)
       roadie-rails (~> 1.2.1)
@@ -39,39 +39,39 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (5.0.5)
-      actionpack (= 5.0.5)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.3)
+      actionpack (= 5.1.3)
+      nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
+    actionmailer (5.1.3)
+      actionpack (= 5.1.3)
+      actionview (= 5.1.3)
+      activejob (= 5.1.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.5)
-      actionview (= 5.0.5)
-      activesupport (= 5.0.5)
+    actionpack (5.1.3)
+      actionview (= 5.1.3)
+      activesupport (= 5.1.3)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.5)
-      activesupport (= 5.0.5)
+    actionview (5.1.3)
+      activesupport (= 5.1.3)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.5)
-      activesupport (= 5.0.5)
+    activejob (5.1.3)
+      activesupport (= 5.1.3)
       globalid (>= 0.3.6)
-    activemodel (5.0.5)
-      activesupport (= 5.0.5)
-    activerecord (5.0.5)
-      activemodel (= 5.0.5)
-      activesupport (= 5.0.5)
-      arel (~> 7.0)
-    activesupport (5.0.5)
+    activemodel (5.1.3)
+      activesupport (= 5.1.3)
+    activerecord (5.1.3)
+      activemodel (= 5.1.3)
+      activesupport (= 5.1.3)
+      arel (~> 8.0)
+    activesupport (5.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -80,7 +80,7 @@ GEM
       activerecord (>= 3.0.0)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
+    arel (8.0.0)
     builder (3.2.3)
     byebug (9.0.6)
     capybara (2.13.0)
@@ -118,13 +118,14 @@ GEM
       sass-rails (< 5.1)
       sprockets (< 4.0)
     concurrent-ruby (1.0.5)
-    css_parser (1.6.0)
+    css_parser (1.5.0)
       addressable
     database_cleaner (1.5.3)
     delocalize (0.4.0)
       rails (>= 3.0)
     diff-lcs (1.3)
     docile (1.1.5)
+    erubi (1.6.1)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.5.0)
@@ -135,7 +136,7 @@ GEM
     ffi (1.9.18)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    haml (5.0.3)
+    haml (5.0.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (1.0.0)
@@ -158,7 +159,7 @@ GEM
     json (2.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.19)
+    libv8 (3.16.14.19-x86_64-darwin-16)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.6)
@@ -169,7 +170,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.2.0)
     minitest (5.10.3)
-    multi_json (1.12.2)
+    multi_json (1.12.1)
     mysql2 (0.4.8)
     nio4r (2.1.0)
     nokogiri (1.8.0)
@@ -190,31 +191,31 @@ GEM
       pry (>= 0.10.4)
     public_suffix (2.0.5)
     rack (2.0.3)
-    rack-cache (1.7.1)
+    rack-cache (1.7.0)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     radius (0.7.4)
-    rails (5.0.5)
-      actioncable (= 5.0.5)
-      actionmailer (= 5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
-      activemodel (= 5.0.5)
-      activerecord (= 5.0.5)
-      activesupport (= 5.0.5)
+    rails (5.1.3)
+      actioncable (= 5.1.3)
+      actionmailer (= 5.1.3)
+      actionpack (= 5.1.3)
+      actionview (= 5.1.3)
+      activejob (= 5.1.3)
+      activemodel (= 5.1.3)
+      activerecord (= 5.1.3)
+      activesupport (= 5.1.3)
       bundler (>= 1.3.0)
-      railties (= 5.0.5)
+      railties (= 5.1.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.5)
-      actionpack (= 5.0.5)
-      activesupport (= 5.0.5)
+    railties (5.1.3)
+      actionpack (= 5.1.3)
+      activesupport (= 5.1.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -266,7 +267,7 @@ GEM
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -313,4 +314,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   1.16.0.pre.2
+   1.15.3

data/app/controllers/admin/page_parts_controller.rb

@@ -10,7 +10,7 @@ class Admin::PagePartsController < Admin::ResourceController
 private
 
   def page_parts_params
-    params.require(:page_part).permit(:name, :filter_id, :content)
+    params.permit(:name, :filter_id, :content)
   end
 
 end

data/app/controllers/admin/password_resets_controller.rb

@@ -20,17 +20,10 @@ class Admin::PasswordResetsController < ApplicationController
     @user = User.find_by_password_reset_token!(params[:id])
     if @user.password_reset_sent_at < 2.hours.ago
       redirect_to new_password_reset_path, :alert => "Password reset has expired."
-    elsif @user.update_attributes(password_params)
+    elsif @user.update_attributes(params[:user])
       redirect_to welcome_url, :notice => "Password has been reset!"
     else
       render :edit
     end
   end
-
-private
-
-  def password_params
-    params.require(:user).permit(:password, :password_confirmation)
-  end
-
 end

data/bin/rails

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/trusty/cms/engine', __FILE__)
+APP_PATH = File.expand_path('../../test/dummy/config/application', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/db/migrate/001_create_radiant_tables.rb

@@ -1,4 +1,4 @@
-class CreateRadiantTables < ActiveRecord::Migration
+class CreateRadiantTables < ActiveRecord::Migration[5.1]
   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
+class InsertInitialData < ActiveRecord::Migration[5.1]
 
   # 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
+class RenameFilterColumn < ActiveRecord::Migration[5.1]
   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
+class AddVirtualColumnToPage < ActiveRecord::Migration[5.1]
   def self.up
     add_column "pages", "virtual", :boolean, :null => false, :default => false
   end

data/db/migrate/007_remove_virtual_column_from_page.rb

@@ -1,4 +1,4 @@
-class RemoveVirtualColumnFromPage < ActiveRecord::Migration
+class RemoveVirtualColumnFromPage < ActiveRecord::Migration[5.1]
   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
+class AddVirtualColumnToPageAgain < ActiveRecord::Migration[5.1]
   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
+class AddContentTypeFieldToLayout < ActiveRecord::Migration[5.1]
   def self.up
     add_column "layouts", "content_type", :string, :limit => 40
   end

data/db/migrate/012_create_extension_meta.rb

@@ -1,4 +1,4 @@
-class CreateExtensionMeta < ActiveRecord::Migration
+class CreateExtensionMeta < ActiveRecord::Migration[5.1]
   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
+class AddNotesFieldToUser < ActiveRecord::Migration[5.1]
   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
+class RenameConfigDefaultPartsKey < ActiveRecord::Migration[5.1]
 
   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
+class AddOptimisticLocking < ActiveRecord::Migration[5.1]
 
   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
+class AddSessions < ActiveRecord::Migration[5.1]
   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
+class RenameCreatedByUpdatedByColumns < ActiveRecord::Migration[5.1]
   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
+class AddDescriptionAndKeywordsToPages < ActiveRecord::Migration[5.1]
   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
+class AddSessionInfoToUsers < ActiveRecord::Migration[5.1]
   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
+class RemoveSessionExpireFromUsers < ActiveRecord::Migration[5.1]
   def self.up
     remove_column :users, :session_expire
   end

data/db/migrate/20081203140407_add_indexes.rb

@@ -1,4 +1,4 @@
-class AddIndexes < ActiveRecord::Migration
+class AddIndexes < ActiveRecord::Migration[5.1]
   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
+class AddUserLanguage < ActiveRecord::Migration[5.1]
   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
+class RenameDeveloperRoleToDesigner < ActiveRecord::Migration[5.1]
   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
+class ChangeUserLanguageToLocale < ActiveRecord::Migration[5.1]
   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
+class AddPageFields < ActiveRecord::Migration[5.1]
   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
+class ConvertPageMetas < ActiveRecord::Migration[5.1]
   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
+class AddFieldNameIndex < ActiveRecord::Migration[5.1]
   def self.up
     remove_index :page_fields, :page_id
     add_index :page_fields, [:page_id, :name, :content]

data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb

@@ -1,4 +1,4 @@
-class AddAllowedChildrenCacheToPages < ActiveRecord::Migration
+class AddAllowedChildrenCacheToPages < ActiveRecord::Migration[5.1]
   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
+class ExtendPagePartContentLimit < ActiveRecord::Migration[5.1]
   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
+class ChangePagesAllowedChildrenCacheToText  < ActiveRecord::Migration[5.1]
   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
+class AddPasswordResetToUsers < ActiveRecord::Migration[5.1]
   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
+class AddPositionToPages < ActiveRecord::Migration[5.1]
   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
+class Create<%= class_name %>Schema < ActiveRecord::Migration[5.1]
   def self.up
 
   end

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

@@ -1,4 +1,4 @@
-class <%= class_name.underscore.camelize %> < ActiveRecord::Migration
+class <%= class_name.underscore.camelize %> < ActiveRecord::Migration[5.1]
   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
+class <%= migration_name %> < ActiveRecord::Migration[5.1]
   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.drop_table table
+        ActiveRecord::Migration[5.1].drop_table table
       end
       Rake::Task["db:migrate"].invoke
     else
@@ -64,7 +64,7 @@ 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.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+    ActiveRecord::Migration[5.1].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
@@ -72,7 +72,7 @@ To add more extensions just add them to your Gemfile and run `bundle install`.
   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.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+      ActiveRecord::Migration[5.1].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
       ActiveRecord::Migrator.migrate(File.join(TrustyCms.root, 'db', 'migrate'), ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
       Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     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.0.11'
+    VERSION = '3.1.0'
   end
 end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -13,113 +12,106 @@
 
 ActiveRecord::Schema.define(version: 20161027141250) do
 
-  create_table "config", force: :cascade do |t|
-    t.string "key",   limit: 40,  default: "", null: false
-    t.string "value", limit: 255, default: ""
+  create_table "config", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "key", limit: 40, default: "", null: false
+    t.string "value", default: ""
+    t.index ["key"], name: "key", unique: true
   end
 
-  add_index "config", ["key"], name: "key", unique: true, using: :btree
-
-  create_table "extension_meta", force: :cascade do |t|
-    t.string  "name",           limit: 255
-    t.integer "schema_version", limit: 4,   default: 0
-    t.boolean "enabled",                    default: true
+  create_table "extension_meta", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name"
+    t.integer "schema_version", default: 0
+    t.boolean "enabled", default: true
   end
 
-  create_table "layouts", force: :cascade do |t|
-    t.string   "name",          limit: 100
-    t.text     "content",       limit: 65535
+  create_table "layouts", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name", limit: 100
+    t.text "content"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "created_by_id", limit: 4
-    t.integer  "updated_by_id", limit: 4
-    t.string   "content_type",  limit: 40
-    t.integer  "lock_version",  limit: 4,     default: 0
+    t.integer "created_by_id"
+    t.integer "updated_by_id"
+    t.string "content_type", limit: 40
+    t.integer "lock_version", default: 0
   end
 
-  create_table "page_fields", force: :cascade do |t|
-    t.integer "page_id", limit: 4
-    t.string  "name",    limit: 255
-    t.string  "content", limit: 255
+  create_table "page_fields", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.integer "page_id"
+    t.string "name"
+    t.string "content"
+    t.index ["page_id", "name", "content"], name: "index_page_fields_on_page_id_and_name_and_content"
   end
 
-  add_index "page_fields", ["page_id", "name", "content"], name: "index_page_fields_on_page_id_and_name_and_content", using: :btree
-
-  create_table "page_parts", force: :cascade do |t|
-    t.string  "name",      limit: 100
-    t.string  "filter_id", limit: 25
-    t.text    "content",   limit: 16777215
-    t.integer "page_id",   limit: 4
+  create_table "page_parts", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name", limit: 100
+    t.string "filter_id", limit: 25
+    t.text "content", limit: 16777215
+    t.integer "page_id"
+    t.index ["page_id", "name"], name: "parts_by_page"
   end
 
-  add_index "page_parts", ["page_id", "name"], name: "parts_by_page", using: :btree
-
-  create_table "pages", force: :cascade do |t|
-    t.string   "title",                  limit: 255
-    t.string   "slug",                   limit: 100
-    t.string   "breadcrumb",             limit: 160
-    t.string   "class_name",             limit: 25
-    t.integer  "status_id",              limit: 4,     default: 1,     null: false
-    t.integer  "parent_id",              limit: 4
-    t.integer  "layout_id",              limit: 4
+  create_table "pages", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "title"
+    t.string "slug", limit: 100
+    t.string "breadcrumb", limit: 160
+    t.string "class_name", limit: 25
+    t.integer "status_id", default: 1, null: false
+    t.integer "parent_id"
+    t.integer "layout_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "published_at"
-    t.integer  "created_by_id",          limit: 4
-    t.integer  "updated_by_id",          limit: 4
-    t.boolean  "virtual",                              default: false, null: false
-    t.integer  "lock_version",           limit: 4,     default: 0
-    t.text     "allowed_children_cache", limit: 65535
-    t.integer  "position",               limit: 4
+    t.integer "created_by_id"
+    t.integer "updated_by_id"
+    t.boolean "virtual", default: false, null: false
+    t.integer "lock_version", default: 0
+    t.text "allowed_children_cache"
+    t.integer "position"
+    t.index ["class_name"], name: "pages_class_name"
+    t.index ["parent_id"], name: "pages_parent_id"
+    t.index ["slug", "parent_id"], name: "pages_child_slug"
+    t.index ["virtual", "status_id"], name: "pages_published"
   end
 
-  add_index "pages", ["class_name"], name: "pages_class_name", using: :btree
-  add_index "pages", ["parent_id"], name: "pages_parent_id", using: :btree
-  add_index "pages", ["slug", "parent_id"], name: "pages_child_slug", using: :btree
-  add_index "pages", ["virtual", "status_id"], name: "pages_published", using: :btree
-
-  create_table "sessions", force: :cascade do |t|
-    t.string   "session_id", limit: 255
-    t.text     "data",       limit: 65535
+  create_table "sessions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "session_id"
+    t.text "data"
     t.datetime "updated_at"
+    t.index ["session_id"], name: "index_sessions_on_session_id"
+    t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
-  add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
-  add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
-
-  create_table "snippets", force: :cascade do |t|
-    t.string   "name",          limit: 100,   default: "", null: false
-    t.string   "filter_id",     limit: 25
-    t.text     "content",       limit: 65535
+  create_table "snippets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name", limit: 100, default: "", null: false
+    t.string "filter_id", limit: 25
+    t.text "content"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "created_by_id", limit: 4
-    t.integer  "updated_by_id", limit: 4
-    t.integer  "lock_version",  limit: 4,     default: 0
+    t.integer "created_by_id"
+    t.integer "updated_by_id"
+    t.integer "lock_version", default: 0
+    t.index ["name"], name: "name", unique: true
   end
 
-  add_index "snippets", ["name"], name: "name", unique: true, using: :btree
-
-  create_table "users", force: :cascade do |t|
-    t.string   "name",                   limit: 100
-    t.string   "email",                  limit: 255
-    t.string   "login",                  limit: 40,    default: "",    null: false
-    t.string   "password",               limit: 40
-    t.boolean  "admin",                                default: false, null: false
-    t.boolean  "designer",                             default: false, null: false
+  create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name", limit: 100
+    t.string "email"
+    t.string "login", limit: 40, default: "", null: false
+    t.string "password", limit: 40
+    t.boolean "admin", default: false, null: false
+    t.boolean "designer", default: false, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "created_by_id",          limit: 4
-    t.integer  "updated_by_id",          limit: 4
-    t.string   "salt",                   limit: 255
-    t.text     "notes",                  limit: 65535
-    t.integer  "lock_version",           limit: 4,     default: 0
-    t.string   "session_token",          limit: 255
-    t.string   "locale",                 limit: 255
-    t.string   "password_reset_token",   limit: 255
+    t.integer "created_by_id"
+    t.integer "updated_by_id"
+    t.string "salt"
+    t.text "notes"
+    t.integer "lock_version", default: 0
+    t.string "session_token"
+    t.string "locale"
+    t.string "password_reset_token"
     t.datetime "password_reset_sent_at"
+    t.index ["login"], name: "login", unique: true
   end
 
-  add_index "users", ["login"], name: "login", unique: true, using: :btree
-
 end

data/trusty_cms.gemspec

@@ -25,7 +25,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.test_files = Dir["spec/**/*"]
 
   s.add_dependency "tzinfo",          "~> 1.2.3"
-  s.add_dependency "rails",           "~> 5.0.1"
+  s.add_dependency "rails",           "~> 5.1"
   s.add_dependency "rdoc",            "~> 5.1"
   s.add_dependency "acts_as_tree",    "~> 2.6.1"
   s.add_dependency "bundler",         "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.1.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -1351,6 +1351,7 @@ files:
 - app/views/widget/_email_form.html.haml
 - app/views/widget/_horizontal_widget.html.haml
 - bin/ci/before_script
+- bin/rails
 - bin/trusty_cms
 - bin/trusty_test
 - config.ru
@@ -1684,7 +1685,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.