katalyst-tables 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a572503d453b3b8b98a82942a48c5e2772cec4023417e8db71ed2cd8299331a
-  data.tar.gz: 4761c4fa4b21aa8c91f70c2118e27bd68dfd700ffc419ed6f7eae299b582710f
+  metadata.gz: ddd6b87989959fe3bea80d3d061984ace8fbaa918033ae6d40f1fb41fa752a4f
+  data.tar.gz: c1fcff810e0c6e76ae8ae8df7a92f26d0badd1601b6fd091748249eaeebdc262
 SHA512:
-  metadata.gz: aa9c1dc28479dc744c18804999d5f34ea9937e1500dbe8c01a1f2c183439077dfdd7047dbb8ce2ea0f93ef43bcfcea15eee6d08b2606f3682a00747e590cbc3b
-  data.tar.gz: 45c36c312e7f6efa8b11409d4822d135c961eba6ade51055b4671371b3b1a6e25a01c9fd1e059c0a89fa5da6bea3e7fe56fda267a1b3d7bfdf51e515b7b8a696
+  metadata.gz: 39a50df893890ed53a0d54acc7ab5d23a0292c9e98ec82b4e6286325713e115d718cfcdaf8caf6c0b2ce211ec20ea514eb53b5dc275dfe04bf253ee00d094aa5
+  data.tar.gz: 919db4197193d5c4d2be8ea6c15642ff309819757c32ae6cb99266412029e0d250156220584442d048b97a40bcc9c5cce7660d141ac9fb157d12d8468b6fd268

data/README.md

@@ -281,8 +281,8 @@ def index
   table = Katalyst::Turbo::TableComponent.new(collection:, id: "people")
   
   respond_to do |format|
+    format.turbo_stream { render table } if self_referred?
     format.html { render locals: { table: table } }
-    format.turbo_stream { render table }
   end
 end
 ```

data/app/components/concerns/katalyst/tables/turbo_replaceable.rb

@@ -47,10 +47,10 @@ module Katalyst
             component_class.alias_method(:vc_render_template_for, :render_template_for)
             component_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def render_template_for(variant = nil)
-              return vc_render_template_for(variant) unless turbo?
-              controller.respond_to do |format|
-                format.html { vc_render_template_for(variant) }
-                format.turbo_stream { turbo_stream.replace(id, vc_render_template_for(variant)) }
+              if turbo? && response.media_type.eql?("text/vnd.turbo-stream.html")
+                turbo_stream.replace(id, vc_render_template_for(variant))
+              else
+                vc_render_template_for(variant)
               end
             end
             RUBY

data/app/components/katalyst/tables/pagy_nav_component.rb

@@ -3,7 +3,9 @@
 module Katalyst
   module Tables
     class PagyNavComponent < ViewComponent::Base # :nodoc:
-      include Pagy::Frontend
+      # Pagy is not a required gem unless you're using pagination
+      # Expect to see NoMethodError failures if pagy is not available
+      "Pagy::Frontend".safe_constantize&.tap { |pagy| include(pagy) }
 
       attr_reader :pagy_options
 

data/app/models/concerns/katalyst/tables/collection/core.rb

@@ -11,13 +11,9 @@ module Katalyst
         include ActiveModel::Dirty
         include ActiveSupport::Configurable
 
-        included do
-          class_attribute :reducers, default: ActionDispatch::MiddlewareStack.new
-
-          class << self
-            delegate :use, :before, to: :reducers
-          end
+        include Reducers
 
+        included do
           attr_accessor :items
 
           delegate :model, :to_model, :each, :count, :empty?, to: :items, allow_nil: true

data/app/models/concerns/katalyst/tables/collection/pagination.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "pagy/backend"
-
 module Katalyst
   module Tables
     module Collection
@@ -41,7 +39,9 @@ module Katalyst
         end
 
         class Paginate # :nodoc:
-          include Pagy::Backend
+          # Pagy is not a required gem unless you're using pagination
+          # Expect to see NoMethodError failures if pagy is not available
+          "Pagy::Backend".safe_constantize&.tap { |pagy| include(pagy) }
 
           def initialize(app)
             @app = app

data/app/models/concerns/katalyst/tables/collection/reducers.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Katalyst
+  module Tables
+    module Collection
+      # Adds stackable reducers to a collection.
+      # Inspired by ActiveDispatch::MiddlewareStack which unfortunately can't
+      # be used due to monkey patches from gems such as NewRelic which assume
+      # it is only used for Rack middleware.
+      module Reducers
+        extend ActiveSupport::Concern
+
+        included do
+          class_attribute :reducers, default: Stack.new
+        end
+
+        class_methods do
+          delegate :use, :insert, to: :reducers
+        end
+
+        class Stack # :nodoc:
+          def initialize
+            @stack = []
+          end
+
+          def use(klass)
+            @stack << Reducer.new(klass) unless index(klass)
+          end
+
+          def insert(other, klass)
+            @stack.insert(index(other), Reducer.new(klass))
+          end
+
+          def index(klass)
+            @stack.index(Reducer.new(klass))
+          end
+
+          def build(&block)
+            @stack.freeze.reduce(block) do |app, reducer|
+              reducer.build(app)
+            end
+          end
+        end
+
+        class Reducer # :nodoc:
+          attr_reader :klass
+
+          def initialize(klass)
+            @klass = klass
+          end
+
+          def build(app)
+            klass.new(app)
+          end
+
+          def ==(other)
+            klass.name == other.klass.name
+          end
+
+          def inspect
+            "#<#{self.class.name} #{klass.name}>"
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/katalyst/tables/collection/sorting.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "pagy/backend"
-
 module Katalyst
   module Tables
     module Collection

data/app/models/katalyst/tables/collection.rb

@@ -24,8 +24,8 @@ module Katalyst
         include Pagination
         include Sorting
 
-        use(Pagination::Paginate)
         use(Sorting::Sort)
+        use(Pagination::Paginate)
       end
     end
   end

data/lib/katalyst/tables/backend.rb

@@ -27,6 +27,11 @@ module Katalyst
                 .apply(collection)
       end
 
+      def self_referred?
+        request.referer.present? && URI.parse(request.referer).path == request.path
+      end
+      alias self_refered? self_referred?
+
       included do
         class_attribute :_default_table_component, instance_accessor: false
       end

data/lib/katalyst/tables/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Tables
-    VERSION = "2.1.0"
+    VERSION = "2.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -68,6 +68,7 @@ files:
 - app/components/katalyst/turbo/table_component.rb
 - app/models/concerns/katalyst/tables/collection/core.rb
 - app/models/concerns/katalyst/tables/collection/pagination.rb
+- app/models/concerns/katalyst/tables/collection/reducers.rb
 - app/models/concerns/katalyst/tables/collection/sorting.rb
 - app/models/katalyst/tables/collection.rb
 - config/importmap.rb