camaleon_cms 2.4.5.5 → 2.4.5.7

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of camaleon_cms might be problematic. Click here for more details.

Files changed (82) hide show
  1. checksums.yaml +4 -4
  2. data/app/apps/themes/default/views/partials/_comments.html.erb +36 -21
  3. data/app/apps/themes/default/views/post.html.erb +1 -1
  4. data/app/assets/javascripts/camaleon_cms/admin/uploader/_media_manager.js.coffee +4 -4
  5. data/app/controllers/camaleon_cms/admin/categories_controller.rb +3 -0
  6. data/app/controllers/camaleon_cms/admin/media_controller.rb +9 -6
  7. data/app/controllers/camaleon_cms/admin/sessions_controller.rb +1 -1
  8. data/app/controllers/camaleon_cms/admin/settings/post_types_controller.rb +2 -0
  9. data/app/controllers/concerns/camaleon_cms/frontend_concern.rb +17 -13
  10. data/app/decorators/camaleon_cms/post_decorator.rb +0 -1
  11. data/app/helpers/camaleon_cms/captcha_helper.rb +1 -1
  12. data/app/helpers/camaleon_cms/frontend/nav_menu_helper.rb +1 -0
  13. data/app/helpers/camaleon_cms/hooks_helper.rb +6 -1
  14. data/app/helpers/camaleon_cms/site_helper.rb +1 -1
  15. data/app/helpers/camaleon_cms/uploader_helper.rb +36 -27
  16. data/app/models/camaleon_cms/custom_fields_relationship.rb +6 -0
  17. data/app/models/camaleon_cms/media.rb +54 -0
  18. data/app/models/camaleon_cms/post.rb +1 -0
  19. data/app/models/camaleon_cms/site.rb +7 -0
  20. data/app/uploaders/camaleon_cms_aws_uploader.rb +21 -23
  21. data/app/uploaders/camaleon_cms_local_uploader.rb +20 -26
  22. data/app/uploaders/camaleon_cms_uploader.rb +17 -45
  23. data/app/views/camaleon_cms/admin/categories/index.html.erb +2 -2
  24. data/app/views/camaleon_cms/admin/media/_render_file_item.html.erb +53 -36
  25. data/app/views/camaleon_cms/admin/media/index.html.erb +1 -1
  26. data/app/views/camaleon_cms/admin/post_tags/index.html.erb +4 -4
  27. data/app/views/camaleon_cms/admin/posts/index.html.erb +1 -0
  28. data/app/views/camaleon_cms/admin/settings/_configuration_settings.html.erb +5 -1
  29. data/app/views/camaleon_cms/admin/settings/post_types/_form.html.erb +1 -1
  30. data/app/views/camaleon_cms/default_theme/partials/_comments.html.erb +45 -28
  31. data/app/views/camaleon_cms/default_theme/single.html.erb +1 -1
  32. data/config/locales/camaleon_cms/admin/es.yml +1 -0
  33. data/config/locales/camaleon_cms/admin/js.yml +54 -3
  34. data/config/locales/camaleon_cms/admin/ru.yml +39 -28
  35. data/db/migrate/20180124132318_create_media.rb +17 -0
  36. data/lib/camaleon_cms/version.rb +1 -1
  37. data/lib/ext/string.rb +8 -0
  38. data/lib/generators/camaleon_cms/gem_plugin_generator.rb +29 -25
  39. data/lib/plugin_routes.rb +27 -0
  40. data/spec/dummy/config/application.rb +1 -0
  41. data/spec/dummy/config/environments/test.rb +2 -0
  42. data/spec/dummy/db/schema.rb +1 -140
  43. data/spec/dummy/db/test.sqlite3 +0 -0
  44. data/spec/dummy/public/favicon.ico +0 -0
  45. data/spec/factories/post_type.rb +17 -0
  46. data/spec/factories/site.rb +8 -0
  47. data/spec/features/{categories_spec.rb → admin/categories_spec.rb} +1 -1
  48. data/spec/features/{comments_spec.rb → admin/comments_spec.rb} +16 -9
  49. data/spec/features/{contact_form_spec.rb → admin/contact_form_spec.rb} +16 -9
  50. data/spec/features/{content_groups_spec.rb → admin/content_groups_spec.rb} +19 -11
  51. data/spec/features/{custom_fields_spec.rb → admin/custom_fields_spec.rb} +1 -1
  52. data/spec/features/{languages_spec.rb → admin/languages_spec.rb} +1 -1
  53. data/spec/features/{media_spec.rb → admin/media_spec.rb} +1 -1
  54. data/spec/features/{menus_spec.rb → admin/menus_spec.rb} +2 -2
  55. data/spec/features/{pages_spec.rb → admin/pages_spec.rb} +1 -1
  56. data/spec/features/{plugins_spec.rb → admin/plugins_spec.rb} +1 -1
  57. data/spec/features/{posts_spec.rb → admin/posts_spec.rb} +4 -3
  58. data/spec/features/admin/session_spec.rb +102 -0
  59. data/spec/features/{settings_spec.rb → admin/settings_spec.rb} +1 -1
  60. data/spec/features/{shortcodes_spec.rb → admin/shortcodes_spec.rb} +1 -1
  61. data/spec/features/{sites_spec.rb → admin/sites_spec.rb} +22 -14
  62. data/spec/features/{tags_spec.rb → admin/tags_spec.rb} +17 -8
  63. data/spec/features/{themes_spec.rb → admin/themes_spec.rb} +1 -1
  64. data/spec/features/{user_roles_spec.rb → admin/user_roles_spec.rb} +25 -19
  65. data/spec/features/{users_spec.rb → admin/users_spec.rb} +2 -2
  66. data/spec/features/{widgets_spec.rb → admin/widgets_spec.rb} +19 -12
  67. data/spec/features/frontend/pages_spec.rb +86 -5
  68. data/spec/features/frontend/post_type_spec.rb +16 -0
  69. data/spec/helpers/email_helper_spec.rb +1 -1
  70. data/spec/helpers/uploader_helper_spec.rb +56 -0
  71. data/spec/mailers/send_mail_spec.rb +3 -3
  72. data/spec/{decorators/camaleon_cms/post_decorator_spec.rb → models/post_spec.rb} +3 -3
  73. data/spec/rails_helper.rb +79 -0
  74. data/spec/spec_helper.rb +25 -56
  75. data/spec/support/common.rb +10 -24
  76. data/spec/support/fixtures/rails.png +0 -0
  77. data/spec/support/fixtures/rails_tmp.png +0 -0
  78. metadata +64 -50
  79. data/app/views/camaleon_cms/admin/media/_files_list.html.erb +0 -2
  80. data/app/views/camaleon_cms/admin/media/_render_folder_item.html.erb +0 -15
  81. data/spec/decorators/post_type_spec.rb +0 -13
  82. data/spec/features/session_spec.rb +0 -74
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: camaleon_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.5.5
4
+ version: 2.4.5.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Owen Peredo Diaz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-02-07 00:00:00.000000000 Z
11
+ date: 2018-05-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt
@@ -184,14 +184,14 @@ dependencies:
184
184
  requirements:
185
185
  - - "<="
186
186
  - !ruby/object:Gem::Version
187
- version: 5.0.6
187
+ version: 5.0.7
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
192
  - - "<="
193
193
  - !ruby/object:Gem::Version
194
- version: 5.0.6
194
+ version: 5.0.7
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: cama_contact_form
197
197
  requirement: !ruby/object:Gem::Requirement
@@ -714,6 +714,7 @@ files:
714
714
  - app/models/camaleon_cms/custom_field.rb
715
715
  - app/models/camaleon_cms/custom_field_group.rb
716
716
  - app/models/camaleon_cms/custom_fields_relationship.rb
717
+ - app/models/camaleon_cms/media.rb
717
718
  - app/models/camaleon_cms/meta.rb
718
719
  - app/models/camaleon_cms/nav_menu.rb
719
720
  - app/models/camaleon_cms/nav_menu_item.rb
@@ -774,9 +775,7 @@ files:
774
775
  - app/views/camaleon_cms/admin/dashboard.html.erb
775
776
  - app/views/camaleon_cms/admin/installers/form.html.erb
776
777
  - app/views/camaleon_cms/admin/installers/welcome.html.erb
777
- - app/views/camaleon_cms/admin/media/_files_list.html.erb
778
778
  - app/views/camaleon_cms/admin/media/_render_file_item.html.erb
779
- - app/views/camaleon_cms/admin/media/_render_folder_item.html.erb
780
779
  - app/views/camaleon_cms/admin/media/index.html.erb
781
780
  - app/views/camaleon_cms/admin/plugins/_plugins_list.html.erb
782
781
  - app/views/camaleon_cms/admin/plugins/index.html.erb
@@ -966,6 +965,7 @@ files:
966
965
  - db/migrate/20160609121449_add_group_to_custom_field_values.rb
967
966
  - db/migrate/20161206211917_install_migrated_seo_plugin.rb
968
967
  - db/migrate/20161215202255_drop_user_relationship_table.rb
968
+ - db/migrate/20180124132318_create_media.rb
969
969
  - lib/camaleon_cms.rb
970
970
  - lib/camaleon_cms/engine.rb
971
971
  - lib/camaleon_cms/version.rb
@@ -1014,8 +1014,6 @@ files:
1014
1014
  - lib/plugin_routes.rb
1015
1015
  - lib/tasks/camaleon_cms/camaleon_tasks.rake
1016
1016
  - lib/tasks/camaleon_cms/rspec_test.rake
1017
- - spec/decorators/camaleon_cms/post_decorator_spec.rb
1018
- - spec/decorators/post_type_spec.rb
1019
1017
  - spec/dummy/README.rdoc
1020
1018
  - spec/dummy/Rakefile
1021
1019
  - spec/dummy/app/assets/javascripts/application.js
@@ -1047,36 +1045,45 @@ files:
1047
1045
  - spec/dummy/config/routes.rb
1048
1046
  - spec/dummy/config/secrets.yml
1049
1047
  - spec/dummy/db/schema.rb
1050
- - spec/features/categories_spec.rb
1051
- - spec/features/comments_spec.rb
1052
- - spec/features/contact_form_spec.rb
1053
- - spec/features/content_groups_spec.rb
1054
- - spec/features/custom_fields_spec.rb
1048
+ - spec/dummy/db/test.sqlite3
1049
+ - spec/dummy/public/favicon.ico
1050
+ - spec/factories/post_type.rb
1051
+ - spec/factories/site.rb
1052
+ - spec/features/admin/categories_spec.rb
1053
+ - spec/features/admin/comments_spec.rb
1054
+ - spec/features/admin/contact_form_spec.rb
1055
+ - spec/features/admin/content_groups_spec.rb
1056
+ - spec/features/admin/custom_fields_spec.rb
1057
+ - spec/features/admin/languages_spec.rb
1058
+ - spec/features/admin/media_spec.rb
1059
+ - spec/features/admin/menus_spec.rb
1060
+ - spec/features/admin/pages_spec.rb
1061
+ - spec/features/admin/plugins_spec.rb
1062
+ - spec/features/admin/posts_spec.rb
1063
+ - spec/features/admin/session_spec.rb
1064
+ - spec/features/admin/settings_spec.rb
1065
+ - spec/features/admin/shortcodes_spec.rb
1066
+ - spec/features/admin/sites_spec.rb
1067
+ - spec/features/admin/tags_spec.rb
1068
+ - spec/features/admin/themes_spec.rb
1069
+ - spec/features/admin/user_roles_spec.rb
1070
+ - spec/features/admin/users_spec.rb
1071
+ - spec/features/admin/widgets_spec.rb
1055
1072
  - spec/features/frontend/pages_spec.rb
1056
- - spec/features/languages_spec.rb
1057
- - spec/features/media_spec.rb
1058
- - spec/features/menus_spec.rb
1059
- - spec/features/pages_spec.rb
1060
- - spec/features/plugins_spec.rb
1061
- - spec/features/posts_spec.rb
1062
- - spec/features/session_spec.rb
1063
- - spec/features/settings_spec.rb
1064
- - spec/features/shortcodes_spec.rb
1065
- - spec/features/sites_spec.rb
1066
- - spec/features/tags_spec.rb
1067
- - spec/features/themes_spec.rb
1068
- - spec/features/user_roles_spec.rb
1069
- - spec/features/users_spec.rb
1070
- - spec/features/widgets_spec.rb
1073
+ - spec/features/frontend/post_type_spec.rb
1071
1074
  - spec/helpers/email_helper_spec.rb
1072
1075
  - spec/helpers/short_code_helper_spec.rb
1076
+ - spec/helpers/uploader_helper_spec.rb
1073
1077
  - spec/mailers/send_mail_spec.rb
1078
+ - spec/models/post_spec.rb
1074
1079
  - spec/models/user_spec.rb
1075
1080
  - spec/rails_helper.rb
1076
1081
  - spec/routing/post_type_routes_spec.rb
1077
1082
  - spec/spec_helper.rb
1078
1083
  - spec/support/common.rb
1079
1084
  - spec/support/custom_admin.html.erb
1085
+ - spec/support/fixtures/rails.png
1086
+ - spec/support/fixtures/rails_tmp.png
1080
1087
  - spec/support/wait_for_ajax.rb
1081
1088
  homepage: http://camaleon.tuzitio.com
1082
1089
  licenses:
@@ -1136,37 +1143,44 @@ test_files:
1136
1143
  - spec/dummy/config/initializers/inflections.rb
1137
1144
  - spec/dummy/config.ru
1138
1145
  - spec/dummy/Rakefile
1146
+ - spec/dummy/public/favicon.ico
1139
1147
  - spec/dummy/db/schema.rb
1148
+ - spec/dummy/db/test.sqlite3
1140
1149
  - spec/dummy/README.rdoc
1141
1150
  - spec/mailers/send_mail_spec.rb
1142
- - spec/decorators/camaleon_cms/post_decorator_spec.rb
1143
- - spec/decorators/post_type_spec.rb
1144
- - spec/features/session_spec.rb
1145
- - spec/features/widgets_spec.rb
1146
- - spec/features/posts_spec.rb
1147
- - spec/features/content_groups_spec.rb
1148
- - spec/features/sites_spec.rb
1149
- - spec/features/media_spec.rb
1151
+ - spec/features/frontend/post_type_spec.rb
1150
1152
  - spec/features/frontend/pages_spec.rb
1151
- - spec/features/user_roles_spec.rb
1152
- - spec/features/menus_spec.rb
1153
- - spec/features/custom_fields_spec.rb
1154
- - spec/features/pages_spec.rb
1155
- - spec/features/shortcodes_spec.rb
1156
- - spec/features/plugins_spec.rb
1157
- - spec/features/tags_spec.rb
1158
- - spec/features/categories_spec.rb
1159
- - spec/features/settings_spec.rb
1160
- - spec/features/users_spec.rb
1161
- - spec/features/themes_spec.rb
1162
- - spec/features/comments_spec.rb
1163
- - spec/features/contact_form_spec.rb
1164
- - spec/features/languages_spec.rb
1153
+ - spec/features/admin/session_spec.rb
1154
+ - spec/features/admin/widgets_spec.rb
1155
+ - spec/features/admin/posts_spec.rb
1156
+ - spec/features/admin/content_groups_spec.rb
1157
+ - spec/features/admin/sites_spec.rb
1158
+ - spec/features/admin/media_spec.rb
1159
+ - spec/features/admin/user_roles_spec.rb
1160
+ - spec/features/admin/menus_spec.rb
1161
+ - spec/features/admin/custom_fields_spec.rb
1162
+ - spec/features/admin/pages_spec.rb
1163
+ - spec/features/admin/shortcodes_spec.rb
1164
+ - spec/features/admin/plugins_spec.rb
1165
+ - spec/features/admin/tags_spec.rb
1166
+ - spec/features/admin/categories_spec.rb
1167
+ - spec/features/admin/settings_spec.rb
1168
+ - spec/features/admin/users_spec.rb
1169
+ - spec/features/admin/themes_spec.rb
1170
+ - spec/features/admin/comments_spec.rb
1171
+ - spec/features/admin/contact_form_spec.rb
1172
+ - spec/features/admin/languages_spec.rb
1173
+ - spec/models/post_spec.rb
1165
1174
  - spec/models/user_spec.rb
1166
1175
  - spec/support/common.rb
1167
1176
  - spec/support/wait_for_ajax.rb
1177
+ - spec/support/fixtures/rails_tmp.png
1178
+ - spec/support/fixtures/rails.png
1168
1179
  - spec/support/custom_admin.html.erb
1180
+ - spec/factories/post_type.rb
1181
+ - spec/factories/site.rb
1169
1182
  - spec/routing/post_type_routes_spec.rb
1170
1183
  - spec/rails_helper.rb
1184
+ - spec/helpers/uploader_helper_spec.rb
1171
1185
  - spec/helpers/short_code_helper_spec.rb
1172
1186
  - spec/helpers/email_helper_spec.rb
