integral 1.4.0 → 1.5.0

data/lib/integral/engine.rb

@@ -64,6 +64,15 @@ module Integral
       Integral::Engine.routes.default_url_options[:host] = Rails.application.routes.default_url_options[:host]
     end
 
+    # Menu Initializaion - Add items to menus which are not directly linked to a Modal
+    initializer "integral.backend.set_main_menu_items" do |app|
+      ActiveSupport::Notifications.subscribe 'integral.routes_loaded' do
+        Integral::ActsAsIntegral.add_backend_main_menu_item(id: :home, icon: 'home', order: 10, label: 'Home', url: Integral::Engine.routes.url_helpers.backend_dashboard_url)
+        Integral::ActsAsIntegral.add_backend_main_menu_item(id: :activities, icon: 'crosshairs', order: 90, label: 'Activities', url: Integral::Engine.routes.url_helpers.backend_activities_url, authorize: proc { policy(Integral::Version).manager? })
+        Integral::ActsAsIntegral.add_backend_main_menu_item(id: :settings, icon: 'cog', order: 100, label: 'Settings', url: Integral::Engine.routes.url_helpers.backend_settings_url, authorize: proc { current_user.admin? })
+      end
+    end
+
     # Clientside I18n
     config.assets.initialize_on_precompile = true
 

data/lib/integral/grids/activities_grid.rb

@@ -44,7 +44,6 @@ module Integral
       column(:action, order: :event)
       column(:object, order: :item_type)
       column(:instance)
-      column(:attributes_changed)
       column(:actions)
     end
   end

data/lib/integral/grids/lists_grid.rb

@@ -14,6 +14,7 @@ module Integral
       end
 
       column(:title, order: :title)
+      column(:description, order: :description)
       column(:updated_at, order: :updated_at)
       column(:actions)
     end

data/lib/integral/grids/posts_grid.rb

@@ -21,8 +21,12 @@ module Integral
         where(user: value)
       end
 
+      filter(:category, multiple: true) do |value|
+        where(category_id: value)
+      end
+
       column(:title, order: :title)
-      column(:user, order: :user)
+      column(:category, order: :category_id)
       column(:status, order: :status)
       column(:view_count, order: :view_count)
       column(:updated_at, order: :updated_at)

data/lib/integral/grids/users_grid.rb

@@ -13,8 +13,13 @@ module Integral
         search(value)
       end
 
+      filter(:status, multiple: true) do |value|
+        where(status: value)
+      end
+
       column(:name, order: :name)
       column(:email, order: :email)
+      column(:status, order: :status)
       column(:updated_at, order: :updated_at)
       column(:actions)
     end

data/lib/integral/list_renderer.rb

@@ -46,7 +46,11 @@ module Integral
         rendered_items += render_item(list_item)
       end
 
-      content_tag opts[:wrapper_element], rendered_items, html_options, false
+      if opts[:wrapper_element]
+        ontent_tag opts[:wrapper_element], rendered_items, html_options, false
+      else
+        rendered_items
+      end
     end
 
     private

data/lib/integral/router.rb

@@ -63,13 +63,27 @@ module Integral
           resources :users do
             get 'list', on: :collection
             member do
+              put 'read_notification'
+              get 'notifications'
+              put 'block'
+              put 'unblock'
               get 'activities', controller: 'users'
               get 'activities/:activity_id', to: 'users#activity', as: :activity
             end
           end
 
+          # Notification subscription management
+          resources :notification_subscriptions, only: [:update]
+
           # Image Management
-          resources :images, as: :img
+          resources :images, as: :img do
+            get 'list', on: :collection
+
+            member do
+              get 'activities', controller: 'images'
+              get 'activities/:activity_id', to: 'images#activity', as: :activity
+            end
+          end
 
           # Page Management
           resources :pages do
@@ -82,10 +96,9 @@ module Integral
           end
 
           # Activity Management
-          resources :activities, only: %i[index show] do
+          resources :activities, only: %i[index] do
             collection do
               post 'widget'
-              post 'grid'
             end
           end
 
@@ -109,9 +122,12 @@ module Integral
           end
 
           # List Management
-          resources :lists, except: [:show] do
+          resources :lists do
+            get 'list', on: :collection
             member do
               post 'duplicate'
+              get 'activities', controller: 'lists'
+              get 'activities/:activity_id', to: 'lists#activity', as: :activity
             end
           end
 

data/lib/integral/version.rb

@@ -1,5 +1,5 @@
 # :nocov:
 module Integral
   # Integral Version
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/spec/factories.rb

@@ -9,7 +9,7 @@ FactoryBot.define do
   sequence(:view_count) { rand(5000) }
   sequence(:url) { Faker::Internet.url }
 
-  factory :integral_user, class: Integral::User, aliases: [:user] do
+  factory :integral_user, class: Integral::User, aliases: [:user, :recipient, :actor] do
     name
     email
     password               { "password" }
@@ -78,6 +78,20 @@ FactoryBot.define do
     status { rand(0..1) }
   end
 
+  factory :integral_notification, class: 'Integral::Notification::Notification' do
+    recipient
+    actor
+    read_at { Faker::Time.backward(30) }
+    action { ['create', 'update', 'destroy'].sample }
+    association(:subscribable, factory: :integral_post)
+  end
+
+  factory :integral_notification_subscription, class: 'Integral::Notification::Subscription' do
+    state { [:subscribe, :unsubscribe].sample }
+    association(:subscribable, factory: :integral_post)
+    user
+  end
+
   factory :integral_category, class: 'Integral::Category', aliases: [:category] do
     title
     description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: integral
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Patrick Lindsay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -274,14 +274,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.1
+        version: 6.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.1
+        version: 6.6.2
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -800,20 +800,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
@@ -1517,6 +1503,8 @@ files:
 - app/assets/stylesheets/integral/backend/devise.sass
 - app/assets/stylesheets/integral/backend/foundation_and_overrides.scss
 - app/assets/stylesheets/integral/backend/materialize-tags.sass
+- app/assets/stylesheets/integral/backend/modules/dropdown_pane_notifications.scss
+- app/assets/stylesheets/integral/backend/modules/dropdown_pane_profile.scss
 - app/assets/stylesheets/integral/backend/modules/timeline.scss
 - app/assets/stylesheets/integral/backend/notifications.sass
 - app/assets/stylesheets/integral/backend/overrides.sass
@@ -1557,6 +1545,7 @@ files:
 - app/controllers/integral/backend/categories_controller.rb
 - app/controllers/integral/backend/images_controller.rb
 - app/controllers/integral/backend/lists_controller.rb
+- app/controllers/integral/backend/notification_subscriptions_controller.rb
 - app/controllers/integral/backend/pages_controller.rb
 - app/controllers/integral/backend/posts_controller.rb
 - app/controllers/integral/backend/settings_controller.rb
@@ -1568,19 +1557,15 @@ files:
 - app/controllers/integral/pages_controller.rb
 - app/controllers/integral/posts_controller.rb
 - app/controllers/integral/tags_controller.rb
+- app/decorators/integral/base_decorator.rb
 - app/decorators/integral/category_decorator.rb
-- app/decorators/integral/category_version_decorator.rb
 - app/decorators/integral/image_decorator.rb
-- app/decorators/integral/image_version_decorator.rb
 - app/decorators/integral/list_decorator.rb
-- app/decorators/integral/list_version_decorator.rb
+- app/decorators/integral/notification/notification_decorator.rb
 - app/decorators/integral/page_decorator.rb
-- app/decorators/integral/page_version_decorator.rb
 - app/decorators/integral/paginating_decorator.rb
 - app/decorators/integral/post_decorator.rb
-- app/decorators/integral/post_version_decorator.rb
 - app/decorators/integral/user_decorator.rb
-- app/decorators/integral/user_version_decorator.rb
 - app/decorators/integral/version_decorator.rb
 - app/helpers/integral/application_helper.rb
 - app/helpers/integral/backend/base_helper.rb
@@ -1593,10 +1578,12 @@ files:
 - app/jobs/integral/newsletter_signup_job.rb
 - app/jobs/integral/webhook/delivery_job.rb
 - app/mailers/integral/contact_mailer.rb
