will_paginate 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b9c92a0ce3f9e697334ea1bf11c0b57bdfd9fe2
-  data.tar.gz: b2794b2de86ceaa34f86d06f2c1952484b5409f9
+  metadata.gz: 990ad7af08e5c983697a5c1c679801e1641fe3fa
+  data.tar.gz: be048d581649ca2a21e671ab46ea603a291ebff8
 SHA512:
-  metadata.gz: fe7a7e48c35bda6cd6648f5243f3992ebe576f586afd5d140066fa05ecdd83862681245f44e554f5483e5dc4fe9f957e3b84b6208cc91a8e1dd1804c8593a49b
-  data.tar.gz: 5c388ced4fd0b8ad3da2ce6c5e9b2323b4cff1b950fdf3b35cc6e148b1e12509e8b6c0b83156b483d1a732ce4fe2497a4c09553b2650775cc922803699bf4347
+  metadata.gz: d5fda69cc13387b95b761efc5c697030cf36f41acbc87f513ed5eef5e629aaecab44e94a45150c4c236444d7a79c6653f446d12f4539f057f1789600682209c2
+  data.tar.gz: 449283390fb84c7a91fb50fd007e1f9207024ef7a8ed16b28cd6887ee2f1b1ba5e9f8a4cb4e175fd44aa4298b45bbf5164cb45d63853faa0ccd2537768f1c269

data/lib/will_paginate/page_number.rb

@@ -40,7 +40,7 @@ module WillPaginate
     alias is_a? kind_of?
   end
 
-  # Ultrahax: makes `Fixnum === current_page` checks pass
+  # Ultrahax: makes `Integer === current_page` checks pass
   Numeric.extend Module.new {
     def ===(obj)
       obj.instance_of? PageNumber or super

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers/link_renderer.rb

@@ -24,7 +24,7 @@ module WillPaginate
       # method as you see fit.
       def to_html
         html = pagination.map do |item|
-          item.is_a?(Fixnum) ?
+          item.is_a?(Integer) ?
             page_number(item) :
             send(item)
         end.join(@options[:link_separator])
@@ -88,7 +88,7 @@ module WillPaginate
       end
 
       def link(text, target, attributes = {})
-        if target.is_a? Fixnum
+        if target.is_a?(Integer)
           attributes[:rel] = rel_value(target)
           target = url(target)
         end

data/spec/database.yml

@@ -6,7 +6,7 @@ sqlite3:
 mysql: &mysql
   adapter: mysql
   database: will_paginate
-  username: 
+  username: root
   encoding: utf8
 <% if File.exist?("/var/run/mysql5/mysqld.sock") %>
   host: localhost

data/spec/finders/active_record_spec.rb

@@ -3,7 +3,6 @@ require 'will_paginate/active_record'
 require File.expand_path('../activerecord_test_connector', __FILE__)
 
 ActiverecordTestConnector.setup
-abort unless ActiverecordTestConnector.able_to_connect
 
 describe WillPaginate::ActiveRecord do
   

data/spec/finders/activerecord_test_connector.rb

@@ -38,7 +38,6 @@ end
 module ActiverecordTestConnector
   extend self
   
-  attr_accessor :able_to_connect
   attr_accessor :connected
 
   FIXTURES_PATH = File.expand_path('../../fixtures', __FILE__)
@@ -49,18 +48,14 @@ module ActiverecordTestConnector
 
   # Set our defaults
   self.connected = false
-  self.able_to_connect = true
 
   def setup
-    unless self.connected || !self.able_to_connect
+    unless self.connected
       setup_connection
       load_schema
       add_load_path FIXTURES_PATH
       self.connected = true
     end
-  rescue Exception => e  # errors from ActiveRecord setup
-    $stderr.puts "\nSkipping ActiveRecord tests: #{e}\n\n"
-    self.able_to_connect = false
   end
 
   private

data/spec/finders/data_mapper_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
 
-begin
+if !ENV['SKIP_NONRAILS_TESTS']
   require 'will_paginate/data_mapper'
   require File.expand_path('../data_mapper_test_connector', __FILE__)
-rescue LoadError => error
-  warn "Error running DataMapper specs: #{error.message}"
-  datamapper_loaded = false
-else
   datamapper_loaded = true
+else
+  datamapper_loaded = false
 end
 
 describe WillPaginate::DataMapper do

data/spec/finders/mongoid_spec.rb

@@ -1,18 +1,23 @@
 require 'spec_helper'
 
-begin
+if !ENV['SKIP_NONRAILS_TESTS']
+  if defined?(Rails)
+    old_rails = Rails
+    # Mongoid sees the `Rails` constant and then proceeds to `require "rails"`
+    # from its railtie. This tricks it into believing there is no Rails.
+    Object.send(:remove_const, :Rails)
+  end
   require 'will_paginate/mongoid'
-rescue LoadError => error
-  warn "Error running Mongoid specs: #{error.message}"
-  mongoid_loaded = false
-else
-  Mongoid.connect_to 'will_paginate_test'
+  Object.send(:const_set, :Rails, old_rails) if old_rails
 
+  Mongoid.connect_to 'will_paginate_test'
   class MongoidModel
     include Mongoid::Document
   end
 
   mongoid_loaded = true
+else
+  mongoid_loaded = false
 end
 
 describe WillPaginate::Mongoid do

data/spec/finders/sequel_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
 
-begin
+if !ENV['SKIP_NONRAILS_TESTS']
   require 'will_paginate/sequel'
   require File.expand_path('../sequel_test_connector', __FILE__)
-rescue LoadError, ArgumentError => error
-  warn "Error running Sequel specs: #{error.message}"
-  sequel_loaded = false
-else
   sequel_loaded = true
+else
+  sequel_loaded = false
 end
 
 describe Sequel::Dataset::Pagination, 'extension' do

data/spec/page_number_spec.rb

@@ -23,12 +23,12 @@ describe WillPaginate::PageNumber do
       (num.is_a? Numeric).should be
     end
 
-    it "is a kind of Fixnum" do
-      (num.is_a? Fixnum).should be
+    it "is a kind of Integer" do
+      (num.is_a? Integer).should be
     end
 
-    it "isn't directly a Fixnum" do
-      (num.instance_of? Fixnum).should_not be
+    it "isn't directly a Integer" do
+      (num.instance_of? Integer).should_not be
     end
 
     it "passes the PageNumber=== type check" do |variable|
@@ -37,7 +37,7 @@ describe WillPaginate::PageNumber do
 
     it "passes the Numeric=== type check" do |variable|
       (Numeric === num).should be
-      (Fixnum === num).should be
+      (Integer === num).should be
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2017-06-07 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
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Pagination plugin for web frameworks and other apps