@@ -1,2 +0,0 @@
1
- <%= render "render_folder_item", folders: folders %>
2
- <%= render "render_file_item", files: files %>
@@ -1,15 +0,0 @@
1
- <% (folders rescue {fname => folder}).each do |fname, folder| %>
2
- <div class="media_item folder_item" data-key="<%= fname %>">
3
- <div class="thumb">
4
- <i class="fa fa-folder"></i>
5
- </div>
6
- <div class="label_thumb">
7
- <%= fname %>
8
- </div>
9
- <% if @show_file_actions %>
10
- <div class="actions">
11
- <a href="#" class="del_folder"><i class="fa fa-trash"></i></a>
12
- </div>
13
- <% end %>
14
- </div>
15
- <% end %>
@@ -1,13 +0,0 @@
1
- require "rails_helper"
2
-
3
- RSpec.describe "PostTypeDecorator", :type => :routing do
4
- it "group url" do
5
- post_type = create_test_post_type(slug: 'test-post-type')
6
- expect(post_type.decorate.the_group_url).to include("/group/#{post_type.id}")
7
- end
8
-
9
- it "public url" do
10
- post_type = create_test_post_type(slug: 'test-post-type')
11
- expect(post_type.decorate.the_url).to include("/#{post_type.slug}")
12
- end
13
- end
@@ -1,74 +0,0 @@
1
- require "rails_helper"
2
- describe "the signin process", js: true do
3
- login_success
4
- it "signs me in not valid" do
5
- visit "#{cama_root_relative_path}/admin/login"
6
- within("#login_user") do
7
- fill_in 'user_username', :with => 'admin'
8
- fill_in 'user_password', :with => 'ADMIN'
9
- end
10
- click_button 'Log In'
11
- expect(page).to have_css('#user_username')
12
- end
13
-
14
- it "forgot pass" do
15
- visit "#{cama_root_relative_path}/admin/forgot"
16
- within("#login_user") do
17
- fill_in 'user_email', :with => 'admin@local.com'
18
- end
19
- click_button 'Submit'
20
- expect(page).to have_content 'Send email reset success'
21
- end
22
-
23
- it "Enable Register" do
24
- admin_sign_in
25
- visit "#{cama_root_relative_path}/admin/settings/site?tab=config"
26
- within '#site_settings_form' do
27
- check "options_permit_create_account"
28
- click_button 'Submit'
29
- end
30
- expect(page).to have_css('.alert-success')
31
- end
32
-
33
-
34
- it "Register User" do
35
- visit "#{cama_root_relative_path}/admin/register"
36
- within("#login_user") do
37
- fill_in 'user[first_name]', :with => 'Name'
38
- fill_in 'user[last_name]', :with => 'Last Name'
39
- fill_in 'user[email]', :with => 'test@tester.com'
40
- fill_in 'user[username]', :with => 'tester'
41
- fill_in 'user[password]', :with => 'passsword'
42
- fill_in 'user[password_confirmation]', :with => 'passsword'
43
- end
44
- click_button 'Sign Up'
45
- expect(page).to have_css('.alert-success')
46
- end
47
-
48
- it "Enable Register with Captcha" do
49
- admin_sign_in
50
- visit "#{cama_root_relative_path}/admin/settings/site?tab=config"
51
- within '#site_settings_form' do
52
- check "options_security_captcha_user_register"
53
- click_button 'Submit'
54
- end
55
- expect(page).to have_css('.alert-success')
56
- end
57
-
58
- it "Register User with Captcha" do
59
- visit "#{cama_root_relative_path}/admin/register"
60
- # puts "@@@@@@@@@@@@@@@@@@@@@@@@@@#{page.current_url}"
61
- within("#login_user") do
62
- fill_in 'user[first_name]', :with => 'Name'
63
- fill_in 'user[last_name]', :with => 'Last Name'
64
- fill_in 'user[email]', :with => "test_#{Time.current.to_i}@tester.com"
65
- fill_in 'user[username]', :with => "tester_#{Time.current.to_i}"
66
- fill_in 'user[password]', :with => 'passsword'
67
- fill_in 'user[password_confirmation]', :with => 'passsword'
68
- fill_in 'captcha', :with => 'password'
69
- end
70
- click_button 'Sign Up'
71
- # screenshot_and_save_page
72
- expect(page).to have_css('.alert-success')
73
- end
74
- end