will_paginate 3.0.4 → 3.0.5

data/lib/will_paginate/active_record.rb

@@ -80,7 +80,7 @@ module WillPaginate
 
       def count
         if limit_value
-          excluded = [:order, :limit, :offset]
+          excluded = [:order, :limit, :offset, :reorder]
           excluded << :includes unless eager_loading?
           rel = self.except(*excluded)
           # TODO: hack. decide whether to keep

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers/action_view.rb

@@ -30,7 +30,7 @@ module WillPaginate
       options = options.symbolize_keys
       options[:renderer] ||= LinkRenderer
 
-      super(collection, options).try(:html_safe)
+      super(collection, options)
     end
 
     def page_entries_info(collection = nil, options = {}) #:nodoc:
@@ -106,6 +106,7 @@ module WillPaginate
       def url(page)
         @base_url_params ||= begin
           url_params = merge_get_params(default_url_params)
+          url_params[:only_path] = true
           merge_optional_params(url_params)
         end
 

data/lib/will_paginate/view_helpers.rb

@@ -91,7 +91,9 @@ module WillPaginate
       end
       # render HTML for pagination
       renderer.prepare collection, options, self
-      renderer.to_html
+      output = renderer.to_html
+      output = output.html_safe if output.respond_to?(:html_safe)
+      output
     end
 
     # Renders a message containing number of displayed vs. total entries.

data/spec/fake_rubygems.rb

@@ -0,0 +1,18 @@
+# Makes the test suite compatible with Bundler standalone mode (used in CI)
+# because Active Record uses `gem` for loading adapters.
+Kernel.module_eval do
+
+  remove_method :gem if 'method' == defined? gem
+
+  def gem(*args)
+    return if $VERBOSE.nil?
+    $stderr << "warning: gem(#{args.map {|o| o.inspect }.join(', ')}) ignored"
+    $stderr << "; called from:\n  " << caller[0,5].join("\n  ") if $DEBUG
+    $stderr << "\n"
+  end
+
+  private :gem
+
+end
+
+$" << "rubygems.rb"

data/spec/finders/active_record_spec.rb

@@ -200,6 +200,11 @@ describe WillPaginate::ActiveRecord do
       Developer.group(:salary).page(1).total_entries.should == 4
     end
 
+    it "removes :reorder for count with group" do
+      Project.group(:id).reorder(:id).page(1).total_entries
+      $query_sql.last.should_not =~ /\ORDER\b/
+    end
+
     it "should not have zero total_pages when the result set is empty" do
       Developer.where("1 = 2").page(1).total_pages.should == 1
     end

data/spec/finders/activerecord_test_connector.rb

@@ -73,7 +73,10 @@ module ActiverecordTestConnector
   end
 
   def load_schema
-    ActiveRecord::Base.silence do
+    silencer = ActiveRecord::Base.method(:silence)
+    silence_args = []
+    silence_args << :stdout if silencer.arity != 0
+    silencer.call(*silence_args) do
       ActiveRecord::Migration.verbose = false
       load File.join(FIXTURES_PATH, 'schema.rb')
     end

data/spec/finders/data_mapper_spec.rb

@@ -90,7 +90,7 @@ describe WillPaginate::DataMapper do
     animals = Animal.all(:limit => 2).page(1)
     array = animals.to_a
     array.size.should == 2
-    array.is_a? WillPaginate::Collection
+    array.should be_kind_of(WillPaginate::Collection)
     array.current_page.should == 1
     array.per_page.should == 2
   end

data/spec/fixtures/developer.rb

@@ -7,7 +7,9 @@ class Developer < User
     end
   end
 
-  scope :poor, :conditions => ['salary <= ?', 80000], :order => 'salary'
+  scope :poor, lambda {
+    where(['salary <= ?', 80000]).order('salary')
+  }
 
   def self.per_page() 10 end
 end

data/spec/fixtures/reply.rb

@@ -1,9 +1,10 @@
 class Reply < ActiveRecord::Base
   belongs_to :topic, :include => [:replies]
 
-  scope :recent,
-    :conditions => ['replies.created_at > ?', 15.minutes.ago],
-    :order => 'replies.created_at DESC'
+  scope :recent, lambda {
+    where(['replies.created_at > ?', 15.minutes.ago]).
+      order('replies.created_at DESC')
+  }
 
   validates_presence_of :content
 end

data/spec/fixtures/topic.rb

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

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rspec'
-require File.expand_path('../view_helpers/view_example_group', __FILE__)
+require 'view_helpers/view_example_group'
 begin
   require 'ruby-debug'
 rescue LoadError
@@ -20,6 +20,7 @@ RSpec.configure do |config|
   }
   
   config.mock_with :mocha
+  config.backtrace_clean_patterns << /view_example_group/
 end
 
 class PhraseMatcher

data/spec/view_helpers/action_view_spec.rb

@@ -56,6 +56,15 @@ describe WillPaginate::ActionView do
     end
   end
 
+  it "should override existing page param value" do
+    request.params :page => 1
+    paginate do |pagination|
+      assert_select 'a[href]', 3 do |elements|
+        validate_page_numbers [2,3,2], elements
+      end
+    end
+  end
+
   it "should render nothing when there is only 1 page" do
     paginate(:per_page => 30).should be_empty
   end
@@ -180,6 +189,15 @@ describe WillPaginate::ActionView do
     paginate
     assert_links_match /foo\[bar\]=baz/
   end
+
+  it "doesn't allow tampering with host, port, protocol" do
+    request.params :host => 'disney.com', :port => '99', :protocol => 'ftp'
+    paginate
+    assert_links_match %r{^/foo/bar}
+    assert_no_links_match /disney/
+    assert_no_links_match /99/
+    assert_no_links_match /ftp/
+  end
   
   it "should not preserve parameters on POST" do
     request.post
@@ -319,16 +337,16 @@ describe WillPaginate::ActionView do
       include Routes.url_helpers
       include WillPaginate::ActionView
     end
-    helper.default_url_options[:host] = 'example.com'
-    helper.default_url_options[:controller] = 'dummy'
-    # helper.default_url_options[:only_path] = true
+    helper.default_url_options.update \
+      :only_path => true,
+      :controller => 'dummy'
 
     collection = WillPaginate::Collection.new(2, 1, 3)
     @render_output = helper.will_paginate(collection)
 
     assert_select 'a[href]', 4 do |links|
       urls = links.map {|l| l['href'] }.uniq
-      urls.should == ['http://example.com/dummy/page/1', 'http://example.com/dummy/page/3']
+      urls.should == ['/dummy/page/1', '/dummy/page/3']
     end
   end
 

data/spec/view_helpers/base_spec.rb

@@ -32,6 +32,18 @@ describe WillPaginate::ViewHelpers do
       collection = mock 'Collection', :total_pages => 1
       will_paginate(collection).should be_nil
     end
+
+    it "should call html_safe on result" do
+      collection = WillPaginate::Collection.new(1, 2, 4)
+
+      html = mock 'HTML'
+      html.expects(:html_safe).returns(html)
+      renderer = mock 'Renderer'
+      renderer.stubs(:prepare)
+      renderer.expects(:to_html).returns(html)
+
+      will_paginate(collection, :renderer => renderer).should eql(html)
+    end
   end
 
   describe "pagination_options" do

data/spec/view_helpers/view_example_group.rb

@@ -14,6 +14,7 @@ module ViewExampleGroup
   include MiniTest::Assertions if defined? MiniTest
 
   def assert(value, message)
+    message = message.call if message.respond_to?(:call)
     raise message unless value
   end
   

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  version: 3.0.4
   prerelease: 
+  version: 3.0.5
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-09-18 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,7 +21,6 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- Rakefile
 - lib/will_paginate/active_record.rb
 - lib/will_paginate/array.rb
 - lib/will_paginate/collection.rb
@@ -42,11 +41,11 @@ files:
 - lib/will_paginate/view_helpers/sinatra.rb
 - lib/will_paginate/view_helpers.rb
 - lib/will_paginate.rb
-- spec/ci.rb
 - spec/collection_spec.rb
 - spec/console
 - spec/console_fixtures.rb
 - spec/database.yml
+- spec/fake_rubygems.rb
 - spec/finders/active_record_spec.rb
 - spec/finders/activerecord_test_connector.rb
 - spec/finders/data_mapper_spec.rb
@@ -75,7 +74,8 @@ files:
 - README.md
 - LICENSE
 homepage: https://github.com/mislav/will_paginate/wiki
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --main
@@ -102,4 +102,3 @@ signing_key:
 specification_version: 3
 summary: Pagination plugin for web frameworks and other apps
 test_files: []
-has_rdoc: 

data/Rakefile

@@ -1,25 +0,0 @@
-begin
-  require 'rspec/core/rake_task'
-rescue LoadError
-  # no spec tasks
-else
-  task :default => :spec
-
-  desc 'Run ALL OF the specs'
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    # t.ruby_opts = '-w'
-    t.pattern = 'spec/finders/active_record_spec.rb' if ENV['DB'] and ENV['DB'] != 'sqlite3'
-  end
-
-  namespace :spec do
-    desc "Run Rails specs"
-    RSpec::Core::RakeTask.new(:rails) do |t|
-      t.pattern = %w'spec/finders/active_record_spec.rb spec/view_helpers/action_view_spec.rb'
-    end
-  end
-end
-
-desc 'Run specs against both Rails 3.1 and Rails 3.0'
-task :rails3 do |variable|
-  system 'bundle exec rake spec && BUNDLE_GEMFILE=Gemfile.rails3.0 bundle exec rake spec:rails'
-end

data/spec/ci.rb

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-databases = %w[ sqlite3 mysql mysql2 postgres ]
-databases.delete 'mysql2' if ENV['BUNDLE_GEMFILE'].to_s.include? 'rails3.0'
-
-def announce(name, msg)
-  puts "\n\e[1;33m[#{name}] #{msg}\e[m\n"
-end
-
-def system(*args)
-  puts "$ #{args.join(' ')}"
-  super
-end
-
-if ENV['TRAVIS']
-  system "mysql -e 'create database will_paginate;' >/dev/null"
-  abort "failed to create mysql database" unless $?.success?
-  system "psql -c 'create database will_paginate;' -U postgres >/dev/null"
-  abort "failed to create postgres database" unless $?.success?
-end
-
-failed = false
-
-for db in databases
-  announce "DB", db
-  ENV['DB'] = db
-  failed = true unless system %(rake)
-end
-
-exit 1 if failed