alchemy_cms 4.2.4 → 4.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (55) hide show
  1. checksums.yaml +4 -4
  2. data/.github/FUNDING.yml +4 -0
  3. data/.travis.yml +8 -6
  4. data/CHANGELOG.md +15 -10
  5. data/Gemfile +2 -10
  6. data/README.md +11 -4
  7. data/Rakefile +3 -2
  8. data/alchemy_cms.gemspec +11 -2
  9. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +3 -3
  10. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +1 -1
  11. data/app/assets/stylesheets/alchemy/buttons.scss +15 -2
  12. data/app/assets/stylesheets/alchemy/elements.scss +4 -0
  13. data/app/assets/stylesheets/alchemy/form_fields.scss +1 -0
  14. data/app/assets/stylesheets/alchemy/forms.scss +1 -0
  15. data/app/assets/stylesheets/alchemy/frame.scss +9 -29
  16. data/app/assets/stylesheets/alchemy/navigation.scss +30 -6
  17. data/app/assets/stylesheets/alchemy/preview_window.scss +4 -0
  18. data/app/controllers/alchemy/admin/elements_controller.rb +2 -2
  19. data/app/controllers/alchemy/pages_controller.rb +9 -4
  20. data/app/helpers/alchemy/elements_helper.rb +2 -2
  21. data/app/models/alchemy/element.rb +9 -4
  22. data/app/models/alchemy/page/page_elements.rb +17 -25
  23. data/app/models/alchemy/page/page_scopes.rb +1 -1
  24. data/app/models/alchemy/picture.rb +0 -21
  25. data/app/views/alchemy/admin/elements/_element.html.erb +2 -1
  26. data/app/views/alchemy/admin/pages/edit.html.erb +10 -10
  27. data/lib/alchemy/on_page_layout.rb +1 -1
  28. data/lib/alchemy/test_support/factories.rb +3 -1
  29. data/lib/alchemy/test_support/factories/attachment_factory.rb +2 -0
  30. data/lib/alchemy/test_support/factories/content_factory.rb +5 -0
  31. data/lib/alchemy/test_support/factories/dummy_user_factory.rb +2 -0
  32. data/lib/alchemy/test_support/factories/element_factory.rb +3 -0
  33. data/lib/alchemy/test_support/factories/essence_file_factory.rb +2 -0
  34. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +2 -0
  35. data/lib/alchemy/test_support/factories/essence_text_factory.rb +2 -0
  36. data/lib/alchemy/test_support/factories/language_factory.rb +2 -0
  37. data/lib/alchemy/test_support/factories/page_factory.rb +2 -0
  38. data/lib/alchemy/test_support/factories/picture_factory.rb +2 -0
  39. data/lib/alchemy/test_support/factories/site_factory.rb +2 -0
  40. data/lib/alchemy/test_support/shared_uploader_examples.rb +1 -1
  41. data/lib/alchemy/upgrader/tasks/cells_migration.rb +2 -4
  42. data/lib/alchemy/upgrader/tasks/cells_upgrader.rb +2 -3
  43. data/lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb +4 -4
  44. data/lib/alchemy/version.rb +5 -1
  45. data/lib/alchemy_cms.rb +0 -1
  46. data/lib/rails/generators/alchemy/elements/templates/view.html.erb +1 -1
  47. data/lib/rails/generators/alchemy/elements/templates/view.html.haml +1 -1
  48. data/lib/rails/generators/alchemy/elements/templates/view.html.slim +1 -1
  49. data/vendor/assets/javascripts/fileupload/jquery.fileupload-process.js +5 -2
  50. data/vendor/assets/javascripts/fileupload/jquery.fileupload-validate.js +5 -2
  51. data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +28 -8
  52. data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +11 -4
  53. metadata +129 -12
  54. data/.teatro.yml +0 -8
  55. data/lib/alchemy/picture_attributes.rb +0 -28
data/.teatro.yml DELETED
@@ -1,8 +0,0 @@
1
- project:
2
- after:
3
- - apt-get -y install imagemagick
4
- stage:
5
- before: cd spec/dummy
6
- database: bin/rake db:setup RAILS_ENV=production
7
- assets: bin/rake assets:precompile RAILS_ENV=production
8
- run: bin/rails server -e production
data/lib/alchemy/picture_attributes.rb DELETED
@@ -1,28 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Alchemy
4
- # Provides methods to secure your picture attributes against DOS attacks.
5
- #
6
- class PictureAttributes
7
- SECURE_ATTRIBUTES = %w(id size crop crop_from crop_size quality upsample).freeze
8
-
9
- class << self
10
- # Secures given attributes
11
- #
12
- # @param attributes [Hash]
13
- # @return [String]
14
- #
15
- def secure(attributes)
16
- Digest::SHA1.hexdigest(joined_attributes(attributes))[0..15]
17
- end
18
-
19
- private
20
-
21
- # Takes attributes and joins them with the +security_token+ of your rails app.
22
- #
23
- def joined_attributes(attributes)
24
- attributes.stringify_keys.values_at(*SECURE_ATTRIBUTES, Rails.configuration.secret_token).join('-')
25
- end
26
- end
27
- end
28
- end