effective_pages 3.10.2 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd5033b1c1e0aeb36a9d35216a9f47e7e5f68de94dbe8688f8a4cf6e606a690
-  data.tar.gz: 3512cfb9bba19e4a2c71c56c86f05efe574bc7dbe0e924f138f2873b4da20c7a
+  metadata.gz: f608a5aa1318fab93ca116d9edea04aeb3a2077ecbcd41378dad81b3fb3018a5
+  data.tar.gz: 803a6fbc21a969464faf8d149b724d1a65b1b970e2a4b2e5ac57ddd17cf02e87
 SHA512:
-  metadata.gz: 3e8b8bba6f888898cc7e6ba2508b4d0cacd97881011c57e0dafe1ddb63f22b74c6da0db650f8e0bbd9b4b182f6f836c5167f6da95a764b31b1c5b590cb6e86b6
-  data.tar.gz: 01bba194d58a6d6faae7cd5cfa2773f92e165d13c2984015709905475328b019b5ec68b1072d6467ba5249e425ecc9a2d9f89c8276c550d5be2bb28feea7432a
+  metadata.gz: 482a07502489d6b6e6494bc6bf17f5b17c82ee05a68f500b85a33d380b71abc49074c371f556816b60142f131d523f46a3f66271c0ea69094dda69fb147523aa
+  data.tar.gz: dd26dfe9186dc3d1e8408f42967431a3e94d8db2882d8c96f7d53deb9103bb8af0888ccbd5bd247c52a5ba99ff9f0caf8d141caa037d478d5cb5aa98fee64e0b

data/app/controllers/effective/permalinks_controller.rb

@@ -1,9 +1,11 @@
 module Effective
   class PermalinksController < ApplicationController
-    def redirect
+    include Effective::CrudController
+
+    def show
       @permalink = Effective::Permalink.find_by! slug: params[:slug]
 
-      authorize! :redirect, @permalink
+      authorize! :show, @permalink
 
       redirect_to redirect_path_for(@permalink), allow_other_host: (@permalink.target == :url)
     end

data/app/datatables/effective_permalinks_datatable.rb

@@ -5,9 +5,18 @@ class EffectivePermalinksDatatable < Effective::Datatable
     col :updated_at, visible: false
 
     col :title
-    col :slug
+
+    col(:url) do |permalink|
+      url = (root_url + "link/" + permalink.slug)
+      link_to(url, url, target: '_blank')
+    end
+
     col :summary
-    col :tags
+
+    col :slug, visible: false
+    col :tags, visible: false
+
+    col :tracks_count, label: 'Views'
 
     actions_col
   end

data/app/models/effective/permalink.rb

@@ -14,6 +14,7 @@ module Effective
     acts_as_tagged
     acts_as_slugged
 
+    acts_as_trackable if respond_to?(:acts_as_trackable)
     log_changes if respond_to?(:log_changes)
 
     scope :deep, -> { 

data/app/views/admin/permalinks/_form.html.haml

@@ -3,5 +3,11 @@
     = render '/admin/permalinks/form_permalink', permalink: permalink
 
   - if permalink.persisted?
-    = tab 'Logs' do
-      = render_datatable(permalink.log_changes_datatable, inline: true, namespace: :admin)
+    - if permalink.class.respond_to?(:acts_as_trackable?)
+      = tab 'Tracks' do
+        - datatable = Admin::EffectiveTracksDatatable.new(owner: permalink)
+        = render_datatable(datatable, inline: true, namespace: :admin)
+
+    - if permalink.respond_to?(:log_changes_datatable)
+      = tab 'Logs' do
+        = render_datatable(permalink.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/effective/carousels/_carousel.html.haml

@@ -1,4 +1,4 @@
-= cache([carousel, Effective::CarouselItem.all.cache_key]) do
+= cache(EffectiveResources.cache_key(carousel, Effective::CarouselItem.all.cache_key_with_version)) do
   - carousel_items = Effective::CarouselItem.sorted.deep.where(carousel: carousel).to_a
   - uid = "effective-carousel-#{carousel}-#{Time.zone.now.to_i}"
 

data/app/views/effective/pages/_menu.html.haml

@@ -1,7 +1,7 @@
 - raise('expected a menu') unless menu.present?
 - menu = menu.to_s
 
-= cache([menu, current_user, Effective::Page.all.cache_key]) do
+= cache(EffectiveResources.cache_key(menu, current_user, Effective::Page.all.cache_key_with_version)) do
   - # Renders menu_root? level pages and their immediate children
   - Effective::Page.for_menu_root(menu).each do |page|
     - next unless EffectiveResources.authorized?(self, :show, page)

data/config/routes.rb

@@ -14,7 +14,7 @@ EffectivePages::Engine.routes.draw do
   end
 
   scope module: 'effective' do
-    get '/link/:slug', to: 'permalinks#redirect', as: :permalink_redirect
+    get '/link/:slug', to: 'permalinks#show', as: :permalink_redirect
 
     match '*id', to: 'pages#show', via: :get, as: :page, constraints: lambda { |req|
       Effective::Page.find_by_slug_or_id(req.path_parameters[:id] || '/').present?

data/db/migrate/101_create_effective_pages.rb

@@ -88,6 +88,7 @@ class CreateEffectivePages < ActiveRecord::Migration[6.0]
       t.string :slug
       t.string :url
       t.text   :summary
+      t.integer :tracks_count, default: 0
 
       t.timestamps
     end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.10.2'.freeze
+  VERSION = '3.11.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.10.2
+  version: 3.11.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails