archangel 0.0.8 → 0.3.0

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

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

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

@@ -33,8 +33,6 @@ module Archangel
       #     "path": "path/to/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",
       #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
       #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
@@ -80,11 +78,12 @@ module Archangel
       # @return [Object] the page meta tags
       #
       def page_meta_tags
-        {
-          title: @page.title,
-          description: @page.meta_description,
-          keywords: @page.meta_keywords.to_s.split(",")
-        }
+        [
+          current_site.metatags,
+          @page.metatags
+        ].flatten.inject({}) do |tags, metatag|
+          tags.merge(metatag.name => metatag.content)
+        end.merge(title: @page.title)
       end
 
       ##

data/app/controllers/concerns/archangel/actionable_concern.rb

@@ -23,6 +23,7 @@ module Archangel
     # Controller action name as a symbol
     #
     # @return [Symbol] the action name
+    #
     def action
       action_name.to_sym
     end
@@ -34,6 +35,7 @@ module Archangel
     # Collection actions can be modified by overwriting `#collection_actions`
     #
     # @return [Boolean] if action is a collection action
+    #
     def collection_action?
       collection_actions.include?(action)
     end
@@ -45,6 +47,7 @@ module Archangel
     # Edit actions can be modified by overwriting `#edit_actions`
     #
     # @return [Boolean] if action is an edit action
+    #
     def edit_action?
       edit_actions.include?(action)
     end
@@ -52,6 +55,7 @@ module Archangel
     # Test if action is the `index` action
     #
     # @return [Boolean] if action is the index action
+    #
     def index_action?
       action?(:index)
     end
@@ -63,6 +67,7 @@ module Archangel
     # Member actions can be modified by overwriting `#member_actions`
     #
     # @return [Boolean] if action is an edit action
+    #
     def member_action?
       member_actions.include?(action)
     end
@@ -74,6 +79,7 @@ module Archangel
     # New actions can be modified by overwriting `#new_actions`
     #
     # @return [Boolean] if action is an edit action
+    #
     def new_action?
       new_actions.include?(action)
     end
@@ -85,6 +91,7 @@ module Archangel
     # RESTful actions can be modified by overwriting `#restful_actions`
     #
     # @return [Boolean] if action is an edit action
+    #
     def restful_action?
       restful_actions.include?(action)
     end
@@ -96,6 +103,7 @@ module Archangel
     # Save actions can be modified by overwriting `#save_actions`
     #
     # @return [Boolean] if action is an edit action
+    #
     def save_action?
       save_actions.include?(action)
     end
@@ -107,6 +115,7 @@ module Archangel
     # Show actions can be modified by overwriting `#show_actions`
     #
     # @return [Boolean] if action is a show action
+    #
     def show_action?
       show_actions.include?(action)
     end

data/app/controllers/concerns/archangel/controllers/backend/resourceful_concern.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Archangel
+  ##
+  # Controller concerns
+  #
+  module Controllers
+    ##
+    # Backend controller concerns
+    #
+    module Backend
+      ##
+      # Resourceful concern
+      #
+      module ResourcefulConcern
+        extend ActiveSupport::Concern
+
+        include Archangel::Controllers::ResourcefulConcern
+
+        protected
+
+        def resource_namespace
+          :backend
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/archangel/controllers/resourceful_concern.rb

@@ -0,0 +1,258 @@
+# frozen_string_literal: true
+
+module Archangel
+  ##
+  # Controller concerns
+  #
+  module Controllers
+    ##
+    # Resourceful concern
+    #
+    module ResourcefulConcern
+      extend ActiveSupport::Concern
+
+      ##
+      # Resources
+      #
+      # Formats
+      #   HTML, JSON
+      #
+      # Request
+      #   GET /resources
+      #   GET /resources.json
+      #
+      # Response
+      #   [
+      #     {
+      #       "id": 123,
+      #       ...
+      #       "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
+      #       "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
+      #     },
+      #     ...
+      #   ]
+      #
+      def index
+        resources = resources_content
+
+        respond_with resources
+      end
+
+      ##
+      # Resource
+      #
+      # Formats
+      #   HTML, JSON
+      #
+      # Params
+      #   [Integer] id - the resource ID
+      #
+      # Request
+      #   GET /resources/:id
+      #   GET /resources/:id.json
+      #
+      # Response
+      #   {
+      #     "id": 123,
+      #     ...
+      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
+      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
+      #   }
+      #
+      def show
+        resource = resource_content
+
+        respond_with resource
+      end
+
+      ##
+      # New resource
+      #
+      # Formats
+      #   HTML, JSON
+      #
+      # Request
+      #   GET /resources/new
+      #   GET /resources/new.json
+      #
+      # Response
+      #   {
+      #     "id": null,
+      #     ...
+      #     "created_at": null,
+      #     "updated_at": null
+      #   }
+      #
+      def new
+        resource = resource_new_content
+
+        respond_with resource
+      end
+
+      ##
+      # Create resource
+      #
+      # Formats
+      #   HTML, JSON
+      #
+      # Request
+      #   POST /resources
+      #   POST /resources.json
+      #
+      # Paramaters
+      #   {
+      #     "resource": {
+      #       "id": 123,
+      #       ...
+      #     }
+      #   }
+      #
+      def create
+        resource = resource_new_content
+
+        resource.save unless resource.blank?
+
+        respond_with resource, location: -> { location_after_create }
+      end
+
+      ##
+      # Edit resource
+      #
+      # Formats
+      #   HTML, JSON
+      #
+      # Params
+      #   [Integer] id - the resource ID
+      #
+      # Request
+      #   GET /resources/:id/edit
+      #   GET /resources/:id/edit.json
+      #
+      # Response
+      #   {
+      #     "id": 123,
+      #     ...
+      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
+      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
+      #   }
+      #
+      def edit
+        resource = resource_content
+
+        respond_with resource
+      end
+
+      ##
+      # Update resource
+      #
+      # Formats
+      #   HTML, JSON
+      #
+      # Params
+      #   [Integer] id - the resource ID
+      #
+      # Request
+      #   PATCH /resources/:id
+      #   PATCH /resources/:id.json
+      #   PUT   /resources/:id
+      #   PUT   /resources/:id.json
+      #
+      # Paramaters
+      #   {
+      #     "resource": {
+      #       "id": 123,
+      #       ...
+      #     }
+      #   }
+      #
+      def update
+        resource = resource_content
+
+        resource.update(resource_params)
+
+        respond_with resource, location: -> { location_after_update }
+      end
+
+      ##
+      # Destroy resource
+      #
+      # Formats
+      #   HTML, JSON
+      #
+      # Params
+      #   [Integer] id - the resource ID
+      #
+      # Request
+      #   DELETE /resources/:id
+      #   DELETE /resources/:id.json
+      #
+      def destroy
+        resource = resource_content
+
+        resource.destroy unless resource.blank?
+
+        respond_with resource, location: -> { location_after_destroy }
+      end
+
+      protected
+
+      def permitted_attributes
+        %w[]
+      end
+
+      def resources_content
+        []
+      end
+
+      def resource_content
+        {}
+      end
+
+      def resource_new_content
+        action_name.to_sym == :create ? {} : nil
+      end
+
+      def resource_controller
+        controller_name.to_sym
+      end
+
+      def resource_scope
+        resource_controller.to_s.singularize.to_sym
+      end
+
+      def resource_namespace
+        nil
+      end
+
+      def resource_params
+        params.require(resource_scope).permit(permitted_attributes)
+      end
+
+      def resource_new_params
+        action_name.to_sym == :create ? resource_params : nil
+      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
+        resources_path
+      end
+
+      def resources_path(options = {})
+        location_path = [resource_namespace, resource_controller].compact
+
+        archangel.polymorphic_path(location_path, options)
+      end
+    end
+  end
+end