will_paginate 3.0.5 → 3.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2b4a394317f67e89d1bea01f567721310ee8a13c
+  data.tar.gz: db08d65616e1e1f62e3cc8ec0da17703bd78dd3c
+SHA512:
+  metadata.gz: 6cbe6fabc2c9b57da7d9df6fa8408b0c9ff471a8c956db8af8a1d82e0430fd8cae1f89cc9898a5e9796288f411ae76fca939c3ec77647c6179c8f2c61b699847
+  data.tar.gz: f58e6d478a08ea4c24494886d4d623b9f6ff2a2dca2c56d9261325179d8d4598426c20ebe947f8b8d6838cd90347a43e84396b1e367d10981b426eec2fb7b980

data/README.md

@@ -5,8 +5,8 @@ will_paginate is a pagination library that integrates with Ruby on Rails, Sinatr
 Installation:
 
 ``` ruby
-## Gemfile for Rails 3, Sinatra, and Merb
-gem 'will_paginate', '~> 3.0'
+## Gemfile for Rails 3+, Sinatra, and Merb
+gem 'will_paginate', '~> 3.0.6'
 ```
 
 See [installation instructions][install] on the wiki for more info.

data/lib/will_paginate/active_record.rb

@@ -2,6 +2,11 @@ require 'will_paginate/per_page'
 require 'will_paginate/page_number'
 require 'will_paginate/collection'
 require 'active_record'
+begin
+  require 'active_record/deprecated_finders'
+rescue LoadError
+  # only for Rails 4.1
+end
 
 module WillPaginate
   # = Paginating finders for ActiveRecord models
@@ -78,16 +83,16 @@ module WillPaginate
         end
       end
 
-      def count
+      def count(*args)
         if limit_value
           excluded = [:order, :limit, :offset, :reorder]
           excluded << :includes unless eager_loading?
           rel = self.except(*excluded)
           # TODO: hack. decide whether to keep
           rel = rel.apply_finder_options(@wp_count_options) if defined? @wp_count_options
-          rel.count
+          rel.count(*args)
         else
-          super
+          super(*args)
         end
       end
 

data/lib/will_paginate/version.rb

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

data/spec/database.yml

@@ -8,15 +8,18 @@ mysql:
   database: will_paginate
   username: 
   encoding: utf8
+  socket: <%= ENV["BOXEN_MYSQL_SOCKET"] %>
 
 mysql2:
   adapter: mysql2
   database: will_paginate
   username: 
   encoding: utf8
+  socket: <%= ENV["BOXEN_MYSQL_SOCKET"] %>
 
 postgres:
   adapter: postgresql
   database: will_paginate
-  username: postgres
+  username: <%= "postgres" if ENV["TRAVIS"] %>
   min_messages: warning
+  port: <%= ENV["BOXEN_POSTGRESQL_PORT"] %>

data/spec/finders/active_record_spec.rb

@@ -191,6 +191,7 @@ describe WillPaginate::ActiveRecord do
     it "keeps :include for count when they are referenced in :conditions" do
       developers = Developer.paginate(:page => 1, :per_page => 1).includes(:projects)
       with_condition = developers.where('projects.id > 1')
+      with_condition = with_condition.references(:projects) if with_condition.respond_to?(:references)
       with_condition.total_entries.should == 1
 
       $query_sql.last.should =~ /\bJOIN\b/
@@ -304,13 +305,16 @@ describe WillPaginate::ActiveRecord do
   end
 
   it "should paginate with :include and :conditions" do
-    result = Topic.paginate \
+    klass = Topic
+    klass = klass.references(:replies) if klass.respond_to?(:references)
+
+    result = klass.paginate \
       :page     => 1, 
       :include  => :replies,  
       :conditions => "replies.content LIKE 'Bird%' ", 
       :per_page => 10
 
-    expected = Topic.find :all, 
+    expected = klass.find :all,
       :include => 'replies', 
       :conditions => "replies.content LIKE 'Bird%' ", 
       :limit   => 10
@@ -339,13 +343,19 @@ describe WillPaginate::ActiveRecord do
     it "should paginate with include" do
       project = projects(:active_record)
 
