trusty-cms 5.2.1 → 5.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 (9) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -0
  3. data/Gemfile.lock +6 -5
  4. data/app/assets/javascripts/admin.js +1 -1
  5. data/app/controllers/admin/assets_controller.rb +3 -2
  6. data/lib/trusty_cms.rb +1 -1
  7. data/spec/dummy/package.json +1 -0
  8. data/spec/dummy/yarn.lock +12 -0
  9. metadata +39 -39
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3557cf6a591a541c692261c86d2f6d68f3890b4785606c5f0655a853bb58b984
4
- data.tar.gz: 22626f585127b3155a8fa90cd2c0d37ea16a41ea91cad9f07cc1c5632c5b077b
3
+ metadata.gz: 38fabf49ce5ba5526134087066b03104bffd2068b1cae9fff879905e67ce1185
4
+ data.tar.gz: 8272cba43aef447d20d5e7320998c7f61a081cd2194f59d12419a8047f33f87d
5
5
  SHA512:
6
- metadata.gz: db64d86a59f381bfd2bed0cea2febd51d8ccece3a306c9c4136bf44db62a36c90f77d19870a9c8c31f85467ae91e1101492c410b19e95be84e9b14cdd5549147
7
- data.tar.gz: 4f626772569d3cda1a62c1657a466c4ad61677ff62f75baec957b011e668a5187aee4ad227ad34634275e135c81d436c11052efd35a12ff306395ce59efc9e35
6
+ metadata.gz: c907cb268f754852fa624b73be17dfb7d428b00aa9259b5557a3050ca7809ff618f37375b6876c085bc44b4ae6df981d84ae2943ba0d2b9e8a7f1fe33fb13620
7
+ data.tar.gz: 9986b6a5c0873b5f6b51581be2028146e3c98a5f0994de24d90a607377bb68d99ff554e9b7dbbbc3e891baf5ddbe88e1aeda5e7aa8c33317e3c1b65f3c4b6d1d
data/Gemfile CHANGED
@@ -21,6 +21,7 @@ group :development, :test do
21
21
  gem 'mysql2'
22
22
  gem 'poltergeist', '~> 1.18.1'
23
23
  gem 'pry-byebug'
24
+ gem 'psych', '4.0.3'
24
25
  gem 'rails-observers'
25
26
  gem 'rspec-rails'
26
27
  gem 'simplecov'
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (5.2.1)
4
+ trusty-cms (5.3)
5
5
  RedCloth (= 4.3.2)
6
6
  activestorage-validator
7
7
  acts_as_list (>= 0.9.5, < 1.1.0)
@@ -205,9 +205,9 @@ GEM
205
205
  multipart-post (2.1.1)
206
206
  mysql2 (0.5.3)
207
207
  nio4r (2.5.8)
208
- nokogiri (1.13.6-x86_64-darwin)
208
+ nokogiri (1.12.5-x86_64-darwin)
209
209
  racc (~> 1.4)
210
- nokogiri (1.13.6-x86_64-linux)
210
+ nokogiri (1.12.5-x86_64-linux)
211
211
  racc (~> 1.4)
212
212
  orm_adapter (0.5.0)
213
213
  poltergeist (1.18.1)
@@ -220,7 +220,7 @@ GEM
220
220
  pry-byebug (3.9.0)
221
221
  byebug (~> 11.0)
222
222
  pry (~> 0.13.0)
223
- psych (4.0.4)
223
+ psych (4.0.3)
224
224
  stringio
225
225
  public_suffix (4.0.6)
226
226
  racc (1.6.0)
@@ -356,6 +356,7 @@ DEPENDENCIES
356
356
  mysql2
357
357
  poltergeist (~> 1.18.1)
358
358
  pry-byebug
359
+ psych (= 4.0.3)
359
360
  rails-observers
360
361
  rspec-rails
361
362
  simplecov
@@ -363,4 +364,4 @@ DEPENDENCIES
363
364
  trustygems (~> 0.2.0)
364
365
 
365
366
  BUNDLED WITH
366
- 2.2.31
367
+ 2.3.4
data/app/assets/javascripts/admin.js CHANGED
@@ -15,7 +15,7 @@
15
15
  //= require jquery-ui-bundle/jquery-ui
