integral 1.1.0 → 1.5.1

data/app/controllers/integral/pages_controller.rb

@@ -10,7 +10,7 @@ module Integral
       @meta_data = {
         page_title: @page.title,
         page_description: @page.description,
-        open_graph:  {
+        open_graph: {
           image: @page.image&.url(:large)
         }
       }
@@ -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

@@ -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,13 +23,11 @@ module Integral
       @meta_data = {
         page_title: @post.title,
         page_description: @post.description,
-        open_graph:  {
+        open_graph: {
           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 +63,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/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/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/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 url
-      Integral::Engine.routes.url_helpers.edit_backend_img_url(object)
+    def backend_url
+      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 url
-      Integral::Engine.routes.url_helpers.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 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/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

@@ -1,7 +1,46 @@
 module Integral
   # Page view-level logic
-  class PostDecorator < Draper::Decorator
-    delegate_all
+  class PostDecorator < BaseDecorator
+    decorates_association :category
+
+    # 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
+
+    # @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
@@ -34,13 +73,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 url
+    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/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 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

@@ -13,9 +13,18 @@ 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&.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)
@@ -27,9 +36,35 @@ 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_class
+      item_type.constantize
+    end
+
+    def item
+      @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
@@ -37,21 +72,29 @@ module Integral
       @decorated_item ||= item&.decorate
     end
 
-    # @return [String] formatted item type
-    def item_type
-      object.item_type.constantize.model_name.human
+    # @return [String] Font Awesome icon
+    def item_icon
+      item_class.respond_to?(:integral_icon) ? item_class.integral_icon : 'ellipsis-v'
     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]
+    # @return [String] formatted item type
+    def model_name
+      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
+    #
+    # # @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