will_paginate 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebce0ac1df27c233be251b808d3a4a6009c096f90dc44fac0829c1e8474a3565
-  data.tar.gz: 54587b03d64e9da82687d20c3d4570c3820b3f683792ade970f95e5d67721e96
+  metadata.gz: a6263dfb6824224c74e2383ba39b7f35abe25288dfcdd89a3dbab6f2585eb91e
+  data.tar.gz: c26bb41e5bf140fd2564ed63fda7ed4822f3c126a6a3b3885b27e2585dbf3647
 SHA512:
-  metadata.gz: 8aac94bf484f63cecaa633444ae8e1dee6ffe3c0080877cc2deaf4470673475c1e21ca165bdd45c081d7c3b28efe07cc505499ac0fb148868cef1e6c070d0897
-  data.tar.gz: 2969089e28341f2205e3f1b3e4fe9ddae6ea537bf32adf8895329632d437340ed6c09135d0efcac0e85c3cca79e349eb4890c6eafd791b79bca765b1d04a2ca7
+  metadata.gz: 8f67913552fff8839f5de82d9e55c61ad69c1a57216da3d5d627aef77455ee32a03d2b8c2b732299b37481ea6e9fd72a5baa1432e1fe296e78fc06b6a46ee8e0
+  data.tar.gz: 8979fdd5d35ee416e4c607f759b8e868188b11bb2ca7540d982866e936168170519492a027fff90cb31db12fb758b144389691c9374acfd58fd1880105d2201c

data/lib/will_paginate/active_record.rb

@@ -105,9 +105,7 @@ module WillPaginate
       # overloaded to be pagination-aware
       def empty?
         if !loaded? and offset_value
-          result = count
-          result = result.size if result.respond_to?(:size) and !result.is_a?(Integer)
-          result <= offset_value
+          total_entries <= offset_value
         else
           super
         end
@@ -212,6 +210,8 @@ module WillPaginate
                 WHERE rownum <= #{pager.offset + pager.per_page}
               ) WHERE rnum >= #{pager.offset}
             SQL
+          elsif (self.connection.adapter_name =~ /^sqlserver/i)
+            query << " OFFSET #{pager.offset} ROWS FETCH NEXT #{pager.per_page} ROWS ONLY"
           else
             query << " LIMIT #{pager.per_page} OFFSET #{pager.offset}"
           end

data/lib/will_paginate/i18n.rb

@@ -8,11 +8,11 @@ module WillPaginate
       Dir["#{locale_dir}/*.{rb,yml}"]
     end
 
-    def will_paginate_translate(keys, options = {})
+    def will_paginate_translate(keys, options = {}, &block)
       if defined? ::I18n
         defaults = Array(keys).dup
-        defaults << Proc.new if block_given?
-        ::I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => :will_paginate))
+        defaults << block if block_given?
+        ::I18n.translate(defaults.shift, **options.merge(:default => defaults, :scope => :will_paginate))
       else
         key = Array === keys ? keys.first : keys
         yield key, options

data/lib/will_paginate/page_number.rb

@@ -1,4 +1,3 @@
-require 'delegate'
 require 'forwardable'
 
 module WillPaginate

data/lib/will_paginate/railtie.rb

@@ -59,11 +59,11 @@ module WillPaginate
     end
 
     module ControllerRescuePatch
-      def rescue_from(*args, &block)
+      def rescue_from(*args, **kwargs, &block)
         if idx = args.index(WillPaginate::InvalidPage)
           args[idx] = args[idx].name
         end
-        super(*args, &block)
+        super(*args, **kwargs, &block)
       end
     end
   end

data/lib/will_paginate/version.rb

@@ -1,8 +1,8 @@
 module WillPaginate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 2
-    TINY  = 1
+    MINOR = 3
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/will_paginate/view_helpers/action_view.rb

@@ -80,7 +80,7 @@ module WillPaginate
           defaults = nil
           key = keys
         end
-        translate(key, options.merge(:default => defaults, :scope => :will_paginate))
+        translate(key, **options.merge(:default => defaults, :scope => :will_paginate))
       else
         super
       end

data/spec/finders/active_record_spec.rb

@@ -163,6 +163,13 @@ describe WillPaginate::ActiveRecord do
       topics.total_entries.should == 999
     end
 
+    it "overrides empty? count call with a total_entries fixed value" do
+      lambda {
+        topics = Topic.paginate :page => 1, :per_page => 3, :total_entries => 999
+        topics.should_not be_empty
+      }.should run_queries(0)
+    end
+
     it "removes :include for count" do
       lambda {
         developers = Developer.paginate(:page => 1, :per_page => 1).includes(:projects)
@@ -213,7 +220,7 @@ describe WillPaginate::ActiveRecord do
         sql = "select content from topics where content like '%futurama%'"
         topics = Topic.paginate_by_sql sql, :page => 1, :per_page => 1
         topics.total_entries.should == 1
-        topics.first.attributes.has_key?('title').should be_false
+        topics.first.attributes.has_key?('title').should be(false)
       }.should run_queries(2)
     end
 
@@ -271,12 +278,12 @@ describe WillPaginate::ActiveRecord do
     }.should run_queries(1)
   end
   
-  it "should get second (inexistent) page of Topics, requiring 2 queries" do
+  it "should get second (inexistent) page of Topics, requiring 1 query" do
     lambda {
       result = Topic.paginate :page => 2
       result.total_pages.should == 1
       result.should be_empty
-    }.should run_queries(2)
+    }.should run_queries(1)
   end
   
   describe "associations" do

data/spec/finders/mongoid_spec.rb

@@ -10,6 +10,8 @@ if !ENV['SKIP_NONRAILS_TESTS']
   require 'will_paginate/mongoid'
   Object.send(:const_set, :Rails, old_rails) if old_rails
 
+  Mongo::Logger.logger.level = Logger::INFO
+
   Mongoid.connect_to 'will_paginate_test'
   class MongoidModel
     include Mongoid::Document

data/spec/finders/sequel_spec.rb

@@ -11,14 +11,15 @@ end
 describe Sequel::Dataset::Pagination, 'extension' do
   
   class Car < Sequel::Model
+    self.dataset = dataset.extension(:pagination)
   end
 
   it "should have the #paginate method" do
-    Car.should respond_to(:paginate)
+    Car.dataset.should respond_to(:paginate)
   end
 
   it "should NOT have the #paginate_by_sql method" do
-    Car.should_not respond_to(:paginate_by_sql)
+    Car.dataset.should_not respond_to(:paginate_by_sql)
   end
 
   describe 'pagination' do
@@ -29,7 +30,7 @@ describe Sequel::Dataset::Pagination, 'extension' do
     end
 
     it "should imitate WillPaginate::Collection" do
-      result = Car.paginate(1, 2)
+      result = Car.dataset.paginate(1, 2)
       
       result.should_not be_empty
       result.size.should == 2
@@ -41,16 +42,16 @@ describe Sequel::Dataset::Pagination, 'extension' do
     end
     
     it "should perform" do
-      Car.paginate(1, 2).all.should == [Car[1], Car[2]]
+      Car.dataset.paginate(1, 2).all.should == [Car[1], Car[2]]
     end
 
     it "should be empty" do
-      result = Car.paginate(3, 2)
+      result = Car.dataset.paginate(3, 2)
       result.should be_empty
     end
     
     it "should perform with #select and #order" do
-      result = Car.select("name as foo".lit).order(:name).paginate(1, 2).all
+      result = Car.select(Sequel.lit("name as foo")).order(:name).paginate(1, 2).all
       result.size.should == 2
       result.first.values[:foo].should == "Aston Martin"
     end

data/spec/spec_helper.rb

@@ -42,5 +42,5 @@ RSpec.configure do |config|
   }
 
   config.mock_with :mocha
-  config.backtrace_clean_patterns << /view_example_group/
+  config.backtrace_exclusion_patterns << /view_example_group/
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies: []
 description: will_paginate provides a simple API for performing paginated queries
   with Active Record, DataMapper and Sequel, and includes helpers for rendering pagination
@@ -83,9 +83,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/mislav/will_paginate/issues
-  changelog_uri: https://github.com/mislav/will_paginate/releases/tag/v3.2.1
-  documentation_uri: https://www.rubydoc.info/gems/will_paginate/3.2.1
-  source_code_uri: https://github.com/mislav/will_paginate/tree/v3.2.1
+  changelog_uri: https://github.com/mislav/will_paginate/releases/tag/v3.3.0
+  documentation_uri: https://www.rubydoc.info/gems/will_paginate/3.3.0
+  source_code_uri: https://github.com/mislav/will_paginate/tree/v3.3.0
   wiki_uri: https://github.com/mislav/will_paginate/wiki
 post_install_message: 
 rdoc_options:
@@ -98,15 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Pagination plugin for web frameworks and other apps