integral 1.3.0 → 1.4.0

data/db/migrate/20190414172018_create_webhook_endpoints.rb

@@ -0,0 +1,10 @@
+class CreateWebhookEndpoints < ActiveRecord::Migration[5.1]
+  def change
+    create_table :integral_webhook_endpoints do |t|
+      t.string :target_url, null: false
+      t.string :events, null: false, array: true
+      t.timestamps
+      t.index :events
+    end
+  end
+end

data/db/migrate/20190929191412_add_integral_post_categories.rb

@@ -0,0 +1,13 @@
+class AddIntegralPostCategories < ActiveRecord::Migration[5.1]
+  def change
+    create_table :integral_categories do |t|
+      t.string :title
+      t.string :description
+      t.string :slug, unique: true
+
+      t.timestamps null: false
+    end
+
+    add_reference :integral_posts, :category, index: true
+  end
+end

data/db/migrate/20191203090008_add_image_to_integral_categories.rb

@@ -0,0 +1,6 @@
+class AddImageToIntegralCategories < ActiveRecord::Migration[5.2]
+  def change
+    add_column :integral_categories, :image_id, :bigint
+    add_index :integral_categories, :image_id
+  end
+end

data/db/migrate/20200401210442_create_category_versions.rb

@@ -0,0 +1,20 @@
+class CreateCategoryVersions < ActiveRecord::Migration[5.2]
+  # The largest text column available in all supported RDBMS is
+  # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
+  # so that MySQL will use `longtext` instead of `text`.  Otherwise,
+  # when serializing very large objects, `text` might not be big enough.
+  TEXT_BYTES = 1_073_741_823
+
+  def change
+    create_table :integral_category_versions do |t|
+      t.string   :item_type, {:null=>false}
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
+      t.string   :whodunnit
+      t.text     :object, limit: TEXT_BYTES
+      t.text     :object_changes, limit: TEXT_BYTES
+      t.datetime :created_at
+    end
+    add_index :integral_category_versions, %i(item_type item_id)
+  end
+end

data/db/seeds.rb

@@ -34,13 +34,15 @@ Integral::Page.create!(title: 'Integral CMS - Demo Page',
                        status: 1)
 
 # Demo Post
+category = Integral::Category.create!(title: 'Uncategorised', description: "Posts which we haven't yet categorized but are sure to grab your attention", slug: 'uncategorized')
 Integral::Post.create!(title: 'Integral CMS - Demo Post',
                        description:'Integral CMS demo post. Integral is a rails content management system (CMS) which gives developers the ability to create a modern website with all the bells and whistles without the hassle.',
                        body: File.read(File.join(Integral::Engine.root.join('public', 'integral', 'ckeditor_demo_content.html'))),
                        slug: 'integral-demo',
                        user: user,
                        tag_list: 'integral-cms,example-tag',
-                       status: 1)
+                       status: 1,
+                       category: category)
 
 # Main Menu
 Integral::List.create!({ title: 'Main Menu', list_items: [

data/lib/generators/integral/assets_generator.rb

@@ -6,7 +6,7 @@ module Integral
     # @example Generate all Integral assets
     #   rails g integral:assets --assets 'backend frontend email'
     class AssetsGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../../../app/assets', __FILE__)
+      source_root File.expand_path('../../../app/assets', __dir__)
       class_option :asset_list, aliases: '-a', type: :array, default: 'frontend'
       desc 'Copies Integral assets to your application'
 
@@ -24,7 +24,7 @@ module Integral
         return unless options['asset_list'].include?('frontend')
 
         file 'javascripts/integral/frontend.js'
-        file 'stylesheets/integral/frontend.sass'
+        file 'stylesheets/integral/frontend.scss'
         directory 'stylesheets/integral/frontend'
       end
 

data/lib/generators/integral/install_generator.rb

@@ -3,7 +3,7 @@ module Integral
   module Generators
     # Runs setup for an Integral Application
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../templates', __FILE__)
+      source_root File.expand_path('../templates', __dir__)
       desc 'Creates Integral, Carrierwave, CarrierwaveBackgrounder & Sitemap initializers'
 
       # Copies over necessary initialiser files

data/lib/generators/integral/views_generator.rb

@@ -6,7 +6,7 @@ module Integral
     # @example Generate all Integral views
     #   rails g integral:views --views 'backend frontend devise mailer'
     class ViewsGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../../../app/views', __FILE__)
+      source_root File.expand_path('../../../app/views', __dir__)
       class_option :views, aliases: '-v', type: :array, default: 'frontend'
       desc 'Copies Integral views to your application'
 

data/lib/generators/templates/integral.rb

@@ -61,6 +61,11 @@ Integral.configure do |config|
   #
   # config.additional_page_templates = [:full_width]
 
+  # Add additional tracked classes to include within activity tracking
+  # Default is []
+  #
+  # config.additional_tracked_classes = [MyCustomClass]
+
   # Configure what page paths are protected from user entry to prevent accidentally overriding
   # config.black_listed_paths = [
   #   '/admin/',

data/lib/integral.rb

@@ -5,7 +5,6 @@ require 'integral/version'
 require 'integral/router'
 require 'integral/middleware/page_router'
 require 'integral/engine'
-require 'integral/slack_bot'
 require 'integral/button_link_renderer'
 require 'integral/google_tag_manager'
 require 'integral/foundation_builder'
@@ -34,107 +33,81 @@ module Integral
     yield(self)
   end
 
-  #
   mattr_accessor :backend_namespace
   @@backend_namespace = 'admin'
 
-  #
   mattr_accessor :backend_locales
   @@backend_locales = [:en]
 
-  #
   mattr_accessor :additional_settings_params
   @@additional_settings_params = []
 
-  #
   mattr_accessor :additional_widgets
   @@additional_widgets = []
 
-  #
   mattr_accessor :additional_post_params
   @@additional_post_params = []
 
-  #
   mattr_accessor :additional_page_params
   @@additional_page_params = []
 
-  #
   mattr_accessor :gtm_container_id
   @@gtm_container_id = ''
 
-  #
   mattr_accessor :blog_enabled
   @@blog_enabled = true
 
-  #
   mattr_accessor :blog_namespace
   @@blog_namespace = 'blog'
 
-  #
   mattr_accessor :black_listed_paths
   @@black_listed_paths = ['/admin']
 
-  #
   mattr_accessor :root_path
   @@root_path = nil
 
-  #
   mattr_accessor :frontend_parent_controller
   @@frontend_parent_controller = 'Integral::ApplicationController'
 
-  #
   mattr_accessor :editor_image_size_limit
   @@editor_image_size_limit = [1600, 1600]
 
-  #
   mattr_accessor :image_thumbnail_size
   @@image_thumbnail_size = [50, 50]
 
-  #
   mattr_accessor :image_small_size
   @@image_small_size = [500, 500]
 
-  #
   mattr_accessor :image_medium_size
   @@image_medium_size = [800, 800]
 
-  #
   mattr_accessor :image_large_size
   @@image_large_size = [1600, 1600]
 
-  #
   mattr_accessor :additional_page_templates
   @@additional_page_templates = []
 
-  #
+  mattr_accessor :additional_tracked_classes
+  @@additional_tracked_classes = []
+
   mattr_accessor :compression_enabled
   @@compression_enabled = true
 
-  #
   mattr_accessor :image_compression_quality
   @@image_compression_quality = 85
 
-  #
   mattr_accessor :editable_persisted_images
   @@editable_persisted_images = false
 
-  #
-  mattr_accessor :slack_web_hook_url
-  @@slack_web_hook_url = nil
-
-  #
   mattr_accessor :description_length_maximum
   @@description_length_maximum = 300
 
-  #
   mattr_accessor :description_length_minimum
   @@description_length_minimum = 50
 
-  #
   mattr_accessor :title_length_maximum
   @@title_length_maximum = 60
 
-  #
   mattr_accessor :title_length_minimum
   @@title_length_minimum = 4
 

data/lib/integral/acts_as_listable.rb

@@ -2,8 +2,8 @@ module Integral
   # Handles listable behaviour
   module ActsAsListable
     class << self
-       # Keeps a track of listable objects
-       attr_writer :objects
+      # Keeps a track of listable objects
+      attr_writer :objects
      end
 
     # Accessor for listable objects

data/lib/integral/chart_renderer/base.rb

@@ -24,6 +24,7 @@ module Integral
         data = process_data
 
         return respond_with_chart(data) if data_available?(data)
+
         respond_with_no_data_available
       end
 
@@ -64,6 +65,7 @@ module Integral
           data = data.map(&:uniq).uniq
 
           return true if data.length > 1
+
           data = data.first
         end
 

data/lib/integral/content_renderer.rb

@@ -59,8 +59,8 @@ module Integral
       return widget_not_available_message unless widget.present?
 
       widget[1].constantize.render(options)
-    rescue StandardError => error
-      respond_with_widget_error(error)
+    rescue StandardError => e
+      respond_with_widget_error(e)
     end
 
     # Handles widget errors

data/lib/integral/engine.rb

@@ -35,7 +35,6 @@ module Integral
     # require 'before_render'
     require 'friendly_id'
     require 'acts-as-taggable-on'
-    require 'slack-notifier'
     require 'paranoia'
     require 'inky'
     require 'premailer/rails'
@@ -43,6 +42,7 @@ module Integral
     require 'will_paginate-foundation'
     require 'rails-settings-cached'
     require 'gaffe'
+    require 'fast_jsonapi'
 
     isolate_namespace Integral
 
@@ -73,7 +73,7 @@ module Integral
     # Allows engine factories to be reused by application
     initializer 'model_core.factories', after: 'factory_bot.set_factory_paths' do
       if defined?(FactoryBot)
-        FactoryBot.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__)
+        FactoryBot.definition_file_paths << File.expand_path('../../spec/factories', __dir__)
       end
     end
 

data/lib/integral/grids/activities_grid.rb

@@ -6,7 +6,17 @@ module Integral
       include Datagrid
 
       scope do
-        Integral::UserVersion.all.union(Integral::PageVersion.all).union(Integral::PostVersion.all).union(Integral::ListVersion.all).union(Integral::ImageVersion.all).order('created_at DESC')
+        fields = [:id, :item_type, :item_id, :event, :whodunnit, :created_at]
+        scope = Integral::PageVersion.select(fields).all
+
+        [Integral::PostVersion,
+         Integral::CategoryVersion,
+         Integral::ListVersion,
+         Integral::ImageVersion,
+         Integral::UserVersion].concat(Integral.additional_tracked_classes.map { |klass| klass.version_class_name.constantize }).each do |version|
+          scope = scope.union(version.select(fields).all)
+        end
+        scope = scope.order('created_at DESC')
       end
 
       filter(:user, multiple: true) do |value|
@@ -25,6 +35,10 @@ module Integral
         where(item_id: value)
       end
 
+      filter(:created_at) do |value|
+        where("created_at < ?", value)
+      end
+
       column(:date, order: :created_at)
       column(:user, order: :whodunnit)
       column(:action, order: :event)

data/lib/integral/list_item_renderer.rb

@@ -76,6 +76,7 @@ module Integral
     # TODO: Move this onto the model level
     def type_for_dropdown
       return list_item.type unless list_item.object?
+
       list_item.object_type.to_s
     end
 
@@ -97,12 +98,13 @@ module Integral
     # @return [String] URL of list item
     def url
       return if list_item.basic?
+
       url = provide_attr(:url)
 
       return url if url.nil? || url.empty?
-      return url if url.match?(URI::DEFAULT_PARSER.make_regexp)
+      return CGI.unescape(url) if url.match?(URI::DEFAULT_PARSER.make_regexp)
 
-      "#{Rails.application.routes.default_url_options[:host]}#{url}"
+      CGI.unescape("#{Rails.application.routes.default_url_options[:host]}#{url}")
     end
 
     # @return [String] subtitle of list item

data/lib/integral/list_renderer.rb

@@ -79,6 +79,7 @@ module Integral
     def html_id
       return list.html_id if list.html_id.present?
       return opts[:html_id] if opts[:html_id].present?
+
       ''
     end
 

data/lib/integral/middleware/page_router.rb

@@ -39,7 +39,13 @@ module Integral
         return dynamic_homepage if path == '/' && Integral.dynamic_homepage_enabled?
 
         # TODO: Speed this up by adding an index & unique constraint on path attribute
-        Integral::Page.find_by_path(path)&.id
+        Integral::Page.not_archived.find_by_path(path)&.id
+      end
+
+      def category_identifier(path)
+        return nil unless path.starts_with?("/#{Integral.blog_namespace}")
+
+        Integral::Category.select(:id, :slug).all.map { |category| [category.id, "/#{Integral.blog_namespace}/#{category.slug}"] }.find { |category| category[1] == path }&.first
       end
 
       # Converts the request path from human readable into something Rails router understands
@@ -51,12 +57,15 @@ module Integral
       # @return [String] Path Rails needs to link the request to the correct Integral::Page record
       def rewrite_path(env, path)
         page_id = page_identifier(path)
-        return if page_id.nil?
+        if page_id
+          env['PATH_INFO'] = "/pages/#{page_id}"
+        else
+          category_id = category_identifier(path)
 
-        rewritten_path = "/pages/#{page_id}"
-        env['PATH_INFO'] = rewritten_path
-      rescue StandardError => error
-        handle_rewrite_error(error)
+          env['PATH_INFO'] = "/#{Integral.blog_namespace}/categories/#{category_id}" if category_id
+        end
+      rescue StandardError => e
+        handle_rewrite_error(e)
       end
 
       # Homepage ID as defined by User within backend settings

data/lib/integral/router.rb

@@ -33,6 +33,7 @@ module Integral
         if Integral.blog_enabled?
           scope Integral.blog_namespace do
             resources :tags, only: %i[index show]
+            resources :categories, only: %i[show]
           end
           # Post Routing must go after tags otherwise it will override
           resources Integral.blog_namespace, only: %i[show index], as: :posts, controller: 'posts'
@@ -59,13 +60,20 @@ module Integral
           get 'account', to: 'users#account'
 
           # User Management
-          resources :users
+          resources :users do
+            get 'list', on: :collection
+            member do
+              get 'activities', controller: 'users'
+              get 'activities/:activity_id', to: 'users#activity', as: :activity
+            end
+          end
 
           # Image Management
           resources :images, as: :img
 
           # Page Management
-          resources :pages, except: [:show] do
+          resources :pages do
+            get 'list', on: :collection
             member do
               post 'duplicate'
               get 'activities', controller: 'pages'
@@ -76,13 +84,15 @@ module Integral
           # Activity Management
           resources :activities, only: %i[index show] do
             collection do
+              post 'widget'
               post 'grid'
             end
           end
 
           # Post Management
           if Integral.blog_enabled?
-            resources :posts, except: [:show] do
+            resources :posts do
+              get 'list', on: :collection
               member do
                 post 'duplicate'
                 get 'activities', controller: 'posts'
@@ -90,6 +100,12 @@ module Integral
               end
               # resources :comments, only: [:create, :destroy]
             end
+            resources :categories, only: %i[create edit update destroy] do
+              member do
+                get 'activities', controller: 'categories'
+                get 'activities/:activity_id', to: 'categories#activity', as: :activity
+              end
+            end
           end
 
           # List Management