integral 1.3.0 → 1.4.0

data/app/controllers/integral/posts_controller.rb

@@ -9,10 +9,12 @@ module Integral
     # List blog posts
     def index
       add_breadcrumb I18n.t('integral.breadcrumbs.blog'), nil
-      @posts = Integral::Post.published.order('published_at DESC').paginate(page: params[:page])
+      @latest_post = Integral::Post.published.order('published_at DESC').first&.decorate
+      @posts = Integral::Post.published.includes(:image, :user).order('published_at DESC').paginate(page: params[:page])
+      @posts = @posts.where.not(id: @latest_post.id) if @latest_post
     end
 
-    # GET /blog.slug
+    # GET /<post.slug>
     # Presents blog postings
     def show
       add_breadcrumb I18n.t('integral.breadcrumbs.blog'), :posts_url
@@ -21,7 +23,7 @@ module Integral
       @meta_data = {
         page_title: @post.title,
         page_description: @post.description,
-        open_graph:  {
+        open_graph: {
           image: @post.preview_image(:large)
         }
       }

data/app/decorators/integral/category_decorator.rb

@@ -0,0 +1,30 @@
+module Integral
+  # Category view-level logic
+  class CategoryDecorator < Draper::Decorator
+    delegate_all
+
+    # @return [String] URL to backend activity
+    def activity_url(activity_id)
+      Integral::Engine.routes.url_helpers.activity_backend_category_url(object.id, activity_id)
+    end
+
+    # @return [String] URL to backend Image page
+    def backend_url
+      Integral::Engine.routes.url_helpers.backend_posts_url
+    end
+
+    # @return [Relation] posts associated to the category
+    def posts(limit = nil)
+      object.posts.published.order('published_at DESC').limit(limit).decorate
+    end
+
+    # @return [String] image URL associated to the category
+    def image_url
+      if object.image.present?
+        object.image.url
+      else
+        helpers.image_url('integral/image-not-set.png')
+      end
+    end
+  end
+end

data/app/decorators/integral/category_version_decorator.rb

@@ -0,0 +1,7 @@
+module Integral
+  class CategoryVersionDecorator < VersionDecorator
+    def item_icon
+      'tags'
+    end
+  end
+end

data/app/decorators/integral/image_version_decorator.rb

@@ -0,0 +1,7 @@
+module Integral
+  class ImageVersionDecorator < VersionDecorator
+    def item_icon
+      'image'
+    end
+  end
+end

data/app/decorators/integral/list_decorator.rb

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

data/app/decorators/integral/list_version_decorator.rb

@@ -0,0 +1,7 @@
+module Integral
+  class ListVersionDecorator < VersionDecorator
+    def item_icon
+      'list'
+    end
+  end
+end

data/app/decorators/integral/page_version_decorator.rb

@@ -0,0 +1,7 @@
+module Integral
+  class PageVersionDecorator < VersionDecorator
+    def item_icon
+      'file'
+    end
+  end
+end

data/app/decorators/integral/post_decorator.rb

@@ -2,6 +2,7 @@ module Integral
   # Page view-level logic
   class PostDecorator < Draper::Decorator
     delegate_all
+    decorates_association :category
 
     # Enables pagination
     def self.collection_decorator_class
@@ -36,6 +37,12 @@ module Integral
       }
     end
 
+    # @return [String] avatar image
+    def avatar
+      avatar_url = user&.avatar&.url(:thumbnail)
+      h.image_tag avatar_url, class: 'user-avatar' unless avatar_url.nil?
+    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?
@@ -67,13 +74,14 @@ module Integral
     # Date the post was published
     def published_at
       return I18n.l(object.published_at, format: :blog) if object.published?
+
       'Not yet published'
     end
 
     # @return [String] URL to backend post page
     def backend_url
       if Integral.blog_enabled?
-        Integral::Engine.routes.url_helpers.edit_backend_post_url(object.id)
+        Integral::Engine.routes.url_helpers.backend_post_url(object.id)
       else
         ''
       end

data/app/decorators/integral/post_version_decorator.rb

@@ -0,0 +1,7 @@
+module Integral
+  class PostVersionDecorator < VersionDecorator
+    def item_icon
+      'rss'
+    end
+  end
+end

