trusty-cms 3.9.5 → 3.9.6

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 (22) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -0
  3. data/Gemfile.lock +56 -69
  4. data/app/assets/javascripts/admin/assets_admin.js +1 -0
  5. data/app/assets/javascripts/admin/jquery.ui.widget.js +558 -0
  6. data/db/migrate/20200117141251_create_admin_users.rb +5 -0
  7. data/lib/tasks/upgrade_to_devise.rake +1 -1
  8. data/lib/trusty_cms.rb +1 -1
  9. data/spec/controllers/welcome_controller_spec.rb +6 -0
  10. data/spec/dummy/config/application.rb +1 -1
  11. data/spec/dummy/db/schema.rb +0 -30
  12. data/spec/features/admin_login_spec.rb +92 -0
  13. data/spec/features/config_spec.rb +19 -19
  14. data/spec/features/layouts_spec.rb +26 -26
  15. data/spec/features/pages_spec.rb +29 -29
  16. data/spec/fixtures/users.yml +12 -9
  17. data/spec/models/layout_spec.rb +2 -2
  18. data/spec/routing/welcome_routing_spec.rb +18 -0
  19. data/spec/spec_helper.rb +0 -2
  20. data/trusty_cms.gemspec +2 -2
  21. metadata +13 -8
  22. data/spec/dummy/app/assets/config/manifest.js +0 -0
data/trusty_cms.gemspec CHANGED
@@ -37,13 +37,13 @@ a general purpose content managment system--not merely a blogging engine.}
37
37
  s.add_dependency 'paperclip', '> 5.2'
38
38
  s.add_dependency 'rack', '~> 2.0.1'
39
39
  s.add_dependency 'rack-cache', '~> 1.7'
40
- s.add_dependency 'rails'
40
+ s.add_dependency 'rails', '~> 5.2.0'
41
41
  s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
42
42
  s.add_dependency 'radius', '~> 0.7'
43
43
  s.add_dependency 'RedCloth', '4.3.2'
44
44
  s.add_dependency 'rake', '< 13.0'
45
45
  s.add_dependency 'roadie-rails'
46
- s.add_dependency 'sassc-rails'
46
+ s.add_dependency 'sass-rails'
47
47
  s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'
48
48
  s.add_dependency 'tzinfo', '~> 1.2.3'
49
49
  s.add_dependency 'uglifier', '>= 3.2', '< 5.0'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.9.5
4
+ version: 3.9.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
@@ -248,16 +248,16 @@ dependencies:
248
248
  name: rails
249
249
  requirement: !ruby/object:Gem::Requirement
250
250
  requirements:
251
- - - ">="
251
+ - - "~>"
252
252
  - !ruby/object:Gem::Version
253
- version: '0'
253
+ version: 5.2.0
254
254
  type: :runtime
255
255
  prerelease: false
256
256
  version_requirements: !ruby/object:Gem::Requirement
257
257
  requirements:
258
- - - ">="
258
+ - - "~>"
259
259
  - !ruby/object:Gem::Version
260
- version: '0'
260
+ version: 5.2.0
261
261
  - !ruby/object:Gem::Dependency
262
262
  name: rdoc
263
263
  requirement: !ruby/object:Gem::Requirement
@@ -335,7 +335,7 @@ dependencies:
335
335
  - !ruby/object:Gem::Version
336
336
  version: '0'
337
337
  - !ruby/object:Gem::Dependency
338
- name: sassc-rails
338
+ name: sass-rails
339
339
  requirement: !ruby/object:Gem::Requirement
340
340
  requirements:
341
341
  - - ">="
@@ -571,6 +571,7 @@ files:
571
571
  - app/assets/javascripts/admin/jquery.fileupload.js
572
572
  - app/assets/javascripts/admin/jquery.iframe-transport.js
573
573
  - app/assets/javascripts/admin/jquery.treetable.js
574
+ - app/assets/javascripts/admin/jquery.ui.widget.js
574
575
  - app/assets/javascripts/admin/jquery.validate.min.js
575
576
  - app/assets/javascripts/admin/modernizr.js
576
577
  - app/assets/javascripts/admin/more-or-less.js
@@ -923,9 +924,9 @@ files:
923
924
  - spec/ci/database.mysql.yml
924
925
  - spec/controllers/application_controller_spec.rb
925
926
  - spec/controllers/users_controller_spec.rb
927
+ - spec/controllers/welcome_controller_spec.rb
926
928
  - spec/dummy/README.rdoc
927
929
  - spec/dummy/Rakefile
928
- - spec/dummy/app/assets/config/manifest.js
929
930
  - spec/dummy/bin/bundle
930
931
  - spec/dummy/bin/rails
931
932
  - spec/dummy/bin/rake
@@ -963,12 +964,14 @@ files:
963
964
  - spec/factories/page.rb
964
965
  - spec/factories/page_part.rb
965
966
  - spec/factories/user.rb
967
+ - spec/features/admin_login_spec.rb
966
968
  - spec/features/config_spec.rb
967
969
  - spec/features/layouts_spec.rb
968
970
  - spec/features/pages_spec.rb
969
971
  - spec/fixtures/users.yml
970
972
  - spec/models/layout_spec.rb
971
973
  - spec/rails_helper.rb
974
+ - spec/routing/welcome_routing_spec.rb
972
975
  - spec/spec_helper.rb
973
976
  - spec/support/custom_actions.rb
974
977
  - trusty_cms.gemspec
@@ -1074,9 +1077,9 @@ test_files:
1074
1077
  - spec/ci/database.mysql.yml
1075
1078
  - spec/controllers/application_controller_spec.rb
1076
1079
  - spec/controllers/users_controller_spec.rb
1080
+ - spec/controllers/welcome_controller_spec.rb
1077
1081
  - spec/dummy/README.rdoc
1078
1082
  - spec/dummy/Rakefile
1079
- - spec/dummy/app/assets/config/manifest.js
1080
1083
  - spec/dummy/bin/bundle
1081
1084
  - spec/dummy/bin/rails
1082
1085
  - spec/dummy/bin/rake
@@ -1114,11 +1117,13 @@ test_files:
1114
1117
  - spec/factories/page.rb
1115
1118
  - spec/factories/page_part.rb
1116
1119
  - spec/factories/user.rb
1120
+ - spec/features/admin_login_spec.rb
1117
1121
  - spec/features/config_spec.rb
1118
1122
  - spec/features/layouts_spec.rb
1119
1123
  - spec/features/pages_spec.rb
1120
1124
  - spec/fixtures/users.yml
1121
1125
  - spec/models/layout_spec.rb
1122
1126
  - spec/rails_helper.rb
1127
+ - spec/routing/welcome_routing_spec.rb
1123
1128
  - spec/spec_helper.rb
1124
1129
  - spec/support/custom_actions.rb
data/spec/dummy/app/assets/config/manifest.js DELETED
File without changes