pagy_cursor 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab31fcaa027ea7c3a4a39a695505a6215672457b29775bf8139e8ae69de7faff
-  data.tar.gz: b49aeed576699eb3e1237c25ee69e569f0ae0a55e857462dc7473d79e0755d80
+  metadata.gz: 59535b7b4048ff1ca8d86d899e95846e3c67ffc2023d64742480a558d1d6d242
+  data.tar.gz: c5138ff0b4a0f6b11b0f0ed49973bc057d387009e961571c45f5b0bb0d5f08f3
 SHA512:
-  metadata.gz: 687d9a0b4acc0570f333f19f868ff4c19a3866c4515efdd32e0e04086e62b9c928a9be3a472efa39bbe988344deb28a0fde50c3ea85704fa3ff1575e0de34bd1
-  data.tar.gz: 23c476eed3f2963fa2080a1b11019a17f23ee563499441fb45eed0837d84e8e26aaeb297a3253c0bc8e3ad3006cf3f0d2c45678a5983c0ec068cb92af93a19b1
+  metadata.gz: 90a0760bb69481f533719430fcf3b12c042b7b6956880135e5b4e03974f73f8451d303b44717c55d8f46378d30e0b993cb19416095752844da261cda8f49c934
+  data.tar.gz: e8a2040f3308dcf405ece7720c467241e8009b6a7b1d3f0c10dede7f9aec8f55a97f2d7cb396d3d2ddaef2b612811c191739e95cff6c17ebcd615e6f9e84afe6

data/.github/workflows/gempush.yml

@@ -0,0 +1,28 @@
+name: Ruby Gem
+
+on:
+  push:
+    tags:
+      - '*'
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        version: 2.6.x
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/.gitignore

@@ -13,3 +13,5 @@
 gemfiles/*.lock
 log
 *.sqlite3
+
+spec/dummy/tmp

data/Gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem "rails", "~> 6.0.0"
+gem "pg"
+gem "sqlite3"
+gem "mysql2"
+gem "pry"
+# Specify your gem's dependencies in pagy_cursor.gemspec
+gemspec path: "./"

data/Gemfile.lock

@@ -0,0 +1,172 @@
+PATH
+  remote: .
+  specs:
+    pagy_cursor (0.1.1)
+      activerecord (>= 5)
+      pagy
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
+      globalid (>= 0.3.6)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      marcel (~> 0.3.1)
+    activesupport (6.0.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    builder (3.2.4)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    diff-lcs (1.3)
+    erubi (1.9.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.4)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    mysql2 (0.5.3)
+    nio4r (2.5.2)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    pagy (3.7.3)
+    pg (1.2.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.2.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sprockets (4.0.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  mysql2
+  pagy_cursor!
+  pg
+  pry
+  rails (~> 6.0.0)
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  sqlite3
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -15,31 +15,70 @@ gem 'pagy_cursor'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 ## Usage
 
 Include the backend in some controller:
+
 ```ruby
-require "pagy_cursor"
+require "pagy_cursor/pagy/extras/cursor"
+require "pagy_cursor/pagy/extras/cursor_uuid"
 
 include Pagy::Backend
 ```
 Default
+
 ```ruby
 pagy_cursor(Post.all)
 ```
+
 Before and After
+
 ```ruby
 pagy_cursor(Post.all, after: 10)
 pagy_cursor(Post.all, before: 10)
 ```
+
 With UUID
+
 ```ruby
 pagy_uuid_cursor(Post.all, after: "ce5d2741-4e52-49b2-bb76-c41b67ab3aad")
 pagy_uuid_cursor(Post.all, before: "ce5d2741-4e52-49b2-bb76-c41b67ab3aad")
 ```
 
+Ordering collection
+```ruby
+pagy_cursor(Post.all, after: 10, order: {updated_at: :desc})
+```
+
+## Credits
+
+Many thanks to:
+- [Uysim](https://github.com/Uysim)
+- [M. Yunan Helmy](https://github.com/yunanhelmy)
+- [Eumir Gaspar](https://github.com/corroded)
+
+## Support Databases
+
+- SQLite
+- Postgresql
+- MySQL
+
+## Tests & Contributing
+
+To run tests in root folder of gem:
+
+- ```export DB=sqlite3``` to work with sqlite (see [support databases](#support-databases))
+- ```bundle install```
+- ```bundle exec rspec ```
+
+To test on specific Rails verison
+```export BUNDLE_GEMFILE=gemfiles/active_record_5.2.gemfile``` to work with Rails 5.2
+
+To play with app cd test/dummy and rails s -b 0.0.0.0 (before rails db:migrate).
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/gemfiles/active_record_60.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem "rails", "~> 6.0.0"
+gem "pg"
+gem "sqlite3"
+gem "mysql2"
+gem "pry"
+# Specify your gem's dependencies in pagy_cursor.gemspec
+gemspec path: "../"

data/lib/pagy_cursor/pagy/cursor.rb

@@ -12,6 +12,8 @@ class Pagy
       @after = vars[:after]
       @arel_table = vars[:arel_table]
       @primary_key = vars[:primary_key]
+      @reorder = vars[:order] || {}
+
       if @before.present? and @after.present?
         raise(ArgumentError, 'before and after can not be both mentioned')
       end
@@ -20,23 +22,23 @@ class Pagy
 
         @comparation = 'lt' # arel table less than
         @position = @before
-        @order = { :created_at => :desc , @primary_key => :desc }
+        @order = @reorder.merge({ :created_at => :desc , @primary_key => :desc })
 
-        if @after.present?
+        if @after.present? || (@reorder.present? && @reorder.values.uniq.first.to_sym == :asc)
           @comparation = 'gt' # arel table greater than
           @position = @after
-          @order = { :created_at => :asc , @primary_key => :asc }
+          @order = @reorder.merge({ :created_at => :asc , @primary_key => :asc })
         end
       else
 
         @comparation = 'lt'
         @position = @before
-        @order = { @primary_key => :desc }
+        @order = @reorder.merge({ @primary_key => :desc })
 
-        if @after.present?
+        if @after.present? || (@reorder.present? && @reorder.values.uniq.first.to_sym == :asc)
           @comparation = 'gt'
           @position = @after
-          @order = { @primary_key => :asc }
+          @order = @reorder.merge({ @primary_key => :asc })
         end
       end
     end

data/lib/pagy_cursor/version.rb

@@ -1,3 +1,3 @@
 module PagyCursor
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/pagy_cursor.gemspec

@@ -14,19 +14,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Uysim/pagy-cursor"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  #
-  #   spec.metadata["homepage_uri"] = spec.homepage
-  #   spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  #   spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
-
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
@@ -38,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pagy"
   spec.add_dependency "activerecord", ">= 5"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy_cursor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Uysim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -87,10 +87,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -99,6 +101,7 @@ files:
 - gemfiles/active_record_50.gemfile
 - gemfiles/active_record_51.gemfile
 - gemfiles/active_record_52.gemfile
+- gemfiles/active_record_60.gemfile
 - lib/pagy_cursor.rb
 - lib/pagy_cursor/pagy/cursor.rb
 - lib/pagy_cursor/pagy/extras/cursor.rb
@@ -124,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: cursor paginations for pagy

data/.travis.yml

@@ -1,29 +0,0 @@
-
-sudo: false
-
-language: ruby
-
-cache: bundler
-
-services:
-  - postgresql
-  - mysql
-
-rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.5
-  - 2.3.8
-
-gemfile:
-  - gemfiles/active_record_52.gemfile
-  - gemfiles/active_record_51.gemfile
-  - gemfiles/active_record_50.gemfile
-
-env:
-  - DB=sqlite3
-  - DB=postgresql
-  - DB=mysql
-
-before_install: gem install bundler -v 1.17.3
-script: bundle exec rspec