trusty-cms 5.2.0 → 5.2.3

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: ef01db17864b39bd25d87227e0d6b78995df3a784e6ef4fc1416919d7effe180
4
- data.tar.gz: 6b66fad628f8bac4f030edda68a33d403de8530ea41f86ca3fae78ed6921f785
3
+ metadata.gz: 47f1958b702fa213e0ed7be3725d9e846c619a966bdc614c3e30cac3e4cd190e
4
+ data.tar.gz: 9ae273f919dd49d71b3288de4d797578c74684b071648b1ee9ad70abdf89b2a5
5
5
  SHA512:
6
- metadata.gz: e57ba7b714ba22b4a493a2f6616bcab50658f3c53647aa997e7e6b75c218db5f994a351bc352314ff8f42ddf65c0e148a2a787f6bc540fb9287414e8f2fadc7e
7
- data.tar.gz: 98915375ec4787f9ead33fe204a01ec15508d8eac073ebc1ea3ab4d34b3d17142899fa071f6fcd7b73b3fd8f3673072e930b5d0dc600359202ef6378b88919ff
6
+ metadata.gz: 0acfc01a195112e57d8297268c86c4da2773e781b7bb76f16b07606a78f631fe6213906ed4288aa7a17e1bd09b73d4f2cc77cbd34db1853b096078d22e283e97
7
+ data.tar.gz: 452fea2947b5fddc0e1c4522d30f67d4bb8ec30c4770e9d5c09aa7837799e91ac9959fe6ff95fd7ae783c418d2b2898ab8afb620046e40c7c7ca221e0fd14f60
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.0)
4
+ trusty-cms (5.2.3)
5
5
  RedCloth (= 4.3.2)
6
6
  activestorage-validator
7
7
  acts_as_list (>= 0.9.5, < 1.1.0)
@@ -35,62 +35,62 @@ GEM
35
35
  remote: https://rubygems.org/
36
36
  specs:
37
37
  RedCloth (4.3.2)
38
- actioncable (6.1.4.7)
39
- actionpack (= 6.1.4.7)
40
- activesupport (= 6.1.4.7)
38
+ actioncable (6.1.6)
39
+ actionpack (= 6.1.6)
40
+ activesupport (= 6.1.6)
41
41
  nio4r (~> 2.0)
42
42
  websocket-driver (>= 0.6.1)
43
- actionmailbox (6.1.4.7)
44
- actionpack (= 6.1.4.7)
45
- activejob (= 6.1.4.7)
46
- activerecord (= 6.1.4.7)
47
- activestorage (= 6.1.4.7)
48
- activesupport (= 6.1.4.7)
43
+ actionmailbox (6.1.6)
44
+ actionpack (= 6.1.6)
45
+ activejob (= 6.1.6)
46
+ activerecord (= 6.1.6)
47
+ activestorage (= 6.1.6)
48
+ activesupport (= 6.1.6)
49
49
  mail (>= 2.7.1)
50
- actionmailer (6.1.4.7)
51
- actionpack (= 6.1.4.7)
52
- actionview (= 6.1.4.7)
53
- activejob (= 6.1.4.7)
54
- activesupport (= 6.1.4.7)
50
+ actionmailer (6.1.6)
51
+ actionpack (= 6.1.6)
52
+ actionview (= 6.1.6)
53
+ activejob (= 6.1.6)
54
+ activesupport (= 6.1.6)
55
55
  mail (~> 2.5, >= 2.5.4)
56
56
  rails-dom-testing (~> 2.0)
57
- actionpack (6.1.4.7)
58
- actionview (= 6.1.4.7)
59
- activesupport (= 6.1.4.7)
57
+ actionpack (6.1.6)
58
+ actionview (= 6.1.6)
59
+ activesupport (= 6.1.6)
60
60
  rack (~> 2.0, >= 2.0.9)
61
61
  rack-test (>= 0.6.3)
62
62
  rails-dom-testing (~> 2.0)
63
63
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
64
- actiontext (6.1.4.7)
65
- actionpack (= 6.1.4.7)
66
- activerecord (= 6.1.4.7)
67
- activestorage (= 6.1.4.7)
68
- activesupport (= 6.1.4.7)
64
+ actiontext (6.1.6)
65
+ actionpack (= 6.1.6)
66
+ activerecord (= 6.1.6)
67
+ activestorage (= 6.1.6)
68
+ activesupport (= 6.1.6)
69
69
  nokogiri (>= 1.8.5)
70
- actionview (6.1.4.7)
71
- activesupport (= 6.1.4.7)
70
+ actionview (6.1.6)
71
+ activesupport (= 6.1.6)
72
72
  builder (~> 3.1)
73
73
  erubi (~> 1.4)
74
74
  rails-dom-testing (~> 2.0)
75
75
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
76
- activejob (6.1.4.7)
77
- activesupport (= 6.1.4.7)
76
+ activejob (6.1.6)
77
+ activesupport (= 6.1.6)
78
78
  globalid (>= 0.3.6)
79
- activemodel (6.1.4.7)
80
- activesupport (= 6.1.4.7)
81
- activerecord (6.1.4.7)
82
- activemodel (= 6.1.4.7)
83
- activesupport (= 6.1.4.7)
84
- activestorage (6.1.4.7)
85
- actionpack (= 6.1.4.7)
86
- activejob (= 6.1.4.7)
87
- activerecord (= 6.1.4.7)
88
- activesupport (= 6.1.4.7)
89
- marcel (~> 1.0.0)
79
+ activemodel (6.1.6)
80
+ activesupport (= 6.1.6)
81
+ activerecord (6.1.6)
82
+ activemodel (= 6.1.6)
83
+ activesupport (= 6.1.6)
84
+ activestorage (6.1.6)
85
+ actionpack (= 6.1.6)
86
+ activejob (= 6.1.6)
87
+ activerecord (= 6.1.6)
88
+ activesupport (= 6.1.6)
89
+ marcel (~> 1.0)
90
90
  mini_mime (>= 1.1.0)
91
91
  activestorage-validator (0.1.5)
92
92
  rails (>= 5.2.0)
93
- activesupport (6.1.4.7)
93
+ activesupport (6.1.6)
94
94
  concurrent-ruby (~> 1.0, >= 1.0.2)
95
95
  i18n (>= 1.6, < 2)
96
96
  minitest (>= 5.1)
@@ -102,7 +102,7 @@ GEM
102
102
  activerecord (>= 3.0.0)
103
103
  addressable (2.8.0)
104
104
  public_suffix (>= 2.0.2, < 5.0)
105
- bcrypt (3.1.17)
105
+ bcrypt (3.1.18)
106
106
  builder (3.2.4)
107
107
  byebug (11.1.3)
108
108
  capybara (3.35.3)
@@ -176,7 +176,7 @@ GEM
176
176
  image_processing (1.12.2)
177
177
  mini_magick (>= 4.9.5, < 5)
178
178
  ruby-vips (>= 2.0.17, < 3)
179
- json (2.6.1)
179
+ json (2.6.2)
180
180
  kraken-io (0.1.3)
181
181
  activesupport
182
182
  httparty
@@ -186,7 +186,7 @@ GEM
186
186
  addressable (~> 2.7)
187
187
  libv8-node (16.10.0.0-x86_64-darwin)
188
188
  libv8-node (16.10.0.0-x86_64-linux)
189
- loofah (2.15.0)
189
+ loofah (2.18.0)
190
190
  crass (~> 1.0.2)
191
191
  nokogiri (>= 1.5.9)
192
192
  mail (2.7.1)
@@ -198,6 +198,7 @@ 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)
201
202
  mini_racer (0.6.2)
202
203
  libv8-node (~> 16.10.0.0)
203
204
  minitest (5.15.0)
@@ -205,9 +206,8 @@ GEM
205
206
  multipart-post (2.1.1)
206
207
  mysql2 (0.5.3)
207
208
  nio4r (2.5.8)
208
- nokogiri (1.13.3-x86_64-darwin)
209
- racc (~> 1.4)
210
- nokogiri (1.13.3-x86_64-linux)
209
+ nokogiri (1.12.5)
210
+ mini_portile2 (~> 2.6.1)
211
211
  racc (~> 1.4)
212
212
  orm_adapter (0.5.0)
213
213
  poltergeist (1.18.1)
@@ -230,20 +230,20 @@ GEM
230
230
  rack-test (1.1.0)
231
231
  rack (>= 1.0, < 3)
232
232
  radius (0.7.5)
233
- rails (6.1.4.7)
234
- actioncable (= 6.1.4.7)
235
- actionmailbox (= 6.1.4.7)
236
- actionmailer (= 6.1.4.7)
237
- actionpack (= 6.1.4.7)
238
- actiontext (= 6.1.4.7)
239
- actionview (= 6.1.4.7)
240
- activejob (= 6.1.4.7)
241
- activemodel (= 6.1.4.7)
242
- activerecord (= 6.1.4.7)
243
- activestorage (= 6.1.4.7)
244
- activesupport (= 6.1.4.7)
233
+ rails (6.1.6)
234
+ actioncable (= 6.1.6)
235
+ actionmailbox (= 6.1.6)
236
+ actionmailer (= 6.1.6)
237
+ actionpack (= 6.1.6)
238
+ actiontext (= 6.1.6)
239
+ actionview (= 6.1.6)
240
+ activejob (= 6.1.6)
241
+ activemodel (= 6.1.6)
242
+ activerecord (= 6.1.6)
243
+ activestorage (= 6.1.6)
244
+ activesupport (= 6.1.6)
245
245
  bundler (>= 1.15.0)
246
- railties (= 6.1.4.7)
246
+ railties (= 6.1.6)
247
247
  sprockets-rails (>= 2.0.0)
248
248
  rails-dom-testing (2.0.3)
249
249
  activesupport (>= 4.2.0)
@@ -252,11 +252,11 @@ GEM
252
252
  loofah (~> 2.3)
253
253
  rails-observers (0.1.5)
254
254
  activemodel (>= 4.0)
255
- railties (6.1.4.7)
256
- actionpack (= 6.1.4.7)
257
- activesupport (= 6.1.4.7)
255
+ railties (6.1.6)
256
+ actionpack (= 6.1.6)
257
+ activesupport (= 6.1.6)
258
258
  method_source
259
- rake (>= 0.13)
259
+ rake (>= 12.2)
260
260
  thor (~> 1.0)
261
261
  rake (13.0.6)
262
262
  rdoc (6.4.0)
@@ -265,7 +265,7 @@ GEM
265
265
  responders (3.0.1)
266
266
  actionpack (>= 5.0)
267
267
  railties (>= 5.0)
268
- roadie (5.0.0)
268
+ roadie (5.0.1)
269
269
  css_parser (~> 1.4)
270
270
  nokogiri (~> 1.8)
271
271
  roadie-rails (3.0.0)
@@ -279,7 +279,7 @@ GEM
279
279
  rspec-mocks (3.11.1)
280
280
  diff-lcs (>= 1.2.0, < 2.0)
281
281
  rspec-support (~> 3.11.0)
282
- rspec-rails (5.1.1)
282
+ rspec-rails (5.1.2)
283
283
  actionpack (>= 5.2)
284
284
  activesupport (>= 5.2)
285
285
  railties (>= 5.2)
@@ -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
@@ -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'
@@ -145,39 +145,6 @@ module ApplicationHelper
145
145
  overrides
146
146
  end
147
147
 
148
- # Returns a Gravatar URL associated with the email parameter.
149
- # See: http://douglasfshearer.com/blog/gravatar-for-ruby-and-ruby-on-rails
150
- def gravatar_url(email, options = {})
151
- # Default to highest rating. Rating can be one of G, PG, R X.
152
- options[:rating] ||= 'G'
153
-
154
- # Default size of the image.
155
- options[:size] ||= '32px'
156
-
157
- # Default image url to be used when no gravatar is found
158
- # or when an image exceeds the rating parameter.
159
- local_avatar_url = "/production/assets/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
160
- default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}#{local_avatar_url}"
161
- options[:default] ||= default_avatar_url
162
-
163
- if email.blank?
164
- local_avatar_url
165
- else
166
- # Build the Gravatar url.
167
- url = '//gravatar.com/avatar/'
168
- url << "#{Digest::MD5.new.update(email)}?"
169
- url << "rating=#{options[:rating]}" if options[:rating]
170
- url << "&size=#{options[:size]}" if options[:size]
171
- url << "&default=#{options[:default]}" if options[:default]
172
- # Test the Gravatar url
173
- require 'open-uri'
174
- begin; open "http:#{url}", proxy: true
175
- rescue StandardError; local_avatar_url
176
- else; url
177
- end
178
- end
179
- end
180
-
181
148
  # returns the usual set of pagination links.
182
149
  # options are passed through to will_paginate
183
150
  # and a 'show all' depagination link is added if relevant.
@@ -662,46 +662,6 @@ module StandardTags
662
662
  end
663
663
  end
664
664
 
665
- desc %{
666
- Renders the Gravatar of the author of the current page or the named user.
667
-
668
- *Usage:*
669
-
670
- <pre><code><r:gravatar /></code></pre>
671
-
672
- or
673
-
674
- <pre><code><r:gravatar [name="User Name"]
675
- [rating="G | PG | R | X"]
676
- [size="32px"] /></code></pre>
677
- }
678
- tag 'gravatar' do |tag|
679
- page = tag.locals.page
680
- name = (tag.attr['name'] || page.created_by.name)
681
- rating = (tag.attr['rating'] || 'G')
682
- size = (tag.attr['size'] || '32px')
683
- user = User.find_by_name(name)
684
- email = user ? user.email : nil
685
- local_avatar_url = "/images/admin/avatar_#{([size.to_i] * 2).join('x')}.png"
686
- default_avatar_url = "#{request.protocol}#{request.host_with_port}#{local_avatar_url}"
687
-
688
- if email.blank?
689
- local_avatar_url
690
- else
691
- url = '//gravatar.com/avatar/'
692
- url << "#{Digest::MD5.new.update(email)}?"
693
- url << "rating=#{rating}"
694
- url << "&size=#{size.to_i}"
695
- url << "&default=#{default_avatar_url}" unless request.host_with_port == 'testhost.tld'
696
- # Test the Gravatar url
697
- require 'open-uri'
698
- begin; open "http:#{sanitize(url)}", proxy: true
699
- rescue StandardError; local_avatar_url
700
- else; url
701
- end
702
- end
703
- end
704
-
705
665
  desc %{
706
666
  Renders the date based on the current page (by default when it was published or created).
707
667
  The format attribute uses the same formating codes used by the Ruby @strftime@ function.
@@ -3,7 +3,6 @@
3
3
  - user.preferences do
4
4
  %h3
5
5
  = t('personal_preferences')
6
- = image_tag(gravatar_url(@user.email, :size=>'64px'), :class=>'avatar', :width=>64, :height=>64, :alt=>'')
7
6
  %p.ruled
8
7
  %label
9
8
  = t('name')
@@ -1,5 +1,4 @@
1
1
  = form_for [:admin, @user], :html => {class: 'user_form'} do |f|
2
- = render :partial => 'avatar' unless @user.new_record?
3
2
 
4
3
  = render_region :form_top, :locals => {:f => f}
5
4
 
@@ -203,17 +203,7 @@ en:
203
203
  *Usage:*
204
204
 
205
205
  <pre><code><r:find path=\"value_to_find\">...</r:find></code></pre>"
206
- gravatar: "Renders the Gravatar of the author of the current page or the named user.
207
206
 
208
- *Usage:*
209
-
210
- <pre><code><r:gravatar /></code></pre>
211
-
212
- or
213
-
214
- <pre><code><r:gravatar [name=\"User Name\"]
215
- [rating=\"G | PG | R | X\"]
216
- [size=\"32px\"] /></code></pre>"
217
207
  hide: "Nothing inside a set of hide tags is rendered.
218
208
 
219
209
  *Usage:*
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.0'.freeze
5
+ VERSION = '5.2.3'.freeze
6
6
  end
7
7
  end
@@ -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.0
4
+ version: 5.2.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-12 00:00:00.000000000 Z
11
+ date: 2022-05-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activestorage-validator
@@ -779,7 +779,6 @@ files:
779
779
  - app/views/admin/snippets/index.html.haml
780
780
  - app/views/admin/snippets/new.html.haml
781
781
  - app/views/admin/snippets/remove.html.haml
782
- - app/views/admin/users/_avatar.html.haml
783
782
  - app/views/admin/users/_choose_site.html.haml
784
783
  - app/views/admin/users/_form.html.haml
785
784
  - app/views/admin/users/_password_fields.html.haml
@@ -1,5 +0,0 @@
1
- #avatar
2
- = image_tag(gravatar_url(@user.email, :size=>'96px'), :class=>'avatar', :width=>96, :height=>96, :alt=>'')
3
- %p.caption
4
- Avatar provided by
5
- = link_to 'gravatar.com', 'http://gravatar.com/site/signup/'