trusty-cms 2.0.28 → 3.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.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +7 -10
  3. data/Gemfile.lock +142 -145
  4. data/app/assets/javascripts/admin/tabcontrol.js.erb +1 -1
  5. data/app/controllers/admin/configuration_controller.rb +1 -1
  6. data/app/controllers/admin/pages_controller.rb +2 -2
  7. data/app/controllers/admin/password_resets_controller.rb +1 -1
  8. data/app/controllers/admin/preferences_controller.rb +1 -1
  9. data/app/controllers/admin/resource_controller.rb +5 -5
  10. data/app/controllers/admin/users_controller.rb +1 -1
  11. data/app/controllers/admin/welcome_controller.rb +2 -2
  12. data/app/controllers/application_controller.rb +7 -7
  13. data/app/controllers/site_controller.rb +4 -4
  14. data/app/helpers/admin/configuration_helper.rb +1 -1
  15. data/app/models/page.rb +1 -1
  16. data/config/environments/test.rb +2 -4
  17. data/config/initializers/assets.rb +2 -0
  18. data/config/initializers/rails_patch.rb +1 -1
  19. data/lib/login_system.rb +6 -6
  20. data/lib/trusty_cms.rb +1 -1
  21. data/lib/trusty_cms/pagination/controller.rb +1 -1
  22. data/spec/controllers/application_controller_spec.rb +2 -2
  23. data/spec/dummy/config/application.rb +1 -0
  24. data/spec/dummy/config/environments/production.rb +1 -1
  25. data/spec/dummy/config/environments/test.rb +2 -2
  26. data/spec/features/pages_spec.rb +2 -2
  27. data/trusty_cms.gemspec +17 -17
  28. metadata +94 -76
  29. data/spec/features/javascript_smoke_spec.rb +0 -59
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c7c527c5fc2cd57e3a51d7d3c2a46c394501bb52
4
- data.tar.gz: 2fea2796d87bc7ce942daf8ac68bad7ef6e1063a
3
+ metadata.gz: f2313bfbed4aa7c8d88c3765189fe067c4af2130
4
+ data.tar.gz: f2366658bb9bf854f3a029adf6778df74c63ef90
5
5
  SHA512:
6
- metadata.gz: c50f5e491d87a62481f8f80047046672ae50ea18ff9088815383df5cb6841c5751c4a7a1487f204c53ed0e4bd4273f0b82368ef11db6cc55d4d10257329ea952
7
- data.tar.gz: 8cb7a4ed7d817f5dcaa0a6e0d099623e8cb67e4742e317ba73c764b20deb5d8766ee9ba97e3e32697ba5af8053fa1b0772eeac732b5e0a9f8c212484f9764e8a
6
+ metadata.gz: 6ab864d52d43b58a85cf419a997c35c1ee9859e3415b06126d5335cf18fa5e82c495e4d5f466673250daf8959f608fd69a2767993c70a9d178f5fc07f0351206
7
+ data.tar.gz: ee9e9763d5b25fb234eeb3a951bae625b204f1f3c577b65f8589c1fe55ec941f254bedcc0eed546fbaa26ddec48b83cfafaaec6255bbf7daa7f9f22350ead884
data/Gemfile CHANGED
@@ -12,23 +12,20 @@ gem 'trustygems', '~> 0.2.0'
12
12
  gemspec
13
13
 
14
14
  group :development, :test do
15
- gem 'compass-rails', '~> 2.0.1'
16
- gem 'thin', '~> 1.6.2'
17
15
  gem 'pry', '~> 0.10.0'
18
- gem 'capybara', '~> 2.3.0'
19
- gem 'rspec-rails', '~> 3.0.0'
16
+ gem 'capybara', '~> 2.13.0'
17
+ gem 'rspec-rails'
20
18
  gem 'launchy', '~> 2.4.2'
