mwmitchell-rsolr-ext 0.4.1 → 0.5.0

data/lib/core_ext.rb

@@ -0,0 +1,5 @@
+class Hash
+  def to_mash
+    Mash.new(self)
+  end
+end

data/lib/mash.rb

@@ -0,0 +1,143 @@
+# This class has dubious semantics and we only have it so that people can write
+# params[:key] instead of params['key'].
+class Mash < Hash
+
+  # @param constructor<Object>
+  #   The default value for the mash. Defaults to an empty hash.
+  #
+  # @details [Alternatives]
+  #   If constructor is a Hash, a new mash will be created based on the keys of
+  #   the hash and no default value will be set.
+  def initialize(constructor = {})
+    if constructor.is_a?(Hash) 
+      super() 
+      update(constructor) 
+    else 
+      super(constructor) 
+    end 
+  end
+
+  # @param key<Object> The default value for the mash. Defaults to nil.
+  #
+  # @details [Alternatives]
+  #   If key is a Symbol and it is a key in the mash, then the default value will
+  #   be set to the value matching the key.
+  def default(key = nil) 
+    if key.is_a?(Symbol) && include?(key = key.to_s) 
+      self[key] 
+    else 
+      super 
+    end 
+  end 
+ 
+  alias_method :regular_writer, :[]= unless method_defined?(:regular_writer) 
+  alias_method :regular_update, :update unless method_defined?(:regular_update)
+
+  # @param key<Object> The key to set.
+  # @param value<Object>
+  #   The value to set the key to.
+  #
+  # @see Mash#convert_key
+  # @see Mash#convert_value
+  def []=(key, value) 
+    regular_writer(convert_key(key), convert_value(value)) 
+  end
+
+  # @param other_hash<Hash>
+  #   A hash to update values in the mash with. The keys and the values will be
+  #   converted to Mash format.
+  #
+  # @return <Mash> The updated mash.
+  def update(other_hash) 
+    other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) } 
+    self 
+  end 
+ 
+  alias_method :merge!, :update
+
+  # @param key<Object> The key to check for. This will be run through convert_key.
+  #
+  # @return <TrueClass, FalseClass> True if the key exists in the mash.
+  def key?(key) 
+    super(convert_key(key)) 
+  end 
+
+  # def include? def has_key? def member?
+  alias_method :include?, :key?
+  alias_method :has_key?, :key?
+  alias_method :member?, :key?
+
+  # @param key<Object> The key to fetch. This will be run through convert_key.
+  # @param *extras<Array> Default value.
+  #
+  # @return <Object> The value at key or the default value.
+  def fetch(key, *extras) 
+    super(convert_key(key), *extras) 
+  end
+
+  # @param *indices<Array>
+  #   The keys to retrieve values for. These will be run through +convert_key+.
+  #
+  # @return <Array> The values at each of the provided keys
+  def values_at(*indices) 
+    indices.collect {|key| self[convert_key(key)]} 
+  end
+
+  # @return <Mash> A duplicate of this mash.
+  def dup 
+    Mash.new(self) 
+  end
+
+  # @param hash<Hash> The hash to merge with the mash.
+  #
+  # @return <Mash> A new mash with the hash values merged in.
+  def merge(hash) 
+    self.dup.update(hash) 
+  end
+
+  # @param key<Object>
+  #   The key to delete from the mash.\
+  def delete(key) 
+    super(convert_key(key)) 
+  end
+
+  # Used to provide the same interface as Hash.
+  #
+  # @return <Mash> This mash unchanged.
+  def stringify_keys!; self end
+ 
+  # @return <Hash> The mash as a Hash with string keys.
+  def to_hash 
+    Hash.new(default).merge(self) 
+  end 
+ 
+  protected
+  # @param key<Object> The key to convert.
+  #
+  # @param <Object>
+  #   The converted key. If the key was a symbol, it will be converted to a
+  #   string.
+  #
+  # @api private
+  def convert_key(key) 
+    key.kind_of?(Symbol) ? key.to_s : key 
+  end
+
+  # @param value<Object> The value to convert.
+  #
+  # @return <Object>
+  #   The converted value. A Hash or an Array of hashes, will be converted to
+  #   their Mash equivalents.
+  #
+  # @api private
+  def convert_value(value) 
+    case value 
+    when Hash 
+      value.to_mash 
+    when Array 
+      value.collect { |e| convert_value(e) } 
+    else 
+      value 
+    end 
+  end
+end

data/lib/rsolr-ext/request.rb

@@ -1,7 +1,24 @@
 module RSolr::Ext::Request
   
+  # A module that provides method mapping capabilities.
+  # The basic idea is to pass in a hash to the #map method,
+  # the map method then goes through a list of keys to
+  # be processed. Each key name can match a key in the input hash.
+  # If there is a match, a method by the name of "map_#{key}" is
+  # called with the following args: input[key], output_hash
+  # The method is responsible for processing the value.
+  # The return value from the method does nothing.
+  #
+  # For example: if the mapped params list has a name, :query,
+  # there should be a method like: map_query(input_value, output_hash)
   module Mapable
     
+    # accepts an input hash.
+    # prepares a return hash by copying the input.
+    # runs through all of the keys in MAPPED_PARAMS.
+    # calls any mapper methods that match the current key in MAPPED_PARAMS.
+    # The mapped keys from the input hash are deleted.
+    # returns a new hash.
     def map(input)
       result = input.dup
       self.class::MAPPED_PARAMS.each do |meth|
@@ -12,24 +29,42 @@ module RSolr::Ext::Request
       result
     end
     
-    def append_to_param(existing_value, new_value)
+    # creates an array where the "existing_value" param is first
+    # and the "new_value" is the last.
+    # All empty/nil items are removed.
+    # the return result is either the result of the
+    # array being joined on a space, or the array itself.
+    # "auto_join" should be true or false.
+    def append_to_param(existing_value, new_value, auto_join=true)
       values = [existing_value, new_value]
       values.delete_if{|v|v.nil?}
-      values.join(' ')
+      auto_join ? values.join(' ') : values
     end
     
   end
   
+  # a module to help the creation of solr queries.
   module Queryable
     
+    # Wraps a string around double quotes
     def quote(value)
       %("#{value}")
     end
     
+    # builds a solr range query from a Range object
     def build_range(r)
       "[#{r.min} TO #{r.max}]"
     end
     
+    # builds a solr query fragment
+    # if "quote_string" is true, the values will be quoted.
+    # if "value" is a string/symbol, the #to_s method is called
+    # if the "value" is an array, each item in the array is 
+    # send to build_query (recursive)
+    # if the "value" is a Hash, a fielded query is built
+    # where the keys are used as the field names and
+    # the values are either processed as a Range or
+    # passed back into build_query (recursive)
     def build_query(value, quote_string=false)
       case value
       when String,Symbol

data/lib/rsolr-ext/response/doc_ext.rb

@@ -0,0 +1,38 @@
+# module for adding helper methods to each solr response[:docs] object
+module RSolr::Ext::Response::DocExt
+
+  # Helper method to check if value/multi-values exist for a given key.
+  # The value can be a string, or a RegExp
+  # Example:
+  # doc.has?(:location_facet)
+  # doc.has?(:location_facet, 'Clemons')
+  # doc.has?(:id, 'h009', /^u/i)
+  def has?(k, *values)
+    return if self[k].nil?
+    return true if self.key?(k) and values.empty?
+    target = self[k]
+    if target.is_a?(Array)
+      values.each do |val|
+        return target.any?{|tv| val.is_a?(Regexp) ? (tv =~ val) : (tv==val)}
+      end
+    else
+      return values.any? {|val| val.is_a?(Regexp) ? (target =~ val) : (target == val)}
+    end
+  end
+
+  # helper
+  # key is the name of the field
+  # opts is a hash with the following valid keys:
+  #  - :sep - a string used for joining multivalued field values
+  #  - :default - a value to return when the key doesn't exist
+  # if :sep is nil and the field is a multivalued field, the array is returned
+  def get(key, opts={:sep=>', ', :default=>nil})
+    if self.key? key
+      val = self[key]
+      (val.is_a?(Array) and opts[:sep]) ? val.join(opts[:sep]) : val
+    else
+      opts[:default]
+    end
+  end
+
+end

data/lib/rsolr-ext/response/facet_paginator.rb

@@ -0,0 +1,24 @@
+class RSolr::Ext::Response::FacetPaginator
+  
+  attr_reader :total, :items, :previous_offset, :next_offset
+  
+  def initialize(all_facet_values, offset, limit)
+    offset = offset.to_s.to_i
+    limit = limit.to_s.to_i
+    total = all_facet_values.size
+    @items = all_facet_values.slice(0, limit-1)
+    @has_next = total == limit
+    @has_previous = offset > 0
+    @next_offset = offset + (limit-1)
+    @previous_offset = offset - (limit-1)
+  end
+
+  def has_next?
+    @has_next
+  end
+
+  def has_previous?
+    @has_previous
+  end
+
+end

data/lib/rsolr-ext/response/facetable.rb

@@ -0,0 +1,64 @@
+module RSolr::Ext::Response::Facetable
+  
+  # represents a facet value; which is a field value and its hit count
+  class FacetValue
+    attr_reader :value,:hits
+    def initialize(value,hits)
+      @value,@hits=value,hits
+    end
+  end
+  
+  # represents a facet; which is a field and its values
+  class Facet
+    attr_reader :field
+    attr_accessor :values
+    def initialize(field)
+      @field=field
+      @values=[]
+    end
+  end
+
+  # @response.facets.each do |facet|
+  #   facet.field
+  # end
+  # "caches" the result in the @facets instance var
+  def facets
+    # memoize!
+    @facets ||= (
+      facet_fields.inject([]) do |acc,(facet_field_name,values_and_hits_list)|
+        acc << facet = Facet.new(facet_field_name)
+        # the values_and_hits_list is an array where a value is immediately followed by it's hit count
+        # so we shift off an item (the value)
+        while value = values_and_hits_list.shift
+          # and then shift off the next to get the hit value
+          facet.values << FacetValue.new(value, values_and_hits_list.shift)
+          # repeat until there are no more pairs in the values_and_hits_list array
+        end
+        acc
+      end
+    )
+  end
+
+  # pass in a facet field name and get back a Facet instance
+  def facet_by_field_name(name)
+    @facets_by_field_name ||= {}
+    @facets_by_field_name[name] ||= (
+      facets.detect{|facet|facet.field.to_s == name.to_s}
+    )
+  end
+  
+  def facet_counts
+    @facet_counts ||= self[:facet_counts] || {}
+  end
+
+  # Returns the hash of all the facet_fields (ie: {'instock_b' => ['true', 123, 'false', 20]}
+  def facet_fields
+    @facet_fields ||= facet_counts[:facet_fields] || {}
+  end
+
+  # Returns all of the facet queries
+  def facet_queries
+    @facet_queries ||= facet_counts[:facet_queries] || {}
+  end
+  
+end # end Facets

data/lib/rsolr-ext/response/pageable.rb

@@ -0,0 +1,30 @@
+module RSolr::Ext::Response::Pageable
+  
+  attr_accessor :start, :per_page, :total
+  
+  # Returns the current page calculated from 'rows' and 'start'
+  # WillPaginate hook
+  def current_page
+    return 1 if start < 1
+    @current_page ||= (start / per_page).ceil + 1
+  end
+
+  # Calcuates the total pages from 'numFound' and 'rows'
+  # WillPaginate hook
+  def total_pages
+    @total_pages ||= per_page > 0 ? (total / per_page.to_f).ceil : 1
+  end
+
+  # returns the previous page number or 1
+  # WillPaginate hook
+  def previous_page
+    @previous_page ||= (current_page > 1) ? current_page - 1 : 1
+  end
+  
+  # returns the next page number or the last
+  # WillPaginate hook
+  def next_page
+    @next_page ||= (current_page < total_pages) ? current_page + 1 : total_pages
+  end
+  
+end

