order_query 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d5bb8b4f22e2ed2f205ed413e75a41edd4348d
-  data.tar.gz: 1f216dcc1ec1d112126c68af4a20e28e949663de
+  metadata.gz: 01cd918d06d860206e938baf5f500446132bdbd6
+  data.tar.gz: 39882d3d3d1fb272f88597ed281973618b6f293c
 SHA512:
-  metadata.gz: c3f31357b9b6c3d53d3003c90fdce074bb80bd8f314d81c34e2f096da1d61b18d79b9ea053d3f103c11d962daa155ff4b941c54c23e1b91e7d3d170a43afc054
-  data.tar.gz: c1c644de117104e827dbc58422c313f77d892f2d6671533e852fa4e64ae26feb57274a1415b1f9a30696f943541501e522b6de7fd36f060fee1eb880ba165388
+  metadata.gz: 8b23735d7393e0bc5e8842e644deb06f22618b50e68ed5537c1755c3e6dd88858189104d18cef2279d15fa9fc158dc8a3470570f980b13f929187e80be30d5d8
+  data.tar.gz: a40ec816d36f311647c37515adf8866151505a4205b5c46e0d42f22f47c1f9ef7816a290df711876157bfefe25849065ddb86aff1d5bf4b3f1967ae1d187560e

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.4.1
+
+* If a column had a `nulls:` option and there were multiple records with `NULL`,
+  all of these records but one were previously skipped. This is now fixed.
+  [#21](https://github.com/glebm/order_query/issues/21)
+
 ## 0.4.0
 
 * Adds nulls ordering options `nulls: :first` and `nulls: :last`.

data/README.md

@@ -11,7 +11,7 @@ This gem finds the next or previous record(s) relative to the current one effici
 Add to Gemfile:
 
 ```ruby
-gem 'order_query', '~> 0.4.0'
+gem 'order_query', '~> 0.4.1'
 ```
 
 ## Usage

data/lib/order_query/sql/where.rb

@@ -94,9 +94,11 @@ module OrderQuery
       # @param [:before or :after] side
       # @return [query, params] return query fragment for column values
       #   before / after the current one.
-      def where_side(col, side, strict = true, value = point.value(col))
+      def where_side(col, side, strict, value = point.value(col))
         if col.order_enum
           where_in col, col.enum_side(value, side, strict)
+        elsif value.nil?
+          where_null col, side, strict
         else
           where_ray col, value, side, strict
         end
@@ -126,24 +128,23 @@ module OrderQuery
       RAY_OP = { asc: '>', desc: '<' }.freeze
       NULLS_ORD = { first: 'IS NOT NULL', last: 'IS NULL' }.freeze
 
-      # rubocop:disable Metrics/AbcSize
-
-      def where_ray(col, from, mode, strict = true)
-        reverse = (mode == :before)
-        if from.nil?
-          ["#{col.column_name} #{NULLS_ORD[col.nulls_direction(reverse)]}", []]
+      def where_null(col, mode, strict)
+        if strict && col.nulls_direction(mode == :before) != :last
+          ["#{col.column_name} IS NOT NULL", []]
         else
-          ["#{col.column_name} " \
-           "#{RAY_OP[col.direction(reverse)]}#{'=' unless strict} ?",
-           [from]].tap do |ray|
-            if col.nullable? && col.nulls_direction(reverse) == :last
-              ray[0] += " OR #{col.column_name} IS NULL"
-              ray[0] = "(#{ray[0]})"
-            end
+          WHERE_IDENTITY
+        end
+      end
+
+      def where_ray(col, from, mode, strict)
+        ["#{col.column_name} "\
+         "#{RAY_OP[col.direction(mode == :before)]}#{'=' unless strict} ?",
+         [from]].tap do |ray|
+          if col.nullable? && col.nulls_direction(mode == :before) == :last
+            ray[0] = "(#{ray[0]} OR #{col.column_name} IS NULL)"
           end
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       WHERE_IDENTITY = ['', [].freeze].freeze
 

data/lib/order_query/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OrderQuery
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/gemfiles/rails_5_0.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec path: '../../'

data/spec/gemfiles/rails_5_1.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec path: '../../'

data/spec/gemfiles/rails_5_2.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec path: '../../'

data/spec/order_query_spec.rb

@@ -368,7 +368,7 @@ RSpec.describe 'OrderQuery' do
               "expected: #{post.title}.next == #{next_post.title}\n" \
               "     got: #{actual ? actual.title : 'nil'}\n" \
               "     all: #{space.scope.all.map(&:title)}\n" \
-              "     sql: #{space.at(older).before.limit(1).to_sql}"
+              "     sql: #{space.at(post).after.limit(1).to_sql}"
             expect(actual ? actual.title : nil).to eq(next_post.title),
                                                    failure_message
           end
@@ -380,14 +380,35 @@ RSpec.describe 'OrderQuery' do
               "expected: #{post.title}.previous == #{prev_post.title}\n" \
               "     got: #{actual ? actual.title : 'nil'}\n" \
               "     all: #{space.scope.all.map(&:title)}\n" \
-              "     sql: #{space.at(older).before.limit(1).to_sql}"
+              "     sql: #{space.at(post).before.limit(1).to_sql}"
             expect(actual ? actual.title : nil).to eq(prev_post.title),
                                                    failure_message
           end
+
+          def expect_order(space, ordered)
+            actual = space.scope.all.map(&:title)
+            expected = ordered.map(&:title)
+            failure_message =
+              "expected: #{expected * ', '}\n"\
+              "     got: #{actual * ', '}\n"\
+              "     sql: #{space.scope.to_sql}"
+            expect(actual).to eq(expected), failure_message
+
+            ordered.each_cons(2) do |post, next_post|
+              expect_next space, post, next_post
+              expect_prev space, next_post, post
+            end
+            expect_next space, ordered.last, ordered.first
+            expect_prev space, ordered.first, ordered.last
+          end
+
           # rubocop:enable Metrics/AbcSize
 
-          let! :null do
-            Post.create!(title: 'null', published_at: nil).reload
+          let! :null_1 do
+            Post.create!(title: 'null_1', published_at: nil).reload
+          end
+          let! :null_2 do
+            Post.create!(title: 'null_2', published_at: nil).reload
           end
           let! :older do
             Post.create!(title: 'older', published_at: Time.now + 1.hour)
@@ -398,44 +419,22 @@ RSpec.describe 'OrderQuery' do
 
           it 'orders nulls first (desc)' do
             space = Post.seek([:published_at, :desc, nulls: :first])
-            scope = space.scope
-            actual = scope.all.map(&:title)
-            expected = [null, older, newer].map(&:title)
-            expect(actual).to eq(expected), scope.to_sql
-            expect_next space, older, newer
-            expect_prev space, newer, older
-            expect_prev space, older, null
-            expect_next space, null, older
+            expect_order space, [null_1, null_2, older, newer]
           end
 
           it 'orders nulls first (asc)' do
             space = Post.seek([:published_at, :asc, nulls: :first])
-            scope = space.scope
-            actual = scope.all.map(&:title)
-            expected = [null, newer, older].map(&:title)
-            expect(actual).to eq(expected), scope.to_sql
-            expect_prev space, newer, null
-            expect_next space, null, newer
+            expect_order space, [null_1, null_2, newer, older]
           end
 
           it 'orders nulls last (desc)' do
             space = Post.seek([:published_at, :desc, nulls: :last])
-            scope = space.scope
-            actual = scope.all.map(&:title)
-            expected = [older, newer, null].map(&:title)
-            expect(actual).to eq(expected), scope.to_sql
-            expect_next space, newer, null
-            expect_prev space, null, newer
+            expect_order space, [older, newer, null_1, null_2]
           end
 
           it 'orders nulls last (asc)' do
             space = Post.seek([:published_at, :asc, nulls: :last])
-            scope = space.scope
-            actual = scope.all.map(&:title)
-            expected = [newer, older, null].map(&:title)
-            expect(actual).to eq(expected), scope.to_sql
-            expect_next space, older, null
-            expect_prev space, null, older
+            expect_order space, [newer, older, null_1, null_2]
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: order_query
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -82,16 +82,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.53.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement