archangel 0.3.0 → 0.4.0

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

@@ -9,14 +9,16 @@ module Archangel
     # Backend pages controller
     #
     class PagesController < BackendController
-      include Archangel::Controllers::Backend::ResourcefulConcern
+      include Archangel::Controllers::ResourcefulConcern
+
+      helper Archangel::Backend::MetatagsHelper
 
       protected
 
-      def permitted_attributes
+      def permitted_resource_attributes
         [
-          :content, :homepage, :parent_id, :path, :published_at, :slug,
-          :template_id, :title,
+          :content, :design_id, :homepage, :parent_id, :permalink,
+          :published_at, :slug, :title,
           metatags_attributes: %i[id _destroy name content]
         ]
       end
@@ -40,7 +42,7 @@ module Archangel
       def resource_new_content
         @page = current_site.pages.new(resource_new_params)
 
-        @page.metatags.build unless @page.metatags.present?
+        @page.metatags.build if @page.metatags.blank?
 
         authorize @page
       end

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

@@ -9,7 +9,7 @@ module Archangel
     # Backend profiles controller
     #
     class ProfilesController < BackendController
-      include Archangel::SkipAuthorizableConcern
+      include Archangel::Controllers::SkipAuthorizableConcern
 
       ##
       # Backend profile
@@ -173,7 +173,8 @@ module Archangel
       protected
 
       def permitted_attributes
-        %w[avatar email name password remove_avatar username
+        %w[avatar email name password password_confirmation remove_avatar
+           username
            newsletter]
       end
 

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

@@ -9,6 +9,8 @@ module Archangel
     # Backend sites controller
     #
     class SitesController < BackendController
+      helper Archangel::Backend::MetatagsHelper
+
       ##
       # Backend site
       #
@@ -39,12 +41,7 @@ module Archangel
       #       "tiny": {
       #         "url": "/uploads/tiny_file.png"
       #       }
-      #     },
-      #     "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
@@ -83,9 +80,7 @@ module Archangel
       #       "tiny": {
       #         "url": "/uploads/tiny_file.png"
       #       }
-      #     },
-      #     "content": "</p>Content of the Widget</p>",
-      #     "template_id": 123
+      #     }
       #   }
       #
       def edit
@@ -126,9 +121,7 @@ module Archangel
       #         "tiny": {
       #           "url": "/uploads/tiny_file.png"
       #         }
-      #       },
-      #       "content": "</p>Content of the Widget</p>",
-      #       "template_id": 123
+      #       }
       #     }
       #   }
       #
@@ -145,6 +138,7 @@ module Archangel
       def permitted_attributes
         [
           :locale, :logo, :name, :remove_logo, :theme,
+          :allow_registration, :homepage_redirect,
           metatags_attributes: %i[id _destroy name content]
         ]
       end
@@ -156,10 +150,10 @@ module Archangel
       end
 
       def resource_params
-        params.require(resource_namespace).permit(permitted_attributes)
+        params.require(resource_scope).permit(permitted_attributes)
       end
 
-      def resource_namespace
+      def resource_scope
         controller_name.singularize.to_sym
       end
 

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

@@ -9,7 +9,7 @@ module Archangel
     # Backend users controller
     #
     class UsersController < BackendController
-      include Archangel::Controllers::Backend::ResourcefulConcern
+      include Archangel::Controllers::ResourcefulConcern
 
       ##
       # Invite backend user
@@ -21,7 +21,7 @@ module Archangel
       #   POST /backend/users
       #   POST /backend/users.json
       #
-      # Paramaters
+      # Parameters
       #   {
       #     "user": {
       #       "name": "First Last",
@@ -35,8 +35,6 @@ module Archangel
       def create
         user = resource_new_content
 
-        user.invite! user
-
         respond_with user, location: -> { location_after_create }
       end
 
@@ -55,7 +53,7 @@ module Archangel
       #   PUT   /backend/users/:slug
       #   PUT   /backend/users/:slug.json
       #
-      # Paramaters
+      # Parameters
       #   {
       #     "user": {
       #       "name": "First Last",
@@ -76,7 +74,7 @@ module Archangel
 
       protected
 
-      def permitted_attributes
+      def permitted_resource_attributes
         %w[email locale name remove_avatar role username]
       end
 
@@ -100,13 +98,10 @@ module Archangel
       end
 
       def resource_new_content
-        users = current_site.users
-        @user = users.new
+        @user = current_site.users.new
 
         if action_name.to_sym == :create
-          @user = users.invite!(resource_params) do |user|
-            user.skip_invitation = true
-          end
+          @user = current_site.users.invite!(resource_new_params, current_user)
         end
 
         authorize @user

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

@@ -9,12 +9,12 @@ module Archangel
     # Backend widgets controller
     #
     class WidgetsController < BackendController
-      include Archangel::Controllers::Backend::ResourcefulConcern
+      include Archangel::Controllers::ResourcefulConcern
 
       protected
 
-      def permitted_attributes
-        %w[content name slug template_id]
+      def permitted_resource_attributes
+        %w[content design_id name slug]
       end
 
       def resources_content

data/app/controllers/archangel/backend_controller.rb

@@ -7,15 +7,17 @@ module Archangel
   class BackendController < ApplicationController
     include Pundit
 
-    include Archangel::AuthenticatableConcern
-    include Archangel::AuthorizableConcern
+    include Archangel::Controllers::AuthenticatableConcern
+    include Archangel::Controllers::AuthorizableConcern
+    include Archangel::Controllers::MetatagableConcern
+    include Archangel::Helpers::ActionableConcern
 
     rescue_from Pundit::NotAuthorizedError, with: :render_401_error
 
     protected
 
-    def layout_from_theme
-      "backend"
+    def default_meta_tags
+      super.merge(noindex: true, nofollow: true, noarchive: true)
     end
   end
 end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Archangel
+  ##
+  # @see Archangel::FrontendController
+  #
+  module Frontend
+    ##
+    # Frontend homepages controller
+    #
+    # Extends Archangel::Frontend/PagesController to provide functionality
+    #
+    class HomepagesController < PagesController
+      protected
+
+      ##
+      # Find and assign resource to the view
+      #
+      def set_resource
+        @page = current_site.pages.available.homepage.first!
+      end
+
+      ##
+      # Override. Do not redirect. This is the homepage.
+      #
+      # @return [Boolean] false
+      #
+      def redirect_to_homepage?
+        false
+      end
+    end
+  end
+end

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

@@ -10,8 +10,8 @@ module Archangel
     #
     class PagesController < FrontendController
       before_action :set_resource, only: %i[show]
-      before_action :assign_meta_tags, if: -> { request.get? },
-                                       unless: -> { request.xhr? }
+      before_action :assign_resource_meta_tags, if: -> { request.get? },
+                                                unless: -> { request.xhr? }
 
       ##
       # Frontend page
@@ -20,17 +20,17 @@ module Archangel
       #   HTML, JSON
       #
       # Params
-      #   [String] path - the path to the page
+      #   [String] permalink - the permalink to the page
       #
       # Request
-      #   GET /:path
-      #   GET /:path.json
+      #   GET /:permalink
+      #   GET /:permalink.json
       #
       # Response
       #   {
       #     "id": 123,
       #     "title": "Page Title",
-      #     "path": "path/to/page",
+      #     "permalink": "/path/to/page",
       #     "content": "</p>Content of the page</p>",
       #     "homepage": false,
       #     "published_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
@@ -39,17 +39,17 @@ module Archangel
       #   }
       #
       def show
-        return redirect_to_homepage if redirect_to_homepage?
+        return render_or_redirect_to_homepage if redirect_to_homepage?
 
         respond_to do |format|
           format.html do
-            render inline: liquid_rendered_template_content,
+            render inline: liquid_rendered_design_content,
                    layout: layout_from_theme
           end
           format.json do
             @page.content = liquid_rendered_content
 
-            render json: @page, layout: false
+            render(template: "archangel/frontend/pages/show", layout: false)
           end
         end
       end
@@ -60,16 +60,16 @@ module Archangel
       # Find and assign resource to the view
       #
       def set_resource
-        page_path = params.fetch(:path, nil)
+        page_permalink = params.fetch(:permalink, nil)
 
-        @page = page_path.blank? ? find_homepage : find_page(page_path)
+        @page = current_site.pages.available.find_by!(permalink: page_permalink)
       end
 
       ##
       # Assign meta tags to view
       #
-      def assign_meta_tags
-        apply_meta_tags(page_meta_tags)
+      def assign_resource_meta_tags
+        assign_meta_tags(resource_meta_tags)
       end
 
       ##
@@ -77,49 +77,38 @@ module Archangel
       #
       # @return [Object] the page meta tags
       #
-      def page_meta_tags
-        [
+      def resource_meta_tags
+        meta_tags = [
           current_site.metatags,
           @page.metatags
         ].flatten.inject({}) do |tags, metatag|
           tags.merge(metatag.name => metatag.content)
-        end.merge(title: @page.title)
-      end
-
-      ##
-      # Check to redirect to homepage root path
-      #
-      # @return [Boolean] redirect or not
-      #
-      def redirect_to_homepage?
-        return false unless @page
+        end
 
-        (params.fetch(:path, nil) == @page.path) && @page.homepage?
+        { image_src: current_site.logo.url }.merge(meta_tags)
+                                            .merge(title: @page.title)
       end
 
-      ##
-      # Redirect to homepage root path is page is marked as the homepage
-      #
-      def redirect_to_homepage
-        redirect_to root_path, status: :moved_permanently
+      def render_or_redirect_to_homepage
+        return redirect_to_homepage if current_site.homepage_redirect?
+
+        render_error("archangel/errors/error_404", :not_found)
       end
 
       ##
-      # Find the homepage
+      # Check to redirect to homepage root permalink
       #
-      # @return [Object] the homepage
+      # @return [Boolean] redirect or not
       #
-      def find_homepage
-        current_site.pages.published.homepage.first!
+      def redirect_to_homepage?
+        @page.homepage?
       end
 
       ##
-      # Find the requested page
+      # Redirect to homepage root permalink is page is marked as the homepage
       #
-      # @return [Object] the page
-      #
-      def find_page(path)
-        current_site.pages.published.find_by!(path: path)
+      def redirect_to_homepage
+        redirect_to frontend_root_path, status: :moved_permanently
       end
 
       ##
@@ -134,15 +123,15 @@ module Archangel
       end
 
       ##
-      # Render content with template
+      # Render content with design
       #
       # @return [String] the rendered Liquid template
       #
-      def liquid_rendered_template_content
+      def liquid_rendered_design_content
         content = liquid_rendered_content
         variables = default_liquid_assign.merge(content_for_layout: content)
 
-        Archangel::TemplateRenderService.call(@page.template, variables)
+        Archangel::DesignRenderService.call(@page.design, variables)
       end
 
       def default_liquid_assign

data/app/controllers/archangel/frontend_controller.rb

@@ -5,6 +5,30 @@ module Archangel
   # Frontend base controller
   #
   class FrontendController < ApplicationController
-    include Archangel::SeoableConcern
+    include Archangel::Controllers::MetatagableConcern
+
+    protected
+
+    ##
+    # Theme layout
+    #
+    # @return [String] frontend
+    #
+    def layout_from_theme
+      "frontend"
+    end
+
+    ##
+    # Theme switcher
+    #
+    # Theme to use to retrieve Javascripts and styles from.
+    #
+    # @return [String] the theme
+    #
+    def theme_resolver
+      theme = current_site.theme
+
+      Archangel::THEMES.include?(theme) ? theme : Archangel::THEME_DEFAULT
+    end
   end
 end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Archangel
+  ##
+  # Controller concerns
+  #
+  module Controllers
+    ##
+    # Controller authenticate concern
+    #
+    module AuthenticatableConcern
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :authenticate_user!
+      end
+    end
+  end
+end