archangel 0.0.8 → 0.3.0

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

@@ -9,245 +9,19 @@ module Archangel
     # Backend pages controller
     #
     class PagesController < 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 pages
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/pages
-      #   GET /backend/pages.json
-      #
-      # Response
-      #   [
-      #     {
-      #       "id": 123,
-      #       "site_id": 123,
-      #       "parent_id": nil,
-      #       "template_id": nil,
-      #       "title": "Page Title",
-      #       "slug": "my-page",
-      #       "path": "my-page",
-      #       "content": "</p>Content of the Page</p>",
-      #       "homepage": false,
-      #       "meta_keywords": "keywords,for,the,page",
-      #       "meta_description": "Description of the page",
-      #       "published_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 @pages
-      end
-
-      ##
-      # Backend page
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the page id
-      #
-      # Request
-      #   GET /backend/pages/:id
-      #   GET /backend/pages/:id.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "parent_id": nil,
-      #     "template_id": nil,
-      #     "title": "Page Title",
-      #     "slug": "my-page",
-      #     "path": "my-page",
-      #     "content": "</p>Content of the Page</p>",
-      #     "homepage": false,
-      #     "meta_keywords": "keywords,for,the,page",
-      #     "meta_description": "Description of the page",
-      #     "published_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 @page
-      end
-
-      ##
-      # New backend page
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/pages/new
-      #   GET /backend/pages/new.json
-      #
-      # Response
-      #   {
-      #     "id": null,
-      #     "site_id": 123,
-      #     "parent_id": nil,
-      #     "template_id": nil,
-      #     "title": null,
-      #     "slug": null,
-      #     "path": null,
-      #     "content": null,
-      #     "homepage": false,
-      #     "meta_keywords": null,
-      #     "meta_description": null,
-      #     "published_at": null,
-      #     "deleted_at": null,
-      #     "created_at": null,
-      #     "updated_at": null
-      #   }
-      #
-      def new
-        respond_with @page
-      end
-
-      ##
-      # Create backend page
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   POST /backend/pages
-      #   POST /backend/pages.json
-      #
-      # Paramaters
-      #   {
-      #     "page": {
-      #       "parent_id": nil,
-      #       "template_id": nil,
-      #       "title": "Page Title",
-      #       "slug": "my-page",
-      #       "content": "</p>Content of the Page</p>",
-      #       "homepage": false,
-      #       "meta_keywords": "keywords,for,the,page",
-      #       "meta_description": "Description of the page",
-      #       "published_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     }
-      #   }
-      #
-      def create
-        @page.save
-
-        respond_with @page, location: -> { location_after_create }
-      end
-
-      ##
-      # Edit backend page
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the page id
-      #
-      # Request
-      #   GET /backend/pages/:id/edit
-      #   GET /backend/pages/:id/edit.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "parent_id": nil,
-      #     "template_id": nil,
-      #     "title": "Page Title",
-      #     "slug": "my-page",
-      #     "path": "my-page",
-      #     "content": "</p>Content of the Page</p>",
-      #     "homepage": false,
-      #     "meta_keywords": "keywords,for,the,page",
-      #     "meta_description": "Description of the page",
-      #     "published_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 edit
-        respond_with @page
-      end
-
-      ##
-      # Update backend page
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the page id
-      #
-      # Request
-      #   PATCH /backend/pages/:id
-      #   PATCH /backend/pages/:id.json
-      #   PUT   /backend/pages/:id
-      #   PUT   /backend/pages/:id.json
-      #
-      # Paramaters
-      #   {
-      #     "page": {
-      #       "parent_id": nil,
-      #       "template_id": nil,
-      #       "title": "Page Title",
-      #       "slug": "my-page",
-      #       "content": "</p>Content of the Page</p>",
-      #       "homepage": false,
-      #       "meta_keywords": "keywords,for,the,page",
-      #       "meta_description": "Description of the page",
-      #       "published_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     }
-      #   }
-      #
-      def update
-        @page.update(resource_params)
-
-        respond_with @page, location: -> { location_after_update }
-      end
-
-      ##
-      # Destroy backend page
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the page id
-      #
-      # Request
-      #   DELETE /backend/pages/:id
-      #   DELETE /backend/pages/:id.json
-      #
-      def destroy
-        @page.destroy
-
-        respond_with @page, location: -> { location_after_destroy }
-      end
+      include Archangel::Controllers::Backend::ResourcefulConcern
 
       protected
 
       def permitted_attributes
-        %w[content homepage meta_description meta_keywords parent_id path
-           published_at slug template_id title]
+        [
+          :content, :homepage, :parent_id, :path, :published_at, :slug,
+          :template_id, :title,
+          metatags_attributes: %i[id _destroy name content]
+        ]
       end
 
