trusty-cms 5.5.9 → 6.0.0

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.
@@ -31,7 +31,7 @@ module TrustyCms
31
31
 
32
32
  # Initialize extension paths
33
33
  config.initialize_extension_paths
34
- extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
34
+ extension_loader = ExtensionLoader.instance { |l| l.initializer = self }
35
35
  extension_loader.paths(:load).reverse_each do |path, value|
36
36
  config.autoload_paths.unshift path
37
37
  $LOAD_PATH.unshift path
@@ -101,7 +101,7 @@ module TrustyCms
101
101
  # config.action_controller.session_store = :cookie_store DEPRECATED
102
102
 
103
103
  # Activate observers that should always be running
104
- #config.active_record.observers = :user_action_observer
104
+ # config.active_record.observers = :user_action_observer
105
105
 
106
106
  # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
107
107
  # All files from config/locales/*.rb,yml are added automatically.
@@ -122,15 +122,15 @@ module TrustyCms
122
122
 
123
123
  config.after_initialize do
124
124
  extension_loader.load_extensions
125
- extension_loader.load_extension_initalizers
125
+ extension_loader.load_extension_initializers
126
126
 
127
- #Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
127
+ # Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
128
128
  # load(initializer)
129
- #end
129
+ # end
130
130
 
131
- extension_loader.activate_extensions # also calls initialize_views
132
- #config.add_controller_paths(extension_loader.paths(:controller))
133
- #config.add_eager_load_paths(extension_loader.paths(:eager_load))
131
+ extension_loader.activate_extensions # also calls initialize_views
132
+ # config.add_controller_paths(extension_loader.paths(:controller))
133
+ # config.add_eager_load_paths(extension_loader.paths(:eager_load))
134
134
 
135
135
  # Add new inflection rules using the following format:
136
136
  ActiveSupport::Inflector.inflections do |inflect|
@@ -1,20 +1,23 @@
1
- TrustyCms.config do |config|
2
- config.define 'admin.title', :default => "TrustyCms CMS"
3
- config.define 'dev.host'
4
- config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
5
- config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
6
- config.define 'defaults.page.parts', :default => "Body,Extended"
7
- config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
8
- config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
9
- config.define 'defaults.page.fields'
10
- config.define 'pagination.param_name', :default => 'page'
11
- config.define 'pagination.per_page_param_name', :default => 'per_page'
12
- config.define 'admin.pagination.per_page', :type => :integer, :default => 50
13
- config.define 'site.title', :default => "Your site title", :allow_blank => false
14
- config.define 'site.host', :default => "www.example.com", :allow_blank => false
15
- config.define 'user.allow_password_reset?', :default => true
16
- end
1
+ Rails.application.reloader.to_prepare do
2
+ TrustyCms.config do |config|
3
+ config.define 'admin.title', :default => "TrustyCms CMS"
4
+ config.define 'dev.host'
5
+ config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
6
+ config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
7
+ config.define 'defaults.page.parts', :default => "Body,Extended"
8
+ config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
9
+ config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
10
+ config.define 'defaults.page.fields'
11
+ config.define 'pagination.param_name', :default => 'page'
12
+ config.define 'pagination.per_page_param_name', :default => 'per_page'
13
+ config.define 'admin.pagination.per_page', :type => :integer, :default => 50
14
+ config.define 'site.title', :default => "Your site title", :allow_blank => false
15
+ config.define 'site.host', :default => "www.example.com", :allow_blank => false
16
+ config.define 'user.allow_password_reset?', :default => true
17
+ end
18
+
19
+ TrustyCms::Application.config do |config|
17
20
 
18
- TrustyCms::Application.config do |config|
21
+ end
19
22
 
20
23
  end
@@ -2,34 +2,61 @@
2
2
  # of editing this file, please use the migrations feature of Active Record to
3
3
  # incrementally modify your database, and then regenerate this schema definition.
4
4
  #
5
- # Note that this schema.rb definition is the authoritative source for your
6
- # database schema. If you need to create the application database on another
7
- # system, you should be using db:schema:load, not running all the migrations
8
- # from scratch. The latter is a flawed and unsustainable approach (the more migrations
9
- # you'll amass, the slower it'll run and the greater likelihood for issues).
5
+ # This file is the source Rails uses to define your schema when running `bin/rails
6
+ # db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
7
+ # be faster and is potentially less error prone than running all of your
8
+ # migrations from scratch. Old migrations may fail to apply correctly if those
9
+ # migrations use external dependencies or application code.
10
10
  #
11
11
  # It's strongly recommended that you check this file into your version control system.
12
12
 
13
- ActiveRecord::Schema.define(version: 2016_10_27_141250) do
13
+ ActiveRecord::Schema[7.0].define(version: 2023_10_19_192097) do
14
+ create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
15
+ t.string "name", null: false
16
+ t.string "record_type", null: false
17
+ t.bigint "record_id", null: false
18
+ t.bigint "blob_id", null: false
19
+ t.datetime "created_at", precision: nil, null: false
20
+ t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
21
+ t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
22
+ end
23
+
24
+ create_table "active_storage_blobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
25
+ t.string "key", null: false
26
+ t.string "filename", null: false
27
+ t.string "content_type"
28
+ t.text "metadata"
29
+ t.string "service_name", null: false
30
+ t.bigint "byte_size", null: false
31
+ t.string "checksum", null: false
32
+ t.datetime "created_at", precision: nil, null: false
33
+ t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
34
+ end
35
+
36
+ create_table "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
37
+ t.bigint "blob_id", null: false
38
+ t.string "variation_digest", null: false
39
+ t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
40
+ end
14
41
 
15
- create_table "admins", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
42
+ create_table "admins", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
16
43
  t.string "email", default: "", null: false
17
44
  t.string "encrypted_password", default: "", null: false
18
45
  t.string "reset_password_token"
19
- t.datetime "reset_password_sent_at"
20
- t.datetime "remember_created_at"
46
+ t.datetime "reset_password_sent_at", precision: nil
47
+ t.datetime "remember_created_at", precision: nil
21
48
  t.integer "sign_in_count", default: 0, null: false
22
- t.datetime "current_sign_in_at"
23
- t.datetime "last_sign_in_at"
49
+ t.datetime "current_sign_in_at", precision: nil
50
+ t.datetime "last_sign_in_at", precision: nil
24
51
  t.string "current_sign_in_ip"
25
52
  t.string "last_sign_in_ip"
26
53
  t.string "confirmation_token"
27
- t.datetime "confirmed_at"
28
- t.datetime "confirmation_sent_at"
54
+ t.datetime "confirmed_at", precision: nil
55
+ t.datetime "confirmation_sent_at", precision: nil
29
56
  t.string "unconfirmed_email"
30
57
  t.integer "failed_attempts", default: 0, null: false
31
58
  t.string "unlock_token"
32
- t.datetime "locked_at"
59
+ t.datetime "locked_at", precision: nil
33
60
  t.string "first_name"
34
61
  t.string "last_name"
35
62
  t.boolean "admin"
@@ -38,11 +65,11 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
38
65
  t.integer "site_id"
39
66
  t.integer "updated_by_id"
40
67
  t.text "notes"
41
- t.datetime "created_at", null: false
42
- t.datetime "updated_at", null: false
68
+ t.datetime "created_at", precision: nil, null: false
69
+ t.datetime "updated_at", precision: nil, null: false
43
70
  end
44
71
 
45
- create_table "assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
72
+ create_table "assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
46
73
  t.string "caption"
47
74
  t.string "title"
48
75
  t.string "asset_file_name"
@@ -50,31 +77,31 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
50
77
  t.integer "asset_file_size"
51
78
  t.integer "created_by_id"
52
79
  t.integer "updated_by_id"
53
- t.datetime "created_at"
54
- t.datetime "updated_at"
80
+ t.datetime "created_at", precision: nil
81
+ t.datetime "updated_at", precision: nil
55
82
  t.string "uuid"
56
83
  t.integer "original_width"
57
84
  t.integer "original_height"
58
85
  t.string "original_extension"
59
86
  end
60
87
 
61
- create_table "config", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
88
+ create_table "config", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
62
89
  t.string "key", limit: 40, default: "", null: false
63
90
  t.string "value", default: ""
64
91
  t.index ["key"], name: "key", unique: true
65
92
  end
66
93
 
67
- create_table "extension_meta", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
94
+ create_table "extension_meta", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
68
95
  t.string "name"
69
96
  t.integer "schema_version", default: 0
70
97
  t.boolean "enabled", default: true
71
98
  end
72
99
 
73
- create_table "layouts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
100
+ create_table "layouts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
74
101
  t.string "name", limit: 100
75
102
  t.text "content"
76
- t.datetime "created_at"
77
- t.datetime "updated_at"
103
+ t.datetime "created_at", precision: nil
104
+ t.datetime "updated_at", precision: nil
78
105
  t.integer "created_by_id"
79
106
  t.integer "updated_by_id"
80
107
  t.string "content_type", limit: 40
@@ -82,28 +109,28 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
82
109
  t.integer "site_id"
83
110
  end
84
111
 
85
- create_table "page_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
112
+ create_table "page_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
86
113
  t.integer "asset_id"
87
114
  t.integer "page_id"
88
115
  t.integer "position"
89
116
  end
90
117
 
91
- create_table "page_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
118
+ create_table "page_fields", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
92
119
  t.integer "page_id"
93
120
  t.string "name"
94
121
  t.string "content"
95
122
  t.index ["page_id", "name", "content"], name: "index_page_fields_on_page_id_and_name_and_content"
96
123
  end
97
124
 
98
- create_table "page_parts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
125
+ create_table "page_parts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
99
126
  t.string "name", limit: 100
100
127
  t.string "filter_id", limit: 25
101
- t.text "content", limit: 16777215
128
+ t.text "content", size: :medium
102
129
  t.integer "page_id"
103
130
  t.index ["page_id", "name"], name: "parts_by_page"
104
131
  end
105
132
 
106
- create_table "pages", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
133
+ create_table "pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
107
134
  t.string "title"
108
135
  t.string "slug", limit: 100
109
136
  t.string "breadcrumb", limit: 160
@@ -111,9 +138,9 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
111
138
  t.integer "status_id", default: 1, null: false
112
139
  t.integer "parent_id"
113
140
  t.integer "layout_id"
114
- t.datetime "created_at"
115
- t.datetime "updated_at"
116
- t.datetime "published_at"
141
+ t.datetime "created_at", precision: nil
142
+ t.datetime "updated_at", precision: nil
143
+ t.datetime "published_at", precision: nil
117
144
  t.integer "created_by_id"
118
145
  t.integer "updated_by_id"
119
146
  t.boolean "virtual", default: false, null: false
@@ -128,34 +155,34 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
128
155
  t.index ["virtual", "status_id"], name: "pages_published"
129
156
  end
130
157
 
131
- create_table "sessions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
158
+ create_table "sessions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
132
159
  t.string "session_id"
133
160
  t.text "data"
134
- t.datetime "updated_at"
161
+ t.datetime "updated_at", precision: nil
135
162
  t.index ["session_id"], name: "index_sessions_on_session_id"
136
163
  t.index ["updated_at"], name: "index_sessions_on_updated_at"
137
164
  end
138
165
 
139
- create_table "sites", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
166
+ create_table "sites", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
140
167
  t.string "name"
141
168
  t.string "domain"
142
169
  t.integer "homepage_id"
143
170
  t.integer "position", default: 0
144
171
  t.integer "created_by_id"
145
- t.datetime "created_at"
172
+ t.datetime "created_at", precision: nil
146
173
  t.integer "updated_by_id"
147
- t.datetime "updated_at"
174
+ t.datetime "updated_at", precision: nil
148
175
  t.string "subtitle"
149
176
  t.string "abbreviation"
150
177
  t.string "base_domain"
151
178
  end
152
179
 
153
- create_table "snippets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
180
+ create_table "snippets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
154
181
  t.string "name", limit: 100, default: "", null: false
155
182
  t.string "filter_id", limit: 25
156
183
  t.text "content"
157
- t.datetime "created_at"
158
- t.datetime "updated_at"
184
+ t.datetime "created_at", precision: nil
185
+ t.datetime "updated_at", precision: nil
159
186
  t.integer "created_by_id"
160
187
  t.integer "updated_by_id"
161
188
  t.integer "lock_version", default: 0
@@ -163,15 +190,15 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
163
190
  t.index ["name", "site_id"], name: "name_site_id", unique: true
164
191
  end
165
192
 
166
- create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
193
+ create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
167
194
  t.string "name", limit: 100
168
195
  t.string "email"
169
196
  t.string "login", limit: 40, default: "", null: false
170
197
  t.string "password", limit: 40
171
198
  t.boolean "admin", default: false, null: false
172
199
  t.boolean "designer", default: false, null: false
173
- t.datetime "created_at"
174
- t.datetime "updated_at"
200
+ t.datetime "created_at", precision: nil
201
+ t.datetime "updated_at", precision: nil
175
202
  t.integer "created_by_id"
176
203
  t.integer "updated_by_id"
177
204
  t.string "salt"
@@ -181,7 +208,9 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
181
208
  t.integer "site_id"
182
209
  t.string "locale"
183
210
  t.string "password_reset_token"
184
- t.datetime "password_reset_sent_at"
211
+ t.datetime "password_reset_sent_at", precision: nil
185
212
  end
186
213
 
214
+ add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
215
+ add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
187
216
  end
