rsolr-ext 1.0.1 → 1.0.3

data/Rakefile

@@ -11,10 +11,10 @@ begin
     gem.homepage = "http://github.com/mwmitchell/rsolr-ext"
     gem.authors = ["Matt Mitchell", "James Davidson", "Chris Beer", "Jason Ronallo", "Eric Lindvall", "Andreas Kemkes"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "rsolr", ">= 1.0.1"
+    gem.add_dependency "rsolr", ">= 1.0.2"
     
     gem.files = FileList['lib/**/*.rb', 'LICENSE', 'README.rdoc', 'VERSION']
-    gem.test_files = ['spec/*', 'Rakefile']
+    gem.test_files = Dir['spec/*'] + FileList['Rakefile']
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -35,14 +35,13 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+#task :spec => :check_dependencies
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require "rdoc/task"
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rsolr-ext #{version}"
   rdoc.rdoc_files.include('README*')

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.3

data/lib/rsolr-ext.rb

@@ -29,7 +29,6 @@ module RSolr::Ext
   
   # modify the RSolr::Client (provides #find and #luke methods)
   RSolr::Client.class_eval do
-    warn "DEPRECATION WARNING: Future versions of RSolr::Ext will require initialization via RSolr::Ext.connect."
     include RSolr::Ext::Client
   end
   

data/lib/rsolr-ext/client.rb

@@ -15,7 +15,12 @@ module RSolr::Ext::Client
     path, params, opts = rsolr_request_arguments_for(*args)
     path ||= "select"
     # send path, map params and send the rest of the args along
-    response = self.send_and_receive path, opts.merge({ :params => RSolr::Ext::Request.map(params) })
+    if params[:page] || params[:per_page]
+      response = self.paginate params[:page], params[:per_page], path, opts.merge({ :params => RSolr::Ext::Request.map(params) })
+    else
+      response = self.send_and_receive path, opts.merge({ :params => RSolr::Ext::Request.map(params) })
+    end
+    
     RSolr::Ext::Response::Base.new(response, path, params)
   end
   

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

@@ -1,19 +1,5 @@
 module RSolr::Ext::Response::Docs
   
-  # NOTE: This might move/change in the next major release of RSolr::Ext
-  module WillPaginateExt
-    class MissingLibError < RuntimeError
-      def to_s; "WillPaginate is required" end
-    end
-    def will_paginate
-      WillPaginate::Collection.create(self.current_page, self.per_page, self.total) do |pager|
-        pager.replace(self)
-      end
-    rescue NameError
-      raise MissingLibError.new
-    end
-  end
-  
   def self.extended(base)
     d = base['response']['docs']
     # TODO: could we do this lazily (Enumerable etc.)
@@ -22,7 +8,6 @@ module RSolr::Ext::Response::Docs
     d.per_page = [base.rows, 1].max
     d.start = base.start
     d.total = base.total
-    d.extend WillPaginateExt
   end
   
   module Pageable
@@ -67,7 +52,6 @@ module RSolr::Ext::Response::Docs
   
   def docs
     @docs ||= begin
-      warn "DEPRECATION WARNING: The custom pagination codebase in RSolr::Ext will no longer be supported. Use response.docs.will_paginate instead."
       response['docs']
     end
   end

data/spec/rsolr-ext_spec.rb

@@ -12,8 +12,8 @@ describe RSolr::Ext do
 
     it 'should produce results from the #find method' do
       c = client
-      c.should_receive(:send_and_receive).
-        with('select', {:params => {:rows=>10, :start=>20, :q=>"*:*"}}).
+      c.should_receive(:paginate).
+        with(3, 10, 'select', {:params => {:rows=>10, :start=>20, :q=>"*:*"}}).
           and_return({'response'=>{'docs' => []}, 'responseHeader' => {}})
       response = c.find :page=>3, :per_page=>10, :q=>'*:*'#, :page=>1, :per_page=>10
       response.should be_a(Mash)
@@ -218,6 +218,7 @@ describe RSolr::Ext do
       r.ok?.should == true
       r.docs.size.should == 11
       r.params[:echoParams].should == 'EXPLICIT'
+      
       r.docs.previous_page.should == 1
       r.docs.next_page.should == 2
       r.docs.has_previous?.should == false
@@ -328,33 +329,6 @@ describe RSolr::Ext do
       r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', {})
       r.spelling.collation.should == 'dell ultrasharp'
     end
-    
-    ###############################
-    
-    context "docs.will_paginate" do
-      
-      it 'will raise a RSolr::Ext::Response::Docs::WillPaginateExt::MissingLibError if WillPaginate is not defined' do
-        r = create_response
-        r.docs.should respond_to(:will_paginate)
-        lambda{
-          r.docs.will_paginate
-        }.should(raise_error(
-          RSolr::Ext::Response::Docs::WillPaginateExt::MissingLibError,
-          "WillPaginate is required"))
-      end
-      
-      it 'will work, and return a WillPaginate::Collectionified doc array' do
-        # this is one funky part about dynamic dependencies...
-        require "will_paginate"
-        r = create_response
-        original_docs = r.docs
-        r.docs.should_not be_a(WillPaginate::Collection)
-        r.docs.should respond_to(:will_paginate)
-        r.docs.will_paginate.should be_a(WillPaginate::Collection)
-        r.docs.should be(original_docs)
-      end
-      
-    end
 
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr-ext
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -04:00
+date: 2011-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,12 +47,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id002
 description: A query/response extension lib for RSolr
@@ -78,10 +78,10 @@ files:
 - lib/rsolr-ext/response/docs.rb
 - lib/rsolr-ext/response/facets.rb
 - lib/rsolr-ext/response/spelling.rb
-- Rakefile
 - spec/rsolr-ext_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- Rakefile
 has_rdoc: true
 homepage: http://github.com/mwmitchell/rsolr-ext
 licenses: []
@@ -112,12 +112,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A query/response extension lib for RSolr
 test_files: 
-- Rakefile
 - spec/rsolr-ext_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- Rakefile