will_paginate 3.0.pre → 3.0.pre2

data/lib/will_paginate/railtie.rb

@@ -3,8 +3,6 @@ require 'will_paginate/collection'
 
 module WillPaginate
   class Railtie < Rails::Railtie
-    railtie_name :will_paginate
-    
     initializer "will_paginate.active_record" do |app|
       if defined? ::ActiveRecord
         require 'will_paginate/finders/active_record'

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers/action_view.rb

@@ -64,15 +64,7 @@ module WillPaginate
       # blocks of pagination links sharing the same ID (which is invalid HTML).
       def paginated_section(*args, &block)
         pagination = will_paginate(*args).to_s
-        
-        unless ::ActionView::Base.respond_to? :erb_variable
-          concat pagination
-          yield
-          concat pagination
-        else
-          content = pagination + capture(&block) + pagination
-          concat(content, block.binding)
-        end
+        pagination + capture(&block) + pagination
       end
       
     protected

data/spec/finders/activerecord_test_connector.rb

@@ -31,7 +31,7 @@ class ActiverecordTestConnector
   
   def self.add_load_path(path)
     dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
-    dep.load_paths.unshift path
+    dep.autoload_paths.unshift path
   end
 
   def self.setup_connection

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'bundler'
 require 'spec/autorun'
 
 module MyExtras

data/spec/view_helpers/action_view_spec.rb

@@ -5,14 +5,17 @@ require 'view_helpers/view_example_group'
 require 'will_paginate/view_helpers/action_view'
 require 'will_paginate/collection'
 
-ActionController::Routing::Routes.draw do |map|
-  map.connect 'dummy/page/:page', :controller => 'dummy'
-  map.connect 'dummy/dots/page.:page', :controller => 'dummy', :action => 'dots'
-  map.connect 'ibocorp/:page', :controller => 'ibocorp',
-                               :requirements => { :page => /\d+/ },
-                               :defaults => { :page => 1 }
-                               
-  map.connect ':controller/:action/:id'
+ActionView::Base.send(:include, WillPaginate::ViewHelpers::ActionView)
+
+Routes = ActionDispatch::Routing::RouteSet.new
+
+Routes.draw do
+  match 'dummy/page/:page' => 'dummy#index'
+  match 'dummy/dots/page.:page' => 'dummy#dots'
+  match 'ibocorp(/:page)' => 'ibocorp#index',
+        :constraints => { :page => /\d+/ }, :defaults => { :page => 1 }
+
+  match ':controller(/:action(/:id(.:format)))'
 end
 
 describe WillPaginate::ViewHelpers::ActionView do
@@ -28,6 +31,7 @@ describe WillPaginate::ViewHelpers::ActionView do
   def render(locals)
     @view = ActionView::Base.new([], @assigns, @controller)
     @view.request = @request
+    @view.singleton_class.send(:include, @controller._routes.url_helpers)
     @view.render(:inline => @template, :locals => locals)
   end
   
@@ -165,7 +169,7 @@ describe WillPaginate::ViewHelpers::ActionView do
   
   it "should render a paginated section" do
     @template = <<-ERB
-      <% paginated_section collection, options do %>
+      <%= paginated_section collection, options do %>
         <%= content_tag :div, '', :id => "developers" %>
       <% end %>
     ERB
@@ -255,6 +259,8 @@ describe WillPaginate::ViewHelpers::ActionView do
         assert_links_match %r{/ibocorp(?:/(\d+))?$}, links, [nil, nil, 3, 4, 5, 6, 3]
       end
     end
+    # Routes.recognize_path('/ibocorp/2').should == {:page=>'2', :action=>'index', :controller=>'ibocorp'}
+    # Routes.recognize_path('/ibocorp/foo').should == {:action=>'foo', :controller=>'ibocorp'}
   end
 
   ## internal hardcore stuff ##
@@ -295,18 +301,19 @@ class DummyController
   attr_reader :request
   attr_accessor :controller_name
   
+  include ActionController::UrlFor
+  include Routes.url_helpers
+  
   def initialize
     @request = DummyRequest.new
-    @url = ActionController::UrlRewriter.new(@request, @request.params)
   end
 
   def params
     @request.params
   end
-  
-  def url_for(params)
-    @url.rewrite(params)
-  end
+end
+
+class IbocorpController < DummyController
 end
 
 class DummyRequest
@@ -329,6 +336,10 @@ class DummyRequest
   def relative_url_root
     ''
   end
+  
+  def script_name
+    ''
+  end
 
   def params(more = nil)
     @params.update(more) if more

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: will_paginate
 version: !ruby/object:Gem::Version 
-  version: 3.0.pre
+  hash: -1876988247
+  prerelease: true
+  segments: 
+  - 3
+  - 0
+  - pre2
+  version: 3.0.pre2
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -91,21 +97,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adaptive pagination plugin for web frameworks and other applications