alchemy_cms 6.1.2 → 7.0.0.pre.a

data/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.1.2",
+  "version": "7.0.0-a",
   "description": "AlchemyCMS",
-  "browser": "package/admin.js",
+  "browser": "package/dist/admin.js",
   "files": [
     "package/**/*"
   ],
@@ -10,7 +10,8 @@
     "lib": "package"
   },
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "build": "esbuild package/admin.js --bundle --sourcemap --minify --outdir=package/dist --public-path=assets"
   },
   "repository": {
     "type": "git",
@@ -32,6 +33,7 @@
     "@babel/core": "^7.9.6",
     "@babel/preset-env": "^7.9.6",
     "babel-jest": "^29.0.1",
+    "esbuild": "^0.17.5",
     "jest": "^25.2.7",
     "prettier": "^2.0.2",
     "xhr-mock": "^2.5.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 7.0.0.pre.a
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -387,20 +387,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: non-stupid-digest-assets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +396,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -420,7 +406,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -523,26 +509,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: webpacker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -854,13 +820,8 @@ files:
 - app/controllers/alchemy/admin/attachments_controller.rb
 - app/controllers/alchemy/admin/base_controller.rb
 - app/controllers/alchemy/admin/clipboard_controller.rb
-- app/controllers/alchemy/admin/contents_controller.rb
 - app/controllers/alchemy/admin/dashboard_controller.rb
 - app/controllers/alchemy/admin/elements_controller.rb
-- app/controllers/alchemy/admin/essence_audios_controller.rb
-- app/controllers/alchemy/admin/essence_files_controller.rb
-- app/controllers/alchemy/admin/essence_pictures_controller.rb
-- app/controllers/alchemy/admin/essence_videos_controller.rb
 - app/controllers/alchemy/admin/ingredients_controller.rb
 - app/controllers/alchemy/admin/languages_controller.rb
 - app/controllers/alchemy/admin/layoutpages_controller.rb
@@ -873,7 +834,6 @@ files:
 - app/controllers/alchemy/admin/styleguide_controller.rb
 - app/controllers/alchemy/admin/tags_controller.rb
 - app/controllers/alchemy/api/base_controller.rb
-- app/controllers/alchemy/api/contents_controller.rb
 - app/controllers/alchemy/api/elements_controller.rb
 - app/controllers/alchemy/api/ingredients_controller.rb
 - app/controllers/alchemy/api/nodes_controller.rb
@@ -889,14 +849,11 @@ files:
 - app/controllers/concerns/alchemy/admin/uploader_responses.rb
 - app/controllers/concerns/alchemy/legacy_page_redirects.rb
 - app/controllers/concerns/alchemy/site_redirects.rb
-- app/decorators/alchemy/content_editor.rb
 - app/decorators/alchemy/element_editor.rb
 - app/decorators/alchemy/ingredient_editor.rb
 - app/helpers/alchemy/admin/attachments_helper.rb
 - app/helpers/alchemy/admin/base_helper.rb
-- app/helpers/alchemy/admin/contents_helper.rb
 - app/helpers/alchemy/admin/elements_helper.rb
-- app/helpers/alchemy/admin/essences_helper.rb
 - app/helpers/alchemy/admin/form_helper.rb
 - app/helpers/alchemy/admin/ingredients_helper.rb
 - app/helpers/alchemy/admin/navigation_helper.rb
@@ -915,33 +872,14 @@ files:
 - 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
 - app/models/alchemy/eager_loading.rb
 - app/models/alchemy/element.rb
 - app/models/alchemy/element/definitions.rb
 - app/models/alchemy/element/dom_id.rb
-- app/models/alchemy/element/element_contents.rb
-- app/models/alchemy/element/element_essences.rb
 - app/models/alchemy/element/element_ingredients.rb
 - app/models/alchemy/element/presenters.rb
 - app/models/alchemy/element_to_page.rb
 - app/models/alchemy/elements_repository.rb
-- app/models/alchemy/essence_audio.rb
-- app/models/alchemy/essence_boolean.rb
-- app/models/alchemy/essence_date.rb
-- app/models/alchemy/essence_file.rb
-- app/models/alchemy/essence_headline.rb
-- app/models/alchemy/essence_html.rb
-- app/models/alchemy/essence_link.rb
-- app/models/alchemy/essence_node.rb
-- app/models/alchemy/essence_page.rb
-- app/models/alchemy/essence_picture.rb
-- app/models/alchemy/essence_picture_view.rb
-- app/models/alchemy/essence_richtext.rb
-- app/models/alchemy/essence_select.rb
-- app/models/alchemy/essence_text.rb
-- app/models/alchemy/essence_video.rb
 - app/models/alchemy/folded_page.rb
 - app/models/alchemy/image_cropper_settings.rb
 - app/models/alchemy/ingredient.rb
@@ -982,6 +920,7 @@ files:
 - app/models/alchemy/picture/url.rb
 - app/models/alchemy/picture_thumb.rb
 - app/models/alchemy/picture_thumb/create.rb
+- app/models/alchemy/picture_thumb/file_store.rb
 - app/models/alchemy/picture_thumb/signature.rb
 - app/models/alchemy/picture_thumb/uid.rb
 - app/models/alchemy/picture_variant.rb
@@ -995,17 +934,7 @@ files:
 - app/presenters/alchemy/picture_view.rb
 - app/serializers/alchemy/attachment_serializer.rb
 - app/serializers/alchemy/base_serializer.rb
-- app/serializers/alchemy/content_serializer.rb
 - app/serializers/alchemy/element_serializer.rb
-- app/serializers/alchemy/essence_boolean_serializer.rb
-- app/serializers/alchemy/essence_date_serializer.rb
-- app/serializers/alchemy/essence_file_serializer.rb
-- app/serializers/alchemy/essence_html_serializer.rb
-- app/serializers/alchemy/essence_link_serializer.rb
-- app/serializers/alchemy/essence_picture_serializer.rb
-- app/serializers/alchemy/essence_richtext_serializer.rb
-- app/serializers/alchemy/essence_select_serializer.rb
-- app/serializers/alchemy/essence_text_serializer.rb
 - app/serializers/alchemy/ingredient_serializer.rb
 - app/serializers/alchemy/node_serializer.rb
 - app/serializers/alchemy/page_serializer.rb
@@ -1034,7 +963,6 @@ files:
 - app/views/alchemy/admin/clipboard/index.html.erb
 - app/views/alchemy/admin/clipboard/insert.js.erb
 - app/views/alchemy/admin/clipboard/remove.js.erb
-- app/views/alchemy/admin/contents/create.js.erb
 - app/views/alchemy/admin/crop.html.erb
 - app/views/alchemy/admin/dashboard/_locked_pages.html.erb
 - app/views/alchemy/admin/dashboard/_recent_pages.html.erb
@@ -1057,13 +985,6 @@ files:
 - app/views/alchemy/admin/elements/order.js.erb
 - app/views/alchemy/admin/elements/publish.js.erb
 - app/views/alchemy/admin/elements/update.js.erb
-- app/views/alchemy/admin/essence_audios/edit.html.erb
-- app/views/alchemy/admin/essence_files/edit.html.erb
-- app/views/alchemy/admin/essence_pictures/destroy.js.erb
-- app/views/alchemy/admin/essence_pictures/edit.html.erb
-- app/views/alchemy/admin/essence_pictures/save_link.js.erb
-- app/views/alchemy/admin/essence_pictures/update.js.erb
-- app/views/alchemy/admin/essence_videos/edit.html.erb
 - app/views/alchemy/admin/ingredients/_audio_fields.html.erb
 - app/views/alchemy/admin/ingredients/_dom_id_fields.html.erb
 - app/views/alchemy/admin/ingredients/_file_fields.html.erb
@@ -1191,36 +1112,6 @@ files:
 - app/views/alchemy/elements/_view_not_found.html.erb
 - app/views/alchemy/elements/show.html.erb
 - app/views/alchemy/elements/show.js.erb
-- app/views/alchemy/essences/_essence_audio_editor.html.erb
-- app/views/alchemy/essences/_essence_audio_view.html.erb
-- app/views/alchemy/essences/_essence_boolean_editor.html.erb
-- app/views/alchemy/essences/_essence_boolean_view.html.erb
-- app/views/alchemy/essences/_essence_date_editor.html.erb
-- app/views/alchemy/essences/_essence_date_view.html.erb
-- app/views/alchemy/essences/_essence_file_editor.html.erb
-- app/views/alchemy/essences/_essence_file_view.html.erb
-- app/views/alchemy/essences/_essence_headline_editor.html.erb
-- app/views/alchemy/essences/_essence_headline_view.html.erb
-- app/views/alchemy/essences/_essence_html_editor.html.erb
-- app/views/alchemy/essences/_essence_html_view.html.erb
-- app/views/alchemy/essences/_essence_link_editor.html.erb
-- app/views/alchemy/essences/_essence_link_view.html.erb
-- app/views/alchemy/essences/_essence_node_editor.html.erb
-- app/views/alchemy/essences/_essence_node_view.html.erb
-- app/views/alchemy/essences/_essence_page_editor.html.erb
-- app/views/alchemy/essences/_essence_page_view.html.erb
-- app/views/alchemy/essences/_essence_picture_editor.html.erb
-- app/views/alchemy/essences/_essence_picture_view.html.erb
-- app/views/alchemy/essences/_essence_richtext_editor.html.erb
-- app/views/alchemy/essences/_essence_richtext_view.html.erb
-- app/views/alchemy/essences/_essence_select_editor.html.erb
-- app/views/alchemy/essences/_essence_select_view.html.erb
-- app/views/alchemy/essences/_essence_text_editor.html.erb
-- app/views/alchemy/essences/_essence_text_view.html.erb
-- app/views/alchemy/essences/_essence_video_editor.html.erb
-- app/views/alchemy/essences/_essence_video_view.html.erb
-- app/views/alchemy/essences/shared/_essence_picture_tools.html.erb
-- app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb
 - app/views/alchemy/ingredients/_audio_editor.html.erb
 - app/views/alchemy/ingredients/_audio_view.html.erb
 - app/views/alchemy/ingredients/_boolean_editor.html.erb
@@ -1260,7 +1151,6 @@ files:
 - app/views/alchemy/messages_mailer/new.html.erb
 - app/views/alchemy/pages/_meta_data.html.erb
 - app/views/alchemy/pages/show.html.erb
-- app/views/alchemy/pages/show.rss.builder
 - app/views/alchemy/pages/sitemap.xml.erb
 - app/views/alchemy/welcome.html.erb
 - app/views/kaminari/alchemy/_first_page.html.erb
@@ -1286,25 +1176,7 @@ files:
 - config/locales/alchemy.en.yml
 - config/routes.rb
 - config/spring.rb
-- db/migrate/20200226213334_alchemy_four_point_four.rb
-- db/migrate/20200423073425_create_alchemy_essence_nodes.rb
-- db/migrate/20200504210159_remove_site_id_from_nodes.rb
-- db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb
-- 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
-- db/migrate/20201207131309_create_page_versions.rb
-- db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb
-- db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb
-- db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb
-- db/migrate/20210406093436_add_alchemy_essence_headlines.rb
-- db/migrate/20210506135919_create_essence_audios.rb
-- db/migrate/20210506140258_create_essence_videos.rb
-- db/migrate/20210508091432_create_alchemy_ingredients.rb
-- db/migrate/20220514072456_restrict_on_delete_page_id_foreign_key_from_alchemy_nodes.rb
-- db/migrate/20220622130905_add_playsinline_to_alchemy_essence_videos.rb
+- db/migrate/20230121212637_alchemy_six_point_one.rb
 - db/migrate/20230123112425_add_searchable_to_alchemy_pages.rb
 - lib/alchemy.rb
 - lib/alchemy/ability_helper.rb
@@ -1325,7 +1197,6 @@ files:
 - lib/alchemy/error_tracking.rb
 - lib/alchemy/error_tracking/error_logger.rb
 - lib/alchemy/errors.rb
-- lib/alchemy/essence.rb
 - lib/alchemy/filetypes.rb
 - lib/alchemy/forms/builder.rb
 - lib/alchemy/hints.rb
@@ -1343,23 +1214,17 @@ files:
 - lib/alchemy/resource_filter.rb
 - lib/alchemy/resources_helper.rb
 - lib/alchemy/routing_constraints.rb
+- lib/alchemy/searchable_resource.rb
 - lib/alchemy/seeder.rb
 - lib/alchemy/shell.rb
 - lib/alchemy/taggable.rb
 - lib/alchemy/tasks/tidy.rb
 - lib/alchemy/test_support.rb
+- lib/alchemy/test_support/capybara_helpers.rb
 - lib/alchemy/test_support/config_stubbing.rb
-- lib/alchemy/test_support/essence_shared_examples.rb
 - lib/alchemy/test_support/factories/attachment_factory.rb
-- lib/alchemy/test_support/factories/content_factory.rb
 - lib/alchemy/test_support/factories/dummy_user_factory.rb
 - lib/alchemy/test_support/factories/element_factory.rb
-- lib/alchemy/test_support/factories/essence_audio_factory.rb
-- lib/alchemy/test_support/factories/essence_file_factory.rb
-- lib/alchemy/test_support/factories/essence_page_factory.rb
-- lib/alchemy/test_support/factories/essence_picture_factory.rb
-- lib/alchemy/test_support/factories/essence_text_factory.rb
-- lib/alchemy/test_support/factories/essence_video_factory.rb
 - lib/alchemy/test_support/factories/ingredient_factory.rb
 - lib/alchemy/test_support/factories/language_factory.rb
 - lib/alchemy/test_support/factories/node_factory.rb
@@ -1379,12 +1244,8 @@ files:
 - lib/alchemy/test_support/shared_uploader_examples.rb
 - lib/alchemy/tinymce.rb
 - lib/alchemy/upgrader.rb
-- lib/alchemy/upgrader/five_point_zero.rb
-- lib/alchemy/upgrader/six_point_zero.rb
-- lib/alchemy/upgrader/tasks/add_page_versions.rb
-- lib/alchemy/upgrader/tasks/element_views_updater.rb
-- lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb
-- lib/alchemy/upgrader/tasks/ingredients_migrator.rb
+- lib/alchemy/upgrader/seven_point_zero.rb
+- lib/alchemy/upgrader/tasks/.keep
 - lib/alchemy/version.rb
 - lib/alchemy_cms.rb
 - lib/generators/alchemy/base.rb
@@ -1392,9 +1253,6 @@ files:
 - lib/generators/alchemy/elements/templates/view.html.erb
 - lib/generators/alchemy/elements/templates/view.html.haml
 - lib/generators/alchemy/elements/templates/view.html.slim
-- lib/generators/alchemy/essence/essence_generator.rb
-- lib/generators/alchemy/essence/templates/editor.html.erb
-- lib/generators/alchemy/essence/templates/view.html.erb
 - lib/generators/alchemy/ingredient/ingredient_generator.rb
 - lib/generators/alchemy/ingredient/templates/editor.html.erb
 - lib/generators/alchemy/ingredient/templates/model.rb.tt
@@ -1432,6 +1290,7 @@ files:
 - lib/generators/alchemy/site_layouts/templates/layout.html.haml
 - lib/generators/alchemy/site_layouts/templates/layout.html.slim
 - lib/generators/alchemy/views/views_generator.rb
+- lib/non_stupid_digest_assets.rb
 - lib/tasks/alchemy/db.rake
 - lib/tasks/alchemy/install.rake
 - lib/tasks/alchemy/thumbnails.rake
@@ -1439,6 +1298,8 @@ files:
 - lib/tasks/alchemy/upgrade.rake
 - package.json
 - package/admin.js
+- package/dist/admin.js
+- package/dist/admin.js.map
 - package/src/__tests__/i18n.spec.js
 - package/src/datepicker.js
 - package/src/file_editors.js
@@ -1533,9 +1394,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.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.4.6

data/app/controllers/alchemy/admin/contents_controller.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Admin
-    class ContentsController < Alchemy::Admin::BaseController
-      helper "alchemy/admin/essences"
-
-      authorize_resource class: Alchemy::Content
-
-      def create
-        @content = Content.create(content_params)
-      end
-
-      private
-
-      def content_params
-        params.require(:content).permit(:element_id, :name, :ingredient)
-      end
-    end
-  end
-end

data/app/controllers/alchemy/admin/essence_audios_controller.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Admin
-    class EssenceAudiosController < Alchemy::Admin::BaseController
-      authorize_resource class: Alchemy::EssenceAudio
-      before_action :load_essence
-
-      def update
-        @essence_audio.update(essence_audio_params)
-      end
-
-      private
-
-      def load_essence
-        @essence_audio = EssenceAudio.find(params[:id])
-      end
-
-      def essence_audio_params
-        params.require(:essence_audio).permit(
-          :autoplay,
-          :controls,
-          :loop,
-          :muted,
-          :attachment_id
-        )
-      end
-    end
-  end
-end

data/app/controllers/alchemy/admin/essence_files_controller.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Admin
-    class EssenceFilesController < Alchemy::Admin::BaseController
-      authorize_resource class: Alchemy::EssenceFile
-
-      before_action :load_essence_file, only: [:edit, :update]
-
-      helper "Alchemy::Admin::Contents"
-
-      def edit
-        @content = @essence_file.content
-      end
-
-      def update
-        @essence_file.update(essence_file_params)
-      end
-
-      private
-
-      def essence_file_params
-        params.require(:essence_file).permit(:title, :css_class, :link_text)
-      end
-
-      def load_essence_file
-        @essence_file = EssenceFile.find(params[:id])
-      end
-    end
-  end
-end

data/app/controllers/alchemy/admin/essence_pictures_controller.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Admin
-    class EssencePicturesController < Alchemy::Admin::BaseController
-      include CropAction
-
-      authorize_resource class: Alchemy::EssencePicture
-
-      before_action :load_essence_picture, only: [:edit, :update]
-      before_action :load_content, only: [:edit, :update]
-
-      helper "alchemy/admin/contents"
-      helper "alchemy/admin/essences"
-      helper "alchemy/url"
-
-      def edit
-      end
-
-      def update
-        @essence_picture.update(essence_picture_params)
-      end
-
-      private
-
-      def load_essence_picture
-        @essence_picture = EssencePicture.find(params[:id])
-      end
-
-      def load_croppable_resource
-        @croppable_resource = EssencePicture.find(params[:id])
-      end
-
-      def load_content
-        @content = Content.find(params[:content_id])
-      end
-
-      def essence_picture_params
-        params.require(:essence_picture).permit(:alt_tag, :caption, :css_class, :render_size, :title, :crop_from, :crop_size)
-      end
-    end
-  end
-end

data/app/controllers/alchemy/admin/essence_videos_controller.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Admin
-    class EssenceVideosController < Alchemy::Admin::BaseController
-      authorize_resource class: Alchemy::EssenceVideo
-      before_action :load_essence
-
-      def update
-        @essence_video.update(essence_video_params)
-      end
-
-      private
-
-      def load_essence
-        @essence_video = EssenceVideo.find(params[:id])
-      end
-
-      def essence_video_params
-        params.require(:essence_video).permit(
-          :width,
-          :height,
-          :autoplay,
-          :controls,
-          :loop,
-          :muted,
-          :playsinline,
-          :preload,
-          :attachment_id
-        )
-      end
-    end
-  end
-end

data/app/controllers/alchemy/api/contents_controller.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  class Api::ContentsController < Api::BaseController
-    # Returns all contents as json object
-    #
-    # You can either load all or only these for :element_id param
-    #
-    def index
-      # Fix for cancancan not able to merge multiple AR scopes for logged in users
-      if can? :manage, Alchemy::Content
-        @contents = Content.all
-      else
-        @contents = Content.accessible_by(current_ability, :index)
-      end
-      if params[:element_id].present?
-        @contents = @contents.where(element_id: params[:element_id])
-      end
-      @contents = @contents.includes(*content_includes)
-
-      render json: @contents, adapter: :json, root: "contents"
-    end
-
-    # Returns a json object for content
-    #
-    # You can either load it from :id param
-    # or even more useful via passing the element id and the name of the content
-    #
-    #   $ bin/rake routes
-    #
-    # for more infos on how the url looks like.
-    #
-    def show
-      if params[:id]
-        @content = Content.where(id: params[:id]).includes(:essence).first
-      elsif params[:element_id] && params[:name]
-        @content = Content.where(
-          element_id: params[:element_id],
-          name: params[:name],
-        ).includes(*content_includes).first || raise(ActiveRecord::RecordNotFound)
-      end
-      authorize! :show, @content
-      respond_with @content
-    end
-
-    private
-
-    def content_includes
-      %i[essence]
-    end
-  end
-end