+- app/mailers/integral/devise_mailer.rb
 - app/models/ckeditor/asset.rb
 - app/models/ckeditor/attachment_file.rb
 - app/models/ckeditor/picture.rb
 - app/models/concerns/integral/lazy_contentable.rb
+- app/models/concerns/integral/notification/subscribable.rb
 - app/models/concerns/integral/webhook/delivery.rb
 - app/models/concerns/integral/webhook/observable.rb
 - app/models/integral/application_record.rb
@@ -1609,8 +1596,11 @@ files:
 - app/models/integral/link.rb
 - app/models/integral/list.rb
 - app/models/integral/list_item.rb
+- app/models/integral/list_item_connection.rb
 - app/models/integral/list_version.rb
 - app/models/integral/newsletter_signup.rb
+- app/models/integral/notification/notification.rb
+- app/models/integral/notification/subscription.rb
 - app/models/integral/object.rb
 - app/models/integral/page.rb
 - app/models/integral/page_version.rb
@@ -1642,7 +1632,7 @@ files:
 - app/uploaders/integral/image_uploader.rb
 - app/views/devise/invitations/edit.haml
 - app/views/devise/mailer/confirmation_instructions.html.erb
-- app/views/devise/mailer/invitation_instructions.html.erb
+- app/views/devise/mailer/invitation_instructions.inky-haml
 - app/views/devise/mailer/invitation_instructions.text.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/mailer/unlock_instructions.html.erb
@@ -1651,7 +1641,8 @@ files:
 - app/views/devise/sessions/new.haml
 - app/views/devise/shared/_links.html.erb
 - app/views/integral/backend/activities/_activity.haml
-- app/views/integral/backend/activities/_grid.haml
+- app/views/integral/backend/activities/grid/_dropdown_actions.haml
+- app/views/integral/backend/activities/grid/_row_content.haml
 - app/views/integral/backend/activities/index.haml
 - app/views/integral/backend/activities/shared/_grid.haml
 - app/views/integral/backend/activities/shared/index.haml
@@ -1660,30 +1651,39 @@ files:
 - app/views/integral/backend/categories/_modal.haml
 - app/views/integral/backend/images/_create_modal.haml
 - app/views/integral/backend/images/_form.haml
-- app/views/integral/backend/images/_grid.haml
 - app/views/integral/backend/images/edit.haml
+- app/views/integral/backend/images/grid/_dropdown_actions.haml
+- app/views/integral/backend/images/grid/_row_content.haml
 - app/views/integral/backend/images/index.haml
+- app/views/integral/backend/images/list.haml
 - app/views/integral/backend/images/new.haml
+- app/views/integral/backend/images/show.haml
 - app/views/integral/backend/lists/_child_fields.haml
 - app/views/integral/backend/lists/_form.haml
-- app/views/integral/backend/lists/_grid.haml
 - app/views/integral/backend/lists/_item_container.haml
 - app/views/integral/backend/lists/_item_modal.haml
 - app/views/integral/backend/lists/_list_item_fields.haml
 - app/views/integral/backend/lists/_manager.haml
 - app/views/integral/backend/lists/edit.haml
+- app/views/integral/backend/lists/grid/_dropdown_actions.haml
+- app/views/integral/backend/lists/grid/_row_content.haml
 - app/views/integral/backend/lists/index.haml
+- app/views/integral/backend/lists/list.haml
 - app/views/integral/backend/lists/new.haml
+- app/views/integral/backend/lists/show.haml
+- app/views/integral/backend/notifications/_notification.haml
 - app/views/integral/backend/pages/_form.haml
-- app/views/integral/backend/pages/_grid.haml
 - app/views/integral/backend/pages/edit.haml
+- app/views/integral/backend/pages/grid/_dropdown_actions.haml
+- app/views/integral/backend/pages/grid/_row_content.haml
 - app/views/integral/backend/pages/index.haml
 - app/views/integral/backend/pages/list.haml
 - app/views/integral/backend/pages/new.haml
 - app/views/integral/backend/pages/show.haml
 - app/views/integral/backend/posts/_form.haml
-- app/views/integral/backend/posts/_grid.haml
 - app/views/integral/backend/posts/edit.haml
+- app/views/integral/backend/posts/grid/_dropdown_actions.haml
+- app/views/integral/backend/posts/grid/_row_content.haml
 - app/views/integral/backend/posts/index.haml
 - app/views/integral/backend/posts/list.haml
 - app/views/integral/backend/posts/new.haml
@@ -1697,31 +1697,35 @@ files:
 - app/views/integral/backend/settings/sections/_social.haml
 - app/views/integral/backend/shared/_activity_modal.haml
 - app/views/integral/backend/shared/_breadcrumbs.haml
-- app/views/integral/backend/shared/_empty_grid.haml
-- app/views/integral/backend/shared/_grid.haml
 - app/views/integral/backend/shared/_image_preview.haml
 - app/views/integral/backend/shared/_image_selector.haml
-- app/views/integral/backend/shared/_pagination.haml
+- app/views/integral/backend/shared/_notification_subscription_toggle.haml
+- app/views/integral/backend/shared/action_bar/_index.haml
+- app/views/integral/backend/shared/action_bar/_show.haml
 - app/views/integral/backend/shared/cards/_at_a_glance.haml
 - app/views/integral/backend/shared/cards/_categories.haml
 - app/views/integral/backend/shared/cards/_object.haml
 - app/views/integral/backend/shared/cards/_recent_activity.haml
-- app/views/integral/backend/shared/cards/_recent_pages.haml
-- app/views/integral/backend/shared/cards/_recent_posts.haml
+- app/views/integral/backend/shared/cards/_recent_resources.haml
 - app/views/integral/backend/shared/cards/_recent_user_activity.haml
-- app/views/integral/backend/shared/cards/_recent_users.haml
 - app/views/integral/backend/shared/cards/_top_post_authors.haml
 - app/views/integral/backend/shared/cards/_welcome.haml
 - app/views/integral/backend/shared/graphs/_donut.haml
 - app/views/integral/backend/shared/graphs/_line.haml
 - app/views/integral/backend/shared/graphs/_no_data_available.haml
+- app/views/integral/backend/shared/grid/_empty.haml
+- app/views/integral/backend/shared/grid/_form.haml
+- app/views/integral/backend/shared/grid/_grid.haml
+- app/views/integral/backend/shared/grid/_pagination.haml
+- app/views/integral/backend/shared/grid/_row_layout.haml
 - app/views/integral/backend/shared/record_selector/_collection.haml
 - app/views/integral/backend/shared/record_selector/_modal.haml
 - app/views/integral/backend/shared/record_selector/_record.haml
 - app/views/integral/backend/static_pages/dashboard.haml
 - app/views/integral/backend/users/_form.haml
-- app/views/integral/backend/users/_grid.haml
 - app/views/integral/backend/users/edit.haml
+- app/views/integral/backend/users/grid/_dropdown_actions.haml
+- app/views/integral/backend/users/grid/_row_content.haml
 - app/views/integral/backend/users/index.haml
 - app/views/integral/backend/users/list.haml
 - app/views/integral/backend/users/new.haml
@@ -1840,6 +1844,8 @@ files:
 - db/migrate/20190929191412_add_integral_post_categories.rb
 - db/migrate/20191203090008_add_image_to_integral_categories.rb
 - db/migrate/20200401210442_create_category_versions.rb
+- db/migrate/20200407022636_create_integral_notifications.rb
+- db/migrate/20200421223602_add_status_to_integral_users.rb
 - db/seeds.rb
 - lib/generators/integral/assets_generator.rb
 - lib/generators/integral/install_generator.rb
@@ -1852,6 +1858,7 @@ files:
 - lib/generators/templates/seeds.rb
 - lib/generators/templates/sitemap.rb
 - lib/integral.rb
+- lib/integral/acts_as_integral.rb
 - lib/integral/acts_as_listable.rb
 - lib/integral/button_link_renderer.rb
 - lib/integral/chart_renderer/base.rb
@@ -1914,8 +1921,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Integral CMS combines all the tools necessary to create a website which stands

data/app/decorators/integral/category_version_decorator.rb

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

data/app/decorators/integral/image_version_decorator.rb

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

data/app/decorators/integral/list_version_decorator.rb

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

data/app/decorators/integral/page_version_decorator.rb

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