data/trusty_cms.gemspec CHANGED
@@ -25,31 +25,31 @@ a general purpose content management system--not merely a blogging engine.'
25
25
  s.license = 'MIT'
26
26
  s.test_files = Dir['spec/**/*']
27
27
  s.add_dependency 'activestorage-validator'
28
- s.add_dependency 'acts_as_list', '>= 0.9.5', '< 1.2.0'
29
- s.add_dependency 'acts_as_tree', '~> 2.9.1'
30
- s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.4.0'
31
- s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
28
+ s.add_dependency 'acts_as_list', '>= 0.9.5', '< 1.2.0'
29
+ s.add_dependency 'acts_as_tree', '~> 2.9.1'
30
+ s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.4.0'
31
+ s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
32
32
  s.add_dependency 'devise'
33
- s.add_dependency 'execjs', '~> 2.7'
34
- s.add_dependency 'haml'
33
+ s.add_dependency 'execjs', '~> 2.7'
34
+ s.add_dependency 'haml', '>= 5.0', '< 6.0'
35
35
  s.add_dependency 'haml-rails'
36
- s.add_dependency 'highline', '>= 1.7.8', '< 2.2.0'
36
+ s.add_dependency 'highline', '>= 1.7.8', '< 2.2.0'
37
37
  s.add_dependency 'image_processing'
38
38
  s.add_dependency 'kraken-io'
39
39
  s.add_dependency 'mini_racer'
40
40
  s.add_dependency 'mysql2'
41
- s.add_dependency 'rack', '>= 2.0.1', '< 3.1.0'
42
- s.add_dependency 'rack-cache', '~> 1.7'
43
- s.add_dependency 'radius', '~> 0.7'
41
+ s.add_dependency 'rack', '>= 2.0.1', '< 3.1.0'
42
+ s.add_dependency 'rack-cache', '~> 1.7'
43
+ s.add_dependency 'radius', '~> 0.7'
44
44
  s.add_dependency 'rails'
45
- s.add_dependency 'rake', '< 14.0'
46
- s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
47
- s.add_dependency 'RedCloth', '4.3.2'
45
+ s.add_dependency 'rake', '< 14.0'
46
+ s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
47
+ s.add_dependency 'RedCloth', '4.3.2'
48
48
  s.add_dependency 'roadie-rails'
49
49
  s.add_dependency 'sass-rails'
50
- s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'
51
- s.add_dependency 'tzinfo', '>= 1.2.3', '< 2.1.0'
52
- s.add_dependency 'uglifier', '>= 3.2', '< 5.0'
50
+ s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'
51
+ s.add_dependency 'tzinfo', '>= 1.2.3', '< 2.1.0'
52
+ s.add_dependency 'uglifier', '>= 3.2', '< 5.0'
53
53
  s.add_dependency 'uuidtools', '>= 2.1.5', '< 2.3.0'
54
54
  s.add_dependency 'will_paginate', '>= 3', '< 5'
55
55
  end
@@ -1,5 +1,3 @@
1
- require_dependency 'application_controller'
2
-
3
1
  class MultiSiteExtension < TrustyCms::Extension
4
2
  version "3.0.2"
5
3
  description %{ Enables virtual sites to be created with associated domain names.
@@ -7,7 +5,6 @@ class MultiSiteExtension < TrustyCms::Extension
7
5
  individual site) and allows model classes to be scoped by site. }
8
6
  url "http://trustarts.org/"
9
7
 
10
-
11
8
  def activate
12
9
 
13
10
  # Model extensions
@@ -19,7 +16,7 @@ class MultiSiteExtension < TrustyCms::Extension
19
16
  Admin::ResourceController.send :include, MultiSite::ApplicationControllerExtensions
20
17
  ApplicationController.send :include, MultiSite::ApplicationControllerFilterExtensions
21
18
 
22
- #ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
19
+ # ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
23
20
  SiteController.send :include, MultiSite::SiteControllerExtensions
24
21
  Admin::ResourceController.send :include, MultiSite::ResourceControllerExtensions
25
22
  Admin::PagesController.send :include, MultiSite::PagesControllerExtensions
@@ -39,7 +36,6 @@ class MultiSiteExtension < TrustyCms::Extension
39
36
  admin.snippets.edit.add :form, "choose_site", :before => "edit_filter" unless admin.snippets.edit.form.include?("choose_site")
40
37
  end
41
38
 
42
-
43
39
  unless defined? admin.site
44
40
  TrustyCms::AdminUI.send :include, MultiSite::AdminUI
45
41
  admin.site = TrustyCms::AdminUI.load_default_site_regions