16
16
  //= require js-cookie/dist/js.cookie
17
17
  //= require 'jquery-validation/dist/jquery.validate.min'
18
- //= require 'jquery-treetable/jquery.treetable'
18
+ //= require jquery-treetable/jquery.treetable.js
19
19
  //= require_tree './admin/validations'
20
20
  //= require ckeditor/init
21
21
  //= require 'admin/persist.min'
data/app/controllers/admin/assets_controller.rb CHANGED
@@ -34,7 +34,7 @@ class Admin::AssetsController < Admin::ResourceController
34
34
  def create
35
35
  @assets = []
36
36
  @page_attachments = []
37
- compress = current_site.try(:compress) ? current_site.compress : true
37
+ compress = current_site.try(:compress).nil? ? true : current_site.compress
38
38
  asset_params[:asset][:asset].to_a.each do |uploaded_asset|
39
39
  if uploaded_asset.content_type == 'application/octet-stream'
40
40
  flash[:notice] = 'Please only upload assets that have a valid extension in the name.'
@@ -72,7 +72,8 @@ class Admin::AssetsController < Admin::ResourceController
72
72
  def compress(uploaded_asset)
73
73
  require 'open-uri'
74
74
  data = $kraken.upload(uploaded_asset.tempfile.path, 'lossy' => true)
75
- File.write(uploaded_asset.tempfile, URI.open(data.kraked_url).read, mode: 'wb')
75
+ new_asset = data.success ? data.kraked_url : uploaded_asset.tempfile.path
76
+ File.write(uploaded_asset.tempfile, URI.open(new_asset).read, mode: 'wb')
76
77
  uploaded_asset
77
78
  end
78
79
 
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 = '5.2.1'.freeze
5
+ VERSION = '5.3'.freeze
6
6
  end
7
7
  end
data/spec/dummy/package.json CHANGED
@@ -5,6 +5,7 @@
5
5
  "license": "MIT",
6
6
  "dependencies": {
7
7
  "jquery": "^3.5.0",
8
+ "jquery-treetable": "^3.2.0-1",
8
9
  "jquery-ui-bundle": "^1.12.1",
9
10
  "jquery-ujs": "^1.2.2"
10
11
  }
data/spec/dummy/yarn.lock CHANGED
@@ -2,6 +2,13 @@
2
2
  # yarn lockfile v1
3
3
 
4
4
 
5
+ jquery-treetable@^3.2.0-1:
6
+ version "3.2.0-1"
7
+ resolved "https://registry.yarnpkg.com/jquery-treetable/-/jquery-treetable-3.2.0-1.tgz#2a844f59396f764f71747a5087ee555d360aaed7"
8
+ integrity sha1-KoRPWTlvdk9xdHpQh+5VXTYKrtc=
9
+ dependencies:
10
+ jquery ">=1.6"
11
+
5
12
  jquery-ui-bundle@^1.12.1:
6
13
  version "1.12.1"
7
14
  resolved "https://registry.yarnpkg.com/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz#d6be2e4c377494e2378b1cae2920a91d1182d8c4"
@@ -12,6 +19,11 @@ jquery-ujs@^1.2.2:
12
19
  dependencies:
13
20
  jquery ">=1.8.0"
14
21
 
22
+ jquery@>=1.6:
23
+ version "3.6.0"
24
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
25
+ integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
26
+
15
27
  jquery@>=1.8.0, jquery@^3.5.0:
16
28
  version "3.5.0"
17
29
  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.2.1
4
+ version: '5.3'
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-05-17 00:00:00.000000000 Z
11
+ date: 2022-06-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activestorage-validator
@@ -1168,52 +1168,52 @@ signing_key:
1168
1168
  specification_version: 4
1169
1169
  summary: A no-fluff content management system designed for small teams.
1170
1170
  test_files:
1171
- - spec/spec_helper.rb
1172
- - spec/support/custom_actions.rb
1173
- - spec/fixtures/users.yml
1174
- - spec/dummy/package.json
1171
+ - spec/dummy/db/schema.rb
1175
1172
  - spec/dummy/yarn.lock
