rotulus 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01279029660a73c745ba2c67c703454f54f44a160b5964523c0fd521ca973c0
-  data.tar.gz: b1479c0f2a2b8971e4d8977f4b5e4a052829d2d3f472fe1199497266d8d3cafe
+  metadata.gz: 6bc659ce794517af485f9c65dc18467b4278c21e8813e612a0b4dcdabde0b10f
+  data.tar.gz: 2dc66e54844499214cc07ae49d8ca0ad33586ba28a11d4e2a3a4366d4633525a
 SHA512:
-  metadata.gz: 12120dce0516e9823e891dea5bfe76af1148234e18a556f1d889d1b5ec68031746afbe6e0599955ced295de214d6eedfa3b560ffdce03e0c49e94561a3c5399a
-  data.tar.gz: 6b10d0bab75dffd5f1c988f09161a56cdc0688e50af403864a9b15c6d6b0b2a1191eddff5606be86e516ba3ba785a96cbbaa39dbb963593a00108fb4aee8bc23
+  metadata.gz: f60f971213d39e4baa5d6fd53227971df6e09fb87f1824487e17a2972e80803db29e2b5894cc7b0be659d73ad3bf959a5944c5ed0235b754f19a80afe0cd69e1
+  data.tar.gz: f0b072563fe10c626772f2879d9533263b393452022a5e4547ea6e5413a5bfab92ef629dd3aa787328b3bda14ae89ae04e1d5c345073fe3ae2e2afc2092dae86

data/CHANGELOG.md

@@ -1,3 +1,7 @@
-## 0.1.0
+## 0.2.0
 
 Initial release.
+
+## 0.2.1
+
+Drop unnecessary ORDER BY columns following a non-nullable and distinct column.

data/README.md

@@ -1,6 +1,6 @@
 # Rotulus
 
-[![CI](https://github.com/jsonb-uy/rotulus/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/jsonb-uy/rotulus/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/jsonb-uy/rotulus/branch/main/graph/badge.svg?token=OKGOWP4SH9)](https://codecov.io/gh/jsonb-uy/rotulus)
+[![Gem Version](https://badge.fury.io/rb/rotulus.svg)](https://badge.fury.io/rb/rotulus) [![CI](https://github.com/jsonb-uy/rotulus/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/jsonb-uy/rotulus/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/jsonb-uy/rotulus/branch/main/graph/badge.svg?token=OKGOWP4SH9)](https://codecov.io/gh/jsonb-uy/rotulus)
 
 ### Cursor-based pagination for apps built on Rails/ActiveRecord 
 
@@ -352,13 +352,13 @@ page = Rotulus::Page.new(User.all, order: { first_name: { direction: :asc, nulls
 
 ###### SQL:
 ```sql
--- if first_name value of the last record on current page is not null:
+-- if last_name value of the current page's last record  is not null:
 WHERE ((users.last_name >= ? OR users.last_name IS NULL) AND
   ((users.last_name > ? OR users.last_name IS NULL) 
   OR (users.last_name = ? AND users.id > ?)))
 ORDER BY users.last_name asc nulls last, users.id asc LIMIT 3
 
--- if first_name value of the last record on current page is null:
+-- if last_name value of the current page's last record is null:
 WHERE users.last_name IS NULL AND users.id > ?
 ORDER BY users.last_name asc nulls last, users.id asc LIMIT 3
 ```

data/lib/rotulus/order.rb

@@ -62,14 +62,14 @@ module Rotulus
     #
     # @return [String] the ORDER BY clause
     def reversed_sql
-      Arel.sql(columns.map(&:reversed_order_sql).join(', '))
+      Arel.sql(columns_for_order.map(&:reversed_order_sql).join(', '))
     end
 
     # Returns the ORDER BY sort expression(s) to sort the records
     #
     # @return [String] the ORDER BY clause
     def sql
-      Arel.sql(columns.map(&:order_sql).join(', '))
+      Arel.sql(columns_for_order.map(&:order_sql).join(', '))
     end
 
     # Generate a 'state' so we can detect whether the order definition has changed.
@@ -92,6 +92,19 @@ module Rotulus
 
     attr_reader :ar_model, :definition, :raw_hash
 
+    def columns_for_order
+      return @columns_for_order if instance_variable_defined?(:@columns_for_order)
+
+      @columns_for_order = []
+      columns.each do |col|
+        @columns_for_order << col
+
+        break if col.distinct? && !col.nullable?
+      end
+
+      @columns_for_order
+    end
+
     def ar_model_primary_key
       ar_model.primary_key
     end

data/lib/rotulus/version.rb

@@ -1,3 +1,3 @@
 module Rotulus
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rotulus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Uy Jayson B
@@ -73,7 +73,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
 - lib/rotulus.rb
@@ -97,7 +96,7 @@ metadata:
   homepage_uri: https://github.com/jsonb-uy/rotulus
   source_code_uri: https://github.com/jsonb-uy/rotulus
   changelog_uri: https://github.com/jsonb-uy/rotulus/blob/main/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/github/jsonb-uy/rotulus
+  documentation_uri: https://rubydoc.info/github/jsonb-uy/rotulus/main
   bug_tracker_uri: https://github.com/jsonb-uy/rotulus/issues
 post_install_message:
 rdoc_options: []

data/Gemfile

@@ -1,46 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-rails_version = ENV['RAILS_VERSION'] || '7-0-stable'
-
-gem 'rake'
-gem 'rspec'
-
-if ENV.fetch('COVERAGE', nil) == 'true'
-  gem 'simplecov'
-  gem 'simplecov-cobertura'
-end
-
-case rails_version
-when '4-2-stable'
-  # Ruby 2.2 or newer.
-  gem 'pg', '~> 0.15'
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'mysql2', '~> 0.4.4'
-when '5-0-stable', '5-1-stable', '5-2-stable'
-  # Ruby 2.2.2 or newer.
-  gem 'pg', '~> 0.18'
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'mysql2', '~> 0.4.4'
-when '6-0-stable'
-  # Ruby 2.5.0 or newer.
-  gem 'pg', '~> 0.18'
-  gem 'sqlite3', '~> 1.4'
-  gem 'mysql2', '>= 0.4.4'
-when '6-1-stable'
-  # Ruby 2.5.0 or newer.
-  gem 'pg', '~> 1.1'
-  gem 'sqlite3', '~> 1.4'
-  gem 'mysql2', '~> 0.5'
-when '7-0-stable'
-  # Ruby 2.7.0 or newer.
-  gem 'pg', '~> 1.1'
-  gem 'sqlite3', '~> 1.4'
-  gem 'mysql2', '~> 0.5'
-else
-  gem 'pg'
-  gem 'sqlite3'
-  gem 'mysql2'
-end
-
-gem 'rails', git: 'https://github.com/rails/rails', branch: rails_version