Merge pull request #69 from AlchemyCMS/alchemy-7-support

Alchemy 7 support: Remove essence serializers
AlchemyCMS · Mar 31, 2023 · 75aa2f4 · 75aa2f4
2 parents df7155e + 451b687
commit 75aa2f4
Show file tree

Hide file tree

Showing 39 changed files with 115 additions and 1,115 deletions.
diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Customize the ruby version depending on your needs
       - name: Set up Ruby
@@ -39,6 +39,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: output.sarif.json
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,25 +11,23 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
-          - 6.0-stable
-          - 6.1-stable
           - main
         ruby:
-          - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
     env:
       ALCHEMY_BRANCH: ${{ matrix.alchemy_branch }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Restore apt cache
         id: apt-cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: /home/runner/apt/cache
           key: apt-sqlite-
@@ -51,9 +49,9 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3
       - name: Restore node modules cache
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }}

diff --git a/alchemy-json_api.gemspec b/alchemy-json_api.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile", "README.md"]
 
-  spec.add_dependency "alchemy_cms", [">= 6.0.0", "< 7"]
+  spec.add_dependency "alchemy_cms", [">= 7.0.0.a", "< 8"]
   spec.add_dependency "jsonapi.rb", "~> 1.6"
 
   spec.add_development_dependency "factory_bot"

diff --git a/app/controllers/alchemy/json_api/pages_controller.rb b/app/controllers/alchemy/json_api/pages_controller.rb
@@ -100,7 +100,6 @@ def page_scope_with_includes
                 page_version_type => {
                   elements: [
                     :nested_elements,
-                    { contents: { essence: :ingredient_association } },
                     { ingredients: :related_object },
                   ],
                 },

diff --git a/app/models/alchemy/json_api/page.rb b/app/models/alchemy/json_api/page.rb
@@ -1,4 +1,10 @@
 module Alchemy
+  # With Ransack 4 we need to define the attributes
+  # that are allowed to be searched.
+  def Page.ransackable_attributes(_auth_object = nil)
+    %w[urlname page_layout]
+  end
+
   module JsonApi
     class Page < SimpleDelegator
       attr_reader :page_version_type, :page_version

diff --git a/app/serializers/alchemy/json_api/element_serializer.rb b/app/serializers/alchemy/json_api/element_serializer.rb
@@ -16,10 +16,6 @@ class ElementSerializer < BaseSerializer
         !!element.definition[:deprecated]
       end
 
-      has_many :essences, polymorphic: true do |element|
-        element.contents.map(&:essence)
-      end
-
       has_many :ingredients,
         serializer: ->(record) do
           "Alchemy::JsonApi::Ingredient#{record.type.demodulize}Serializer".constantize

diff --git a/app/serializers/alchemy/json_api/essence_audio_serializer.rb b/app/serializers/alchemy/json_api/essence_audio_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_boolean_serializer.rb b/app/serializers/alchemy/json_api/essence_boolean_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_date_serializer.rb b/app/serializers/alchemy/json_api/essence_date_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_file_serializer.rb b/app/serializers/alchemy/json_api/essence_file_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_headline_serializer.rb b/app/serializers/alchemy/json_api/essence_headline_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_html_serializer.rb b/app/serializers/alchemy/json_api/essence_html_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_link_serializer.rb b/app/serializers/alchemy/json_api/essence_link_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_node_serializer.rb b/app/serializers/alchemy/json_api/essence_node_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_page_serializer.rb b/app/serializers/alchemy/json_api/essence_page_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_picture_serializer.rb b/app/serializers/alchemy/json_api/essence_picture_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_richtext_serializer.rb b/app/serializers/alchemy/json_api/essence_richtext_serializer.rb
diff --git a/app/serializers/alchemy/json_api/essence_select_serializer.rb b/app/serializers/alchemy/json_api/essence_select_serializer.rb