proper Merb integration

lib/will_paginate.rb

@@ -6,10 +6,14 @@ module WillPaginate
   require 'will_paginate/railtie'
 end
 
-if defined?(::Merb::Plugins)
+if defined?(Merb::AbstractController)
   require 'will_paginate/view_helpers/merb'
-  # auto-load the right ORM adapter
-  if adapter = { :datamapper => 'data_mapper', :activerecord => 'active_record', :sequel => 'sequel' }[Merb.orm]
-    require "will_paginate/#{adapter}"
+
+  Merb::BootLoader.before_app_loads do
+    adapters = { :datamapper => 'data_mapper', :activerecord => 'active_record', :sequel => 'sequel' }
+    # auto-load the right ORM adapter
+    if adapter = adapters[Merb.orm]
+      require "will_paginate/#{adapter}"
+    end
   end
 end

lib/will_paginate/view_helpers/merb.rb

@@ -1,13 +1,25 @@
-require 'will_paginate/view_helpers/base'
+require 'will_paginate/view_helpers'
 require 'will_paginate/view_helpers/link_renderer'
 
-WillPaginate::ViewHelpers::LinkRenderer.class_eval do
-  protected
+module WillPaginate
+  module Merb
+    include ViewHelpers
 
-  def url(page)
-    params = @template.request.params.except(:action, :controller).merge(param_name => page)
-    @template.url(:this, params)
+    def will_paginate(collection, options = {}) #:nodoc:
+      options = options.merge(:renderer => LinkRenderer) unless options[:renderer]
+      super(collection, options)
+    end
+
+    class LinkRenderer < ViewHelpers::LinkRenderer
+      protected
+
+      def url(page)
+        params = @template.request.params.except(:action, :controller).merge(param_name => page)
+        @template.url(:this, params)
+      end
+    end
+
+    ::Merb::AbstractController.send(:include, self)
   end
 end
 
-Merb::AbstractController.send(:include, WillPaginate::ViewHelpers::Base)