21
- gem 'database_cleaner', '~> 1.3.0'
22
- gem 'poltergeist', '~> 1.5.1'
23
- gem 'ckeditor', '~> 4.1.0'
19
+ gem 'database_cleaner', '~> 1.5.3'
20
+ gem 'poltergeist', '~> 1.14.0'
24
21
  gem 'factory_girl_rails', '~> 4.6.0'
25
- gem 'rails-observers'
26
- gem 'protected_attributes'
22
+ gem 'rails-observers', :git => 'https://github.com/rails/rails-observers'
23
+ gem 'protected_attributes_continued'
27
24
  gem 'pry-rails'
28
25
  gem 'mysql2', '~> 0.4.2'
29
26
  gem 'pry-byebug'
30
27
  gem 'simplecov'
31
28
  gem 'codeclimate-test-reporter'
32
29
  end
30
+
33
31
  gem 'nokogiri', '>= 1.7.1'
34
- gem 'actionview', '~> 4.2.7.1'
data/Gemfile.lock CHANGED
@@ -1,89 +1,99 @@
1
+ GIT
2
+ remote: https://github.com/rails/rails-observers
3
+ revision: 7d3c9c331242d58ed8ebdbd2eff1f7d6f68a1b2c
4
+ specs:
5
+ rails-observers (0.1.3.alpha)
6
+ activemodel (>= 4.0, < 5.1)
7
+
1
8
  PATH
2
9
  remote: .
3
10
  specs:
4
- trusty-cms (2.0.28)
11
+ trusty-cms (3.0.0)
5
12
  RedCloth (~> 4.3.2)
6
- acts_as_tree (~> 2.1)
13
+ acts_as_tree (~> 2.6.1)
7
14
  bundler (~> 1.7)
8
- ckeditor (~> 4.1)
9
- compass-rails (~> 2.0)
15
+ ckeditor (~> 4.2.2)
16
+ compass-rails (~> 3.0.2)
10
17
  delocalize (~> 0.2)
11
- execjs (~> 2.2)
12
- haml (~> 4.0)
13
- haml-rails (~> 0.5)
14
- highline (~> 1.6)
15
- jquery-rails (~> 3.1)
18
+ execjs (~> 2.7)
19
+ haml (~> 5.0)
20
+ haml-rails (~> 1.0.0)
21
+ highline (~> 1.7.8)
22
+ jquery-rails (~> 4.3.1)
16
23
  mysql2 (~> 0.4.2)
17
- protected_attributes (~> 1.1.4)
18
- rack (~> 1.4)
19
- rack-cache (~> 1.2)
24
+ rack (~> 2.0.1)
25
+ rack-cache (~> 1.7)
20
26
  radius (~> 0.7)
21
- rails (~> 4.2)
27
+ rails (~> 5.0.2)
22
28
  rake (< 11.0)
23
- rdoc (~> 3.9)
24
- stringex (~> 1.3)
25
- therubyracer (~> 0.12)
26
- tzinfo (~> 1.2)
27
- uglifier (~> 2.6)
29
+ rdoc (~> 5.1)
30
+ sass-rails (~> 5.0.6)
31
+ stringex (~> 2.7.1)
32
+ therubyracer (~> 0.12.3)
33
+ tzinfo (~> 1.2.3)
34
+ uglifier (~> 3.2)
28
35
  will_paginate (~> 3.0)
29
36
 
30
37
  GEM
31
38
  remote: https://rubygems.org/
32
39
  specs:
33
40
  RedCloth (4.3.2)
34
- actionmailer (4.2.7.1)
35
- actionpack (= 4.2.7.1)
36
- actionview (= 4.2.7.1)
37
- activejob (= 4.2.7.1)
41
+ actioncable (5.0.2)
42
+ actionpack (= 5.0.2)
43
+ nio4r (>= 1.2, < 3.0)
44
+ websocket-driver (~> 0.6.1)
45
+ actionmailer (5.0.2)
46
+ actionpack (= 5.0.2)
47
+ actionview (= 5.0.2)
48
+ activejob (= 5.0.2)
38
49
  mail (~> 2.5, >= 2.5.4)
39
- rails-dom-testing (~> 1.0, >= 1.0.5)
40
- actionpack (4.2.7.1)
41
- actionview (= 4.2.7.1)
42
- activesupport (= 4.2.7.1)
43
- rack (~> 1.6)
44
- rack-test (~> 0.6.2)
45
- rails-dom-testing (~> 1.0, >= 1.0.5)
50
+ rails-dom-testing (~> 2.0)
51
+ actionpack (5.0.2)
52
+ actionview (= 5.0.2)
53
+ activesupport (= 5.0.2)
54
+ rack (~> 2.0)
55
+ rack-test (~> 0.6.3)
56
+ rails-dom-testing (~> 2.0)
46
57
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
47
- actionview (4.2.7.1)
48
- activesupport (= 4.2.7.1)
58
+ actionview (5.0.2)
59
+ activesupport (= 5.0.2)
49
60
  builder (~> 3.1)
50
61
  erubis (~> 2.7.0)
51
- rails-dom-testing (~> 1.0, >= 1.0.5)
52
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
53
- activejob (4.2.7.1)
54
- activesupport (= 4.2.7.1)
55
- globalid (>= 0.3.0)
56
- activemodel (4.2.7.1)
57
- activesupport (= 4.2.7.1)
58
- builder (~> 3.1)
59
- activerecord (4.2.7.1)
60
- activemodel (= 4.2.7.1)
61
- activesupport (= 4.2.7.1)
62
- arel (~> 6.0)
63
- activesupport (4.2.7.1)
62
+ rails-dom-testing (~> 2.0)
63
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
64
+ activejob (5.0.2)
65
+ activesupport (= 5.0.2)
66
+ globalid (>= 0.3.6)
67
+ activemodel (5.0.2)
68
+ activesupport (= 5.0.2)
69
+ activerecord (5.0.2)
70
+ activemodel (= 5.0.2)
71
+ activesupport (= 5.0.2)
72
+ arel (~> 7.0)
73
+ activesupport (5.0.2)
74
+ concurrent-ruby (~> 1.0, >= 1.0.2)
64
75
  i18n (~> 0.7)
65
- json (~> 1.7, >= 1.7.7)
66
76
  minitest (~> 5.1)
67
- thread_safe (~> 0.3, >= 0.3.4)
68
77
  tzinfo (~> 1.1)
69
78
  acts_as_tree (2.6.1)
70
79
  activerecord (>= 3.0.0)
71
80
  addressable (2.5.1)
72
81
  public_suffix (~> 2.0, >= 2.0.2)
73
- arel (6.0.4)
82
+ arel (7.1.4)
74
83
  builder (3.2.3)
75
84
  byebug (9.0.6)
76
- capybara (2.3.0)
85
+ capybara (2.13.0)
86
+ addressable
77
87
  mime-types (>= 1.16)
78
88
  nokogiri (>= 1.3.3)
79
89
  rack (>= 1.0.0)
80
90
  rack-test (>= 0.5.4)
81
91
  xpath (~> 2.0)
82
92
  chunky_png (1.3.8)
83
- ckeditor (4.1.6)
93
+ ckeditor (4.2.3)
84
94
  cocaine
85
95
  orm_adapter (~> 0.5.0)
86
- climate_control (0.2.0)
96
+ climate_control (0.1.0)
87
97
  cliver (0.3.2)
88
98
  cocaine (0.5.8)
89
99
  climate_control (>= 0.0.3, < 1.0)
@@ -102,18 +112,17 @@ GEM
102
112
  sass (>= 3.3.0, < 3.5)
103
113
  compass-import-once (1.0.5)
104
114
  sass (>= 3.2, < 3.5)
105
- compass-rails (2.0.5)
115
+ compass-rails (3.0.2)
106
116
  compass (~> 1.0.0)
107
117
  sass-rails (< 5.1)
108
- sprockets (< 2.13)
109
- daemons (1.2.4)
110
- database_cleaner (1.3.0)
118
+ sprockets (< 4.0)
119
+ concurrent-ruby (1.0.5)
120
+ database_cleaner (1.5.3)
111
121
  delocalize (0.4.0)
112
122
  rails (>= 3.0)
113
123
  diff-lcs (1.3)
114
124
  docile (1.1.5)
115
125
  erubis (2.7.0)
116
- eventmachine (1.2.3)
117
126
  execjs (2.7.0)
118
127
  factory_girl (4.5.0)
119
128
  activesupport (>= 3.0.0)
@@ -123,51 +132,52 @@ GEM
123
132
  ffi (1.9.18)
124
133
  globalid (0.4.0)
125
134
  activesupport (>= 4.2.0)
126
- haml (4.0.7)
135
+ haml (5.0.1)
136
+ temple (>= 0.8.0)
127
137
  tilt
128
- haml-rails (0.9.0)
138
+ haml-rails (1.0.0)
129
139
  actionpack (>= 4.0.1)
130
140
  activesupport (>= 4.0.1)
131
- haml (>= 4.0.6, < 5.0)
141
+ haml (>= 4.0.6, < 6.0)
132
142
  html2haml (>= 1.0.1)
133
143
  railties (>= 4.0.1)
134
144
  highline (1.7.8)
135
- hike (1.2.3)
136
145
  html2haml (2.2.0)
137
146
  erubis (~> 2.7.0)
138
147
  haml (>= 4.0, < 6)
139
148
  nokogiri (>= 1.6.0)
140
149
  ruby_parser (~> 3.5)
141
- i18n (0.8.4)
142
- jquery-rails (3.1.4)
143
- railties (>= 3.0, < 5.0)
150
+ i18n (0.8.1)
151
+ jquery-rails (4.3.1)
152
+ rails-dom-testing (>= 1, < 3)
153
+ railties (>= 4.2.0)
144
154
  thor (>= 0.14, < 2.0)
145
- json (1.8.6)
155
+ json (2.1.0)
146
156
  launchy (2.4.3)
147
157
  addressable (~> 2.3)
148
- libv8 (3.16.14.19-x86_64-darwin-16)
158
+ libv8 (3.16.14.19)
149
159
  loofah (2.0.3)
150
160
  nokogiri (>= 1.5.9)
151
- mail (2.6.6)
161
+ mail (2.6.5)
152
162
  mime-types (>= 1.16, < 4)
153
163
  method_source (0.8.2)
154
164
  mime-types (3.1)
155
165
  mime-types-data (~> 3.2015)
156
166
  mime-types-data (3.2016.0521)
157
- mini_portile2 (2.2.0)
158
- minitest (5.10.2)
167
+ mini_portile2 (2.1.0)
168
+ minitest (5.10.1)
159
169
  multi_json (1.12.1)
160
- mysql2 (0.4.7)
161
- nokogiri (1.8.0)
162
- mini_portile2 (~> 2.2.0)
170
+ mysql2 (0.4.6)
171
+ nio4r (2.0.0)
172
+ nokogiri (1.7.1)
173
+ mini_portile2 (~> 2.1.0)
163
174
  orm_adapter (0.5.0)
164
- poltergeist (1.5.1)
175
+ poltergeist (1.14.0)
165
176
  capybara (~> 2.1)
166
177
  cliver (~> 0.3.1)
167
- multi_json (~> 1.0)
168
178
  websocket-driver (>= 0.2.0)
169
- protected_attributes (1.1.4)
170
- activemodel (>= 4.0.1, < 5.0)
179
+ protected_attributes_continued (1.2.4)
180
+ activemodel (>= 4.0.1, < 6.0)
171
181
  pry (0.10.4)
172
182
  coderay (~> 1.1.0)
173
183
  method_source (~> 0.8.1)
@@ -178,64 +188,61 @@ GEM
178
188
  pry-rails (0.3.6)
179
189
  pry (>= 0.10.4)
180
190
  public_suffix (2.0.5)
181
- rack (1.6.8)
191
+ rack (2.0.1)
182
192
  rack-cache (1.7.0)
183
193
  rack (>= 0.4)
184
194
  rack-test (0.6.3)
185
195
  rack (>= 1.0)
186
196
  radius (0.7.4)
187
- rails (4.2.7.1)
188
- actionmailer (= 4.2.7.1)
189
- actionpack (= 4.2.7.1)
190
- actionview (= 4.2.7.1)
191
- activejob (= 4.2.7.1)
192
- activemodel (= 4.2.7.1)
193
- activerecord (= 4.2.7.1)
194
- activesupport (= 4.2.7.1)
197
+ rails (5.0.2)
198
+ actioncable (= 5.0.2)
199
+ actionmailer (= 5.0.2)
200
+ actionpack (= 5.0.2)
201
+ actionview (= 5.0.2)
202
+ activejob (= 5.0.2)
203
+ activemodel (= 5.0.2)
204
+ activerecord (= 5.0.2)
205
+ activesupport (= 5.0.2)
195
206
  bundler (>= 1.3.0, < 2.0)
196
- railties (= 4.2.7.1)
197
- sprockets-rails
198
- rails-deprecated_sanitizer (1.0.3)
199
- activesupport (>= 4.2.0.alpha)
200
- rails-dom-testing (1.0.8)
201
- activesupport (>= 4.2.0.beta, < 5.0)
207
+ railties (= 5.0.2)
208
+ sprockets-rails (>= 2.0.0)
209
+ rails-dom-testing (2.0.2)
210
+ activesupport (>= 4.2.0, < 6.0)
202
211
  nokogiri (~> 1.6)
203
- rails-deprecated_sanitizer (>= 1.0.1)
204
212
  rails-html-sanitizer (1.0.3)
205
213
  loofah (~> 2.0)
206
- rails-observers (0.1.4)
207
- activemodel (>= 4.0)
208
- railties (4.2.7.1)
209
- actionpack (= 4.2.7.1)
210
- activesupport (= 4.2.7.1)
214
+ railties (5.0.2)
215
+ actionpack (= 5.0.2)
216
+ activesupport (= 5.0.2)
217
+ method_source
211
218
  rake (>= 0.8.7)
212
219
  thor (>= 0.18.1, < 2.0)
213
220
  rake (10.5.0)
214
- rb-fsevent (0.10.2)
215
- rb-inotify (0.9.10)
216
- ffi (>= 0.5.0, < 2)
217
- rdoc (3.12.2)
218
- json (~> 1.4)
221
+ rb-fsevent (0.9.8)
222
+ rb-inotify (0.9.8)
223
+ ffi (>= 0.5.0)
224
+ rdoc (5.1.0)
219
225
  ref (2.0.0)
220
- rspec-core (3.0.4)
221
- rspec-support (~> 3.0.0)
222
- rspec-expectations (3.0.4)
226
+ rspec-core (3.6.0)
227
+ rspec-support (~> 3.6.0)
228
+ rspec-expectations (3.6.0)
223
229
  diff-lcs (>= 1.2.0, < 2.0)
224
- rspec-support (~> 3.0.0)
225
- rspec-mocks (3.0.4)
226
- rspec-support (~> 3.0.0)
227
- rspec-rails (3.0.2)
230
+ rspec-support (~> 3.6.0)
231
+ rspec-mocks (3.6.0)
232
+ diff-lcs (>= 1.2.0, < 2.0)
233
+ rspec-support (~> 3.6.0)
234
+ rspec-rails (3.6.0)
228
235
  actionpack (>= 3.0)
229
236
  activesupport (>= 3.0)
230
237
  railties (>= 3.0)
231
- rspec-core (~> 3.0.0)
232
- rspec-expectations (~> 3.0.0)
233
- rspec-mocks (~> 3.0.0)
234
- rspec-support (~> 3.0.0)
235
- rspec-support (3.0.4)
238
+ rspec-core (~> 3.6.0)
239
+ rspec-expectations (~> 3.6.0)
240
+ rspec-mocks (~> 3.6.0)
241
+ rspec-support (~> 3.6.0)
242
+ rspec-support (3.6.0)
236
243
  ruby_parser (3.9.0)
