alchemy_cms 5.0.1 → 5.1.0.beta1

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.0.1"
+  VERSION = "5.1.0.beta1"
 
   def self.version
     VERSION

data/lib/generators/alchemy/install/files/alchemy.en.yml

@@ -18,7 +18,7 @@ en:
     # Default texts for new contents created
     default_content_texts:
       article_headline: "Welcome to your first Alchemy CMS page"
-      article_text: '<p><strong>How to get started.</strong></p><p>First of all you should read about Alchemy and its architecture in the <a class="external" href="http://guides.alchemy-cms.com/stable/alchemy_approach.html" target="_blank" data-link-target="blank">guidelines</a>.</p><p>The most important things to know about Alchemy are elements and page layouts.</p><p><span style="text-decoration: underline;"><strong>Elements:</strong></span></p><p>With Alchemy you can split pages into content parts, elements. These elements can be defined out of several base content types: essences. The basic essences are:</p><ul><li>EssenceText - <em>A single line of text</em></li><li>EssenceRichtext - <em>A TinyMCE powered formatted text block</em></li><li>EssencePicture - <em>A reference to an image</em></li><li>EssenceHtml - <em>HTML embed code</em></li><li>EssenceSelect - <em>A selection of values</em></li><li>EssenceBoolean - <em>A checkbox</em></li></ul><p>Elements get defined in a YAML file <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/stable/elements.html" target="_blank" data-link-target="blank">Read more about elements and how to define them in the guidelines.</a></p><p><span style="text-decoration: underline;"><strong>Page types:</strong></span></p><p>You can define several types of pages, called page layouts. You can assign elements to page layouts and control how elements and the page of a certain layout behave.</p><p>Page layouts get defined in a YAML file <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/stable/page_layouts.html" target="_blank" data-link-target="blank">Read more about defining page layouts in the guidelines.</a></p>'
+      article_text: '<p><strong>How to get started.</strong></p><p>First of all you should read about Alchemy and its architecture in the <a class="external" href="http://guides.alchemy-cms.com/alchemy_approach.html" target="_blank" data-link-target="blank">guidelines</a>.</p><p>The most important things to know about Alchemy are elements and page layouts.</p><p><span style="text-decoration: underline;"><strong>Elements:</strong></span></p><p>With Alchemy you can split pages into content parts, elements. These elements can be defined out of several base content types: essences. The basic essences are:</p><ul><li>EssenceText - <em>A single line of text</em></li><li>EssenceRichtext - <em>A TinyMCE powered formatted text block</em></li><li>EssencePicture - <em>A reference to an image</em></li><li>EssenceHtml - <em>HTML embed code</em></li><li>EssenceSelect - <em>A selection of values</em></li><li>EssenceBoolean - <em>A checkbox</em></li></ul><p>Elements get defined in a YAML file <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/elements.html" target="_blank" data-link-target="blank">Read more about elements and how to define them in the guidelines.</a></p><p><span style="text-decoration: underline;"><strong>Page types:</strong></span></p><p>You can define several types of pages, called page layouts. You can assign elements to page layouts and control how elements and the page of a certain layout behave.</p><p>Page layouts get defined in a YAML file <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/page_layouts.html" target="_blank" data-link-target="blank">Read more about defining page layouts in the guidelines.</a></p>'
 
     # Hint texts for elements
     element_hints:
@@ -28,4 +28,4 @@ en:
     content_hints:
       headline: "This is a single line of unformatable Text"
       picture: "Pictures are stored in the library. You can assign a picture multiple times throughout your site. Alchemy has an image cropper build right in."
-      text: "This is a rich text block powered by TinyMCE editor. You can change the configuration of the editor. See http://guides.alchemy-cms.com/stable/customize_tinymce.html"
+      text: "This is a rich text block powered by TinyMCE editor. You can change the configuration of the editor. See http://guides.alchemy-cms.com/customize_tinymce.html"

data/lib/generators/alchemy/install/templates/dragonfly.rb.tt

@@ -15,12 +15,12 @@ Dragonfly.app(:alchemy_pictures).configure do
   dragonfly_url nil
   plugin :imagemagick
   plugin :svg
-  secret '<%= SecureRandom.hex(32) %>'
-  url_format '/pictures/:job/:name.:ext'
+  secret "<%= SecureRandom.hex(32) %>"
+  url_format "/pictures/:job/:basename.:ext"
 
   datastore :file,
-    root_path: Rails.root.join('uploads/pictures').to_s,
-    server_root: Rails.root.join('public'),
+    root_path: Rails.root.join("uploads/pictures").to_s,
+    server_root: Rails.root.join("public"),
     store_meta: false
 end
 
@@ -30,6 +30,6 @@ Rails.application.middleware.use Dragonfly::Middleware, :alchemy_pictures
 # Attachments
 Dragonfly.app(:alchemy_attachments).configure do
   datastore :file,
-    root_path:  Rails.root.join('uploads/attachments').to_s,
+    root_path: Rails.root.join("uploads/attachments").to_s,
     store_meta: false
 end