-      result = project.topics.paginate \
+      topics = project.topics
+      topics = topics.references(:replies) if topics.respond_to?(:references)
+
+      result = topics.paginate \
         :page       => 1, 
         :include    => :replies,  
         :conditions => ["replies.content LIKE ?", 'Nice%'],
         :per_page   => 10
 
-      expected = Topic.find :all, 
+      topics = Topic
+      topics = topics.references(:replies) if topics.respond_to?(:references)
+
+      expected = topics.find :all,
         :include    => 'replies', 
         :conditions => ["project_id = ? AND replies.content LIKE ?", project.id, 'Nice%'],
         :limit      => 10
@@ -360,8 +370,10 @@ describe WillPaginate::ActiveRecord do
 
       lambda {
         # with association-specified order
-        result = ignore_deprecation { dhh.projects.paginate(:page => 1) }
-        result.should == expected_name_ordered
+        result = ignore_deprecation {
+          dhh.projects.includes(:topics).paginate(:page => 1, :order => 'projects.name')
+        }
+        result.to_a.should == expected_name_ordered
         result.total_entries.should == 2
       }.should run_queries(2)
 

data/spec/finders/activerecord_test_connector.rb

@@ -1,6 +1,8 @@
 require 'active_record'
 require 'active_record/fixtures'
 require 'active_support/multibyte' # needed for Ruby 1.9.1
+require 'stringio'
+require 'erb'
 
 $query_count = 0
 $query_sql = []
@@ -9,7 +11,7 @@ ignore_sql = /
     ^(
       PRAGMA | SHOW\ max_identifier_length |
       SELECT\ (currval|CAST|@@IDENTITY|@@ROWCOUNT) |
-      SHOW\ (FIELDS|TABLES)
+      SHOW\ ((FULL\ )?FIELDS|TABLES)
     )\b |
     \bFROM\ (sqlite_master|pg_tables|pg_attribute)\b
   /x
@@ -59,8 +61,9 @@ module ActiverecordTestConnector
 
   def setup_connection
     db = ENV['DB'].blank?? 'sqlite3' : ENV['DB']
-    
-    configurations = YAML.load_file(File.expand_path('../../database.yml', __FILE__))
+
+    erb = ERB.new(File.read(File.expand_path('../../database.yml', __FILE__)))
+    configurations = YAML.load(erb.result)
     raise "no configuration for '#{db}'" unless configurations.key? db
     configuration = configurations[db]
     
@@ -68,17 +71,17 @@ module ActiverecordTestConnector
     puts "using #{configuration['adapter']} adapter"
     
     ActiveRecord::Base.configurations = { db => configuration }
-    ActiveRecord::Base.establish_connection(db)
+    ActiveRecord::Base.establish_connection(db.to_sym)
     ActiveRecord::Base.default_timezone = :utc
   end
 
   def load_schema
-    silencer = ActiveRecord::Base.method(:silence)
-    silence_args = []
-    silence_args << :stdout if silencer.arity != 0
-    silencer.call(*silence_args) do
+    begin
+      $stdout = StringIO.new
       ActiveRecord::Migration.verbose = false
       load File.join(FIXTURES_PATH, 'schema.rb')
+    ensure
+      $stdout = STDOUT
     end
   end
   

data/spec/fixtures/developer.rb

@@ -1,8 +1,9 @@
 class Developer < User
-  has_and_belongs_to_many :projects, :include => :topics, :order => 'projects.name', :join_table => 'developers_projects'
+  has_and_belongs_to_many :projects, :order => 'projects.name', :join_table => 'developers_projects'
 
   def self.with_poor_ones(&block)
-    with_scope :find => { :conditions => ['salary <= ?', 80000], :order => 'salary' } do
+    options = { :conditions => ['salary <= ?', 80000], :order => 'salary' }
+    with_scope({ :find => options }, :overwrite) do
       yield
     end
   end

data/spec/fixtures/project.rb

@@ -7,9 +7,7 @@ class Project < ActiveRecord::Base
   
   has_many :replies, :through => :topics do
     def only_recent(params = {})
-      scoped.where(['replies.created_at > ?', 15.minutes.ago])
+      where(['replies.created_at > ?', 15.minutes.ago])
     end
   end
-
-  has_many :unique_replies, :through => :topics, :source => :replies, :uniq => true
 end

data/spec/fixtures/reply.rb

@@ -1,6 +1,4 @@
 class Reply < ActiveRecord::Base
-  belongs_to :topic, :include => [:replies]
-
   scope :recent, lambda {
     where(['replies.created_at > ?', 15.minutes.ago]).
       order('replies.created_at DESC')

data/spec/fixtures/topic.rb

@@ -1,11 +1,8 @@
 class Topic < ActiveRecord::Base
-  has_many :replies, :dependent => :destroy, :order => 'replies.created_at DESC'
+  has_many :replies, :dependent => :destroy
   belongs_to :project
 
   scope :mentions_activerecord, lambda {
     where(['topics.title LIKE ?', '%ActiveRecord%'])
   }
-  scope :distinct, lambda {
-    select("DISTINCT #{table_name}.*")
-  }
 end

data/spec/matchers/deprecation_matcher.rb

@@ -0,0 +1,27 @@
+require 'stringio'
+
+class DeprecationMatcher
+  def initialize(message)
+    @message = message
+  end
+
+  def matches?(block)
+    @actual = hijack_stderr(&block)
+    PhraseMatcher.new("DEPRECATION WARNING: #{@message}").matches?(@actual)
+  end
+
+  def failure_message
+    "expected deprecation warning #{@message.inspect}, got #{@actual.inspect}"
+  end
+
+  private
+
+  def hijack_stderr
+    err = $stderr
+    $stderr = StringIO.new
+    yield
+    $stderr.string.rstrip
+  ensure
+    $stderr = err
+  end
+end

data/spec/matchers/phrase_matcher.rb

@@ -0,0 +1,19 @@
+class PhraseMatcher
+  def initialize(string)
+    @string = string
+    @pattern = /\b#{Regexp.escape string}\b/
+  end
+
+  def matches?(actual)
+    @actual = actual.to_s
+    @actual =~ @pattern
+  end
+
+  def failure_message
+    "expected #{@actual.inspect} to contain phrase #{@string.inspect}"
+  end
+
+  def negative_failure_message
+    "expected #{@actual.inspect} not to contain phrase #{@string.inspect}"
+  end
+end

data/spec/matchers/query_count_matcher.rb

@@ -0,0 +1,36 @@
+class QueryCountMatcher
+  def initialize(num)
+    @expected_count = num
+  end
+
+  def matches?(block)
+    run(block)
+
+    if @expected_count.respond_to? :include?
+      @expected_count.include? @count
+    else
+      @count == @expected_count
+    end
+  end
+
+  def run(block)
+    $query_count = 0
+    $query_sql = []
+    block.call
+  ensure
+    @queries = $query_sql.dup
+    @count = $query_count
+  end
+
+  def performed_queries
+    @queries
+  end
+
+  def failure_message
+    "expected #{@expected_count} queries, got #{@count}\n#{@queries.join("\n")}"
+  end
+
+  def negative_failure_message
+    "expected query count not to be #{@expected_count}"
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ rescue LoadError
   # no debugger available
 end
 
+Dir[File.expand_path('../matchers/*_matcher.rb', __FILE__)].each { |matcher| require matcher }
+
 RSpec.configure do |config|
   config.include Module.new {
     protected
@@ -22,51 +24,3 @@ RSpec.configure do |config|
   config.mock_with :mocha
   config.backtrace_clean_patterns << /view_example_group/
 end
-
-class PhraseMatcher
-  def initialize(string)
-    @string = string
-    @pattern = /\b#{Regexp.escape string}\b/
-  end
-
-  def matches?(actual)
-    @actual = actual.to_s
-    @actual =~ @pattern
-  end
-
-  def failure_message
-    "expected #{@actual.inspect} to contain phrase #{@string.inspect}"
-  end
-
-  def negative_failure_message
-    "expected #{@actual.inspect} not to contain phrase #{@string.inspect}"
-  end
-end
-
-require 'stringio'
-
-class DeprecationMatcher
-  def initialize(message)
-    @message = message
-  end
-
-  def matches?(block)
-    @actual = hijack_stderr(&block)
-    PhraseMatcher.new("DEPRECATION WARNING: #{@message}").matches?(@actual)
-  end
-
-  def failure_message
-    "expected deprecation warning #{@message.inspect}, got #{@actual.inspect}"
-  end
-
-  private
-
-  def hijack_stderr
-    err = $stderr
-    $stderr = StringIO.new
-    yield
-    $stderr.string.rstrip
-  ensure
-    $stderr = err
-  end
-end

data/spec/view_helpers/action_view_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'active_support/rescuable' # needed for Ruby 1.9.1
 require 'action_controller'
+require 'action_view'
 require 'will_paginate/view_helpers/action_view'
 require 'will_paginate/collection'
 
@@ -312,13 +313,12 @@ describe WillPaginate::ActionView do
   end
 
   it "renders using ActionView helpers on a custom object" do
-    helper = Object.new
-    class << helper
+    helper = Class.new {
       attr_reader :controller
       include ActionView::Helpers::UrlHelper
       include Routes.url_helpers
       include WillPaginate::ActionView
-    end
+    }.new
     helper.default_url_options[:controller] = 'dummy'
 
     collection = WillPaginate::Collection.new(2, 1, 3)
@@ -331,12 +331,11 @@ describe WillPaginate::ActionView do
   end
 
   it "renders using ActionDispatch helper on a custom object" do
-    helper = Object.new
-    class << helper
+    helper = Class.new {
       include ActionDispatch::Routing::UrlFor
       include Routes.url_helpers
       include WillPaginate::ActionView
-    end
+    }.new
     helper.default_url_options.update \
       :only_path => true,
       :controller => 'dummy'
@@ -398,6 +397,7 @@ end
 
 class DummyRequest
   attr_accessor :symbolized_path_parameters
+  alias :path_parameters :symbolized_path_parameters
   
   def initialize
     @get = true

data/spec/view_helpers/view_example_group.rb

@@ -1,9 +1,13 @@
 require 'active_support'
+require 'stringio'
 begin
+  $stderr = StringIO.new
   require 'minitest/unit'
 rescue LoadError
   # Fails on Ruby 1.8, but it's OK since we only need MiniTest::Assertions
   # on Rails 4 which doesn't support 1.8 anyway.
+ensure
+  $stderr = STDERR
 end
 require 'action_dispatch/testing/assertions'
 require 'will_paginate/array'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2014-06-28 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
@@ -21,6 +20,9 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- LICENSE
+- README.md
+- lib/will_paginate.rb
 - lib/will_paginate/active_record.rb
 - lib/will_paginate/array.rb
 - lib/will_paginate/collection.rb
@@ -34,13 +36,12 @@ files:
 - lib/will_paginate/railtie.rb
 - lib/will_paginate/sequel.rb
 - lib/will_paginate/version.rb
+- lib/will_paginate/view_helpers.rb
 - lib/will_paginate/view_helpers/action_view.rb
 - lib/will_paginate/view_helpers/link_renderer.rb
 - lib/will_paginate/view_helpers/link_renderer_base.rb
 - lib/will_paginate/view_helpers/merb.rb
 - lib/will_paginate/view_helpers/sinatra.rb
-- lib/will_paginate/view_helpers.rb
-- lib/will_paginate.rb
 - spec/collection_spec.rb
 - spec/console
 - spec/console_fixtures.rb
@@ -64,6 +65,9 @@ files:
 - spec/fixtures/topics.yml
 - spec/fixtures/user.rb
 - spec/fixtures/users.yml
+- spec/matchers/deprecation_matcher.rb
+- spec/matchers/phrase_matcher.rb
+- spec/matchers/query_count_matcher.rb
 - spec/page_number_spec.rb
 - spec/per_page_spec.rb
 - spec/spec_helper.rb
@@ -71,34 +75,31 @@ files:
 - spec/view_helpers/base_spec.rb
 - spec/view_helpers/link_renderer_base_spec.rb
 - spec/view_helpers/view_example_group.rb
-- README.md
-- LICENSE
 homepage: https://github.com/mislav/will_paginate/wiki
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pagination plugin for web frameworks and other apps
 test_files: []