alchemy_cms 5.0.6 → 5.1.0.beta1

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

data/lib/tasks/alchemy/upgrade.rake

@@ -42,9 +42,6 @@ namespace :alchemy do
         "alchemy:upgrade:5.0:install_gutentag_migrations",
         "alchemy:upgrade:5.0:remove_layout_roots",
         "alchemy:upgrade:5.0:remove_root_page",
-        "alchemy:upgrade:5.0:run_webpacker_installer",
-        "alchemy:upgrade:5.0:add_npm_package",
-        "alchemy:upgrade:5.0:copy_alchemy_entry_point",
       ]
 
       desc "Install Gutentag migrations"
@@ -61,23 +58,6 @@ namespace :alchemy do
       task remove_root_page: [:environment] do
         Alchemy::Upgrader::FivePointZero.remove_root_page
       end
-
-      desc "Run webpacker installer"
-      task run_webpacker_installer: [:environment] do
-        Alchemy::Upgrader::FivePointZero.run_webpacker_installer
-      end
-
-      desc "Add NPM package"
-      task add_npm_package: [:environment] do
-        puts "adding npm_package..."
-        Alchemy::Upgrader::FivePointZero.add_npm_package
-      end
-
-      desc "Copy alchemy entry point"
-      task copy_alchemy_entry_point: [:environment] do
-        puts "copying alchemy entry point"
-        Alchemy::Upgrader::FivePointZero.copy_alchemy_entry_point
-      end
     end
   end
 end

data/package/admin.js

@@ -1,5 +1,4 @@
 import translate from "./src/i18n"
-import translationData from "./src/translations"
 import NodeTree from "./src/node_tree"
 
 // Global Alchemy object
