rsolr-ext 0.9.6.5 → 0.10.0

data/README.rdoc

@@ -25,13 +25,6 @@ The #luke method returns a Hash/Mash result of a /admin/luke?numTerms=0 request:
 ===#find
 The #find method listens for certain keys. All other keys are ignored, allowing the ability to mix-and-match special keys with normal Solr param keys. The recognized keys are describe below.
 
-
-:page - This maps to the Solr "start" param. The current "page" in the results set. RSolr::Ext handles the page-to-rows math for you.
-
-
-:per_page - This maps to the Solr "rows" param. How many "pages" in the result.
-
-
 :queries - This key maps to the Solr "q" param. Accepts a string, array or hash. When an array is used, each value is joined by a space. When a hash is used, the keys are used as Solr fields.
 
 * :queries => 'normal' BECOMES ?q=normal
@@ -73,8 +66,6 @@ The #find method listens for certain keys. All other keys are ignored, allowing
 ==Request Example
   solr = RSolr::Ext.connect
   solr_params = {
-    :page=>2,
-    :per_page=>10,
     :phrases=>{:name=>'This is a phrase'},
     :filters=>['test', {:price=>(1..10)}],
     :phrase_filters=>{:manu=>['Apple']},
@@ -94,8 +85,6 @@ RSolr::Ext decorates the normal output hash from RSolr and adds some helpful met
   response.ok?
   response.params
   response.docs
-  response.docs.previous_page
-  response.docs.next_page
   response.facets.each do |facet|
     puts facet.name
     facet.items.each do |item|
@@ -105,10 +94,6 @@ RSolr::Ext decorates the normal output hash from RSolr and adds some helpful met
 
 You can access values in the response hash using symbols or strings.
 
-===Documents/Pagination
-If you wanna paginate, just throw the collection into the WillPaginate view helper.
-  <%= will_paginate response.docs %>
-
 ==The "Model" Module
 You can create your own <read-only> "models" using RSolr::Ext::Model
   

data/lib/rsolr-ext/request.rb

@@ -4,17 +4,6 @@ module RSolr::Ext::Request
     
     def map input
       output = {}
-      if input[:per_page]
-        output[:rows] = input.delete(:per_page).to_i
-      end
-      
-      if page = input.delete(:page)
-        raise ':per_page must be set when using :page' unless output[:rows]
-        page = page.to_s.to_i-1
-        page = page < 1 ? 0 : page
-        output[:start] = page * output[:rows]
-      end
-      
       if queries = input.delete(:queries)
         output[:q] = append_to_param output[:q], build_query(queries, false)
       end

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

@@ -1,52 +1,8 @@
 module RSolr::Ext::Response::Docs
   
-  module 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
-      per_page_normalized = per_page < 1 ? 1 : per_page
-      @current_page ||= (start / per_page_normalized).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) ? total_pages : current_page+1
-    end
-    
-    def has_next?
-      current_page < total_pages
-    end
-    
-    def has_previous?
-      current_page > 1
-    end
-    
-  end
-  
   def self.extended(base)
     d = base['response']['docs']
     d.each{|doc| doc.extend RSolr::Ext::Doc }
-    d.extend Pageable
-    d.per_page = base['responseHeader']['params']['rows'].to_s.to_i
-    d.start = base['response']['start'].to_s.to_i
-    d.total = base['response']['numFound'].to_s.to_i
   end
   
   def docs

data/lib/rsolr-ext.rb

@@ -37,6 +37,14 @@ module RSolr
       connection
     end
     
+    # c = RSolr::Ext.connect
+    # c.find(:q=>'*:*').docs.size
+    def self.direct_connect(*args)
+      connection = RSolr.direct_connect(*args)
+      connection.extend RSolr::Ext::Connection
+      connection
+    end
+    
   end
   
 end

data/rsolr-ext.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "rsolr-ext"
-  s.version = "0.9.6.5"
-  s.date = "2009-11-04"
+  s.version = "0.10.0"
+  s.date = "2009-11-13"
   
   s.summary = "An extension lib for RSolr"
   s.email = "goodieboy@gmail.com"
@@ -34,6 +34,6 @@ Gem::Specification.new do |s|
 	
 	s.extra_rdoc_files = %w(LICENSE README.rdoc)
 	
-	s.add_dependency("mwmitchell-rsolr", [">= 0.9.6"])
+	s.add_dependency("rsolr", ["=0.10.0"])
 	
 end

data/test/connection_test.rb

@@ -18,7 +18,7 @@ class RSolrExtConnectionTest < Test::Unit::TestCase
   test 'the #find method with a custom request handler' do
     connection = RSolr::Ext.connect
     response = connection.find '/select', :q=>'*:*'
-    assert response.adapter_response[:path]=~/\/select/
+    assert response.raw[:path]=~/\/select/
   end
   
   test 'the response' do

data/test/request_test.rb

@@ -5,8 +5,8 @@ class RSolrExtRequestTest < Test::Unit::TestCase
   
   test 'standard request' do
     solr_params = RSolr::Ext::Request.map(
-      :page=>'2',
-      :per_page=>'10',
+      :start=>10,
+      :rows=>10,
       :phrases=>{:name=>'This is a phrase'},
       :filters=>['test', {:price=>(1..10)}],
       :phrase_filters=>{:manu=>['Apple']},

data/test/response_test.rb

@@ -18,8 +18,6 @@ class RSolrExtResponseTest < Test::Unit::TestCase
     assert r.ok?
     assert_equal 11, r.docs.size
     assert_equal 'EXPLICIT', r.params[:echoParams]
-    assert_equal 1, r.docs.previous_page
-    assert_equal 2, r.docs.next_page
     #
     assert r.kind_of?(RSolr::Ext::Response::Docs)
     assert r.kind_of?(RSolr::Ext::Response::Facets)
@@ -73,33 +71,4 @@ class RSolrExtResponseTest < Test::Unit::TestCase
     assert_equal 'cat', facet.name
   end
   
-=begin
-  
-  # pagination for facets has been commented out in the response/facets module.
-  # ...need to think more about how this can be handled
-  
-  test 'response::standard facets.paginate' do
-    raw_response = eval(mock_query_response)
-    raw_response['responseHeader']['params']['facet.offset'] = 1
-    raw_response['responseHeader']['params']['facet.limit'] = 2
-    
-    r = RSolr::Ext::Response::Standard.new(raw_response)
-    
-    assert_equal 2, r.facets.current_page
-    
-    # always 1 less than facet.limit
-    assert_equal 1, r.facets.per_page
-    
-    assert_equal 3, r.facets.next_page
-    
-    assert_equal 1, r.facets.previous_page
-    
-    # can't know how many pages there are with facets.... so we set it to -1
-    assert_equal -1, r.facets.total_pages
-    
-    assert r.facets.has_next?
-    assert r.facets.has_previous?
-  end
-=end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr-ext
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.5
+  version: 0.10.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -05:00
+date: 2009-11-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.6
+        version: 0.10.0
     version: 
 description: An extension lib for RSolr
 email: goodieboy@gmail.com