data/app/decorators/integral/user_decorator.rb

@@ -5,7 +5,7 @@ module Integral
 
     # @return [String] URL to backend activity
     def activity_url(activity_id)
-      # Integral::Engine.routes.url_helpers.activity_backend_user_url(object.id, activity_id)
+      Integral::Engine.routes.url_helpers.activity_backend_user_url(object.id, activity_id)
     end
 
     # @return [String] URL to backend list page

data/app/decorators/integral/user_version_decorator.rb

@@ -0,0 +1,7 @@
+module Integral
+  class UserVersionDecorator < VersionDecorator
+    def item_icon
+      'user'
+    end
+  end
+end

data/app/decorators/integral/version_decorator.rb

@@ -13,11 +13,20 @@ module Integral
       h.t("integral.actions.#{object.event}")
     end
 
+    # @return [String] formatted event verb (past)
+    def event_verb
+      h.t("integral.actions.tense.past.#{object.event}")
+    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.whodunnit.to_i
@@ -27,6 +36,28 @@ module Integral
       @user = Integral::User.unscoped.find_by_id(object.whodunnit)&.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_type.constantize.unscoped.find(item_id)
+    end
+
     # @return [String] formatted title
     def item_title
       decorated_item&.title
@@ -37,21 +68,29 @@ module Integral
       @decorated_item ||= item&.decorate
     end
 
+    # @return [String] Font Awesome icon
+    def item_icon
+      'ellipsis-v'
+    end
+
     # @return [String] formatted item type
-    def item_type
+    def model_name
       object.item_type.constantize.model_name.human
     end
 
-    # @return [String] formatted attributes changed
-    def attributes_changed
-      return unless object.event == 'update'
-      keys = ''
-
-      object.changeset.each_key do |key|
-        # next if ['updated_at', 'lock_version'].include? key
-        keys += "#{key}, "
-      end
-      keys[0..-3]
-    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
+    #
+    # # @return [String] formatted attributes changed
+    # def attributes_changed
+    #   return unless object.event == 'update'
+    #
+    #   keys = ''
+    #
+    #   object.changeset.each_key do |key|
+    #     # next if ['updated_at', 'lock_version'].include? key
+    #     keys += "#{key}, "
+    #   end
+    #   keys[0..-3]
+    # end
   end
 end

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

@@ -5,17 +5,54 @@ module Integral
     module BaseHelper
       include Integral::SupportHelper
 
+      # @return [String] Integral card
+      def render_card(partial, locals = {})
+        render(partial: "integral/backend/shared/cards/#{partial}", locals: locals)
+      end
+
+      # @return [Array] returns array of VersionDecorators subclassed depending on the Version subclass
+      def recent_user_activity_grid
+        @recent_user_activity_grid ||= begin
+                                      options = { user: current_user.id }
+                                      options[:object] = resource_klass.to_s if resource_klass.present?
+                                      options[:item_id] = @resource.id if @resource.present?
+
+                                      recent_activity_grid(options)
+                                    end
+      end
+
+      # @return [Array] returns array of VersionDecorators subclassed depending on the Version subclass
+      def recent_site_activity_grid
+        @recent_site_activity_grid ||= begin
+                                      options = {}
+                                      options[:object] = resource_klass.to_s if resource_klass.present?
+                                      options[:item_id] = @resource.id if @resource.present?
+
+                                      recent_activity_grid(options)
+                                    end
+      end
+
+      def recent_activity_grid(options)
+        Integral::Grids::ActivitiesGrid.new(options)
+      end
+
       # @return [String] title provided through yield or i18n scoped to controller namespace & action
       def page_title
         return content_for(:title) if content_for?(:title)
+        return t("devise.#{controller_name}.#{action_name}.title") if devise_controller?
 
         # Scope is set to current controller namespace & action
-        t('title', scope: "#{controller_path.tr('/', '.')}.#{action_name}")
+        t('title', scope: "#{controller_path.tr('/', '.')}.#{action_name}",
+                   default: I18n.t("integral.backend.titles.#{action_name}",
+                                   type_singular: resource_klass.model_name.human.capitalize,
+                                   type_plural: resource_klass.model_name.human(count: 2).capitalize))
       end
 
       # Renders a grid from a local partial within a datagrid container
       def render_data_grid