@@ -11,6 +10,5 @@ if (typeof window.Alchemy === "undefined") {
 Object.assign(Alchemy, {
   // Global utility method for translating a given string
   t: translate,
-  translations: Object.assign(Alchemy.translations || {}, translationData),
   NodeTree
 })

data/package/src/__tests__/i18n.spec.js

@@ -15,20 +15,12 @@ describe("translate", () => {
     })
 
     describe("if translation is present", () => {
-      beforeEach(() => {
-        Alchemy.translations = { en: { help: "Help" } }
-      })
-
       it("Returns translated string", () => {
         expect(translate("help")).toEqual("Help")
       })
 
       describe("if key includes a period", () => {
         describe("that is translated", () => {
-          beforeEach(() => {
-            Alchemy.translations = { en: { formats: { date: "Y-m-d" } } }
-          })
-
           it("splits into group", () => {
             expect(translate("formats.date")).toEqual("Y-m-d")
           })
@@ -48,10 +40,6 @@ describe("translate", () => {
       })
 
       describe("if replacement is given", () => {
-        beforeEach(() => {
-          Alchemy.translations = { en: { allowed_chars: "of %{number} chars" } }
-        })
-
         it("replaces it", () => {
           expect(translate("allowed_chars", 5)).toEqual("of 5 chars")
         })
@@ -79,15 +67,4 @@ describe("translate", () => {
       spy.mockRestore()
     })
   })
-
-  describe("if Alchemy.translations is not set", () => {
-    it("Returns passed string and logs a warning", () => {
-      const spy = jest.spyOn(console, "warn").mockImplementation(() => {})
-      expect(translate("help")).toEqual("help")
-      expect(spy.mock.calls).toEqual([
-        ["Translations for locale kl not found!"]
-      ])
-      spy.mockRestore()
-    })
-  })
 })

data/package/src/i18n.js

@@ -1,3 +1,5 @@
+import translationData from "./translations"
+
 const KEY_SEPARATOR = /\./
 
 function currentLocale() {
@@ -9,7 +11,7 @@ function currentLocale() {
 
 function getTranslations() {
   const locale = currentLocale()
-  const translations = Alchemy.translations && Alchemy.translations[locale]
+  const translations = translationData[locale]
 
   if (translations) {
     return translations

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "5.0.6",
+  "version": "0.2.0",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.1.0.beta1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-17 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
@@ -113,9 +113,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -126,9 +123,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: dragonfly_svg
   requirement: !ruby/object:Gem::Requirement
@@ -483,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
@@ -602,14 +596,13 @@ files:
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/ci.yml"
-- ".github/workflows/greetings.yml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".localeapp/config.rb"
 - ".prettierrc"
 - ".rubocop.yml"
+- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -626,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
@@ -763,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
@@ -786,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
@@ -821,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
@@ -1076,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
@@ -1124,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
@@ -1134,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
@@ -1181,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
@@ -1264,17 +1266,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      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.2.26
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails

data/.github/workflows/ci.yml

@@ -1,126 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  RSpec:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        rails:
-          - '5.2'
-          - '6.0'
-        ruby:
-          - '2.6.x'
-          - '2.7.x'
-        database:
-          - mysql
-          - postgresql
-    env:
-      DB: ${{ matrix.database }}
-      DB_USER: alchemy_user
-      DB_PASSWORD: password
-      DB_HOST: '127.0.0.1'
-      RAILS_ENV: test
-      RAILS_VERSION: ${{ matrix.rails }}
-    services:
-      postgres:
-        image: postgres:11
-        env:
-          POSTGRES_USER: alchemy_user
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: alchemy_cms_dummy_test
-        ports: ['5432:5432']
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-      mysql:
-        image: mysql:latest
-        ports: ['3306:3306']
-        env:
-          MYSQL_USER: alchemy_user
-          MYSQL_PASSWORD: password
-          MYSQL_DATABASE: alchemy_cms_dummy_test
-          MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
-    steps:
-      - uses: actions/checkout@v2.3.4
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1.1.2
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Restore apt cache
-        id: apt-cache
-        uses: actions/cache@v2.1.3
-        with:
-          path: /home/runner/apt/cache
-          key: ${{ runner.os }}-apt-${{ matrix.database }}
-          restore-keys: |
-            ${{ runner.os }}-apt-
-      - name: Install Postgres headers
-        if: matrix.database == 'postgresql'
-        run: |
-          mkdir -p /home/runner/apt/cache
-          sudo apt update -qq
-          sudo apt install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache"
-          sudo chown -R runner /home/runner/apt/cache
-      - name: Install MySQL headers
-        if: matrix.database == 'mysql'
-        run: |
-          mkdir -p /home/runner/apt/cache
-          sudo apt update -qq
-          sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
-          sudo chown -R runner /home/runner/apt/cache
-      - name: Install bundler
-        run: |
-          gem install bundler
-      - name: Restore Ruby Gems cache
-        id: cache
-        uses: actions/cache@v2.1.3
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-bundle-${{ matrix.ruby }}-${{ matrix.rails }}-${{ matrix.database }}-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-bundle-
-      - name: Install bundle
-        timeout-minutes: 10
-        run: |
-          bundle install --jobs 4 --retry 3 --path vendor/bundle
-      - name: Restore node modules cache
-        id: yarn-cache
-        uses: actions/cache@v2.1.3
-        with:
-          path: spec/dummy/node_modules
-          key: ${{ runner.os }}-yarn-dummy-${{ hashFiles('./package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-dummy-
-      - name: Prepare database
-        run: |
-          bundle exec rake alchemy:spec:prepare
-      - name: Run tests & publish code coverage
-        uses: paambaati/codeclimate-action@v2.7.5
-        env:
-          CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
-        with:
-          coverageCommand: bundle exec rspec
-      - uses: actions/upload-artifact@main
-        if: failure()
-        with:
-          name: Screenshots
-          path: spec/dummy/tmp/screenshots
-  Jest:
-    runs-on: ubuntu-latest
-    env:
-      NODE_ENV: test
-    steps:
-      - uses: actions/checkout@v2.3.4
-      - name: Restore node modules cache
-        uses: actions/cache@v2.1.3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install yarn
-        run: yarn install
-      - name: Run jest
-        run: yarn jest

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