data/lib/tasks/alchemy/thumbnails.rake

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+namespace :alchemy do
+  namespace :generate do
+    desc "Generates all thumbnails for Alchemy Pictures and EssencePictures."
+    task thumbnails: [
+      "alchemy_dragonfly_s3:generate:picture_thumbnails",
+      "alchemy_dragonfly_s3:generate:essence_picture_thumbnails",
+    ]
+
+    desc "Generates thumbnails for Alchemy Pictures."
+    task picture_thumbnails: :environment do
+      puts "Regenerate #{Alchemy::Picture.count} picture thumbnails."
+      puts "Please wait..."
+
+      Alchemy::Picture.find_each do |picture|
+        puts Alchemy::PictureThumb.generate_thumbs!(picture)
+      end
+
+      puts "Done!"
+    end
+
+    desc "Generates thumbnails for Alchemy EssencePictures."
+    task essence_picture_thumbnails: :environment do
+      essence_pictures = Alchemy::EssencePicture.joins(:content, :ingredient_association)
+      puts "Regenerate #{essence_pictures.count} essence picture thumbnails."
+      puts "Please wait..."
+
+      essence_pictures.find_each do |essence_picture|
+        puts essence_picture.picture_url
+        puts essence_picture.thumbnail_url
+      end
+
+      puts "Done!"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0.beta1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -87,22 +87,22 @@ dependencies:
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -477,14 +477,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -596,7 +596,6 @@ files:
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/greetings.yml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
 - ".hound.yml"
@@ -620,6 +619,7 @@ files:
 - app/assets/images/alchemy/icon-white.svg
 - app/assets/images/alchemy/icon.svg
 - app/assets/images/alchemy/lupe.cur
+- app/assets/images/alchemy/missing-image.svg
 - app/assets/javascripts/alchemy/admin.js
 - app/assets/javascripts/alchemy/alchemy.autocomplete.js.coffee
 - app/assets/javascripts/alchemy/alchemy.base.js.coffee
@@ -757,8 +757,6 @@ files:
 - app/controllers/concerns/alchemy/admin/current_language.rb
 - app/controllers/concerns/alchemy/admin/uploader_responses.rb
 - app/controllers/concerns/alchemy/legacy_page_redirects.rb
-- app/controllers/concerns/alchemy/locale_redirects.rb
-- app/controllers/concerns/alchemy/page_redirects.rb
 - app/controllers/concerns/alchemy/site_redirects.rb
 - app/decorators/alchemy/content_editor.rb
 - app/decorators/alchemy/element_editor.rb
@@ -780,6 +778,7 @@ files:
 - app/mailers/alchemy/base_mailer.rb
 - app/mailers/alchemy/messages_mailer.rb
 - app/models/alchemy/attachment.rb
+- app/models/alchemy/attachment/url.rb
 - app/models/alchemy/base_record.rb
 - app/models/alchemy/content.rb
 - app/models/alchemy/content/factory.rb
@@ -815,9 +814,15 @@ files:
 - app/models/alchemy/page/page_scopes.rb
 - app/models/alchemy/page/url_path.rb
 - app/models/alchemy/picture.rb
+- app/models/alchemy/picture/calculations.rb
 - app/models/alchemy/picture/preprocessor.rb
 - app/models/alchemy/picture/transformations.rb
 - app/models/alchemy/picture/url.rb
+- app/models/alchemy/picture_thumb.rb
+- app/models/alchemy/picture_thumb/create.rb
+- app/models/alchemy/picture_thumb/signature.rb
+- app/models/alchemy/picture_thumb/uid.rb
+- app/models/alchemy/picture_variant.rb
 - app/models/alchemy/site.rb
 - app/models/alchemy/site/layout.rb
 - app/models/alchemy/tag.rb
@@ -1070,6 +1075,8 @@ files:
 - db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb
 - db/migrate/20200514091507_make_page_layoutpage_null_false.rb
 - db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb
+- db/migrate/20200617110713_create_alchemy_picture_thumbs.rb
+- db/migrate/20200907111332_remove_tri_state_booleans.rb
 - lib/alchemy/ability_helper.rb
 - lib/alchemy/admin/locale.rb
 - lib/alchemy/admin/preview_url.rb
@@ -1118,6 +1125,7 @@ files:
 - lib/alchemy/test_support/factories/node_factory.rb
 - lib/alchemy/test_support/factories/page_factory.rb
 - lib/alchemy/test_support/factories/picture_factory.rb
+- lib/alchemy/test_support/factories/picture_thumb_factory.rb
 - lib/alchemy/test_support/factories/site_factory.rb
 - lib/alchemy/test_support/fixtures/image.png
 - lib/alchemy/test_support/integration_helpers.rb
@@ -1128,7 +1136,6 @@ files:
 - lib/alchemy/upgrader/five_point_zero.rb
 - lib/alchemy/upgrader/tasks/element_views_updater.rb
 - lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb
-- lib/alchemy/userstamp.rb
 - lib/alchemy/version.rb
 - lib/alchemy_cms.rb
 - lib/generators/alchemy/base.rb
@@ -1175,6 +1182,7 @@ files:
 - lib/kaminari/scoped_pagination_url_helper.rb
 - lib/tasks/alchemy/db.rake
 - lib/tasks/alchemy/install.rake
+- lib/tasks/alchemy/thumbnails.rake
 - lib/tasks/alchemy/tidy.rake
 - lib/tasks/alchemy/upgrade.rake
 - package.json
@@ -1263,9 +1271,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubygems_version: 3.0.3

data/.github/workflows/greetings.yml

@@ -1,13 +0,0 @@
-name: Greetings
-
-on: [pull_request, issues]
-
-jobs:
-  greeting:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/first-interaction@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: 'Hey. Thanks for reporting this issue and welcome to AlchemyCMS. The maintainer have been notified. Please be patient while waiting for an answer. Open Source is done by volunteers, so give them some time to react. Meanwhile please think about sending a PR that fixes this issue. It is way more likely that it will be accepted than this bug fixed for you. Remember OpenSource is done by all of us. Again, thanks for reporting.'
-        pr-message: 'Hey. Thanks for sending this PR. It is very much appreciated. Please be patient and give the maintainers some time to review your work. Meanwhile make sure that the PR meets our [contributing guidelines](https://github.com/AlchemyCMS/alchemy_cms/blob/master/CONTRIBUTING.md). This mostly means [great commit messages](https://chris.beams.io/posts/git-commit/) and adding tests. Thanks again for your contribution. Your help makes Alchemy better.'

data/app/controllers/concerns/alchemy/locale_redirects.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  # Handles locale redirects
-  #
-  # If the current URL has a locale prefix, but should not have one it redirects
-  # to url without locale prefix.
-  #
-  # Situations we don't want a locale prefix:
-  #
-  # 1. If only one language is published
-  # 2. If the requested locale is the current default locale
-  #
-  module LocaleRedirects
-    extend ActiveSupport::Concern
-
-    included do
-      before_action :enforce_no_locale,
-        if: :locale_prefix_not_allowed?,
-        only: [:index, :show]
-    end
-
-    private
-
-    # Redirects to requested action without locale prefixed
-    def enforce_no_locale
-      redirect_permanently_to additional_params.merge(locale: nil)
-    end
-
-    # Is the requested locale allowed?
-    #
-    # If Alchemy is not in multi language mode or the requested locale is the default locale,
-    # then we want to redirect to a non prefixed url.
-    #
-    def locale_prefix_not_allowed?
-      params[:locale].present? && !multi_language? ||
-        params[:locale].presence == ::I18n.default_locale.to_s
-    end
-  end
-end

data/app/controllers/concerns/alchemy/page_redirects.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  # Handles page redirect urls
-  #
-  # Lots of reasons exist to redirect to another URL than the requested one.
-  # These module holds the logic behind these needs.
-  #
-  module PageRedirects
-    extend ActiveSupport::Concern
-
-    private
-
-    # Returns an URL to redirect the request to.
-    #
-    # == Lookup:
-    #
-    # 1. If the page is not published and we have a published child,
-    #    we return the url top that page. (Configurable through +redirect_to_public_child+).
-    # 2. If the page layout of the page found has a controller and action configured,
-    #    we return the url to that route. (Configure controller and action in `page_layouts.yml`).
-    # 3. If the current page URL has no locale prefixed, but we should have one,
-    #    we return the prefixed URL.
-    # 4. If no redirection is needed returns nil.
-    #
-    # @return String
-    # @return NilClass
-    #
-    def redirect_url
-      @_redirect_url ||= public_child_redirect_url || locale_prefixed_url || nil
-    end
-
-    def locale_prefixed_url
-      return unless locale_prefix_missing?
-
-      page_redirect_url(locale: Language.current.code)
-    end
-
-    def public_child_redirect_url
-      return if @page.public?
-
-      if configuration(:redirect_to_public_child)
-        @page = @page.descendants.published.not_restricted.first
-        @page ? page_redirect_url : page_not_found!
-      else
-        page_not_found!
-      end
-    end
-
-    # Page url with or without locale while keeping all additional params
-    def page_redirect_url(options = {})
-      options = {
-        locale: prefix_locale? ? @page.language_code : nil,
-        urlname: @page.urlname,
-      }.merge(options)
-
-      alchemy.show_page_path additional_params.merge(options)
-    end
-
-    def default_locale?
-      Language.current.code.to_sym == ::I18n.default_locale.to_sym
-    end
-
-    def locale_prefix_missing?
-      multi_language? && params[:locale].blank? && !default_locale?
-    end
-  end
-end

data/lib/alchemy/userstamp.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-# Adds the model stamper ability to the provided user class
-#
-# It only adds it, if the user model is a active_record model.
-#
-if Alchemy.user_class < ActiveRecord::Base
-  Alchemy.user_class.class_eval do
-    model_stamper
-    stampable stamper_class_name: Alchemy.user_class_name
-  end
-end