237
244
  sexp_processor (~> 4.1)
238
- sass (3.4.24)
245
+ sass (3.4.23)
239
246
  sass-rails (5.0.6)
240
247
  railties (>= 4.0.0, < 6)
241
248
  sass (~> 3.1)
@@ -247,67 +254,57 @@ GEM
247
254
  docile (~> 1.1.0)
248
255
  json (>= 1.8, < 3)
249
256
  simplecov-html (~> 0.10.0)
250
- simplecov-html (0.10.1)
257
+ simplecov-html (0.10.0)
251
258
  slop (3.6.0)
252
- sprockets (2.12.4)
253
- hike (~> 1.2)
254
- multi_json (~> 1.0)
255
- rack (~> 1.0)
256
- tilt (~> 1.1, != 1.3.0)
257
- sprockets-rails (2.3.3)
258
- actionpack (>= 3.0)
259
- activesupport (>= 3.0)
260
- sprockets (>= 2.8, < 4.0)
261
- stringex (1.5.1)
259
+ sprockets (3.7.1)
260
+ concurrent-ruby (~> 1.0)
261
+ rack (> 1, < 3)
262
+ sprockets-rails (3.2.0)
263
+ actionpack (>= 4.0)
264
+ activesupport (>= 4.0)
265
+ sprockets (>= 3.0.0)
266
+ stringex (2.7.1)
267
+ temple (0.8.0)
262
268
  therubyracer (0.12.3)
263
269
  libv8 (~> 3.16.14.15)
264
270
  ref
265
- thin (1.6.4)
266
- daemons (~> 1.0, >= 1.0.9)
267
- eventmachine (~> 1.0, >= 1.0.4)
268
- rack (~> 1.0)
269
271
  thor (0.19.4)
270
272
  thread_safe (0.3.6)
271
- tilt (1.4.1)
273
+ tilt (2.0.7)
272
274
  trustygems (0.2.1)
273
275
  rake
274
276
  tzinfo (1.2.3)
275
277
  thread_safe (~> 0.1)
276
- uglifier (2.7.2)
277
- execjs (>= 0.3.0)
278
- json (>= 1.8.0)
278
+ uglifier (3.2.0)
279
+ execjs (>= 0.3.0, < 3)
279
280
  websocket-driver (0.6.5)
280
281
  websocket-extensions (>= 0.1.0)
281
282
  websocket-extensions (0.1.2)
282
- will_paginate (3.1.6)
283
- xpath (2.1.0)
283
+ will_paginate (3.1.5)
284
+ xpath (2.0.0)
284
285
  nokogiri (~> 1.3)
285
286
 
286
287
  PLATFORMS
287
288
  ruby
288
289
 
289
290
  DEPENDENCIES
290
- actionview (~> 4.2.7.1)
291
- capybara (~> 2.3.0)
292
- ckeditor (~> 4.1.0)
291
+ capybara (~> 2.13.0)
293
292
  codeclimate-test-reporter
294
- compass-rails (~> 2.0.1)
295
- database_cleaner (~> 1.3.0)
293
+ database_cleaner (~> 1.5.3)
296
294
  factory_girl_rails (~> 4.6.0)
297
295
  launchy (~> 2.4.2)
298
296
  mysql2 (~> 0.4.2)
299
297
  nokogiri (>= 1.7.1)
300
- poltergeist (~> 1.5.1)
301
- protected_attributes
298
+ poltergeist (~> 1.14.0)
299
+ protected_attributes_continued
302
300
  pry (~> 0.10.0)
303
301
  pry-byebug
304
302
  pry-rails
305
- rails-observers
306
- rspec-rails (~> 3.0.0)
303
+ rails-observers!
304
+ rspec-rails
307
305
  simplecov
308
- thin (~> 1.6.2)
309
306
  trusty-cms!
310
307
  trustygems (~> 0.2.0)
311
308
 
312
309
  BUNDLED WITH
313
- 1.15.1
310
+ 1.14.5