data/lib/rsolr-ext/response.rb

@@ -1,8 +1,67 @@
 module RSolr::Ext::Response
   
-  autoload :Base, 'rsolr-ext/response/base'
-  autoload :Select, 'rsolr-ext/response/select'
-  autoload :Luke, 'rsolr-ext/response/luke'
-  autoload :Update, 'rsolr-ext/response/update'
+  autoload :Facetable, 'rsolr-ext/response/facetable'
+  autoload :Pageable, 'rsolr-ext/response/pageable'
+  autoload :DocExt, 'rsolr-ext/response/doc_ext'
+  
+  class Base < Mash
+    
+    attr_reader :raw_response
+    
+    def initialize(raw_response)
+      @raw_response = raw_response
+      super(raw_response)
+      RSolr::Ext::HashMethodizer.methodize!(self)
+    end
+    
+    def ok?
+      response_header.status == 0
+    end
+    
+  end
+  
+  # 
+  class Standard < Base
+    
+    include Facetable
+    
+    def initialize(*a)
+      super
+      activate_pagination!
+    end
+    
+    def activate_pagination!
+      response.docs.each{ |d| d.extend DocExt }
+      d = response.docs
+      d.extend Pageable
+      d.start = response_header.params[:start].to_s.to_i
+      d.per_page = response_header.params[:rows].to_s.to_i
+      d.total = d.size
+    end
+    
+  end
+  
+  class Dismax < Standard
+    
+  end
+  
+  # 
+  class RSolr::Ext::Response::Luke < Base
+    
+    # Returns an array of fields from the index
+    # An optional rule can be used for "grepping" field names:
+    # field_list(/_facet$/)
+    def field_list(rule=nil)
+      fetch(:fields).select do |k,v|
+        rule ? k =~ rule : true
+      end.collect{|k,v|k}
+    end
+
+  end# end Luke
+  
+  # Update
+  class Update < Base
+    
+  end
   
 end

data/lib/rsolr-ext.rb

@@ -15,10 +15,11 @@ module RSolr
   
   module Ext
     
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
     
     autoload :Request, 'rsolr-ext/request.rb'
     autoload :Response, 'rsolr-ext/response.rb'
+    autoload :HashMethodizer, 'rsolr-ext/hash_methodizer.rb'
     
   end
   

data/rsolr-ext.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.name = "rsolr-ext"
-	s.version = "0.4.1"
-	s.date = "2009-03-15"
+	s.version = "0.5.0"
+	s.date = "2009-03-17"
 	s.summary = "An extension lib for RSolr"
 	s.email = "goodieboy@gmail.com"
 	s.homepage = "http://github.com/mwmitchell/rsolr_ext"
@@ -9,19 +9,27 @@ Gem::Specification.new do |s|
 	s.has_rdoc = true
 	s.authors = ["Matt Mitchell"]
 	s.files = [
-	"lib/rsolr-ext.rb",
-	"lib/rsolr-ext/params.rb",
-	"lib/rsolr-ext/request.rb",
-	"lib/rsolr-ext/request/standard.rb",
-	"lib/rsolr-ext/request/dismax.rb",
-	"lib/rsolr-ext/response.rb",
-	"lib/rsolr-ext/response/base.rb",
-	"lib/rsolr-ext/response/luke.rb",
-	"lib/rsolr-ext/response/select.rb",
-	"lib/rsolr-ext/response/update.rb",
-	"LICENSE",
-	"README.rdoc",
-	"rsolr-ext.gemspec"
+    
+    "lib/core_ext.rb",
+    "lib/mash.rb",
+    
+    "lib/rsolr-ext/hash_methodizer",
+    
+    "lib/rsolr-ext/request/dismax.rb",
+    "lib/rsolr-ext/request/standard.rb",
+    "lib/rsolr-ext/request.rb",
+    
+    "lib/rsolr-ext/response/doc_ext.rb",
+    "lib/rsolr-ext/response/facet_paginator.rb",
+    "lib/rsolr-ext/response/facetable.rb",
+    "lib/rsolr-ext/response/pageable.rb",
+    "lib/rsolr-ext/response.rb",
+    
+    "lib/rsolr-ext.rb",
+    
+    "LICENSE",
+    "README.rdoc",
+    "rsolr-ext.gemspec"
 	]
 	s.test_files = ['test/request_test.rb', 'test/response_test.rb', 'test/test_unit_test_case.rb', 'test/helper.rb']
 	s.extra_rdoc_files = %w(LICENSE README.rdoc)

data/test/response_test.rb

@@ -4,10 +4,25 @@ require 'helper'
 
 class RSolrExtResponseTest < Test::Unit::TestCase
   
-  test 'base response module' do
+  test 'base response class' do
     raw_response = eval(mock_query_response)
-    r = RSolr::Ext::Response::Base.create(raw_response)
+    r = RSolr::Ext::Response::Base.new(raw_response)
     assert r.ok?
   end
   
+  test 'standard response class' do
+    raw_response = eval(mock_query_response)
+    r = RSolr::Ext::Response::Standard.new(raw_response)
+    assert r.ok?
+    assert_equal 10, r.response.docs.size
+    assert_equal 'EXPLICIT', r.response_header.params.echo_params
+    assert_equal r['responseHeader'], r.response_header
+    assert_equal r[:responseHeader], r.response_header
+    assert_equal 1, r.response.docs.previous_page
+    assert_equal 1, r.response.docs.next_page
+    #
+    assert r.response.docs.kind_of?(RSolr::Ext::Response::Pageable)
+    assert r.kind_of?(RSolr::Ext::Response::Facetable)
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr-ext
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -07:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,16 +23,18 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- lib/rsolr-ext.rb
-- lib/rsolr-ext/params.rb
-- lib/rsolr-ext/request.rb
-- lib/rsolr-ext/request/standard.rb
+- lib/core_ext.rb
+- lib/mash.rb
+- lib/rsolr-ext/hash_methodizer
 - lib/rsolr-ext/request/dismax.rb
+- lib/rsolr-ext/request/standard.rb
+- lib/rsolr-ext/request.rb
+- lib/rsolr-ext/response/doc_ext.rb
+- lib/rsolr-ext/response/facet_paginator.rb
+- lib/rsolr-ext/response/facetable.rb
+- lib/rsolr-ext/response/pageable.rb
 - lib/rsolr-ext/response.rb
-- lib/rsolr-ext/response/base.rb
-- lib/rsolr-ext/response/luke.rb
-- lib/rsolr-ext/response/select.rb
-- lib/rsolr-ext/response/update.rb
+- lib/rsolr-ext.rb
 - LICENSE
 - README.rdoc
 - rsolr-ext.gemspec

data/lib/rsolr-ext/response/base.rb

@@ -1,35 +0,0 @@
-#
-# my_solr_hash.extend RSolrExt::Response::Base
-# my_solr_hash.header
-# my_solr_hash.ok?
-#
-module RSolr::Ext::Response::Base
-  
-  def header
-    self[:responseHeader]
-  end
-  
-  def params
-    header[:params]
-  end
-  
-  def status
-    header[:status].to_i
-  end
-  
-  def query_time
-    header[:QTime]
-  end
-  
-  def ok?
-    self.status == 0
-  end
-  
-  # converts to mash, then extends
-  def self.create(hash)
-    mash = hash.is_a?(Mash) ? hash : hash.to_mash
-    mash.extend self
-    mash
-  end
-  
-end # end Base

