lib/will_paginate/view_helpers/merb_renderer_ext.rb @@ -32,6 +32,7 @@ lib/will_paginate/view_helpers/action_view.rb lib/will_paginate/view_helpers/base.rb lib/will_paginate/view_helpers/link_renderer.rb lib/will_paginate/view_helpers/link_renderer_base.rb +lib/will_paginate/view_helpers/merb_renderer_ext.rb spec spec/collection_spec.rb spec/console @@ -41,6 +42,8 @@ spec/finders spec/finders/active_record_spec.rb spec/finders/active_resource_spec.rb spec/finders/activerecord_test_connector.rb +spec/finders/data_mapper_spec.rb +spec/finders/data_mapper_test_connector.rb spec/finders_spec.rb spec/fixtures spec/fixtures/admin.rb .manifest @@ -42,4 +42,5 @@ if defined?(Merb::Plugins) Merb::AbstractController.send(:include, WillPaginate::ViewHelpers::Base) adapter = { :datamapper => 'data_mapper', :activerecord => 'active_record' }[Merb.orm] require "will_paginate/finders/#{adapter}" + require 'will_paginate/view_helpers/merb_renderer_ext' end lib/will_paginate.rb @@ -18,6 +18,8 @@ module WillPaginate # * <tt>:param_name</tt> -- parameter name for page number in URLs (default: <tt>:page</tt>) # * <tt>:params</tt> -- additional parameters when generating pagination links # (eg. <tt>:controller => "foo", :action => nil</tt>) + # * <tt>:base_url</tt> -- specify the action url, the helper will only add the page # attribute + # to the url # * <tt>:renderer</tt> -- class name, class or instance of a link renderer (default: # <tt>WillPaginate::LinkRenderer</tt>) # * <tt>:page_links</tt> -- when false, only previous/next links are rendered (default: true) lib/will_paginate/view_helpers/base.rb @@ -90,7 +90,7 @@ module WillPaginate url_params = @base_url_params.dup add_current_page_param(url_params, page) - generate_url(url_params) + generate_url(url_params, page) end def default_url_params @@ -123,7 +123,9 @@ module WillPaginate @template.request.get? end - def generate_url(params) + # Url generation method + # it's being overwritten by merb_renderer_ext + def generate_url(params, page) @template.url(params) end lib/will_paginate/view_helpers/link_renderer.rb @@ -15,6 +15,6 @@ Gem::Specification.new do |s| s.rdoc_options << '--inline-source' << '--charset=UTF-8' s.extra_rdoc_files = ['README.rdoc', 'LICENSE'] - s.files = %w(CHANGELOG.rdoc LICENSE README.rdoc Rakefile examples examples/apple-circle.gif examples/index.haml examples/index.html examples/pagination.css examples/pagination.sass init.rb lib lib/will_paginate lib/will_paginate.rb lib/will_paginate/array.rb lib/will_paginate/collection.rb lib/will_paginate/core_ext.rb lib/will_paginate/deprecation.rb lib/will_paginate/finders lib/will_paginate/finders.rb lib/will_paginate/finders/active_record lib/will_paginate/finders/active_record.rb lib/will_paginate/finders/active_record/named_scope.rb lib/will_paginate/finders/active_record/named_scope_patch.rb lib/will_paginate/finders/active_resource.rb lib/will_paginate/finders/base.rb lib/will_paginate/finders/data_mapper.rb lib/will_paginate/version.rb lib/will_paginate/view_helpers lib/will_paginate/view_helpers.rb lib/will_paginate/view_helpers/action_view.rb lib/will_paginate/view_helpers/base.rb lib/will_paginate/view_helpers/link_renderer.rb lib/will_paginate/view_helpers/link_renderer_base.rb spec spec/collection_spec.rb spec/console spec/console_fixtures.rb spec/database.yml spec/finders spec/finders/active_record_spec.rb spec/finders/active_resource_spec.rb spec/finders/activerecord_test_connector.rb spec/finders_spec.rb spec/fixtures spec/fixtures/admin.rb spec/fixtures/developer.rb spec/fixtures/developers_projects.yml spec/fixtures/project.rb spec/fixtures/projects.yml spec/fixtures/replies.yml spec/fixtures/reply.rb spec/fixtures/schema.rb spec/fixtures/topic.rb spec/fixtures/topics.yml spec/fixtures/user.rb spec/fixtures/users.yml spec/rcov.opts spec/spec.opts spec/spec_helper.rb spec/tasks.rake spec/view_helpers spec/view_helpers/action_view_spec.rb spec/view_helpers/base_spec.rb spec/view_helpers/link_renderer_base_spec.rb spec/view_helpers/view_example_group.rb) - s.test_files = %w(spec/collection_spec.rb spec/console spec/console_fixtures.rb spec/database.yml spec/finders spec/finders/active_record_spec.rb spec/finders/active_resource_spec.rb spec/finders/activerecord_test_connector.rb spec/finders_spec.rb spec/fixtures spec/fixtures/admin.rb spec/fixtures/developer.rb spec/fixtures/developers_projects.yml spec/fixtures/project.rb spec/fixtures/projects.yml spec/fixtures/replies.yml spec/fixtures/reply.rb spec/fixtures/schema.rb spec/fixtures/topic.rb spec/fixtures/topics.yml spec/fixtures/user.rb spec/fixtures/users.yml spec/rcov.opts spec/spec.opts spec/spec_helper.rb spec/tasks.rake spec/view_helpers spec/view_helpers/action_view_spec.rb spec/view_helpers/base_spec.rb spec/view_helpers/link_renderer_base_spec.rb spec/view_helpers/view_example_group.rb) + s.files = %w(CHANGELOG.rdoc LICENSE README.rdoc Rakefile examples examples/apple-circle.gif examples/index.haml examples/index.html examples/pagination.css examples/pagination.sass init.rb lib lib/will_paginate lib/will_paginate.rb lib/will_paginate/array.rb lib/will_paginate/collection.rb lib/will_paginate/core_ext.rb lib/will_paginate/deprecation.rb lib/will_paginate/finders lib/will_paginate/finders.rb lib/will_paginate/finders/active_record lib/will_paginate/finders/active_record.rb lib/will_paginate/finders/active_record/named_scope.rb lib/will_paginate/finders/active_record/named_scope_patch.rb lib/will_paginate/finders/active_resource.rb lib/will_paginate/finders/base.rb lib/will_paginate/finders/data_mapper.rb lib/will_paginate/version.rb lib/will_paginate/view_helpers lib/will_paginate/view_helpers.rb lib/will_paginate/view_helpers/action_view.rb lib/will_paginate/view_helpers/base.rb lib/will_paginate/view_helpers/link_renderer.rb lib/will_paginate/view_helpers/link_renderer_base.rb lib/will_paginate/view_helpers/merb_renderer_ext.rb spec spec/collection_spec.rb spec/console spec/console_fixtures.rb spec/database.yml spec/finders spec/finders/active_record_spec.rb spec/finders/active_resource_spec.rb spec/finders/activerecord_test_connector.rb spec/finders/data_mapper_spec.rb spec/finders/data_mapper_test_connector.rb spec/finders_spec.rb spec/fixtures spec/fixtures/admin.rb spec/fixtures/developer.rb spec/fixtures/developers_projects.yml spec/fixtures/project.rb spec/fixtures/projects.yml spec/fixtures/replies.yml spec/fixtures/reply.rb spec/fixtures/schema.rb spec/fixtures/topic.rb spec/fixtures/topics.yml spec/fixtures/user.rb spec/fixtures/users.yml spec/rcov.opts spec/spec.opts spec/spec_helper.rb spec/tasks.rake spec/view_helpers spec/view_helpers/action_view_spec.rb spec/view_helpers/base_spec.rb spec/view_helpers/link_renderer_base_spec.rb spec/view_helpers/view_example_group.rb) + s.test_files = %w(spec/collection_spec.rb spec/console spec/console_fixtures.rb spec/database.yml spec/finders spec/finders/active_record_spec.rb spec/finders/active_resource_spec.rb spec/finders/activerecord_test_connector.rb spec/finders/data_mapper_spec.rb spec/finders/data_mapper_test_connector.rb spec/finders_spec.rb spec/fixtures spec/fixtures/admin.rb spec/fixtures/developer.rb spec/fixtures/developers_projects.yml spec/fixtures/project.rb spec/fixtures/projects.yml spec/fixtures/replies.yml spec/fixtures/reply.rb spec/fixtures/schema.rb spec/fixtures/topic.rb spec/fixtures/topics.yml spec/fixtures/user.rb spec/fixtures/users.yml spec/rcov.opts spec/spec.opts spec/spec_helper.rb spec/tasks.rake spec/view_helpers spec/view_helpers/action_view_spec.rb spec/view_helpers/base_spec.rb spec/view_helpers/link_renderer_base_spec.rb spec/view_helpers/view_example_group.rb) end \ No newline at end of file will_paginate.gemspec 32d31d3646e306a18b7ad0b494f741bf92b854f7 Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/will_paginate/commit/aef06fcc72f2540d605edfd000903e606f924dc6 aef06fcc72f2540d605edfd000903e606f924dc6 2008-10-27T00:15:06-07:00 2008-10-27T00:15:06-07:00 w00t added real/full Merb support a49a6c87a6bc0f930492b9f73d4105fcfaad0e17 Matt Aimonetti mattaimonetti@gmail.com