integral 1.1.0 → 1.2.0

data/app/controllers/integral/backend/settings_controller.rb

@@ -22,6 +22,10 @@ module Integral
 
       private
 
+      def resource_klass
+        Integral::Settings
+      end
+
       def parsed_value(value)
         return true if value == '_1'
         return false if value == '_0'
@@ -32,22 +36,13 @@ module Integral
       def settings_params
         permitted_settings_params = %i[
           website_title contact_email homepage_id newsletter_api_key newsletter_list_id github_url
-          twitter_url facebook_url youtube_url google_plus_url linkedin_url instagram_url
+          twitter_url facebook_url youtube_url linkedin_url instagram_url
           google_tag_manager_id facebook_app_id twitter_handler main_menu_list_id
         ]
         permitted_settings_params.concat Integral.additional_settings_params
 
         params[:settings].permit(*permitted_settings_params)
       end
-
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('integral.breadcrumbs.dashboard'), :backend_dashboard_path
-        add_breadcrumb I18n.t('integral.breadcrumbs.settings'), :backend_settings_path
-      end
-
-      def authorize_with_klass
-        authorize Settings
-      end
     end
   end
 end

data/app/controllers/integral/backend/static_pages_controller.rb

@@ -5,6 +5,10 @@ module Integral
       # GET /
       # Dashboard to show website stats and other useful information
       def dashboard; end
+
+      private
+
+      def set_breadcrumbs; end
     end
   end
 end

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

@@ -2,10 +2,10 @@ module Integral
   module Backend
     # Users controller
     class UsersController < BaseController
-      before_action :set_user, only: %i[edit update destroy show]
+      before_action :set_resource, only: %i[edit update destroy show activities activity]
       before_action :authorize_with_instance, only: %i[show edit update]
       before_action :authorize_with_klass, only: %i[index new create destroy]
-      before_action -> { set_grid(Integral::Grids::UsersGrid) }, only: [:index]
+      before_action -> { set_grid }, only: [:index]
 
       # GET /
       # Lists all users
@@ -18,26 +18,26 @@ module Integral
         end
       end
 
-      # GET /new
-      # User creation form
-      def new
-        add_breadcrumb I18n.t('integral.navigation.new'), :new_backend_user_path
-        @user = User.new
-      end
-
       # GET /:id
       # Show specific user
       #
       def show
-        add_breadcrumb @user.name, :backend_user_path
+        add_breadcrumb @resource.name, :backend_user_path
+      end
+
+      # GET /:id/edit
+      # Resource edit screen
+      def edit
+        add_breadcrumb @resource.name, :backend_user_path
+        add_breadcrumb I18n.t('integral.navigation.edit'), "edit_backend_#{controller_name.singularize}_path".to_sym
       end
 
       # GET /account
       # Show specific users account page
       #
       def account
-        @user = current_user
-        add_breadcrumb @user.name, :backend_account_path
+        @resource = current_user
+        add_breadcrumb @resource.name, :backend_account_path
 
         render :show
       end
@@ -45,85 +45,42 @@ module Integral
       # POST /
       # User creation
       def create
-        @user = User.invite!(user_params, current_user)
+        @resource = User.invite!(resource_params, current_user)
 
-        if @user.errors.present?
+        if @resource.errors.present?
           respond_failure I18n.t('integral.backend.users.notification.creation_failure'), 'new'
         else
-          respond_successfully I18n.t('integral.backend.users.notification.creation_success'), backend_user_path(@user)
+          respond_successfully I18n.t('integral.backend.users.notification.creation_success'), backend_user_path(@resource)
         end
       end
 
-      # GET /:id/edit
-      # User edit form
-      def edit
-        add_breadcrumb @user.name, :backend_user_path
-        add_breadcrumb I18n.t('integral.navigation.edit'), :edit_backend_user_path
-      end
-
       # PUT /:id
       # Updating a user
       def update
-        authorized_user_params = user_params
-        authorized_user_params.delete(:role_ids) unless policy(@user).manager?
+        authorized_user_params = resource_params
+        authorized_user_params.delete(:role_ids) unless policy(current_user).manager?
 
-        if @user.update(authorized_user_params)
-          respond_successfully I18n.t('integral.backend.users.notification.edit_success'), backend_user_path(@user)
+        if @resource.update(authorized_user_params)
+          respond_successfully I18n.t('integral.backend.users.notification.edit_success'), backend_user_path(@resource)
         else
           respond_failure I18n.t('integral.backend.users.notification.edit_failure'), 'edit'
         end
       end
 
-      # DELETE /:id
-      def destroy
-        @user.destroy
-
-        respond_successfully I18n.t('integral.backend.users.notification.delete_success'), backend_users_path
-      end
-
       private
 