data/lib/rsolr-ext/response/luke.rb

@@ -1,53 +0,0 @@
-module RSolr::Ext::Response::Luke
-  
-  include Base
-  
-  def index
-    self[:index]
-  end
-  
-  def directory
-    index[:directory]
-  end
-  
-  def has_deletions
-    index[:hasDeletions]
-  end
-  
-  def current
-    index[:current]
-  end
-  
-  def max_doc
-    index[:max_doc]
-  end
-  
-  def num_docs
-    index[:numDocs]
-  end
-  
-  def version
-    index[:version]
-  end
-  
-  alias :has_deletions? :has_deletions
-  alias :optimized? :optimized
-  alias :current? :current
-
-  # Returns an array of fields from the index
-  # An optional rule can be used for "grepping" field names:
-  # field_list(/_facet$/)
-  def field_list(rule=nil)
-    self[:fields].select do |k,v|
-      rule ? k =~ rule : true
-    end.collect{|k,v|k}
-  end
-  
-  # converts to mash, then extends
-  def self.create(hash)
-    mash = hash.is_a?(Mash) ? hash : hash.to_mash
-    mash.extend self
-    mash
-  end
-  
-end# end Luke

data/lib/rsolr-ext/response/select.rb

@@ -1,216 +0,0 @@
-module RSolr::Ext::Response::Select
-  
-  # module for adding helper methods to each solr response[:docs] object
-  module DocExt
-
-    # Helper method to check if value/multi-values exist for a given key.
-    # The value can be a string, or a RegExp
-    # Example:
-    # doc.has?(:location_facet)
-    # doc.has?(:location_facet, 'Clemons')
-    # doc.has?(:id, 'h009', /^u/i)
-    def has?(k, *values)
-      return if self[k].nil?
-      return true if self.key?(k) and values.empty?
-      target = self[k]
-      if target.is_a?(Array)
-        values.each do |val|
-          return target.any?{|tv| val.is_a?(Regexp) ? (tv =~ val) : (tv==val)}
-        end
-      else
-        return values.any? {|val| val.is_a?(Regexp) ? (target =~ val) : (target == val)}
-      end
-    end
-
-    # helper
-    # key is the name of the field
-    # opts is a hash with the following valid keys:
-    #  - :sep - a string used for joining multivalued field values
-    #  - :default - a value to return when the key doesn't exist
-    # if :sep is nil and the field is a multivalued field, the array is returned
-    def get(key, opts={:sep=>', ', :default=>nil})
-      if self.key? key
-        val = self[key]
-        (val.is_a?(Array) and opts[:sep]) ? val.join(opts[:sep]) : val
-      else
-        opts[:default]
-      end
-    end
-
-  end
-
-  module Facets
-    
-    # represents a facet value; which is a field value and its hit count
-    class FacetValue
-      attr_reader :value,:hits
-      def initialize(value,hits)
-        @value,@hits=value,hits
-      end
-    end
-    
-    # represents a facet; which is a field and its values
-    class Facet
-      attr_reader :field
-      attr_accessor :values
-      def initialize(field)
-        @field=field
-        @values=[]
-      end
-    end
-
-    # @response.facets.each do |facet|
-    #   facet.field
-    # end
-    # "caches" the result in the @facets instance var
-    def facets
-      # memoize!
-      @facets ||= (
-        facet_fields.inject([]) do |acc,(facet_field_name,values_and_hits_list)|
-          acc << facet = Facet.new(facet_field_name)
-          # the values_and_hits_list is an array where a value is immediately followed by it's hit count
-          # so we shift off an item (the value)
-          while value = values_and_hits_list.shift
-            # and then shift off the next to get the hit value
-            facet.values << FacetValue.new(value, values_and_hits_list.shift)
-            # repeat until there are no more pairs in the values_and_hits_list array
-          end
-          acc
-        end
-      )
-    end
-
-    # pass in a facet field name and get back a Facet instance
-    def facet_by_field_name(name)
-      @facets_by_field_name ||= {}
-      @facets_by_field_name[name] ||= (
-        facets.detect{|facet|facet.field.to_s == name.to_s}
-      )
-    end
-    
-    def facet_counts
-      @facet_counts ||= self[:facet_counts] || {}
-    end
-
-    # Returns the hash of all the facet_fields (ie: {'instock_b' => ['true', 123, 'false', 20]}
-    def facet_fields
-      @facet_fields ||= facet_counts[:facet_fields] || {}
-    end
-
-    # Returns all of the facet queries
-    def facet_queries
-      @facet_queries ||= facet_counts[:facet_queries] || {}
-    end
-    
-  end # end Facets
-  
-  #
-  #
-  #
-  class FacetPaginator
-    
-    attr_reader :total, :items, :previous_offset, :next_offset
-    
-    def initialize(all_facet_values, offset, limit)
-      offset = offset.to_s.to_i
-      limit = limit.to_s.to_i
-      total = all_facet_values.size
-      @items = all_facet_values.slice(0, limit-1)
-      @has_next = total == limit
-      @has_previous = offset > 0
-      @next_offset = offset + (limit-1)
-      @previous_offset = offset - (limit-1)
-    end
-
-    def has_next?
-      @has_next
-    end
-
-    def has_previous?
-      @has_previous
-    end
-
-  end
-  
-  #
-  #
-  #
-  class Paginator
-    
-    attr_reader :start, :per_page, :total
-    
-    def initialize(start, per_page, total)
-      @start = start.to_s.to_i
-      @per_page = per_page.to_s.to_i
-      @total = total.to_s.to_i
-    end
-    
-    # Returns the current page calculated from 'rows' and 'start'
-    # WillPaginate hook
-    def current_page
-      return 1 if start < 1
-      @current_page ||= (start / per_page).ceil + 1
-    end
-
-    # Calcuates the total pages from 'numFound' and 'rows'
-    # WillPaginate hook
-    def total_pages
-      @total_pages ||= per_page > 0 ? (total / per_page.to_f).ceil : 1
-    end
-
-    # returns the previous page number or 1
-    # WillPaginate hook
-    def previous_page
-      @previous_page ||= (current_page > 1) ? current_page - 1 : 1
-    end
-    
-    # returns the next page number or the last
-    # WillPaginate hook
-    def next_page
-      @next_page ||= (current_page < total_pages) ? current_page + 1 : total_pages
-    end
-  end
-  
-  def paginator
-    @paginator ||= Paginator.new(start, rows, total)
-  end
-  
-  # The main select response class.
-  # Includes the top level Response::Base module
-  # Includes the Pagination module.
-  # Each solr hash doc is extended by the DocExt module.
-  
-  include RSolr::Ext::Response::Base
-  include Facets
-  
-  def response
-    self[:response]
-  end
-  
-  def num_found
-    response[:numFound]
-  end
-  
-  def start
-    response[:start]
-  end
-  
-  def rows
-    params[:rows]
-  end
-  
-  alias :total :num_found
-  alias :offset :start
-  
-  def docs
-    @docs ||= response[:docs].collect{ |d| d=d.to_mash; d.extend(DocExt); d }
-  end
-  
-  # converts to mash, then extends
-  def self.create(hash)
-    mash = hash.is_a?(Mash) ? hash : hash.to_mash
-    mash.extend self
-    mash
-  end
-  
-end # end Select

data/lib/rsolr-ext/response/update.rb

@@ -1,13 +0,0 @@
-# for update responses
-module RSolr::Ext::Response::Update
-  
-  include Base
-  
-  # converts to mash, then extends
-  def self.create(hash)
-    mash = hash.is_a?(Mash) ? hash : hash.to_mash
-    mash.extend self
-    mash
-  end
-  
-end