integral 1.4.0 → 1.5.0

data/app/controllers/integral/blog_controller.rb

@@ -15,5 +15,17 @@ module Integral
     def set_breadcrumbs
       add_breadcrumb I18n.t('integral.breadcrumbs.home'), :root_url
     end
+
+    def page_title
+      return t('.title') unless params[:page].present?
+
+      "Page #{params[:page]} - #{t('.title')}"
+    end
+
+    def page_description
+      return t('.description') unless params[:page].present?
+
+      "Page #{params[:page]} - #{t('.description')}"
+    end
   end
 end

data/app/controllers/integral/categories_controller.rb

@@ -8,14 +8,28 @@ module Integral
     def show
       add_breadcrumb @resource.title, nil
 
+      page_title = params[:page].present? ? "#{@resource.title} - Page #{params[:page]}" : @resource.title
+      page_description = params[:page].present? ? "#{@resource.description} - Page #{params[:page]}" : @resource.description
+
       @meta_data = {
-        page_title: @resource.title,
-        page_description: @resource.description,
+        page_title: page_title,
+        page_description: page_description,
         image: @resource&.image&.url
       }
 
-      @posts = Integral::Post.published.where(category_id: @resource.id).paginate(page: params[:page])
+      @posts = Integral::Post.published.where(category_id: @resource.id).includes(:image).order('published_at DESC').paginate(page: params[:page]).decorate
+    end
+
+    def url_for(options={})
+      if options.is_a?(Hash) && options.include?(:category_path) && options[:category_path] == true
+        "#{category_path(@resource)}?page=#{options[:page]}"
+      elsif options.is_a?(Hash) && options.empty?
+        category_path(@resource)
+      else
+        super(options)
+      end
     end
+    helper_method :url_for
 
     private
 

data/app/controllers/integral/tags_controller.rb

@@ -16,9 +16,12 @@ module Integral
       add_breadcrumb t('integral.breadcrumbs.tags'), :tags_url
       add_breadcrumb @tag.name, nil
 
+      page_title = params[:page].present? ? "#{@tag.name} - Page #{params[:page]}" : @tag.name
+      page_description = params[:page].present? ? "Page #{params[:page] } - #{t('integral.tags.show.description', tag_name: @tag.name)}" : t('integral.tags.show.description', tag_name: @tag.name)
+
       @meta_data = {
-        page_title: @tag.name,
-        page_description: t('integral.tags.show.description', tag_name: @tag.name)
+        page_title: page_title,
+        page_description: page_description
       }
 
       @tagged_posts = Integral::Post.tagged_with(@tag.name).published.paginate(page: params[:page])

data/app/decorators/integral/base_decorator.rb

@@ -0,0 +1,16 @@
+module Integral
+  # Base decorator for Integral view-level logic
+  class BaseDecorator < Draper::Decorator
+    delegate_all
+
+    # @return [String] URL to backend activity
+    def activity_url(activity_id)
+      Integral::Engine.routes.url_helpers.send("activity_backend_#{object.class.model_name.singular_route_key}_url", object.id, activity_id)
+    end
+
+    # @return [String] URL to backend Image page
+    def backend_url
+      Integral::Engine.routes.url_helpers.send("backend_#{object.class.model_name.singular_route_key}_url", object.id)
+    end
+  end
+end

data/app/decorators/integral/image_decorator.rb

@@ -5,12 +5,12 @@ module Integral
 
     # @return [String] URL to backend activity
     def activity_url(activity_id)
-      # Integral::Engine.routes.url_helpers.activity_backend_img_url(object.id, activity_id)
+      Integral::Engine.routes.url_helpers.activity_backend_img_url(object.id, activity_id)
     end
 
     # @return [String] URL to backend Image page
     def backend_url
-      Integral::Engine.routes.url_helpers.edit_backend_img_url(object)
+      Integral::Engine.routes.url_helpers.backend_img_url(object)
     end
   end
 end

data/app/decorators/integral/list_decorator.rb

@@ -1,18 +1,6 @@
 module Integral
   # List view-level logic
-  class ListDecorator < Draper::Decorator
-    delegate_all
-
-    # @return [String] URL to backend activity
-    def activity_url(activity_id)
-      # Integral::Engine.routes.url_helpers.activity_backend_user_url(object.id, activity_id)
-    end
-
-    # @return [String] URL to backend list page
-    def backend_url
-      Integral::Engine.routes.url_helpers.edit_backend_list_url(self)
-    end
-
+  class ListDecorator < BaseDecorator
     # @return [String] formatted title
     def title
       object.title

data/app/decorators/integral/notification/notification_decorator.rb

@@ -0,0 +1,74 @@
+module Integral
+  module Notification
+    class NotificationDecorator < Draper::Decorator
+      delegate_all
+
+      def formatted_action
+        h.t("integral.actions.#{object.action}")
+      end
+
+      def action_verb
+        h.t("integral.actions.tense.past.#{object.action}")
+      end
+
+      # @return [String] Item URL
+      def item_url
+        decorated_item&.backend_url
+      end
+
+      def whodunnit_url
+        Integral::Engine.routes.url_helpers.backend_user_url(whodunnit.id) if whodunnit.present?
+      end
+
+      # @return [Integral::User] who carried out the version (if one exists)
+      def whodunnit
+        user_id = object.actor_id.to_i
+
+        return '' if user_id.zero?
+
+        @user = Integral::User.unscoped.find_by_id(object.actor_id)&.decorate
+      end
+
+      # @return [String] image linked to whodunnit
+      def whodunnit_avatar_url
+        if whodunnit.present?
+          whodunnit.avatar.url(:thumbnail)
+        else
+          ActionController::Base.helpers.asset_path('integral/defaults/user_avatar.jpg')
+        end
+      end
+
+      # @return [String] name linked to whodunnit
+      def whodunnit_name
+        if whodunnit.present?
+          whodunnit.name
+        else
+          'System'
+        end
+      end
+
+      def item
+        @item ||= item_klass.unscoped.find(subscribable_id)
+      end
+
+      # @return [String] formatted title
+      def item_title
+        decorated_item&.title
+      end
+
+      # @return [Object] Associated Item
+      def decorated_item
+        @decorated_item ||= item&.decorate
+      end
+
+      # @return [String] formatted item type
+      def model_name
+        item_klass.model_name.human
+      end
+
+      def item_klass
+        subscribable_type.constantize
+      end
+    end
+  end
+end

data/app/decorators/integral/page_decorator.rb

@@ -1,18 +1,6 @@
 module Integral
   # Page view-level logic
-  class PageDecorator < Draper::Decorator
-    delegate_all
-
-    # @return [String] URL to backend activity
-    def activity_url(activity_id)
-      Integral::Engine.routes.url_helpers.activity_backend_page_url(object.id, activity_id)
-    end
-
-    # @return [String] URL to backend list page
-    def backend_url
-      Integral::Engine.routes.url_helpers.edit_backend_page_url(self)
-    end
-
+  class PageDecorator < BaseDecorator
     # @return [String] formatted title
     def title
       object.title

data/app/decorators/integral/post_decorator.rb

@@ -1,7 +1,6 @@
 module Integral
   # Page view-level logic
-  class PostDecorator < Draper::Decorator
-    delegate_all
+  class PostDecorator < BaseDecorator
     decorates_association :category
 
     # Enables pagination

data/app/decorators/integral/user_decorator.rb

@@ -1,18 +1,6 @@
 module Integral
   # User view-level logic
-  class UserDecorator < Draper::Decorator
-    delegate_all
-
-    # @return [String] URL to backend activity
-    def activity_url(activity_id)
-      Integral::Engine.routes.url_helpers.activity_backend_user_url(object.id, activity_id)
-    end
-
-    # @return [String] URL to backend list page
-    def backend_url
-      Integral::Engine.routes.url_helpers.backend_user_url(self)
-    end
-
+  class UserDecorator < BaseDecorator
     # @return [String] formatted title
     def title
       object.name

data/app/decorators/integral/version_decorator.rb

@@ -54,13 +54,17 @@ module Integral
       end
     end
 
+    def item_class
+      item_type.constantize
+    end
+
     def item
-      @item ||= item_type.constantize.unscoped.find(item_id)
+      @item ||= item_class.unscoped.find_by_id(item_id)
     end
 
     # @return [String] formatted title
     def item_title
-      decorated_item&.title
+      decorated_item.present? ? decorated_item.title : '<deleted>'
     end
 
     # @return [Object] Associated Item
@@ -70,12 +74,12 @@ module Integral
 
     # @return [String] Font Awesome icon
     def item_icon
-      'ellipsis-v'
+      item_class.respond_to?(:integral_icon) ? item_class.integral_icon : 'ellipsis-v'
     end
 
     # @return [String] formatted item type
     def model_name
-      object.item_type.constantize.model_name.human
+      item_class.model_name.human
     end
 
     # Currently not possible to show this as changeset isn't available in the query resultset for performance reasons - One possible solution would be to create a Grid class for each Version - rather than unioning all the tables it only includes it's own

data/app/helpers/integral/backend/base_helper.rb

@@ -5,6 +5,54 @@ module Integral
     module BaseHelper
       include Integral::SupportHelper
 
+      def render_main_menu
+        render_menu(extract_menu_items(Integral::ActsAsIntegral.backend_main_menu_items, :integral_backend_main_menu_item))
+      end
+
+      def render_create_menu
+        render_menu(extract_menu_items(Integral::ActsAsIntegral.backend_create_menu_items, :integral_backend_create_menu_item))
+      end
+
+      def recent_user_notifications
+        @recent_user_notifications ||= current_user.notifications.recent
+      end
+
+      # Handles extra optional options to `link_to` - Font awesome icons & wrapper
+      def link_to(name = nil, options = nil, html_options = nil, &block)
+        return super if block_given?
+        return super if html_options.nil?
+
+        if html_options[:icon]
+          name = content_tag(:span, name)
+          name.prepend(icon(html_options.delete(:icon)))
+        end
+
+        if html_options[:wrapper]
+          wrapper = html_options.delete(:wrapper)
+          if wrapper == :cell
+            content_tag(:div, super(name, options, html_options, &block), class: 'cell')
+          else
+            content_tag(wrapper, super(name, options, html_options, &block))
+          end
+        else
+          super(name, options, html_options, &block)
+        end
+      end
+
+      # @return [String] Resource Grid Form
+      def render_resource_grid_form(&block)
+        if block_given?
+          render(layout: "integral/backend/shared/grid/form", &block)
+        else
+          render(partial: "integral/backend/shared/grid/form")
+        end
+      end
+
+      # @return [String] Resource Grid
+      def render_resource_grid(locals = {})
+        render(partial: "integral/backend/shared/grid/grid", locals: locals)
+      end
+
       # @return [String] Integral card
       def render_card(partial, locals = {})
         render(partial: "integral/backend/shared/cards/#{partial}", locals: locals)
@@ -33,7 +81,10 @@ module Integral
       end
 
       def recent_activity_grid(options)
-        Integral::Grids::ActivitiesGrid.new(options)
+        #Integral::Grids::ActivitiesGrid.new(options)
+        Integral::Grids::ActivitiesGrid.new options do |scope|
+          scope.where.not(whodunnit: nil)
+        end
       end
 
       # @return [String] title provided through yield or i18n scoped to controller namespace & action
@@ -85,36 +136,6 @@ module Integral
         ChartRenderer::Donut.render(dataset)
       end
 
-      # Donut Graph - At a Glance
-      def dataset_at_a_glance_posts
-        [
-          { scope: Integral::Post.published, label: 'Published' },
-          { scope: Integral::Post.draft, label: 'Draft ' }
-        ]
-      end
-
-      # Donut Graph - At a Glance
-      def dataset_at_a_glance_pages
-        [
-          { scope: Integral::Page.published, label: 'Published' },
-          { scope: Integral::Page.draft, label: 'Draft ' },
-          { scope: Integral::Page.archived, label: 'Archived ' }
-        ]
-      end
-
-      # Donut Graph - At a Glance
-      def dataset_dashboard_atg
-        data = [
-          { scope: Integral::Page, label: 'Total Pages' },
-          { scope: Integral::List, label: 'Total Lists' },
-          { scope: Integral::Image, label: 'Total Images' },
-          { scope: Integral::User, label: 'Total Users' }
-        ]
-
-        data.prepend(scope: Integral::Post, label: 'Total Posts') if Integral.blog_enabled?
-        data
-      end
-
       # Line graph - Last week
       def dataset_dashboard_last_week
         data = [
@@ -127,6 +148,51 @@ module Integral
         data.prepend(scope: Integral::Post, label: 'Posts') if Integral.blog_enabled?
         data
       end
+
+      def current_user_authorized_for_menu_item?(item)
+        if item[:authorize]
+          instance_eval(&item[:authorize])
+        elsif item[:authorize_class] && item[:authorize_action]
+          Pundit.policy(current_user, item[:authorize_class]).public_send("#{item[:authorize_action]}?")
+        else
+          true
+        end
+      end
+
+      private
+
+      def extract_menu_items(items, extract_method)
+        items = items.map { |item| item.class == Class ? item.send(extract_method) : item }
+      end
+
+      def render_menu(items, options={})
+        return '' if items.empty?
+
+        output = ''
+        items = items.sort_by { |item| item[:order] }
+
+        items.each do |item|
+          next unless current_user_authorized_for_menu_item?(item)
+
+          if item[:list_items]&.any?
+            output += content_tag :li do
+              list = content_tag :ul do
+                list_items = item[:list_items].map do |list_item|
+                  next unless current_user_authorized_for_menu_item?(list_item)
+
+                  link_to list_item[:label], list_item[:url], wrapper: :li
+                end.join.html_safe
+                list_items.prepend(content_tag(:li, item[:label]))
+              end
+              list.prepend(link_to(item[:label], item[:url], icon: item[:icon]))
+            end
+          else
+            output += link_to item[:label], item[:url], wrapper: :li, icon: item[:icon]
+          end
+        end
+
+        output.html_safe
+      end
     end
   end
 end

data/app/jobs/integral/application_job.rb

@@ -1,6 +1,7 @@
 module Integral
   # All jobs inherit this behaviour
   class ApplicationJob < ActiveJob::Base
+    queue_as :default
     # Automatically retry jobs that encountered a deadlock
     # retry_on ActiveRecord::Deadlocked
 

data/app/jobs/integral/newsletter_signup_job.rb

@@ -1,8 +1,6 @@
 module Integral
   # Carry out actual newsletter signing up process
   class NewsletterSignupJob < ApplicationJob
-    queue_as :default
-
     rescue_from(Gibbon::MailChimpError) do |e|
       error_msg = "NewsletterSignupJob - Error when signing visitor up to Newsletter: #{e.message}"
       Rails.logger.error(error_msg)