-      def grid_options
-        default_grid_options = { 'order' => 'updated_at',
-                                 'page' => 1,
-                                 'descending' => true }
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :name) : {}
-        grid_params.delete_if { |_k, v| v.empty? }
-        default_grid_options.merge(grid_params)
-      end
-      helper_method :grid_options
-
-      def respond_successfully(flash_message, redirect_path)
-        flash[:notice] = flash_message
-        redirect_to redirect_path
+      def resource_klass
+        Integral::User
       end
 
-      def respond_failure(flash_message, template)
-        flash.now[:error] = flash_message
-        render template
-      end
-
-      def set_user
-        @user = User.find(params[:id])
-      end
-
-      def user_params
+      def resource_params
         return params.require(:user).permit(:name, :email, :avatar, :locale, role_ids: []) unless params[:user][:password].present?
 
         params.require(:user).permit(:name, :email, :avatar, :locale, :password, :password_confirmation, role_ids: [])
       end
 
-      def authorize_with_klass
-        authorize User
-      end
-
       def authorize_with_instance
-        authorize @user
-      end
-
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('integral.navigation.dashboard'), :backend_dashboard_path
-        add_breadcrumb I18n.t('integral.navigation.users'), :backend_users_path
+        authorize @resource
       end
     end
   end

data/app/controllers/integral/pages_controller.rb

@@ -31,7 +31,7 @@ module Integral
     end
 
     def set_breadcrumbs
-      add_breadcrumb I18n.t('header.navigation.home'), :root_url
+      add_breadcrumb I18n.t('integral.navigation.home'), :root_url
 
       @page.breadcrumbs.each do |breadcrumb|
         add_breadcrumb breadcrumb[:title], "#{Rails.application.routes.default_url_options[:host]}#{breadcrumb[:path]}"
@@ -40,7 +40,7 @@ module Integral
 
     def canonical_url
       if Settings[:homepage_id]&.to_i == @page.id
-        "#{Rails.application.routes.default_url_options[:host]}"
+        Rails.application.routes.default_url_options[:host].to_s
       else
         "#{Rails.application.routes.default_url_options[:host]}#{@page.path}"
       end

data/app/controllers/integral/posts_controller.rb

@@ -25,9 +25,7 @@ module Integral
           image: @post.preview_image(:large)
         }
       }
-      # TODO: Implement post templates
-      # template = @page.template
-      template = 'default'
+      template = 'default' # TODO: Implement post templates
       render "integral/posts/templates/#{template}"
     end
 
@@ -63,9 +61,7 @@ module Integral
       # If an old id or a numeric id was used to find the record, then
       # the request path will not match the post_path, and we should do
       # a 301 redirect that uses the current friendly id.
-      if request.path != post_path(@post)
-        return redirect_to post_url(@post), status: :moved_permanently
-      end
+      redirect_to post_url(@post), status: :moved_permanently if request.path != post_path(@post)
     end
   end
 end

data/app/decorators/integral/image_decorator.rb

@@ -9,7 +9,7 @@ module Integral
     end
 
     # @return [String] URL to backend Image page
-    def url
+    def backend_url
       Integral::Engine.routes.url_helpers.edit_backend_img_url(object)
     end
   end

data/app/decorators/integral/list_decorator.rb

@@ -9,7 +9,7 @@ module Integral
     end
 
     # @return [String] URL to backend list page
-    def url
+    def backend_url
       Integral::Engine.routes.url_helpers.backend_list_url(self)
     end
 

data/app/decorators/integral/page_decorator.rb

@@ -9,7 +9,7 @@ module Integral
     end
 
     # @return [String] URL to backend list page
-    def url
+    def backend_url
       Integral::Engine.routes.url_helpers.edit_backend_page_url(self)
     end
 

data/app/decorators/integral/paginating_decorator.rb

@@ -0,0 +1,6 @@
+module Integral
+  # Allows decorated collections to be paginated
+  class PaginatingDecorator < Draper::CollectionDecorator
+    delegate :current_page, :total_pages, :limit_value, :entry_name, :total_count, :offset_value, :last_page?
+  end
+end

data/app/decorators/integral/post_decorator.rb

@@ -3,6 +3,39 @@ module Integral
   class PostDecorator < Draper::Decorator
     delegate_all
 
+    # Enables pagination
+    def self.collection_decorator_class
+      PaginatingDecorator
+    end
+
+    # @return [Hash] JSON-LD representing the instance
+    def to_json_ld
+      {
+        "@type": 'blogPosting',
+        "mainEntityOfPage": Integral::Engine.routes.url_helpers.post_url(object),
+        "headline": title,
+        "description": description,
+        "datePublished": object.published_at,
+        "dateModified": object.updated_at,
+        "author": {
+          "@type": 'Person',
+          "name": object.author&.name
+        },
+        "image": [
+          preview_image(:large),
+          image(:large)
+        ],
+        "publisher": {
+          "@type": 'Organization',
+          "name": Integral::Settings.website_title,
+          "logo": {
+            "@type": 'ImageObject',
+            "url": h.image_url('logo.png')
+          }
+        }
+      }
+    end
+
     # Tags to be used within the header of an article to describe the subject
     def header_tags
       return I18n.t('integral.posts.show.subtitle') if object.tags_on('published').empty?
@@ -38,7 +71,7 @@ module Integral
     end
 
     # @return [String] URL to backend post page
-    def url
+    def backend_url
       if Integral.blog_enabled?
         Integral::Engine.routes.url_helpers.edit_backend_post_url(object.id)
       else

data/app/decorators/integral/user_decorator.rb

@@ -9,7 +9,7 @@ module Integral
     end
 
     # @return [String] URL to backend list page
-    def url
+    def backend_url
       Integral::Engine.routes.url_helpers.backend_user_url(self)
     end
 

data/app/decorators/integral/version_decorator.rb

@@ -15,7 +15,7 @@ module Integral
 
     # @return [String] Item URL
     def item_url
-      decorated_item&.url
+      decorated_item&.backend_url
     end
 
     # @return [Integral::User] who carried out the version (if one exists)

data/app/helpers/integral/application_helper.rb

@@ -6,6 +6,13 @@ module Integral
     include Integral::BlogHelper
     include Integral::GalleryHelper
 
+    # @return [String] Javascript snippet containing LD-JSON
+    def render_json_ld
+      content_tag 'script', type: 'application/ld+json' do
+        yield.to_json.html_safe
+      end
+    end
+
     # @param [String] content HTML, most likely generated from the WYSIWYG editor
     #
     # @return [String] Processed HTML. Any Integral Widgets placeholders replaced with content.

data/app/helpers/integral/blog_helper.rb

@@ -1,6 +1,35 @@
 module Integral
   # Blog Helper which contains methods used through the blog
   module BlogHelper
+    # @param post [Integral::Post] post to convert to JSON-LD
+    #
+    # @return [String] Javascript snippet containing JSON-LD of the provided post
+    def render_post_as_json_ld(post)
+      render_json_ld do
+        post.to_json_ld.merge("@context": 'http://schema.org')
+      end
+    end
+
+    # @param posts [Integral::Post] collection of posts to convert to JSON-LD
+    #
+    # @return [String] Javascript snippet containing JSON-LD of the provided posts
+    def render_posts_as_json_ld(posts)
+      render_json_ld do
+        {
+          "@context": 'http://schema.org',
+          "@type": 'Blog',
+          "name": t('.title'),
+          "url": request.original_url,
+          "description": t('.description'),
+          "publisher": {
+            "@type": 'Organization',
+            "name": Integral::Settings.website_title
+          },
+          "blogPosts": posts.map(&:to_json_ld)
+        }
+      end
+    end
+
     # Whether or not to display newsletter signup widget
     def display_newsletter_signup_widget?
       true

data/app/helpers/integral/social_helper.rb

@@ -36,22 +36,6 @@ module Integral
       share_url
     end
 
-    # Google Plus social sharing
-    # URL snippet built from - https://sharingbuttons.io/
-    #
-    # @param [Hash] opts the options to create the share URL
-    # @option opts [String] :url Supply URL if would like to share URL other than the current
-    #
-    # @return [String] Google Plus URL to share a page
-    def google_plus_share_url(opts = {})
-      page_url = opts.fetch(:url, request.original_url)
-
-      page_url = CGI.escape(page_url)
-      share_url = "https://plus.google.com/share?url=#{page_url}"
-
-      share_url
-    end
-
     # Linkedin social sharing
     # URL snippet built from - https://sharingbuttons.io/
     #
@@ -99,13 +83,6 @@ module Integral
       Settings.youtube_url
     end
 
-    # Google Plus Profile URL set from within Backend Settings area
-    #
-    # @return [String] Youtube URL
-    def google_plus_url
-      Settings.google_plus_url
-    end
-
     # Linkedin Profile URL set from within Backend Settings area
     #
     # @return [String] Linkedin URL

data/app/models/integral/list.rb

@@ -30,9 +30,8 @@ module Integral
     # Duplicates the list including all attributes, list items and list item children
     #
     # @return [List] Unsaved cloned list
-    def dup(title = '')
+    def dup
       new_list = super()
-      new_list.title = title if title.present?
 
       list_items.each do |list_item|
         new_list_item = list_item.dup

data/app/models/integral/page.rb

@@ -32,7 +32,7 @@ module Integral
     validate :validate_parent_is_available
 
     # Scopes
-    scope :search, ->(search) { where('lower(title) LIKE ?', "%#{search.downcase}%") }
+    scope :search, ->(query) { where('lower(title) LIKE ? OR lower(path) LIKE ?', "%#{query.downcase}%", "%#{query.downcase}%") }
 
     # Return all available parents
     # TODO: Update parent behaviour