-        return content_tag(:div, render(partial: 'grid', locals: { grid: @grid }), data: { 'grid' => true, 'form' => 'grid_form' }) unless block_given?
+        unless block_given?
+          return content_tag(:div, render(partial: 'grid', locals: { grid: @grid }), data: { 'grid' => true, 'form' => 'grid_form' })
+        end
 
         content_tag :div, data: { 'grid' => true, 'form' => 'grid_form' } do
           yield
@@ -48,6 +85,23 @@ 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 = [

data/app/helpers/integral/blog_helper.rb

@@ -1,6 +1,11 @@
 module Integral
   # Blog Helper which contains methods used through the blog
   module BlogHelper
+    # @return [Relation] featured categories - currently all which have posts associated to them
+    def featured_categories
+      @featured_categories ||= Integral::Category.where(id: Integral::Post.published.select(:category_id).uniq.map(&:category_id))
+    end
+
     # @param post [Integral::Post] post to convert to JSON-LD
     #
     # @return [String] Javascript snippet containing JSON-LD of the provided post
@@ -13,14 +18,14 @@ module Integral
     # @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)
+    def render_posts_as_json_ld(posts, title: t('.title'), url: request.original_url, description: t('.description'))
       render_json_ld do
         {
           "@context": 'http://schema.org',
           "@type": 'Blog',
-          "name": t('.title'),
-          "url": request.original_url,
-          "description": t('.description'),
+          "name": title,
+          "url": url,
+          "description": description,
           "publisher": {
             "@type": 'Organization',
             "name": Integral::Settings.website_title
@@ -38,12 +43,14 @@ module Integral
     # Whether or not to display share widget
     def display_share_widget?
       return true if "#{controller_name}.#{action_name}" == 'posts.show'
+
       false
     end
 
     # Whether or not to display recent posts sidebar widget
     def display_recent_posts_widget?
       return false if "#{controller_name}.#{action_name}" == 'posts.index'
+
       true
     end
 
@@ -51,5 +58,15 @@ module Integral
     def display_popular_posts_widget?
       Integral::Post.published.count > 4
     end
+
+    # Whether or not to display most read widget
+    def display_most_read_posts_widget?
+      Integral::Post.published.count > 10
+    end
+
+    # TODO: Change this to use GA API through a GoogleAnalyticsService
+    def most_read_posts
+      @popular_posts.decorate
+    end
   end
 end

data/app/jobs/integral/webhook/delivery_job.rb

@@ -0,0 +1,37 @@
+require 'net/http'
+
+module Integral
+  module Webhook
+    # Handles the delivery of a webhook event payload to a webhook endpoint
+    class DeliveryJob < ApplicationJob
+      # Delivers webhook payload to endpoint
+      def perform(endpoint_id, payload)
+        return unless endpoint = Webhook::Endpoint.find(endpoint_id)
+
+        response = request(endpoint.target_url, payload)
+
+        case response.code
+        when 410
+          endpoint.destroy
+        when 400..599
+          raise response.to_s
+        end
+      end
+
+      private
+
+      def request(endpoint, payload)
+        uri = URI.parse(endpoint)
+
+        request = Net::HTTP::Post.new(uri.request_uri)
+        request['Content-Type'] = 'application/json'
+        request.body = payload
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = (uri.scheme == 'https')
+
+        http.request(request)
+      end
+    end
+  end
+end

data/app/mailers/integral/contact_mailer.rb

@@ -49,7 +49,10 @@ module Integral
     # Subject of the forwarding email
     # Adds the enquiry subject if it exists otherwise uses only reference
     def forwarding_subject(enquiry)
-      return "#{enquiry.reference} #{I18n.t('integral.contact_mailer.forward_enquiry.subject')}" if enquiry.subject.blank?
+      if enquiry.subject.blank?
+        return "#{enquiry.reference} #{I18n.t('integral.contact_mailer.forward_enquiry.subject')}"
+      end
+
       "#{enquiry.reference} #{I18n.t('integral.contact_mailer.forward_enquiry.subject')} - #{enquiry.subject}"
     end
   end