1176
- - spec/dummy/bin/rake
1177
- - spec/dummy/bin/bundle
1178
- - spec/dummy/bin/rails
1179
- - spec/dummy/bin/setup
1180
- - spec/dummy/Rakefile
1181
- - spec/dummy/config/boot.rb
1182
- - spec/dummy/config/secrets.yml
1183
- - spec/dummy/config/application.rb
1184
- - spec/dummy/config/routes.rb
1185
- - spec/dummy/config/environments/development.rb
1186
- - spec/dummy/config/environments/test.rb
1173
+ - spec/dummy/public/422.html
1174
+ - spec/dummy/public/500.html
1175
+ - spec/dummy/public/404.html
1176
+ - spec/dummy/public/favicon.ico
1177
+ - spec/dummy/app/assets/config/manifest.js
1178
+ - spec/dummy/package.json
1179
+ - spec/dummy/config.ru
1187
1180
  - spec/dummy/config/environments/production.rb
1188
- - spec/dummy/config/database.yml
1181
+ - spec/dummy/config/environments/test.rb
1182
+ - spec/dummy/config/environments/development.rb
1189
1183
  - spec/dummy/config/environment.rb
1190
- - spec/dummy/config/locales/en.yml
1191
- - spec/dummy/config/initializers/assets.rb
1192
- - spec/dummy/config/initializers/filter_parameter_logging.rb
1184
+ - spec/dummy/config/secrets.yml
1185
+ - spec/dummy/config/routes.rb
1186
+ - spec/dummy/config/application.rb
1187
+ - spec/dummy/config/initializers/backtrace_silencers.rb
1193
1188
  - spec/dummy/config/initializers/mime_types.rb
1194
1189
  - spec/dummy/config/initializers/inflections.rb
1190
+ - spec/dummy/config/initializers/wrap_parameters.rb
1195
1191
  - spec/dummy/config/initializers/cookies_serializer.rb
1196
- - spec/dummy/config/initializers/trusty_cms_config.rb
1197
- - spec/dummy/config/initializers/backtrace_silencers.rb
1198
1192
  - spec/dummy/config/initializers/session_store.rb
1199
- - spec/dummy/config/initializers/wrap_parameters.rb
1193
+ - spec/dummy/config/initializers/trusty_cms_config.rb
1194
+ - spec/dummy/config/initializers/filter_parameter_logging.rb
1195
+ - spec/dummy/config/initializers/assets.rb
1196
+ - spec/dummy/config/locales/en.yml
1197
+ - spec/dummy/config/database.yml
1198
+ - spec/dummy/config/boot.rb
1199
+ - spec/dummy/Rakefile
1200
+ - spec/dummy/bin/bundle
1201
+ - spec/dummy/bin/rake
1202
+ - spec/dummy/bin/rails
1203
+ - spec/dummy/bin/setup
1200
1204
  - spec/dummy/README.rdoc
1201
- - spec/dummy/app/assets/config/manifest.js
1202
- - spec/dummy/db/schema.rb
1203
- - spec/dummy/public/422.html
1204
- - spec/dummy/public/500.html
1205
- - spec/dummy/public/favicon.ico
1206
- - spec/dummy/public/404.html
1207
- - spec/dummy/config.ru
1208
- - spec/factories/layout.rb
1209
- - spec/factories/page.rb
1210
- - spec/factories/page_part.rb
1211
- - spec/factories/user.rb
1212
- - spec/controllers/application_controller_spec.rb
1213
- - spec/controllers/users_controller_spec.rb
1214
- - spec/rails_helper.rb
1215
- - spec/features/layouts_spec.rb
1216
1205
  - spec/features/pages_spec.rb
1217
1206
  - spec/features/config_spec.rb
1207
+ - spec/features/layouts_spec.rb
1208
+ - spec/rails_helper.rb
1209
+ - spec/controllers/users_controller_spec.rb
1210
+ - spec/controllers/application_controller_spec.rb
1211
+ - spec/fixtures/users.yml
1218
1212
  - spec/models/layout_spec.rb
1213
+ - spec/factories/layout.rb
1214
+ - spec/factories/user.rb
1215
+ - spec/factories/page.rb
1216
+ - spec/factories/page_part.rb
1217
+ - spec/support/custom_actions.rb
1219
1218
  - spec/ci/database.mysql.yml
1219
+ - spec/spec_helper.rb