actionpack 1.13.6 → 2.0.0

data/lib/action_controller/cgi_ext/pstore_performance_fix.rb

@@ -1,30 +0,0 @@
-# CGI::Session::PStore.initialize requires 'digest/md5' on every call.
-# This makes sense when spawning processes per request, but is
-# unnecessarily expensive when serving requests from a long-lived
-# process.
-require 'cgi/session'
-require 'cgi/session/pstore'
-require 'digest/md5'
-
-class CGI::Session::PStore #:nodoc:
-  def initialize(session, option={})
-    dir = option['tmpdir'] || Dir::tmpdir
-    prefix = option['prefix'] || ''
-    id = session.session_id
-    md5 = Digest::MD5.hexdigest(id)[0,16]
-    path = dir+"/"+prefix+md5
-    path.untaint
-    if File::exist?(path)
-      @hash = nil
-    else
-      unless session.new_session
-        raise CGI::Session::NoSession, "uninitialized session"
-      end
-      @hash = {}
-    end
-    @p = ::PStore.new(path)
-    @p.transaction do |p|
-      File.chmod(0600, p.path)
-    end
-  end
-end

data/lib/action_controller/cgi_ext/raw_post_data_fix.rb

@@ -1,95 +0,0 @@
-class CGI #:nodoc:
-  module QueryExtension
-    # Initialize the data from the query.
-    #
-    # Handles multipart forms (in particular, forms that involve file uploads).
-    # Reads query parameters in the @params field, and cookies into @cookies.
-    def initialize_query
-      @cookies = CGI::Cookie::parse(env_table['HTTP_COOKIE'] || env_table['COOKIE'])
-
-      # Fix some strange request environments.
-      if method = env_table['REQUEST_METHOD']
-        method = method.to_s.downcase.intern
-      else
-        method = :get
-      end
-
-      # POST assumes missing Content-Type is application/x-www-form-urlencoded.
-      content_type = env_table['CONTENT_TYPE']
-      if content_type.blank? && method == :post
-        content_type = 'application/x-www-form-urlencoded'
-      end
-
-      # Force content length to zero if missing.
-      content_length = env_table['CONTENT_LENGTH'].to_i
-
-      # Set multipart to false by default.
-      @multipart = false
-
-      # POST and PUT may have params in entity body. If content type is
-      # missing for POST, assume urlencoded. If content type is missing
-      # for PUT, don't assume anything and don't parse the parameters:
-      # it's likely binary data.
-      #
-      # The other HTTP methods have their params in the query string.
-      if method == :post || method == :put
-        if boundary = extract_multipart_form_boundary(content_type)
-          @multipart = true
-          @params = read_multipart(boundary, content_length)
-        elsif content_type.blank? || content_type !~ %r{application/x-www-form-urlencoded}i
-          read_params(method, content_length)
-          @params = {}
-        end
-      end
-
-      @params ||= CGI.parse(read_params(method, content_length))
-    end
-
-    private
-      unless defined?(MULTIPART_FORM_BOUNDARY_RE)
-        MULTIPART_FORM_BOUNDARY_RE = %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n #"
-      end
-
-      def extract_multipart_form_boundary(content_type)
-        MULTIPART_FORM_BOUNDARY_RE.match(content_type).to_a.pop
-      end
-
-      if defined? MOD_RUBY
-        def read_query
-          Apache::request.args || ''
-        end
-      else
-        def read_query
-          # fixes CGI querystring parsing for lighttpd
-          env_qs = env_table['QUERY_STRING']
-          if env_qs.blank? && !(uri = env_table['REQUEST_URI']).blank?
-            uri.split('?', 2)[1] || ''
-          else
-            env_qs || ''
-          end
-        end
-      end
-
-      def read_body(content_length)
-        stdinput.binmode if stdinput.respond_to?(:binmode)
-        content = stdinput.read(content_length) || ''
-        # Fix for Safari Ajax postings that always append \000
-        content.chop! if content[-1] == 0
-        content.gsub!(/&_=$/, '')
-        env_table['RAW_POST_DATA'] = content.freeze
-      end
-
-      def read_params(method, content_length)
-        case method
-          when :get
-            read_query
-          when :post, :put
-            read_body(content_length)
-          when :cmd
-            read_from_cmdline
-          else # :head, :delete, :options, :trace, :connect
-            read_query
-        end
-      end
-  end # module QueryExtension
-end

data/lib/action_controller/cgi_ext/session_performance_fix.rb

@@ -1,30 +0,0 @@
-# CGI::Session#create_new_id requires 'digest/md5' on every call.  This makes
-# sense when spawning processes per request, but is unnecessarily expensive
-# when serving requests from a long-lived process.
-#
-# http://railsexpress.de/blog/articles/2005/11/22/speeding-up-the-creation-of-new-sessions
-require 'cgi/session'
-require 'digest/md5'
-
-class CGI
-  class Session #:nodoc:
-    private
-      # Create a new session id.
-      #
-      # The session id is an MD5 hash based upon the time,
-      # a random number, and a constant string.  This routine
-      # is used internally for automatically generated
-      # session ids.
-      def create_new_id
-        md5 = Digest::MD5::new
-        now = Time::now
-        md5.update(now.to_s)
-        md5.update(String(now.usec))
-        md5.update(String(rand(0)))
-        md5.update(String($$))
-        md5.update('foobar')
-        @new_session = true
-        md5.hexdigest
-      end
-  end
-end

data/lib/action_controller/deprecated_dependencies.rb

@@ -1,65 +0,0 @@
-module ActionController #:nodoc:
-  module Dependencies #:nodoc:
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    # Deprecated module. The responsibility of loading dependencies belong with Active Support now.
-    module ClassMethods #:nodoc:
-      # Specifies a variable number of models that this controller depends on. Models are normally Active Record classes or a similar
-      # backend for modelling entity classes.
-      def model(*models)
-        require_dependencies(:model, models)
-        depend_on(:model, models)
-      end
-      deprecate :model
-
-      # Specifies a variable number of services that this controller depends on. Services are normally singletons or factories, like
-      # Action Mailer service or a Payment Gateway service.
-      def service(*services)
-        require_dependencies(:service, services)
-        depend_on(:service, services)
-      end
-      deprecate :service
-      
-      # Specifies a variable number of observers that are to govern when this controller is handling actions. The observers will
-      # automatically have .instance called on them to make them active on assignment.
-      def observer(*observers)
-        require_dependencies(:observer, observers)
-        depend_on(:observer, observers)
-        instantiate_observers(observers)
-      end
-      deprecate :observer
-
-      # Returns an array of symbols that specify the dependencies on a given layer. For the example at the top, calling
-      # <tt>ApplicationController.dependencies_on(:model)</tt> would return <tt>[:account, :company, :person, :project, :category]</tt>
-      def dependencies_on(layer)
-        read_inheritable_attribute("#{layer}_dependencies")
-      end
-      deprecate :dependencies_on
-
-      def depend_on(layer, dependencies) #:nodoc:
-        write_inheritable_array("#{layer}_dependencies", dependencies)
-      end
-      deprecate :depend_on
-
-      private
-        def instantiate_observers(observers)
-          observers.flatten.each { |observer| Object.const_get(Inflector.classify(observer.to_s)).instance }
-        end
-        
-        def require_dependencies(layer, dependencies)
-          dependencies.flatten.each do |dependency|
-            begin
-              require_dependency(dependency.to_s)
-            rescue LoadError => e
-              raise LoadError.new("Missing #{layer} #{dependency}.rb").copy_blame!(e)
-            rescue Exception => exception  # error from loaded file
-              exception.blame_file! "=> #{layer} #{dependency}.rb"
-              raise
-            end
-          end
-        end
-    end
-  end
-end

