geared_pagination 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e47e02d5c3c03e2a1fdcfefba1e637b18f657ae70cfd7ba856c8196549cdcd11
-  data.tar.gz: 1f14405e08bdad25c2d8a0d7b8d3beb6b60841f2b34c3f9b08eb63fd1260a348
+  metadata.gz: dcd6217ccba91dc6481791650dd5906e390d45acf4fb71caf0c34d76eedaea83
+  data.tar.gz: 68a65630d9dc8cd95c236dcbf313aa2c4076c09a06ee0ccb9175a175857072f6
 SHA512:
-  metadata.gz: d48fc3e0cba4123df563a29081afd854f8af253c9ff39abb2a65e50bc83373974cd8cfb71334704ab3b9833cd43e32f364119d1475b46ec6dae54a2b7bc8f9c1
-  data.tar.gz: 743b038bbcc2d062fb4917b3c2842b9be34283e504b0150d74ba6260a021183267b68b7fc2806e31f0bd74021913be55fe046779d41bb6edda25be17eadd5785
+  metadata.gz: 86686dda8a790f044b647946737c6ebb238a370f77ea0aea7f3c22d3335779b9ce6ee1bd89c43a62d66d3e6299769a6d70ae48f86fbce1df09df8106e113069f
+  data.tar.gz: 9d0a5ea64551d9978cb366411e8b1141ae09deab60e6f8ff24b4485122a155e17156060b73bd76802a37f3b124dd79c7d51c2ed83b308d4a9841a7923680b295

data/.github/workflows/ci.yml

@@ -2,22 +2,19 @@ name: CI
 on: [push, pull_request]
 jobs:
   tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-
+      - uses: actions/checkout@v4
       - name: Set up Ruby 2.7
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.7.x
-
-      - name: Cache gem dependencies
-        uses: actions/cache@v1
+        uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-bundler-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-bundler-
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Install system dependencies
         run: sudo apt-get update && sudo apt-get install libsqlite3-dev

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geared_pagination (1.1.2)
+    geared_pagination (1.2.0)
       activesupport (>= 5.0)
       addressable (>= 2.5.0)
 
@@ -73,8 +73,8 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     builder (3.2.4)
     byebug (11.1.3)
     concurrent-ruby (1.1.10)
@@ -113,7 +113,7 @@ GEM
     nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    public_suffix (4.0.7)
+    public_suffix (5.0.4)
     racc (1.6.0)
     rack (2.2.3.1)
     rack-test (1.1.0)
@@ -160,7 +160,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
+  bundler
   byebug
   geared_pagination!
   rails (>= 5.0)

data/bin/release

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+VERSION=$1
+
+printf "module GearedPagination\n  VERSION = \"$VERSION\"\nend\n" > ./lib/geared_pagination/version.rb
+bundle
+git add Gemfile.lock lib/geared_pagination/version.rb
+git commit -m "Bump version for $VERSION"
+git push
+git tag v$VERSION
+git push --tags
+gem build geared_pagination.gemspec
+gem push "geared_pagination-$VERSION.gem" --host https://rubygems.org

data/bin/test

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+$: << File.expand_path("../test", __dir__)
+
+puts "Installing Ruby dependencies"
+`bundle install`
+
+require "bundler/setup"
+require "rails/plugin/test"

data/geared_pagination.gemspec

@@ -1,6 +1,8 @@
+require_relative "lib/geared_pagination/version"
+
 Gem::Specification.new do |s|
   s.name     = 'geared_pagination'
-  s.version  = '1.1.2'
+  s.version  = GearedPagination::VERSION
   s.authors  = 'David Heinemeier Hansson'
   s.email    = 'david@basecamp.com'
   s.summary  = 'Paginate Active Record sets at variable speeds'
@@ -12,7 +14,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>= 5.0'
   s.add_dependency 'addressable', '>= 2.5.0'
 
-  s.add_development_dependency 'bundler', '~> 1.12'
+  s.add_development_dependency 'bundler'
 
   s.files      = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")

data/lib/geared_pagination/engine.rb

@@ -7,4 +7,10 @@ class GearedPagination::Engine < ::Rails::Engine
       ActionController::Base.send :include, GearedPagination::Controller
     end
   end
+
+  if GearedPagination.rails_7_1?
+    initializer "geared_pagination.deprecator" do |app|
+      app.deprecators[:geared_pagination] = GearedPagination.deprecator
+    end
+  end
 end

data/lib/geared_pagination/page.rb

@@ -48,7 +48,11 @@ module GearedPagination
     end
 
     alias_method :next_number, :next_param
-    deprecate next_number: "use #next_param instead"
+    if GearedPagination.rails_7_1?
+      deprecate next_number: "use #next_param instead", deprecator: GearedPagination.deprecator
+    else
+      deprecate next_number: "use #next_param instead"
+    end
 
 
     def cache_key

data/lib/geared_pagination/portions/portion_at_cursor.rb

@@ -12,10 +12,13 @@ module GearedPagination
     end
 
     def from(scope)
-      if scope.order_values.none? && scope.limit_value.nil?
-        selection_from(scope).order(orderings).limit(limit)
-      else
-        raise ArgumentError, "Can't paginate relation with ORDER BY or LIMIT clauses (got #{scope.to_sql})"
+      @froms ||= {}
+      @froms[scope] ||= begin
+        if scope.order_values.none? && scope.limit_value.nil?
+          selection_from(scope).order(orderings).limit(limit)
+        else
+          raise ArgumentError, "Can't paginate relation with ORDER BY or LIMIT clauses (got #{scope.to_sql})"
+        end
       end
     end
 

data/lib/geared_pagination/version.rb

@@ -0,0 +1,3 @@
+module GearedPagination
+  VERSION = "1.2.0"
+end

data/lib/geared_pagination.rb

@@ -1,2 +1,15 @@
+require 'active_support/deprecation'
+require_relative "geared_pagination/version"
+
+module GearedPagination
+  def self.rails_7_1?
+    Rails.version >= "7.1.0" rescue false
+  end
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new(VERSION, "GearedPagination")
+  end
+end
+
 require 'geared_pagination/recordset'
 require 'geared_pagination/engine' if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geared_pagination
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,17 +42,17 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
-description: 
+        version: '0'
+description:
 email: david@basecamp.com
 executables: []
 extensions: []
@@ -66,6 +66,8 @@ files:
 - README.md
 - Rakefile
 - bin/rails
+- bin/release
+- bin/test
 - geared_pagination.gemspec
 - lib/geared_pagination.rb
 - lib/geared_pagination/controller.rb
@@ -79,6 +81,7 @@ files:
 - lib/geared_pagination/portions/portion_at_offset.rb
 - lib/geared_pagination/ratios.rb
 - lib/geared_pagination/recordset.rb
+- lib/geared_pagination/version.rb
 - test/controller_test.rb
 - test/cursor_test.rb
 - test/dummy/Rakefile
@@ -162,7 +165,7 @@ homepage: https://github.com/basecamp/geared_pagination
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,8 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Paginate Active Record sets at variable speeds
 test_files: