trusty-cms 5.2.2 → 5.3.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '0873cdea83c6d22b3d8fc20f35721d99a21de43f6bc6b7e19c4939ca8f7f8d4f'
4
- data.tar.gz: 76e92c2d55993cf8a75d1cfd3af2e8e273b49a3b84c1c3020af6111a6de0a2e3
3
+ metadata.gz: 0db12a9ef02b41ed7f72023d47359e2d09ba6ee251d6a6b2df8d128742ce17ad
4
+ data.tar.gz: b227c357bf7c52bd7c9bb4fa4dd369d039f0aa422e1bf1dcaac446a24ea151c7
5
5
  SHA512:
6
- metadata.gz: 6ab046ad79cae4a2e785065295392e55d47e6365a4ca7889b993c034e9d61d6df9834e175fcb179f05964d1d898d33a285df75e268622ed54f72793e4129ca65
7
- data.tar.gz: 31897515f17878210022247f17db5bd84b870cc5285c07b4ab750d4449b2cafeea541ca9a779a690a78a792f099f7ff3669c9caf0e4e6e5fda8d0f910e77d278
6
+ metadata.gz: ea4ae2569c7703a5fadbe8da6b6dc94fe10f7e46cc52f7cfc51df874e164ff0916c78f3f0cc1c82c8175c2d6b4e71a650f8b4c2c5a86761e03d50ec40f6bbd38
7
+ data.tar.gz: 6bacfa11732c89241179a97accbb018f37a5d164ae86011ad4f7df4cf5e7d2be3328e57211f4cbb68dcdf49e23367b81a30bc06909cbf363f25c6ef889f0fa82
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (5.2.2)
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)
@@ -198,7 +198,6 @@ GEM
198
198
  mime-types-data (3.2021.0225)
199
199
  mini_magick (4.11.0)
200
200
  mini_mime (1.1.2)
201
- mini_portile2 (2.6.1)
202
201
  mini_racer (0.6.2)
203
202
  libv8-node (~> 16.10.0.0)
204
203
  minitest (5.15.0)
@@ -206,8 +205,9 @@ GEM
206
205
  multipart-post (2.1.1)
207
206
  mysql2 (0.5.3)
208
207
  nio4r (2.5.8)
209
- nokogiri (1.12.5)
210
- mini_portile2 (~> 2.6.1)
208
+ nokogiri (1.12.5-x86_64-darwin)
209
+ racc (~> 1.4)
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)
@@ -364,4 +364,4 @@ DEPENDENCIES
364
364
  trustygems (~> 0.2.0)
365
365
 
366
366
  BUNDLED WITH
367
- 2.2.31
367
+ 2.3.4
@@ -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.2'.freeze
5
+ VERSION = '5.3.1'.freeze
6
6
  end
7
7
  end
data/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "trusty-cms",
3
- "version": "3.1.6",
4
- "description": "TrustyCMS is a branch of Radiant CMS. Its goal is to pull the Radiant framework into Rails 5 with minimal changes to its infrastructure.",
3
+ "version": "5.3.1",
4
+ "description": "TrustyCMS is a branch of Radiant CMS. Its goal is to pull the Radiant framework into Rails 6 with minimal changes to its infrastructure.",
5
5
  "main": "index.js",
6
6
  "repository": "https://github.com/pgharts/trusty-cms.git",
7
7
  "author": "Danielle Greaves <danigreaves@gmail.com>",
@@ -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.2
4
+ version: 5.3.1
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-18 00:00:00.000000000 Z
11
+ date: 2022-06-08 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
1171
  - spec/fixtures/users.yml
1172
+ - spec/dummy/public/500.html
1173
+ - spec/dummy/public/422.html
1174
+ - spec/dummy/public/404.html
1175
+ - spec/dummy/public/favicon.ico
1176
+ - spec/dummy/app/assets/config/manifest.js
1177
+ - spec/dummy/db/schema.rb
1178
+ - spec/dummy/config.ru
1174
1179
  - spec/dummy/package.json
1175
- - spec/dummy/yarn.lock
1176
1180
  - spec/dummy/bin/rake
1177
- - spec/dummy/bin/bundle
1178
1181
  - spec/dummy/bin/rails
1179
1182
  - spec/dummy/bin/setup
1183
+ - spec/dummy/bin/bundle
1184
+ - spec/dummy/README.rdoc
1180
1185
  - spec/dummy/Rakefile
1181
- - spec/dummy/config/boot.rb
1182
- - spec/dummy/config/secrets.yml
1183
1186
  - spec/dummy/config/application.rb
1184
1187
  - spec/dummy/config/routes.rb
1185
- - spec/dummy/config/environments/development.rb
1186
1188
  - spec/dummy/config/environments/test.rb
1189
+ - spec/dummy/config/environments/development.rb
1187
1190
  - spec/dummy/config/environments/production.rb
1188
- - spec/dummy/config/database.yml
1189
- - spec/dummy/config/environment.rb
1190
- - spec/dummy/config/locales/en.yml
1191
1191
  - spec/dummy/config/initializers/assets.rb
1192
- - spec/dummy/config/initializers/filter_parameter_logging.rb
1193
1192
  - spec/dummy/config/initializers/mime_types.rb
1194
- - spec/dummy/config/initializers/inflections.rb
1195
1193
  - spec/dummy/config/initializers/cookies_serializer.rb
1196
- - spec/dummy/config/initializers/trusty_cms_config.rb
1197
- - spec/dummy/config/initializers/backtrace_silencers.rb
1194
+ - spec/dummy/config/initializers/filter_parameter_logging.rb
1198
1195
  - spec/dummy/config/initializers/session_store.rb
1199
1196
  - spec/dummy/config/initializers/wrap_parameters.rb
1200
- - 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
1197
+ - spec/dummy/config/initializers/backtrace_silencers.rb
1198
+ - spec/dummy/config/initializers/inflections.rb
1199
+ - spec/dummy/config/initializers/trusty_cms_config.rb
1200
+ - spec/dummy/config/locales/en.yml
1201
+ - spec/dummy/config/secrets.yml
1202
+ - spec/dummy/config/database.yml
1203
+ - spec/dummy/config/environment.rb
1204
+ - spec/dummy/config/boot.rb
1205
+ - spec/dummy/yarn.lock
1206
+ - spec/ci/database.mysql.yml
1207
+ - spec/support/custom_actions.rb
1208
+ - spec/rails_helper.rb
1209
+ - spec/factories/user.rb
1210
+ - spec/factories/page_part.rb
1208
1211
  - spec/factories/layout.rb
1209
1212
  - spec/factories/page.rb
1210
- - spec/factories/page_part.rb
1211
- - spec/factories/user.rb
1212
- - spec/controllers/application_controller_spec.rb
1213
1213
  - spec/controllers/users_controller_spec.rb
1214
- - spec/rails_helper.rb
1214
+ - spec/controllers/application_controller_spec.rb
1215
+ - spec/spec_helper.rb
1215
1216
  - spec/features/layouts_spec.rb
1216
1217
  - spec/features/pages_spec.rb
1217
1218
  - spec/features/config_spec.rb
1218
1219
  - spec/models/layout_spec.rb
1219
- - spec/ci/database.mysql.yml