-      def set_resources
+      def resources_content
         @pages = current_site.pages
                              .order(title: :asc)
                              .page(page_num).per(per_page)
@@ -255,7 +29,7 @@ module Archangel
         authorize @pages
       end
 
-      def set_resource
+      def resource_content
         resource_id = params.fetch(:id)
 
         @page = current_site.pages.find_by!(id: resource_id)
@@ -263,37 +37,13 @@ module Archangel
         authorize @page
       end
 
-      def set_new_resource
-        new_params = action_name.to_sym == :create ? resource_params : nil
+      def resource_new_content
+        @page = current_site.pages.new(resource_new_params)
 
-        @page = current_site.pages.new(new_params)
+        @page.metatags.build unless @page.metatags.present?
 
         authorize @page
       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_pages_path
-      end
     end
   end
 end

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

@@ -11,8 +11,6 @@ module Archangel
     class ProfilesController < BackendController
       include Archangel::SkipAuthorizableConcern
 
-      before_action :set_resource
-
       ##
       # Backend profile
       #
@@ -60,7 +58,9 @@ module Archangel
       #   }
       #
       def show
-        respond_with @profile
+        profile = resource_content
+
+        respond_with profile
       end
 
       ##
@@ -110,7 +110,9 @@ module Archangel
       #   }
       #
       def edit
-        respond_with @profile
+        profile = resource_content
+
+        respond_with profile
       end
 
       ##
@@ -136,16 +138,18 @@ module Archangel
       def update
         empty_password_params if resource_params.fetch(:password, nil).blank?
 
+        profile = resource_content
+
         successfully_updated =
-          if needs_password?(@profile, resource_params)
-            @profile.update(resource_params)
+          if needs_password?(profile, resource_params)
+            profile.update(resource_params)
           else
-            @profile.update_without_password(resource_params)
+            profile.update_without_password(resource_params)
           end
 
         reauth_current_user if successfully_updated
 
-        respond_with @profile, location: -> { location_after_update }
+        respond_with profile, location: -> { location_after_update }
       end
 
       ##
@@ -159,18 +163,21 @@ module Archangel
       #   DELETE /backend/profile.json
       #
       def destroy
-        @profile.destroy
+        profile = resource_content
+
+        profile.destroy
 
-        respond_with @profile, location: -> { location_after_destroy }
+        respond_with profile, location: -> { location_after_destroy }
       end
 
       protected
 
       def permitted_attributes
-        %w[avatar email name password remove_avatar username]
+        %w[avatar email name password remove_avatar username
+           newsletter]
       end
 
-      def set_resource
+      def resource_content
         @profile = current_user
       end
 

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

@@ -9,8 +9,6 @@ module Archangel
     # Backend sites controller
     #
     class SitesController < BackendController
-      before_action :set_resource
-
       ##
       # Backend site
       #
@@ -44,15 +42,15 @@ module Archangel
       #     },
       #     "content": "</p>Content of the Widget</p>",
       #     "template_id": 123,
-      #     "meta_keywords": "keywords,for,the,site",
-      #     "meta_description": "Description of the site",
       #     "deleted_at": null,
       #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
       #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
       #   }
       #
       def show
-        respond_with @site
+        site = resource_content
+
+        respond_with site
       end
 
       ##
@@ -87,13 +85,13 @@ module Archangel
       #       }
       #     },
       #     "content": "</p>Content of the Widget</p>",
-      #     "template_id": 123,
-      #     "meta_keywords": "keywords,for,the,site",
-      #     "meta_description": "Description of the site"
+      #     "template_id": 123
       #   }
       #
       def edit
-        respond_with @site
+        site = resource_content
+
+        respond_with site
       end
 
       ##
@@ -130,25 +128,28 @@ module Archangel
       #         }
       #       },
       #       "content": "</p>Content of the Widget</p>",
-      #       "template_id": 123,
-      #       "meta_keywords": "keywords,for,the,site",
-      #       "meta_description": "Description of the site"
+      #       "template_id": 123
       #     }
       #   }
       #
       def update
-        @site.update(resource_params)
+        site = resource_content
+
+        site.update(resource_params)
 
-        respond_with @site, location: -> { location_after_update }
+        respond_with site, location: -> { location_after_update }
       end
 
       protected
 
       def permitted_attributes
-        %w[locale logo meta_description meta_keywords name remove_logo theme]
+        [
+          :locale, :logo, :name, :remove_logo, :theme,
+          metatags_attributes: %i[id _destroy name content]
+        ]
       end
 
-      def set_resource
+      def resource_content
         @site = current_site
 
         authorize @site