archangel 0.0.8 → 0.3.0

data/app/controllers/archangel/backend/collections_controller.rb

@@ -9,190 +9,7 @@ module Archangel
     # Backend collections controller
     #
     class CollectionsController < BackendController
-      before_action :set_resources, only: %i[index]
-      before_action :set_resource, only: %i[destroy edit show update]
-      before_action :set_new_resource, only: %i[create new]
-
-      ##
-      # Backend collections
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/collections
-      #   GET /backend/collections.json
-      #
-      # Response
-      #   [
-      #     {
-      #       "id": 123,
-      #       "site_id": 123,
-      #       "name": "Collection Name",
-      #       "slug": "collection_slug",
-      #       "deleted_at": null,
-      #       "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #       "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     },
-      #     ...
-      #   ]
-      #
-      def index
-        respond_with @collections
-      end
-
-      ##
-      # Backend collection
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #
-      # Request
-      #   GET /backend/collections/:slug
-      #   GET /backend/collections/:slug.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "name": "Collection Name",
-      #     "slug": "collection_slug",
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def show
-        respond_with @collection
-      end
-
-      ##
-      # New backend collection
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/collections/new
-      #   GET /backend/collections/new.json
-      #
-      # Response
-      #   {
-      #     "id": null,
-      #     "site_id": 123,
-      #     "name": null,
-      #     "slug": null,
-      #     "deleted_at": null,
-      #     "created_at": null,
-      #     "updated_at": null
-      #   }
-      #
-      def new
-        respond_with @collection
-      end
-
-      ##
-      # Create backend collection
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   POST /backend/collections
-      #   POST /backend/collections.json
-      #
-      # Paramaters
-      #   {
-      #     "collection": {
-      #       "name": "Collection Name",
-      #       "slug": "collection_slug"
-      #     }
-      #   }
-      #
-      def create
-        @collection.save
-
-        respond_with @collection, location: -> { location_after_create }
-      end
-
-      ##
-      # Edit backend collection
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #
-      # Request
-      #   GET /backend/collections/:slug/edit
-      #   GET /backend/collections/:slug/edit.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "name": "Collection Name",
-      #     "slug": "collection_slug",
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def edit
-        respond_with @collection
-      end
-
-      ##
-      # Update backend collection
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #
-      # Request
-      #   PATCH /backend/collections/:slug
-      #   PATCH /backend/collections/:slug.json
-      #   PUT   /backend/collections/:slug
-      #   PUT   /backend/collections/:slug.json
-      #
-      # Response
-      #   {
-      #     "collection": {
-      #       "name": "Collection Name",
-      #       "slug": "collection_slug"
-      #     }
-      #   }
-      #
-      def update
-        @collection.update(resource_params)
-
-        respond_with @collection, location: -> { location_after_update }
-      end
-
-      ##
-      # Destroy backend collection
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #
-      # Request
-      #   DELETE /backend/collections/:slug
-      #   DELETE /backend/collections/:slug.json
-      #
-      def destroy
-        @collection.destroy
-
-        respond_with @collection, location: -> { location_after_destroy }
-      end
+      include Archangel::Controllers::Backend::ResourcefulConcern
 
       protected
 
@@ -203,7 +20,7 @@ module Archangel
         ]
       end
 
-      def set_resources
+      def resources_content
         @collections = current_site.collections
                                    .order(name: :asc)
                                    .page(page_num).per(per_page)
@@ -211,7 +28,7 @@ module Archangel
         authorize @collections
       end
 
-      def set_resource
+      def resource_content
         resource_id = params.fetch(:id)
 
         @collection = current_site.collections.find_by!(slug: resource_id)
@@ -219,39 +36,13 @@ module Archangel
         authorize @collection
       end
 
-      def set_new_resource
-        new_params = action_name.to_sym == :create ? resource_params : nil
-
-        @collection = current_site.collections.new(new_params)
+      def resource_new_content
+        @collection = current_site.collections.new(resource_new_params)
 
         @collection.fields.build unless @collection.fields.present?
 
         authorize @collection
       end
-
-      def resource_params
-        params.require(resource_namespace).permit(permitted_attributes)
-      end
-
-      def resource_namespace
-        controller_name.singularize.to_sym
-      end
-
-      def location_after_create
-        location_after_save
-      end
-
-      def location_after_update
-        location_after_save
-      end
-
-      def location_after_destroy
-        location_after_save
-      end
-
-      def location_after_save
-        backend_collections_path
-      end
     end
   end
 end

data/app/controllers/archangel/backend/entries_controller.rb

@@ -9,215 +9,7 @@ module Archangel
     # Backend collection entries controller
     #
     class EntriesController < BackendController
-      before_action :set_parent_resource
-      before_action :set_resources, only: %i[index]
-      before_action :set_resource, only: %i[destroy edit show update]
-      before_action :set_new_resource, only: %i[create new]
-
-      ##
-      # Backend collection entries
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/collections/:slug/entries/:id
-      #   GET /backend/collections/:slug/entries/:id.json
-      #
-      # Response
-      #   [
-      #     {
-      #       "id": 123,
-      #       "collection_id": 123,
-      #       "value": {
-      #         "field_key_1": "Field 1 Value",
-      #         "field_key_2": "Field 2 Value"
-      #       },
-      #       "position": 0,
-      #       "available_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #       "deleted_at": null,
-      #       "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #       "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     },
-      #     ...
-      #   ]
-      #
-      def index
-        respond_with @entries
-      end
-
-      ##
-      # Backend collection entry
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #   [Integer] id - the entry id
-      #
-      # Request
-      #   GET /backend/collections/:slug/entries/:id
-      #   GET /backend/collections/:slug/entries/:id.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "collection_id": 123,
-      #     "value": {
-      #       "field_key_1": "Field 1 Value",
-      #       "field_key_2": "Field 2 Value"
-      #     },
-      #     "position": 0,
-      #     "available_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def show
-        respond_with @entry
-      end
-
-      ##
-      # New backend collection entry
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/collections/:slug/entries/new
-      #   GET /backend/collections/:slug/entries/new.json
-      #
-      # Response
-      #   {
-      #     "id": null,
-      #     "collection_id": null,
-      #     "value": null,
-      #     "position": null,
-      #     "available_at": null,
-      #     "deleted_at": null,
-      #     "created_at": null,
-      #     "updated_at": null
-      #   }
-      #
-      def new
-        respond_with @entry
-      end
-
-      ##
-      # Create backend collection entry
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #
-      # Request
-      #   POST /backend/collections/:slug/entries
-      #   POST /backend/collections/:slug/entries.json
-      #
-      # Paramaters
-      #   {
-      #     "collection_entry": {
-      #       "value": {
-      #         "field_key_1": "Field 1 Value",
-      #         "field_key_2": "Field 2 Value"
-      #       },
-      #       "available_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     }
-      #   }
-      #
-      def create
-        @entry.save
-
-        respond_with @entry, location: -> { location_after_create }
-      end
-
-      ##
-      # Edit backend collection entry
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #   [Integer] id - the entry id
-      #
-      # Request
-      #   GET /backend/collections/:slug/entries/:id/edit
-      #   GET /backend/collections/:slug/entries/:id/edit.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "name": "Widget Name",
-      #     slug": "widget_slug",
-      #     "content": "</p>Content of the Widget</p>",
-      #     "template_id": 123,
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def edit
-        respond_with @entry
-      end
-
-      ##
-      # Update backend collection entry
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #   [Integer] id - the entry id
-      #
-      # Request
-      #   PATCH /backend/collections/:slug/entries/:id
-      #   PATCH /backend/collections/:slug/entries/:id.json
-      #   PUT   /backend/collections/:slug/entries/:id
-      #   PUT   /backend/collections/:slug/entries/:id.json
-      #
-      # Paramaters
-      #   {
-      #     "collection_entry": {
-      #       "value": {
-      #         "field_key_1": "Field 1 Value",
-      #         "field_key_2": "Field 2 Value"
-      #       },
-      #       "available_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     }
-      #   }
-      #
-      def update
-        @entry.update(resource_params)
-
-        respond_with @entry, location: -> { location_after_update }
-      end
-
-      ##
-      # Destroy backend collection entry
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] slug - the collection slug
-      #   [Integer] id - the entry id
-      #
-      # Request
-      #   DELETE /backend/collections/:slug/entries/:id
-      #   DELETE /backend/collections/:slug/entries/:id.json
-      #
-      def destroy
-        @entry.destroy
-
-        respond_with @entry, location: -> { location_after_destroy }
-      end
+      include Archangel::Controllers::Backend::ResourcefulConcern
 
       ##
       # Update collection entry sort order
@@ -240,6 +32,8 @@ module Archangel
       #   }
       #
       def sort
+        parent_resource_content
+
         sort_order = sort_resource_params.fetch(:sort)
 
         ApplicationRecord.transaction do
@@ -274,14 +68,28 @@ module Archangel
         ]
       end
 
-      def set_parent_resource
+      def resource_params
+        params.require(resource_namespace)
+              .permit(permitted_attributes)
+              .merge(collection_id: @collection.id)
+      end
+
+      def sort_resource_params
+        params.clone
+              .require(resource_namespace)
+              .permit(permitted_sort_attributes)
+      end
+
+      def parent_resource_content
         collection_id = params.fetch(:collection_id)
 
         @collection = current_site.collections
                                   .find_by!(slug: collection_id)
       end
 
-      def set_resources
+      def resources_content
+        parent_resource_content
+
         @entries = current_site.entries
                                .where(collection: @collection)
                                .page(page_num)
@@ -290,7 +98,9 @@ module Archangel
         authorize @entries
       end
 
-      def set_resource
+      def resource_content
+        parent_resource_content
+
         resource_id = params.fetch(:id)
 
         @entry = current_site.entries
@@ -300,42 +110,18 @@ module Archangel
         authorize @entry
       end
 
-      def set_new_resource
-        new_params = action_name.to_sym == :create ? resource_params : nil
+      def resource_new_content
+        parent_resource_content
 
-        @entry = current_site.entries.new(new_params)
+        @entry = current_site.entries.new(resource_new_params)
 
         authorize @entry
       end
 
-      def resource_params
-        params.require(resource_namespace)
-              .permit(permitted_attributes)
-              .merge(collection_id: @collection.id)
-      end
-
-      def sort_resource_params
-        params.clone
-              .require(resource_namespace)
-              .permit(permitted_sort_attributes)
-      end
-
       def resource_namespace
         :collection_entry
       end
 
-      def location_after_create
-        location_after_save
-      end
-
-      def location_after_update
-        location_after_save
-      end
-
-      def location_after_destroy
-        location_after_save
-      end
-
       def location_after_save
         backend_collection_entries_path(@collection)
       end