fluxbit_view_components 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60a235092c19fce1b3548ee037d23e4698e106230bcffc2c64e38eea922c3fe2
-  data.tar.gz: 61ffaeca393020f18b18a6b1956bf568c5bcc99379f4b53c778da4512fe48b82
+  metadata.gz: 762b3796b8dfaa6244369146383b4994f3d5e0c3ba81226606f2a8e2e89b5cb8
+  data.tar.gz: 98299ec772265f75887e33f74a9d4249dcc18e1548e97ca684ba4bec7a75278a
 SHA512:
-  metadata.gz: '046998a7d114dc3e3734079b51a509665ae36c1ec585891d832c514f8bfca125d1ea991dce89f49b9758872c97a0c4ce9ca5738d6e49457401f2e2a37626e6e2'
-  data.tar.gz: 78d051dc5b7b9dd7ef26bcdaf5f26d6c3a1e8c6352dc1fe70dd19f3bfb46e933378e9fff5e79411aae94e85218526c3318ab66b0b88382a1e3f3026d548115e3
+  metadata.gz: d736f9bc7abfa18e62843b64960de28fe7aec3ece62c90343683548ab821168ce3fa7c3c374592cf71dbc951a0cbf726c9501f1adf550725046b47f123199bb5
+  data.tar.gz: 30c713c9c039c11e5aa0b3e0b10e13874ca92939c6ed765ac636322c9662a31da92d274af1de33923551bca92a182133996fdf7996eb3de4e369012d56acc30f

data/app/components/fluxbit/pagination_component.rb

@@ -15,19 +15,23 @@ class Fluxbit::PaginationComponent < Fluxbit::Component
     @next = @props.delete(:next)
     @page = @props.delete(:page) || 1
     @previous = @props.delete(:previous)
-    @size = @props.delete(:size) || :default
+    @size = @props.delete(:size) || 3
     @ends = @props.delete(:ends) || true
     @request_path = @props.delete(:request_path) || nil
 
     if @pagy
-      @count = @pagy.count
-      @last = @pagy.last
-      @next = @pagy.next
-      @page = @pagy.page
-      @previous = @pagy.previous
-      @size = @pagy.vars[:size]
-      @ends = @pagy.vars[:ends]
-      @request_path = @pagy.vars[:request_path]
+      @count = @pagy.count if @pagy.respond_to?(:count)
+      @last = @pagy.last if @pagy.respond_to?(:last)
+      @next = @pagy.next if @pagy.respond_to?(:next)
+      @page = @pagy.page if @pagy.respond_to?(:page)
+      @previous = @pagy.prev if @pagy.respond_to?(:prev)
+      @previous = @pagy.previous if @pagy.respond_to?(:previous)
+
+      if @pagy.respond_to?(:vars)
+        @size = @pagy.vars[:size]
+        @ends = @pagy.vars[:ends]
+        @request_path = @pagy.vars[:request_path]
+      end
     end
 
     unless @size.is_a?(Integer) && @size >= 0
@@ -186,13 +190,14 @@ class Fluxbit::PaginationComponent < Fluxbit::Component
   end
 
   def url_for(page)
-    vars = @pagy&.vars || {}
+    vars = @pagy.respond_to?(:vars) ? @pagy&.vars : {}
     # Use current request parameters as base
     params = (respond_to?(:request) ? request.GET : controller.request.GET).dup
     params.merge!(vars[:params].transform_keys(&:to_s)) if vars[:params].is_a?(Hash)
     # Set page and possibly limit
-    params[vars[:page_param].to_s] = page
-    params[vars[:limit_param].to_s] = vars[:limit] if vars[:limit_extra]
+    page_param = vars[:page_param]&.to_s.presence || 'page'
+    params[page_param] = page
+    params[vars[:limit_param].to_s] = vars[:limit] if vars[:limit_extra] && vars[:limit_param]
     # Apply params proc if given
     params = vars[:params].call(params) if vars[:params].is_a?(Proc)
 

data/lib/fluxbit/view_components/version.rb

@@ -1,5 +1,5 @@
 module Fluxbit
   module ViewComponents
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluxbit_view_components
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Arthur Molina