will_paginate 3.0.2 → 3.0.3

data/lib/will_paginate/data_mapper.rb

@@ -51,7 +51,9 @@ module WillPaginate
           if loaded? and @array.size < per_page and (current_page == 1 or @array.size > 0)
             offset + @array.size
           else
-            clean_query = query.merge(:order => [])
+            # :reload prevents Collection.filter from being run, which
+            # would cause a stack overflow
+            clean_query = query.merge(:reload => true)
             # seems like the only way
             clean_query.instance_variable_set('@limit', nil)
             clean_query.instance_variable_set('@offset', 0)
@@ -61,9 +63,13 @@ module WillPaginate
       end
 
       def to_a
-        ::WillPaginate::Collection.create(current_page, per_page) do |col|
-          col.replace super
-          col.total_entries ||= total_entries
+        if paginated?
+          ::WillPaginate::Collection.create(current_page, per_page) do |col|
+            col.replace super
+            col.total_entries ||= total_entries
+          end
+        else
+          super
         end
       end
 

data/lib/will_paginate/railtie.rb

@@ -25,7 +25,9 @@ module WillPaginate
     end
 
     def self.setup_actioncontroller
-      ActionDispatch::ShowExceptions.send :include, ShowExceptionsPatch
+      ( defined?(ActionDispatch::ExceptionWrapper) ?
+        ActionDispatch::ExceptionWrapper : ActionDispatch::ShowExceptions
+      ).send :include, ShowExceptionsPatch
       ActionController::Base.extend ControllerRescuePatch
     end
 
@@ -39,13 +41,18 @@ module WillPaginate
       extend ActiveSupport::Concern
       included { alias_method_chain :status_code, :paginate }
       private
-      def status_code_with_paginate(exception)
+      def status_code_with_paginate(exception = @exception)
         if exception.is_a?(WillPaginate::InvalidPage) or
             (exception.respond_to?(:original_exception) &&
               exception.original_exception.is_a?(WillPaginate::InvalidPage))
           Rack::Utils.status_code(:not_found)
         else
-          status_code_without_paginate(exception)
+          original_method = method(:status_code_without_paginate)
+          if original_method.arity != 0
+            original_method.call(exception)
+          else
+            original_method.call()
+          end
         end
       end
     end

data/lib/will_paginate/version.rb

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

data/spec/finders/active_record_spec.rb

@@ -279,7 +279,8 @@ describe WillPaginate::ActiveRecord do
   end
   
   it "should paginate with :conditions" do
-    result = Topic.paginate :page => 1, :conditions => ["created_at > ?", 30.minutes.ago]
+    result = Topic.paginate :page => 1, :order => 'id ASC',
+      :conditions => ["created_at > ?", 30.minutes.ago]
     result.should == topics(:rails, :ar)
     result.total_pages.should == 1
   end

data/spec/finders/data_mapper_spec.rb

@@ -80,4 +80,24 @@ describe WillPaginate::DataMapper do
     Animal.all(:conditions => ['1=2']).page(1).total_pages.should == 1
   end
 
+  it "can iterate and then call WP methods" do
+    animals = Animal.all(:limit => 2).page(1)
+    animals.each { |a| }
+    animals.total_entries.should == 3
+  end
+
+  it "augments to_a to return a WP::Collection" do
+    animals = Animal.all(:limit => 2).page(1)
+    array = animals.to_a
+    array.size.should == 2
+    array.is_a? WillPaginate::Collection
+    array.current_page.should == 1
+    array.per_page.should == 2
+  end
+
+  it "doesn't have a problem assigning has-one-through relationship" do
+    human = Human.create :name => "Mislav"
+    human.pet = Animal.first
+  end
+
 end if datamapper_loaded

data/spec/finders/data_mapper_test_connector.rb

@@ -19,9 +19,34 @@ class Animal
   end
 end
 
+class Ownership
+  include DataMapper::Resource
+
+  belongs_to :animal, :key => true
+  belongs_to :human, :key => true
+
+  def self.setup
+  end
+end
+
+class Human
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :name, String
+
+  has n, :ownerships
+  has 1, :pet, :model => 'Animal', :through => :ownerships, :via => :animal
+
+  def self.setup
+  end
+end
+
 # Load fixtures
-Animal.auto_migrate!
-Animal.setup
+[Animal, Ownership, Human].each do |klass|
+  klass.auto_migrate!
+  klass.setup
+end
 
 if 'irb' == $0
   DataMapper.logger.set_log($stdout, :debug)

metadata

@@ -1,28 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: will_paginate
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.0.3
   prerelease: 
-  version: 3.0.2
 platform: ruby
-authors: 
-- "Mislav Marohni\xC4\x87"
+authors:
+- Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-27 00:00:00 Z
+date: 2012-01-31 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 links in Rails, Sinatra and Merb web apps.
+description: will_paginate provides a simple API for performing paginated queries
+  with Active Record, DataMapper and Sequel, and includes helpers for rendering pagination
+  links in Rails, Sinatra and Merb web apps.
 email: mislav.marohnic@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - Rakefile
 - lib/will_paginate/active_record.rb
 - lib/will_paginate/array.rb
@@ -78,32 +76,30 @@ files:
 - LICENSE
 homepage: https://github.com/mislav/will_paginate/wiki
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Pagination plugin for web frameworks and other apps
 test_files: []
-
+has_rdoc: