pagy_cursor 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b30060ea35c9a871c94d64e1bca0a9d289e13a9c3751b34aca9b5d358df1e7bf
-  data.tar.gz: cc89b1199ee954188859776d4db32b6634ad8efef34f7ffa94a917802a5fd701
+  metadata.gz: aeef340ec1e16f142493c13d33e9aff54b231be6e6bccbcd54407feafe8ee392
+  data.tar.gz: 6e4f963a7cc5ae9d19c6a07327464989081e69bfc6c431fa672aad91dded0af7
 SHA512:
-  metadata.gz: 7450e19adcb2c85ff8cff5af659790ee7094a47580edc9e18ea6d5735da3c635357ca041908a2b160a1e19d3e45966c6e7f4757ea5d0881afa6d885d040f1cff
-  data.tar.gz: bda797625d3c5579f6ae4f10f0a9a0623b41c11f82536047b3d95beabee13b8f0c16b2dc0fbf1daf390229f50c0e8e547cb2920ca7c47ca98f86e1fe69a776b8
+  metadata.gz: d78438ba52a1287c0c445d4e59a7688bf625116cd54468a6e879f2871361f9d3a2731c150ddb1c40f0c29c3dfdea387f0812cc2b20136ccdf4d511777565494b
+  data.tar.gz: 5f0498e40683a5e51caa923845e56fcf9d9633f6cb22b48c5fb9453bffbf5007f43ca7e5e24ae65de194c68fe1bfe3d6e90d70783a877ec69fb4b73c00734cc2

data/.github/workflows/ci.yml

@@ -34,12 +34,14 @@ jobs:
           - ruby-version: 3.1
             env:
               BUNDLE_GEMFILE: gemfiles/active_record_70.gemfile
-
+          - ruby-version: 3.2
+            env:
+              BUNDLE_GEMFILE: gemfiles/active_record_70.gemfile
       fail-fast: false
     env: ${{ matrix.env }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up ruby
         uses: ruby/setup-ruby@v1
@@ -74,16 +76,19 @@ jobs:
           - ruby-version: 2.7
             env:
               BUNDLE_GEMFILE: gemfiles/active_record_52.gemfile
-          - ruby-version: 3.0
+          - ruby-version: "3.0"
             env:
               BUNDLE_GEMFILE: gemfiles/active_record_61.gemfile
           - ruby-version: 3.1
             env:
               BUNDLE_GEMFILE: gemfiles/active_record_70.gemfile
+          - ruby-version: 3.2
+            env:
+              BUNDLE_GEMFILE: gemfiles/active_record_70.gemfile
       fail-fast: false
     env: ${{ matrix.env }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up ruby
         uses: ruby/setup-ruby@v1

data/.github/workflows/gempush.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 3.1
       uses: actions/setup-ruby@v1
       with:
-        version: 2.6.x
+        version: 3.1
 
     - name: Publish to RubyGems
       run: |

data/Gemfile.lock

@@ -106,6 +106,8 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
+    nokogiri (1.14.3-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.14.3-x86_64-darwin)
       racc (~> 1.4)
     pagy (6.0.3)
@@ -157,6 +159,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
+    sqlite3 (1.6.2-arm64-darwin)
     sqlite3 (1.6.2-x86_64-darwin)
     thor (1.2.1)
     timeout (0.3.2)
@@ -168,6 +171,7 @@ GEM
     zeitwerk (2.6.7)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-19
 
 DEPENDENCIES

data/README.md

@@ -55,6 +55,7 @@ pagy_cursor(Post.all, after: 10, order: {updated_at: :desc})
 
 Many thanks to:
 - [Uysim](https://github.com/Uysim)
+- [Hirokazu Hata](https://github.com/h-michael)
 - [M. Yunan Helmy](https://github.com/yunanhelmy)
 - [Eumir Gaspar](https://github.com/corroded)
 
@@ -73,7 +74,7 @@ To run tests in root folder of gem:
 - ```bundle exec rspec ```
 
 To test on specific Rails version
-```export BUNDLE_GEMFILE=gemfiles/active_record_52.gemfile``` to work with Rails 5.2
+```export BUNDLE_GEMFILE=gemfiles/active_record_70.gemfile``` to work with Rails 7
 
 To play with app cd test/dummy and rails s -b 0.0.0.0 (before rails db:migrate).
 

data/lib/pagy_cursor/pagy/extras/uuid_cursor.rb

@@ -23,9 +23,22 @@ class Pagy
       if position.present?
         arel_table = pagy.arel_table
 
-        select_created_at = arel_table.project(arel_table[:created_at]).where(arel_table[pagy.primary_key].eq(position))
-        select_the_sample_created_at = arel_table[:created_at].eq(select_created_at).and(arel_table[pagy.primary_key].send(pagy.comparation, position))
-        sql_comparation = arel_table[:created_at].send(pagy.comparation, select_created_at).or(select_the_sample_created_at)
+        # If the primary sort key is not "created_at"
+
+        # Select the primary sort key
+        # pagy.order should be something like:
+        #  [:created_at, :id] or [:foo_column, ..., :created_at, :id]
+        primary_sort_key = pagy.order.keys.detect{ |order_key| ![:created_at, :id].include?(order_key.to_sym) } || :created_at
+
+        select_previous_row = arel_table.project(arel_table[primary_sort_key]).
+          where(arel_table[pagy.primary_key].eq(position))
+
+        sql_comparation = arel_table[primary_sort_key].
+          send(pagy.comparation, select_previous_row).
+          or(
+            arel_table[primary_sort_key].eq(select_previous_row).
+            and(arel_table[pagy.primary_key].send(pagy.comparation, position))
+          )
 
         collection = collection.where(sql_comparation)
       end

data/lib/pagy_cursor/version.rb

@@ -1,3 +1,3 @@
 module PagyCursor
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy_cursor
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Uysim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy