sequel-seek-pagination 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c6ce6e2a2e78ab2b3741bc2037a2ef40bb85cc7
-  data.tar.gz: 4d1dd2e3c9852312ba44ad35b389d45de5aca54a
+  metadata.gz: 9f9206a9a384b1cdf9e934dc6e414c7e31a7572b
+  data.tar.gz: e717fb468e5a8224e5c7cd48e1b40b91bffb318f
 SHA512:
-  metadata.gz: c189067b2cc80490d41c684a891ec3486eaa0a675f599bfe3bcb066fceb5a698ce79fdc2aceb0e7f683f37e6a30e0af20f763ba82b3a883004fc53960dbca3a2
-  data.tar.gz: 040bfa003540c47c7faa0367685c0d718bfe19955ce26fed037835a22ec3319e89da21e60123134830f540aef1f8693cc21dcec92f849af39c7a033f5fb70de4
+  metadata.gz: e358d7edefd328fa41a0378f52f25c4c3e05b98b0da49a74742241a2f487ef8eb383dd615f67c678a4b8ed54c11e4d6e917baa3560a6787ac7d4cd835430c16d
+  data.tar.gz: 96b6e87a78cd4c93113d385f53ec37062f56fc031e1e563ca6f0b0fd67b4c95e1432a35f3dd4bc49b272470091179dc428c17b76b8b11da37e072e05e5275f22

data/lib/sequel/extensions/seek_pagination.rb

@@ -11,8 +11,8 @@ module Sequel
 
       if order.nil? || order.length.zero?
         raise Error, "cannot seek_paginate on a dataset with no order"
-      elsif from && after
-        raise Error, "cannot pass both :from and :after params to seek_paginate"
+      elsif [from, after, from_pk, after_pk].compact.count > 1
+        raise Error, "cannot pass more than one of the :from, :after, :from_pk and :after_pk arguments to seek_paginate"
       elsif model.nil? && (from_pk || after_pk)
         raise Error, "passed the :#{from_pk ? 'from' : 'after'}_pk option to seek_paginate on a dataset that doesn't have an associated model"
       end
@@ -26,11 +26,14 @@ module Sequel
           raise Error, "passed the wrong number of values in the :#{from ? 'from' : 'after'} option to seek_paginate"
         end
       elsif pk = from_pk || after_pk
-        # Need to load the order expressions for that pk from the DB.
-        selections = order.map { |o| Sequel::SQL::OrderedExpression === o ? o.expression : o }
+        # Need to load the values to order from for that pk from the DB, so we
+        # need to fetch the actual expressions being ordered by.
+        expressions = order.map { |o| Sequel::SQL::OrderedExpression === o ? o.expression : o }
 
-        # #get won't like it if we pass it bare expressions, so give it aliases for everything.
-        gettable = selections.zip(:a..:z).map{|s,a| Sequel.as(s, a)}
+        # Dataset#get won't like it if we pass it expressions that aren't
+        # simple columns, so give it aliases for everything.
+        al = :a
+        gettable = expressions.map.with_index{|s,i| Sequel.as(s, (al = al.next))}
 
         values = where(model.qualified_primary_key_hash(pk)).get(gettable)
       end
@@ -74,9 +77,13 @@ module Sequel
           # Handle the common case where we can do a simpler (and faster)
           # WHERE (non_nullable_1, non_nullable_2) > (1, 2) clause.
           if length > 1 && orders.all?(&:not_null) && has_uniform_order_direction?
-            method = orders.first.direction == :asc ? '>' : '<'
-            method << '='.freeze if include_exact_match
-            Sequel.virtual_row{|o| o.__send__(method, orders.map(&:name), orders.map(&:value))}
+            Sequel.virtual_row do |o|
+              o.__send__(
+                orders.first.inequality_method(include_exact_match),
+                orders.map(&:name),
+                orders.map(&:value)
+              )
+            end
           else
             Sequel.&(
               *length.times.map { |i|
@@ -148,12 +155,11 @@ module Sequel
         {name => nil}
       end
 
-      def ineq(eq: true)
+      def ineq(eq:)
         nulls_upcoming = !not_null && nulls == :last
 
         if !value.nil?
-          method = "#{direction == :asc ? '>' : '<'}#{'=' if eq}"
-          filter = Sequel.virtual_row{|o| o.__send__(method, name, value)}
+          filter = Sequel.virtual_row{|o| o.__send__(inequality_method(eq), name, value)}
           nulls_upcoming ? Sequel.|(filter, null_filter) : filter
         else
           if nulls_upcoming && eq
@@ -164,6 +170,14 @@ module Sequel
         end
       end
 
+      def inequality_method(eq)
+        case direction
+        when :asc  then eq ? :>= : :>
+        when :desc then eq ? :<= : :<
+        else raise "Bad direction: #{direction.inspect}"
+        end
+      end
+
       private
 
       # By default, Postgres sorts NULLs as higher than any other value. So we

data/lib/sequel/extensions/seek_pagination/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module SeekPagination
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/seek_pagination_spec.rb

@@ -27,7 +27,7 @@ class SeekPaginationSpec < Minitest::Spec
           dataset = dataset.order(*ordering)
 
           # Can't pass any random expression to #get, so give them all aliases.
-          gettable = columns.zip(:a..:z).map{|c,a| c.as(a)}
+          gettable = columns.zip(:a..:z).map{|c,a| Sequel.as(c, a)}
 
           it "should limit the dataset appropriately when a starting point is not given" do
             assert_equal_results dataset.limit(10),
@@ -83,23 +83,23 @@ class SeekPaginationSpec < Minitest::Spec
   end
 
   describe "for ordering by a single not-null column in either order" do
-    [:id.asc, :id.desc].each do |o1|
+    [Sequel.asc(:id), Sequel.desc(:id)].each do |o1|
       it_should_seek_paginate_properly [o1]
     end
   end
 
   describe "for ordering by two not-null columns in any order" do
-    [:not_nullable_1.asc, :not_nullable_1.desc].each do |o1|
-      [:id.asc, :id.desc].each do |o2|
+    [Sequel.asc(:not_nullable_1), Sequel.desc(:not_nullable_1)].each do |o1|
+      [Sequel.asc(:id), Sequel.desc(:id)].each do |o2|
         it_should_seek_paginate_properly [o1, o2]
       end
     end
   end
 
   describe "for ordering by three not-null columns in any order" do
-    [:not_nullable_1.asc, :not_nullable_1.desc].each do |o1|
-      [:not_nullable_2.asc, :not_nullable_2.desc].each do |o2|
-        [:id.asc, :id.desc].each do |o3|
+    [Sequel.asc(:not_nullable_1), Sequel.desc(:not_nullable_1)].each do |o1|
+      [Sequel.asc(:not_nullable_2), Sequel.desc(:not_nullable_2)].each do |o2|
+        [Sequel.asc(:id), Sequel.desc(:id)].each do |o3|
           it_should_seek_paginate_properly [o1, o2, o3]
         end
       end
@@ -108,8 +108,8 @@ class SeekPaginationSpec < Minitest::Spec
 
   describe "for ordering by a nullable column" do
     # We still tack on :id because the ordering needs to be unique.
-    [:nullable_1.asc, :nullable_1.desc, :nullable_1.asc(nulls: :first), :nullable_1.desc(nulls: :last)].each do |o1|
-      [:id.asc, :id.desc].each do |o2|
+    [Sequel.asc(:nullable_1), Sequel.desc(:nullable_1), Sequel.asc(:nullable_1, nulls: :first), Sequel.desc(:nullable_1, nulls: :last)].each do |o1|
+      [Sequel.asc(:id), Sequel.desc(:id)].each do |o2|
         it_should_seek_paginate_properly [o1, o2]
       end
     end
@@ -117,9 +117,9 @@ class SeekPaginationSpec < Minitest::Spec
 
   describe "for ordering by multiple nullable columns" do
     # We still tack on :id because the ordering needs to be unique.
-    [:nullable_1.asc, :nullable_1.desc, :nullable_1.asc(nulls: :first), :nullable_1.desc(nulls: :last)].each do |o1|
-      [:nullable_2.asc, :nullable_2.desc, :nullable_2.asc(nulls: :first), :nullable_2.desc(nulls: :last)].each do |o2|
-        [:id.asc, :id.desc].each do |o3|
+    [Sequel.asc(:nullable_1), Sequel.desc(:nullable_1), Sequel.asc(:nullable_1, nulls: :first), Sequel.desc(:nullable_1, nulls: :last)].each do |o1|
+      [Sequel.asc(:nullable_2), Sequel.desc(:nullable_2), Sequel.asc(:nullable_2, nulls: :first), Sequel.desc(:nullable_2, nulls: :last)].each do |o2|
+        [Sequel.asc(:id), Sequel.desc(:id)].each do |o3|
           it_should_seek_paginate_properly [o1, o2, o3]
         end
       end
@@ -129,14 +129,14 @@ class SeekPaginationSpec < Minitest::Spec
   describe "for ordering by a mix of nullable and not-nullable columns" do
     20.times do
       columns = [
-        [:not_nullable_1, :not_nullable_1.asc, :not_nullable_1.desc],
-        [:not_nullable_2, :not_nullable_2.asc, :not_nullable_2.desc],
-        [:nullable_1, :nullable_1.asc, :nullable_1.desc, :nullable_1.asc(nulls: :first), :nullable_1.desc(nulls: :last)],
-        [:nullable_2, :nullable_2.asc, :nullable_2.desc, :nullable_2.asc(nulls: :first), :nullable_2.desc(nulls: :last)],
+        [:not_nullable_1, Sequel.asc(:not_nullable_1), Sequel.desc(:not_nullable_1)],
+        [:not_nullable_2, Sequel.asc(:not_nullable_2), Sequel.desc(:not_nullable_2)],
+        [:nullable_1, Sequel.asc(:nullable_1), Sequel.desc(:nullable_1), Sequel.asc(:nullable_1, nulls: :first), Sequel.desc(:nullable_1, nulls: :last)],
+        [:nullable_2, Sequel.asc(:nullable_2), Sequel.desc(:nullable_2), Sequel.asc(:nullable_2, nulls: :first), Sequel.desc(:nullable_2, nulls: :last)],
       ]
 
       testing_columns = columns.sample(rand(columns.count) + 1).map(&:sample)
-      testing_columns << [:id, :id.asc, :id.desc].sample
+      testing_columns << [:id, Sequel.asc(:id), Sequel.desc(:id)].sample
 
       it_should_seek_paginate_properly(testing_columns)
     end
@@ -145,14 +145,14 @@ class SeekPaginationSpec < Minitest::Spec
   describe "for ordering by a mix of expressions and columns" do
     20.times do
       columns = [
-        [:not_nullable_1, :not_nullable_1.asc, :not_nullable_1.desc, :not_nullable_1.sql_number % 10, (:not_nullable_1.sql_number % 10).asc, (:not_nullable_1.sql_number % 10).desc],
-        [:not_nullable_2, :not_nullable_2.asc, :not_nullable_2.desc, :not_nullable_2.sql_number % 10, (:not_nullable_2.sql_number % 10).asc, (:not_nullable_2.sql_number % 10).desc],
-        [:nullable_1, :nullable_1.asc, :nullable_1.desc, :nullable_1.asc(nulls: :first), :nullable_1.desc(nulls: :last), :nullable_1.sql_number % 10, (:nullable_1.sql_number % 10).asc, (:nullable_1.sql_number % 10).desc, (:nullable_1.sql_number % 10).asc(nulls: :first), (:nullable_1.sql_number % 10).desc(nulls: :last)],
-        [:nullable_2, :nullable_2.asc, :nullable_2.desc, :nullable_2.asc(nulls: :first), :nullable_2.desc(nulls: :last), :nullable_2.sql_number % 10, (:nullable_2.sql_number % 10).asc, (:nullable_2.sql_number % 10).desc, (:nullable_2.sql_number % 10).asc(nulls: :first), (:nullable_2.sql_number % 10).desc(nulls: :last)],
+        [:not_nullable_1, Sequel.asc(:not_nullable_1), Sequel.desc(:not_nullable_1), Sequel.expr(:not_nullable_1).sql_number % 10, Sequel.asc(Sequel.expr(:not_nullable_1).sql_number % 10), Sequel.desc(Sequel.expr(:not_nullable_1).sql_number % 10)],
+        [:not_nullable_2, Sequel.asc(:not_nullable_2), Sequel.desc(:not_nullable_2), Sequel.expr(:not_nullable_2).sql_number % 10, Sequel.asc(Sequel.expr(:not_nullable_2).sql_number % 10), Sequel.desc(Sequel.expr(:not_nullable_2).sql_number % 10)],
+        [:nullable_1, Sequel.asc(:nullable_1), Sequel.desc(:nullable_1), Sequel.asc(:nullable_1, nulls: :first), Sequel.desc(:nullable_1, nulls: :last), Sequel.expr(:nullable_1).sql_number % 10, Sequel.asc(Sequel.expr(:nullable_1).sql_number % 10), (Sequel.expr(:nullable_1).sql_number % 10).desc, Sequel.asc(Sequel.expr(:nullable_1).sql_number % 10, nulls: :first), Sequel.desc(Sequel.expr(:nullable_1).sql_number % 10, nulls: :last)],
+        [:nullable_2, Sequel.asc(:nullable_2), Sequel.desc(:nullable_2), Sequel.asc(:nullable_2, nulls: :first), Sequel.desc(:nullable_2, nulls: :last), Sequel.expr(:nullable_2).sql_number % 10, Sequel.asc(Sequel.expr(:nullable_2).sql_number % 10), (Sequel.expr(:nullable_2).sql_number % 10).desc, Sequel.asc(Sequel.expr(:nullable_2).sql_number % 10, nulls: :first), Sequel.desc(Sequel.expr(:nullable_2).sql_number % 10, nulls: :last)],
       ]
 
       testing_columns = columns.sample(rand(columns.count) + 1).map(&:sample)
-      testing_columns << [:id, :id.asc, :id.desc].sample
+      testing_columns << [:id, Sequel.asc(:id), Sequel.desc(:id)].sample
 
       it_should_seek_paginate_properly(testing_columns)
     end
@@ -162,10 +162,10 @@ class SeekPaginationSpec < Minitest::Spec
     datasets = [
       DB[:seek].order(:id),
       DB[:seek].order(:seek__id),
-      DB[:seek].order(:id.asc),
-      DB[:seek].order(:seek__id.asc),
-      DB[:seek].order(:id.desc).reverse_order,
-      DB[:seek].order(:seek__id.desc).reverse_order,
+      DB[:seek].order(Sequel.asc(:id)),
+      DB[:seek].order(Sequel.asc(:seek__id)),
+      DB[:seek].order(Sequel.desc(:id)).reverse_order,
+      DB[:seek].order(Sequel.desc(:seek__id)).reverse_order,
     ]
 
     # With point to start from/after:
@@ -187,8 +187,11 @@ class SeekPaginationSpec < Minitest::Spec
     assert_error_message("cannot seek_paginate on a dataset with no order") { DB[:seek].seek_paginate(30) }
   end
 
-  it "should raise an error if the dataset is not ordered" do
-    assert_error_message("cannot pass both :from and :after params to seek_paginate") { DB[:seek].order(:id).seek_paginate(30, from: 3, after: 4) }
+  it "should raise an error if more than one location argument is passed to seek_paginate" do
+    assert_error_message("cannot pass more than one of the :from, :after, :from_pk and :after_pk arguments to seek_paginate") { DB[:seek].order(:id).seek_paginate(30, from: 3, after: 4) }
+    assert_error_message("cannot pass more than one of the :from, :after, :from_pk and :after_pk arguments to seek_paginate") { DB[:seek].order(:id).seek_paginate(30, from_pk: 3, after_pk: 4) }
+    assert_error_message("cannot pass more than one of the :from, :after, :from_pk and :after_pk arguments to seek_paginate") { DB[:seek].order(:id).seek_paginate(30, from: 3, after_pk: 4) }
+    assert_error_message("cannot pass more than one of the :from, :after, :from_pk and :after_pk arguments to seek_paginate") { DB[:seek].order(:id).seek_paginate(30, from_pk: 3, after: 4) }
   end
 
   it "should raise an error if given the wrong number of values to from or after" do

data/spec/spec_helper.rb

@@ -2,8 +2,6 @@ require 'sequel'
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Sequel.extension :core_extensions
-
 Sequel::Database.extension :seek_pagination
 
 DB = Sequel.connect "postgres:///sequel-seek-pagination-test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-seek-pagination
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler