archangel 0.0.8 → 0.3.0

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

@@ -9,208 +9,7 @@ module Archangel
     # Backend templates controller
     #
     class TemplatesController < 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 templates
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/templates
-      #   GET /backend/templates.json
-      #
-      # Response
-      #   [
-      #     {
-      #       "id": 123,
-      #       "site_id": 123,
-      #       "parent_id": null,
-      #       "name": "Template Name",
-      #       "slug": "template_slug",
-      #       "content": "</p>Content of Template 1</p>",
-      #       "partial": false,
-      #       "deleted_at": null,
-      #       "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #       "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     },
-      #     ...
-      #   ]
-      #
-      def index
-        respond_with @templates
-      end
-
-      ##
-      # Backend template
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the template id
-      #
-      # Request
-      #   GET /backend/templates/:id
-      #   GET /backend/templates/:id.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "parent_id": null,
-      #     "name": "Template Name",
-      #     "slug": "template_slug",
-      #     "content": "</p>Content of Template</p>",
-      #     "partial": false,
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def show
-        respond_with @template
-      end
-
-      ##
-      # New backend template
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/templates/new
-      #   GET /backend/templates/new.json
-      #
-      # Response
-      #   {
-      #     "id": null,
-      #     "site_id": 123,
-      #     "parent_id": null,
-      #     "name": null,
-      #     "slug": null,
-      #     "content": null,
-      #     "partial": false,
-      #     "deleted_at": null,
-      #     "created_at": null,
-      #     "updated_at": null
-      #   }
-      #
-      def new
-        respond_with @template
-      end
-
-      ##
-      # Create backend template
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   POST /backend/templates
-      #   POST /backend/templates.json
-      #
-      # Paramaters
-      #   {
-      #     "template": {
-      #       "parent_id": null,
-      #       "name": "Template Name",
-      #       "slug": "template_slug",
-      #       "content": "</p>Content of Template</p>",
-      #       "partial": false
-      #     }
-      #   }
-      #
-      def create
-        @template.save
-
-        respond_with @template, location: -> { location_after_create }
-      end
-
-      ##
-      # Edit backend template
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the template id
-      #
-      # Request
-      #   GET /backend/templates/:id/edit
-      #   GET /backend/templates/:id/edit.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "parent_id": null,
-      #     "name": "Template Name",
-      #     "slug": "template_slug",
-      #     "content": "</p>Content of Template</p>",
-      #     "partial": false,
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def edit
-        respond_with @template
-      end
-
-      ##
-      # Update backend template
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the template id
-      #
-      # Request
-      #   PATCH /backend/templates/:id
-      #   PATCH /backend/templates/:id.json
-      #   PUT   /backend/templates/:id
-      #   PUT   /backend/templates/:id.json
-      #
-      # Paramaters
-      #   {
-      #     "template": {
-      #       "parent_id": null,
-      #       "name": "Template Name",
-      #       "slug": "template_slug",
-      #       "content": "</p>Content of Template</p>",
-      #       "partial": false
-      #     }
-      #   }
-      #
-      def update
-        @template.update(resource_params)
-
-        respond_with @template, location: -> { location_after_update }
-      end
-
-      ##
-      # Destroy backend template
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the template id
-      #
-      # Request
-      #   DELETE /backend/templates/:id
-      #   DELETE /backend/templates/:id.json
-      #
-      def destroy
-        @template.destroy
-
-        respond_with @template, location: -> { location_after_destroy }
-      end
+      include Archangel::Controllers::Backend::ResourcefulConcern
 
       protected
 
@@ -218,7 +17,7 @@ module Archangel
         %w[content name parent_id partial]
       end
 
-      def set_resources
+      def resources_content
         @templates = current_site.templates
                                  .order(name: :asc)
                                  .page(page_num).per(per_page)
@@ -226,7 +25,7 @@ module Archangel
         authorize @templates
       end
 
-      def set_resource
+      def resource_content
         resource_id = params.fetch(:id)
 
         @template = current_site.templates.find_by!(id: resource_id)
@@ -234,37 +33,11 @@ module Archangel
         authorize @template
       end
 
-      def set_new_resource
-        new_params = action_name.to_sym == :create ? resource_params : nil
-
-        @template = current_site.templates.new(new_params)
+      def resource_new_content
+        @template = current_site.templates.new(resource_new_params)
 
         authorize @template
       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_templates_path
-      end
     end
   end
 end

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

@@ -9,165 +9,7 @@ module Archangel
     # Backend users controller
     #
     class UsersController < 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 users
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/users
-      #   GET /backend/users.json
-      #
-      # Response
-      #   [
-      #     {
-      #       "id": 123,
-      #       "site_id": 123,
-      #       "name": "First Last",
-      #       "username": "user_name",
-      #       "role": "editor",
-      #       "avatar": {
-      #         "url": "/uploads/file.png",
-      #         "large": {
-      #           "url": "/uploads/large_file.png"
-      #         },
-      #         "medium": {
-      #           "url": "/uploads/medium_file.png"
-      #         },
-      #         "small": {
-      #           "url": "/uploads/small_file.png"
-      #         },
-      #         "tiny": {
-      #           "url": "/uploads/tiny_file.png"
-      #         }
-      #       },
-      #       "email": "me@example.com",
-      #       "invitation_token": "abc123xyz",
-      #       "invitation_created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #       "invitation_sent_at": null,
-      #       "invitation_accepted_at": null,
-      #       "invitation_limit": null,
-      #       "invited_by_type": "Archangel::User",
-      #       "invited_by_id": 2,
-      #       "invitations_count": 0,
-      #       "deleted_at": null,
-      #       "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #       "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     },
-      #     ...
-      #   ]
-      #
-      def index
-        respond_with @users
-      end
-
-      ##
-      # Backend user
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] username - the user username
-      #
-      # Request
-      #   GET /backend/users/:username
-      #   GET /backend/users/:username.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "name": "First Last",
-      #     "username": "user_name",
-      #     "role": "editor",
-      #     "avatar": {
-      #       "url": "/uploads/file.png",
-      #       "large": {
-      #         "url": "/uploads/large_file.png"
-      #       },
-      #       "medium": {
-      #         "url": "/uploads/medium_file.png"
-      #       },
-      #       "small": {
-      #         "url": "/uploads/small_file.png"
-      #       },
-      #       "tiny": {
-      #         "url": "/uploads/tiny_file.png"
-      #       }
-      #     },
-      #     "email": "me@example.com",
-      #     "invitation_token": "abc123xyz",
-      #     "invitation_created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "invitation_sent_at": null,
-      #     "invitation_accepted_at": null,
-      #     "invitation_limit": null,
-      #     "invited_by_type": "Archangel::User",
-      #     "invited_by_id": 2,
-      #     "invitations_count": 0,
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def show
-        respond_with @user
-      end
-
-      ##
-      # New backend user
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/users/new
-      #   GET /backend/users/new.json
-      #
-      # Response
-      #   {
-      #     "id": null,
-      #     "site_id": 123,
-      #     "name": null,
-      #     "username": null,
-      #     "role": "editor",
-      #     "avatar": {
-      #       "url": null,
-      #       "large": {
-      #         "url": null
-      #       },
-      #       "medium": {
-      #         "url": null
-      #       },
-      #       "small": {
-      #         "url": null
-      #       },
-      #       "tiny": {
-      #         "url": null
-      #       }
-      #     },
-      #     "email": null,
-      #     "invitation_token": null,
-      #     "invitation_created_at": null,
-      #     "invitation_sent_at": null,
-      #     "invitation_accepted_at": null,
-      #     "invitation_limit": null,
-      #     "invited_by_type": null,
-      #     "invited_by_id": null,
-      #     "invitations_count": 0,
-      #     "deleted_at": null,
-      #     "created_at": null,
-      #     "updated_at": null,
-      #   }
-      #
-      def new
-        respond_with @user
-      end
+      include Archangel::Controllers::Backend::ResourcefulConcern
 
       ##
       # Invite backend user
@@ -191,62 +33,11 @@ module Archangel
       #   }
       #
       def create
-        @user.invite! @user
+        user = resource_new_content
 
-        respond_with @user, location: -> { location_after_create }
-      end
+        user.invite! user
 
-      ##
-      # Edit backend user
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] username - the user username
-      #
-      # Request
-      #   GET /backend/users/:username/edit
-      #   GET /backend/users/:username/edit.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "name": "First Last",
-      #     "username": "user_name",
-      #     "role": "editor",
-      #     "avatar": {
-      #       "url": "/uploads/file.png",
-      #       "large": {
-      #         "url": "/uploads/large_file.png"
-      #       },
-      #       "medium": {
-      #         "url": "/uploads/medium_file.png"
-      #       },
-      #       "small": {
-      #         "url": "/uploads/small_file.png"
-      #       },
-      #       "tiny": {
-      #         "url": "/uploads/tiny_file.png"
-      #       }
-      #     },
-      #     "email": "me@example.com",
-      #     "invitation_token": "abc123xyz",
-      #     "invitation_created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "invitation_sent_at": null,
-      #     "invitation_accepted_at": null,
-      #     "invitation_limit": null,
-      #     "invited_by_type": "Archangel::User",
-      #     "invited_by_id": 2,
-      #     "invitations_count": 0,
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def edit
-        respond_with @user
+        respond_with user, location: -> { location_after_create }
       end
 
       ##
@@ -276,28 +67,11 @@ module Archangel
       #   }
       #
       def update
-        @user.update_without_password(resource_params)
+        user = resource_content
 
-        respond_with @user, location: -> { location_after_update }
-      end
+        user.update_without_password(resource_params)
 
-      ##
-      # Destroy backend user
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [String] username - the user username
-      #
-      # Request
-      #   DELETE /backend/users/:username
-      #   DELETE /backend/users/:username.json
-      #
-      def destroy
-        @user.destroy
-
-        respond_with @user, location: -> { location_after_destroy }
+        respond_with user, location: -> { location_after_update }
       end
 
       protected
@@ -306,7 +80,7 @@ module Archangel
         %w[email locale name remove_avatar role username]
       end
 
-      def set_resources
+      def resources_content
         @users = current_site.users
                              .where.not(id: current_user.id)
                              .order(name: :asc)
@@ -315,7 +89,7 @@ module Archangel
         authorize @users
       end
 
-      def set_resource
+      def resource_content
         resource_id = params.fetch(:id)
 
         @user = current_site.users
@@ -325,7 +99,7 @@ module Archangel
         authorize @user
       end
 
-      def set_new_resource
+      def resource_new_content
         users = current_site.users
         @user = users.new
 
@@ -337,30 +111,6 @@ module Archangel
 
         authorize @user
       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_users_path
-      end
     end
   end
 end