data/lib/action_controller/deprecated_redirects.rb

@@ -1,17 +0,0 @@
-module ActionController
-  class Base
-    protected
-      # Deprecated in favor of calling redirect_to directly with the path.
-      def redirect_to_path(path) #:nodoc:
-        redirect_to(path)
-      end
-
-      # Deprecated in favor of calling redirect_to directly with the url. If the resource has moved permanently, it's possible to pass
-      # true as the second parameter and the browser will get "301 Moved Permanently" instead of "302 Found". This can also be done through
-      # just setting the headers["Status"] to "301 Moved Permanently" before using the redirect_to.
-      def redirect_to_url(url, permanently = false) #:nodoc:
-        headers["Status"] = "301 Moved Permanently" if permanently
-        redirect_to(url)
-      end
-  end
-end

data/lib/action_controller/deprecated_request_methods.rb

@@ -1,34 +0,0 @@
-module ActionController
-  class AbstractRequest
-    # Determine whether the body of a HTTP call is URL-encoded (default)
-    # or matches one of the registered param_parsers. 
-    #
-    # For backward compatibility, the post format is extracted from the
-    # X-Post-Data-Format HTTP header if present.
-    def post_format
-      case content_type.to_s
-      when 'application/xml'
-        :xml
-      when 'application/x-yaml'
-        :yaml
-      else
-        :url_encoded
-      end
-    end
-
-    # Is this a POST request formatted as XML or YAML?
-    def formatted_post?
-      post? && (post_format == :yaml || post_format == :xml)
-    end
-
-    # Is this a POST request formatted as XML?
-    def xml_post?
-      post? && post_format == :xml
-    end
-
-    # Is this a POST request formatted as YAML?
-    def yaml_post?
-      post? && post_format == :yaml
-    end
-  end
-end

data/lib/action_controller/macros/auto_complete.rb

@@ -1,53 +0,0 @@
-module ActionController
-  # Macros are class-level calls that add pre-defined actions to the controller based on the parameters passed in.
-  # Currently, they're used to bridge the JavaScript macros, like autocompletion and in-place editing, with the controller
-  # backing.
-  module Macros
-    module AutoComplete #:nodoc:
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-      end
-
-      # DEPRECATION WARNING: This method will become a separate plugin when Rails 2.0 ships.
-      #
-      # Example:
-      #
-      #   # Controller
-      #   class BlogController < ApplicationController
-      #     auto_complete_for :post, :title
-      #   end
-      #
-      #   # View
-      #   <%= text_field_with_auto_complete :post, title %>
-      #
-      # By default, auto_complete_for limits the results to 10 entries,
-      # and sorts by the given field.
-      # 
-      # auto_complete_for takes a third parameter, an options hash to
-      # the find method used to search for the records:
-      #
-      #   auto_complete_for :post, :title, :limit => 15, :order => 'created_at DESC'
-      #
-      # For help on defining text input fields with autocompletion, 
-      # see ActionView::Helpers::JavaScriptHelper.
-      #
-      # For more examples, see script.aculo.us:
-      # * http://script.aculo.us/demos/ajax/autocompleter
-      # * http://script.aculo.us/demos/ajax/autocompleter_customized
-      module ClassMethods
-        def auto_complete_for(object, method, options = {})
-          define_method("auto_complete_for_#{object}_#{method}") do
-            find_options = { 
-              :conditions => [ "LOWER(#{method}) LIKE ?", '%' + params[object][method].downcase + '%' ], 
-              :order => "#{method} ASC",
-              :limit => 10 }.merge!(options)
-            
-            @items = object.to_s.camelize.constantize.find(:all, find_options)
-
-            render :inline => "<%= auto_complete_result @items, '#{method}' %>"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/action_controller/macros/in_place_editing.rb

@@ -1,33 +0,0 @@
-module ActionController
-  module Macros
-    module InPlaceEditing #:nodoc:
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-      end
-
-      # DEPRECATION WARNING: This method will become a separate plugin when Rails 2.0 ships.
-      #
-      # Example:
-      #
-      #   # Controller
-      #   class BlogController < ApplicationController
-      #     in_place_edit_for :post, :title
-      #   end
-      #
-      #   # View
-      #   <%= in_place_editor_field :post, 'title' %>
-      #
-      # For help on defining an in place editor in the browser,
-      # see ActionView::Helpers::JavaScriptHelper.
-      module ClassMethods
-        def in_place_edit_for(object, attribute, options = {})
-          define_method("set_#{object}_#{attribute}") do
-            @item = object.to_s.camelize.constantize.find(params[:id])
-            @item.update_attribute(attribute, params[:value])
-            render :text => @item.send(attribute).to_s
-          end
-        end
-      end
-    end
-  end
-end

data/lib/action_controller/pagination.rb

@@ -1,408 +0,0 @@
-module ActionController
-  # === Action Pack pagination for Active Record collections
-  #
-  # DEPRECATION WARNING: Pagination will be moved to a plugin in Rails 2.0.
-  # Install the classic_pagination plugin for forward compatibility:
-  #   script/plugin install svn://errtheblog.com/svn/plugins/classic_pagination
-  #
-  # The Pagination module aids in the process of paging large collections of
-  # Active Record objects. It offers macro-style automatic fetching of your
-  # model for multiple views, or explicit fetching for single actions. And if
-  # the magic isn't flexible enough for your needs, you can create your own
-  # paginators with a minimal amount of code.
-  #
-  # The Pagination module can handle as much or as little as you wish. In the
-  # controller, have it automatically query your model for pagination; or,
-  # if you prefer, create Paginator objects yourself.
-  #
-  # Pagination is included automatically for all controllers.
-  #
-  # For help rendering pagination links, see 
-  # ActionView::Helpers::PaginationHelper.
-  #
-  # ==== Automatic pagination for every action in a controller
-  #
-  #   class PersonController < ApplicationController   
-  #     model :person
-  #
-  #     paginate :people, :order => 'last_name, first_name',
-  #              :per_page => 20
-  #     
-  #     # ...
-  #   end
-  #
-  # Each action in this controller now has access to a <tt>@people</tt>
-  # instance variable, which is an ordered collection of model objects for the
-  # current page (at most 20, sorted by last name and first name), and a 
-  # <tt>@person_pages</tt> Paginator instance. The current page is determined
-  # by the <tt>params[:page]</tt> variable.
-  #
-  # ==== Pagination for a single action
-  #
-  #   def list
-  #     @person_pages, @people =
-  #       paginate :people, :order => 'last_name, first_name'
-  #   end
-  #
-  # Like the previous example, but explicitly creates <tt>@person_pages</tt>
-  # and <tt>@people</tt> for a single action, and uses the default of 10 items
-  # per page.
-  #
-  # ==== Custom/"classic" pagination 
-  #
-  #   def list
-  #     @person_pages = Paginator.new self, Person.count, 10, params[:page]
-  #     @people = Person.find :all, :order => 'last_name, first_name', 
-  #                           :limit  =>  @person_pages.items_per_page,
-  #                           :offset =>  @person_pages.current.offset
-  #   end
-  # 
-  # Explicitly creates the paginator from the previous example and uses 
-  # Paginator#to_sql to retrieve <tt>@people</tt> from the model.
-  #
-  module Pagination
-    unless const_defined?(:OPTIONS)
-      # A hash holding options for controllers using macro-style pagination
-      OPTIONS = Hash.new
-  
-      # The default options for pagination
-      DEFAULT_OPTIONS = {
-        :class_name => nil,
-        :singular_name => nil,
-        :per_page   => 10,
-        :conditions => nil,
-        :order_by   => nil,
-        :order      => nil,
-        :join       => nil,
-        :joins      => nil,
-        :count      => nil,
-        :include    => nil,
-        :select     => nil,
-        :parameter  => 'page'
-      }
-    end
-      
-    def self.included(base) #:nodoc:
-      super
-      base.extend(ClassMethods)
-    end
-  
-    def self.validate_options!(collection_id, options, in_action) #:nodoc:
-      options.merge!(DEFAULT_OPTIONS) {|key, old, new| old}
-
-      valid_options = DEFAULT_OPTIONS.keys
-      valid_options << :actions unless in_action
-    
-      unknown_option_keys = options.keys - valid_options
-      raise ActionController::ActionControllerError,
-            "Unknown options: #{unknown_option_keys.join(', ')}" unless
-              unknown_option_keys.empty?
-
-      options[:singular_name] ||= Inflector.singularize(collection_id.to_s)
-      options[:class_name]  ||= Inflector.camelize(options[:singular_name])
-    end
-
-    # Returns a paginator and a collection of Active Record model instances
-    # for the paginator's current page. This is designed to be used in a
-    # single action; to automatically paginate multiple actions, consider
-    # ClassMethods#paginate.
-    #
-    # +options+ are:
-    # <tt>:singular_name</tt>:: the singular name to use, if it can't be inferred by singularizing the collection name
-    # <tt>:class_name</tt>:: the class name to use, if it can't be inferred by
-    #                        camelizing the singular name
-    # <tt>:per_page</tt>::   the maximum number of items to include in a 
-    #                        single page. Defaults to 10
-    # <tt>:conditions</tt>:: optional conditions passed to Model.find(:all, *params) and
-    #                        Model.count
-    # <tt>:order</tt>::      optional order parameter passed to Model.find(:all, *params)
-    # <tt>:order_by</tt>::   (deprecated, used :order) optional order parameter passed to Model.find(:all, *params)
-    # <tt>:joins</tt>::      optional joins parameter passed to Model.find(:all, *params)
-    #                        and Model.count
-    # <tt>:join</tt>::       (deprecated, used :joins or :include) optional join parameter passed to Model.find(:all, *params)
-    #                        and Model.count
-    # <tt>:include</tt>::    optional eager loading parameter passed to Model.find(:all, *params)
-    #                        and Model.count
-    # <tt>:select</tt>::     :select parameter passed to Model.find(:all, *params)
-    #
-    # <tt>:count</tt>::      parameter passed as :select option to Model.count(*params)
-    #
-    def paginate(collection_id, options={})
-      Pagination.validate_options!(collection_id, options, true)
-      paginator_and_collection_for(collection_id, options)
-    end
-
-    deprecate :paginate => 'Pagination is moving to a plugin in Rails 2.0: script/plugin install svn://errtheblog.com/svn/plugins/classic_pagination'
-
-    # These methods become class methods on any controller 
-    module ClassMethods
-      # Creates a +before_filter+ which automatically paginates an Active
-      # Record model for all actions in a controller (or certain actions if
-      # specified with the <tt>:actions</tt> option).
-      #
-      # +options+ are the same as PaginationHelper#paginate, with the addition 
-      # of:
-      # <tt>:actions</tt>:: an array of actions for which the pagination is
-      #                     active. Defaults to +nil+ (i.e., every action)
-      def paginate(collection_id, options={})
-        Pagination.validate_options!(collection_id, options, false)
-        module_eval do
-          before_filter :create_paginators_and_retrieve_collections
-          OPTIONS[self] ||= Hash.new
-          OPTIONS[self][collection_id] = options
-        end
-      end
-
-      deprecate :paginate => 'Pagination is moving to a plugin in Rails 2.0: script/plugin install svn://errtheblog.com/svn/plugins/classic_pagination'
-    end
-
-    def create_paginators_and_retrieve_collections #:nodoc:
-      Pagination::OPTIONS[self.class].each do |collection_id, options|
-        next unless options[:actions].include? action_name if
-          options[:actions]
-
-        paginator, collection = 
-          paginator_and_collection_for(collection_id, options)
-
-        paginator_name = "@#{options[:singular_name]}_pages"
-        self.instance_variable_set(paginator_name, paginator)
-
-        collection_name = "@#{collection_id.to_s}"
-        self.instance_variable_set(collection_name, collection)     
-      end
-    end
-  
-    # Returns the total number of items in the collection to be paginated for
-    # the +model+ and given +conditions+. Override this method to implement a
-    # custom counter.
-    def count_collection_for_pagination(model, options)
-      model.count(:conditions => options[:conditions],
-                  :joins => options[:join] || options[:joins],
-                  :include => options[:include],
-                  :select => options[:count])
-    end
-    
-    # Returns a collection of items for the given +model+ and +options[conditions]+,
-    # ordered by +options[order]+, for the current page in the given +paginator+.
-    # Override this method to implement a custom finder.
-    def find_collection_for_pagination(model, options, paginator)
-      model.find(:all, :conditions => options[:conditions],
-                 :order => options[:order_by] || options[:order],
-                 :joins => options[:join] || options[:joins], :include => options[:include],
-                 :select => options[:select], :limit => options[:per_page],
-                 :offset => paginator.current.offset)
-    end
-  
-    protected :create_paginators_and_retrieve_collections,
-              :count_collection_for_pagination,
-              :find_collection_for_pagination
-
-    def paginator_and_collection_for(collection_id, options) #:nodoc:
-      klass = options[:class_name].constantize
-      page  = params[options[:parameter]]
-      count = count_collection_for_pagination(klass, options)
-      paginator = Paginator.new(self, count, options[:per_page], page)
-      collection = find_collection_for_pagination(klass, options, paginator)
-    
-      return paginator, collection 
-    end
-      
-    private :paginator_and_collection_for
-
-    # A class representing a paginator for an Active Record collection.
-    class Paginator
-      include Enumerable
-
-      # Creates a new Paginator on the given +controller+ for a set of items
-      # of size +item_count+ and having +items_per_page+ items per page.
-      # Raises ArgumentError if items_per_page is out of bounds (i.e., less
-      # than or equal to zero). The page CGI parameter for links defaults to
-      # "page" and can be overridden with +page_parameter+.
-      def initialize(controller, item_count, items_per_page, current_page=1)
-        raise ArgumentError, 'must have at least one item per page' if
-          items_per_page <= 0
-
-        @controller = controller
-        @item_count = item_count || 0
-        @items_per_page = items_per_page
-        @pages = {}
-        
-        self.current_page = current_page
-      end
-      attr_reader :controller, :item_count, :items_per_page
-      
-      # Sets the current page number of this paginator. If +page+ is a Page
-      # object, its +number+ attribute is used as the value; if the page does 
-      # not belong to this Paginator, an ArgumentError is raised.
-      def current_page=(page)
-        if page.is_a? Page
-          raise ArgumentError, 'Page/Paginator mismatch' unless
-            page.paginator == self
-        end
-        page = page.to_i
-        @current_page_number = has_page_number?(page) ? page : 1
-      end
-
-      # Returns a Page object representing this paginator's current page.
-      def current_page
-        @current_page ||= self[@current_page_number]
-      end
-      alias current :current_page
-
-      # Returns a new Page representing the first page in this paginator.
-      def first_page
-        @first_page ||= self[1]
-      end
-      alias first :first_page
-
-      # Returns a new Page representing the last page in this paginator.
-      def last_page
-        @last_page ||= self[page_count] 
-      end
-      alias last :last_page
-
-      # Returns the number of pages in this paginator.
-      def page_count
-        @page_count ||= @item_count.zero? ? 1 :
-                          (q,r=@item_count.divmod(@items_per_page); r==0? q : q+1)
-      end
-
-      alias length :page_count
-
-      # Returns true if this paginator contains the page of index +number+.
-      def has_page_number?(number)
-        number >= 1 and number <= page_count
-      end
-
-      # Returns a new Page representing the page with the given index
-      # +number+.
-      def [](number)
-        @pages[number] ||= Page.new(self, number)
-      end
-
-      # Successively yields all the paginator's pages to the given block.
-      def each(&block)
-        page_count.times do |n|
-          yield self[n+1]
-        end
-      end
-
-      # A class representing a single page in a paginator.
-      class Page
-        include Comparable
-
-        # Creates a new Page for the given +paginator+ with the index
-        # +number+. If +number+ is not in the range of valid page numbers or
-        # is not a number at all, it defaults to 1.
-        def initialize(paginator, number)
-          @paginator = paginator
-          @number = number.to_i
-          @number = 1 unless @paginator.has_page_number? @number
-        end
-        attr_reader :paginator, :number
-        alias to_i :number
-
-        # Compares two Page objects and returns true when they represent the 
-        # same page (i.e., their paginators are the same and they have the
-        # same page number).
-        def ==(page)
-          return false if page.nil?
-          @paginator == page.paginator and 
-            @number == page.number
-        end
-
-        # Compares two Page objects and returns -1 if the left-hand page comes
-        # before the right-hand page, 0 if the pages are equal, and 1 if the
-        # left-hand page comes after the right-hand page. Raises ArgumentError
-        # if the pages do not belong to the same Paginator object.
-        def <=>(page)
-          raise ArgumentError unless @paginator == page.paginator
-          @number <=> page.number
-        end
-
-        # Returns the item offset for the first item in this page.
-        def offset
-          @paginator.items_per_page * (@number - 1)
-        end
-        
-        # Returns the number of the first item displayed.
-        def first_item
-          offset + 1
-        end
-        
-        # Returns the number of the last item displayed.
-        def last_item
-          [@paginator.items_per_page * @number, @paginator.item_count].min
-        end
-
-        # Returns true if this page is the first page in the paginator.
-        def first?
-          self == @paginator.first
-        end
-
-        # Returns true if this page is the last page in the paginator.
-        def last?
-          self == @paginator.last
-        end
-
-        # Returns a new Page object representing the page just before this
-        # page, or nil if this is the first page.
-        def previous
-          if first? then nil else @paginator[@number - 1] end
-        end
-
-        # Returns a new Page object representing the page just after this
-        # page, or nil if this is the last page.
-        def next
-          if last? then nil else @paginator[@number + 1] end
-        end
-
-        # Returns a new Window object for this page with the specified 
-        # +padding+.
-        def window(padding=2)
-          Window.new(self, padding)
-        end
-
-        # Returns the limit/offset array for this page.
-        def to_sql
-          [@paginator.items_per_page, offset]
-        end
-        
-        def to_param #:nodoc:
-          @number.to_s
-        end
-      end
-
-      # A class for representing ranges around a given page.
-      class Window
-        # Creates a new Window object for the given +page+ with the specified
-        # +padding+.
-        def initialize(page, padding=2)
-          @paginator = page.paginator
-          @page = page
-          self.padding = padding
-        end
-        attr_reader :paginator, :page
-
-        # Sets the window's padding (the number of pages on either side of the
-        # window page).
-        def padding=(padding)
-          @padding = padding < 0 ? 0 : padding
-          # Find the beginning and end pages of the window
-          @first = @paginator.has_page_number?(@page.number - @padding) ?
-            @paginator[@page.number - @padding] : @paginator.first
-          @last =  @paginator.has_page_number?(@page.number + @padding) ?
-            @paginator[@page.number + @padding] : @paginator.last
-        end
-        attr_reader :padding, :first, :last
-
-        # Returns an array of Page objects in the current window.
-        def pages
-          (@first.number..@last.number).to_a.collect! {|n| @paginator[n]}
-        end
-        alias to_a :pages
-      end
-    end
-
-  end
-end