rsolr-ext 0.11.2 → 0.12.0

data/README.rdoc

@@ -9,10 +9,11 @@ A set of helper methods/modules to assist in building Solr queries and handling
 * {RSolr}[http://github.com/mwmitchell/rsolr]
 
 ==Requests
-To use the RSolr::Ext connection instead of the normal RSolr connection:
-  solr = RSolr::Ext.connect
+To use the RSolr::Ext connection instead of the normal RSolr connection just require 'rsolr-ext':
+  require 'rsolr-ext'
+  solr = RSolr.connect
 
-RSolr::Ext adds a #find and a #luke_admin method to the connection object.
+RSolr::Ext adds a #find and a #luke method to the connection object.
 
 ===#luke
 The #luke method returns a Hash/Mash result of a /admin/luke?numTerms=0 request:
@@ -71,7 +72,8 @@ The #find method listens for certain keys. All other keys are ignored, allowing
 
 
 ==Request Example
-  solr = RSolr::Ext.connect
+  require 'rsolr-ext'
+  solr = RSolr.connect
   solr_params = {
     :page=>2,
     :per_page=>10,
@@ -87,7 +89,8 @@ The #find method listens for certain keys. All other keys are ignored, allowing
 ==Responses
 RSolr::Ext decorates the normal output hash from RSolr and adds some helpful methods.
   
-  solr = RSolr::Ext.connect
+  require 'rsolr-ext'
+  solr = RSolr.connect
   
   response = solr.find :q=>'*:*'
   

data/Rakefile

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "rsolr-ext"
+    gem.summary = %Q{A query/response extension lib for RSolr}
+    gem.description = %Q{A query/response extension lib for RSolr}
+    gem.email = "goodieboy@gmail.com"
+    gem.homepage = "http://github.com/mwmitchell/rsolr-ext"
+    gem.authors = ["Matt Mitchell"]
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_dependency "rsolr", ">= 0.12.1"
+    
+    gem.files = FileList['lib/**/*.rb', 'LICENSE', 'README.rdoc', 'VERSION']
+    gem.test_files = ['spec/*', 'Rakefile']
+    
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  # Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rsolr-ext #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.12.0

data/lib/rsolr-ext.rb

@@ -17,28 +17,29 @@ end
 require 'rubygems'
 require 'rsolr'
 
-module RSolr
+module RSolr::Ext
   
-  module Ext
-    
-    VERSION = '0.11.1'
-    
-    autoload :Connection, 'rsolr-ext/connection.rb'
-    autoload :Doc, 'rsolr-ext/doc.rb'
-    autoload :Request, 'rsolr-ext/request.rb'
-    autoload :Response, 'rsolr-ext/response.rb'
-    autoload :Model, 'rsolr-ext/model.rb'
-    
-    module Connectors
-      [:connect, :direct_connect].each do |m|
-        define_method m do |*args|
-          RSolr.send(m, *args).extend RSolr::Ext::Connection
-        end
-      end
-    end
-    
-    extend Connectors
-    
+  autoload :Client, 'rsolr-ext/client.rb'
+  autoload :Doc, 'rsolr-ext/doc.rb'
+  autoload :Request, 'rsolr-ext/request.rb'
+  autoload :Response, 'rsolr-ext/response.rb'
+  autoload :Model, 'rsolr-ext/model.rb'
+  
+  def self.version
+    @version ||= File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+  end
+  
+  VERSION = self.version
+  
+  # modify the RSolr::Client (provides #find and #luke methods)
+  RSolr::Client.class_eval do
+    include RSolr::Ext::Client
+  end
+  
+  # this is for backward compatibility: RSolr::Ext.connect
+  # recommended way is to just use RSolr.connect
+  def self.connect *args, &blk
+    RSolr.connect *args, &blk
   end
   
 end

data/lib/rsolr-ext/{connection.rb → client.rb}

@@ -1,4 +1,4 @@
-module RSolr::Ext::Connection
+module RSolr::Ext::Client
   
   # TWO modes of arguments:
   #
@@ -18,7 +18,7 @@ module RSolr::Ext::Connection
     params = args.first.kind_of?(Hash) ? args.shift : {}
     # send path, map params and send the rest of the args along
     response = self.request path, RSolr::Ext::Request.map(params), *args
-    RSolr::Ext::Response::Base.new(response)
+    RSolr::Ext::Response::Base.new(response, path, params)
   end
   
   # TWO modes of arguments:

data/lib/rsolr-ext/request.rb

@@ -20,7 +20,7 @@ module RSolr::Ext::Request
       
       # remove the input :q params
       output[:q] = input.delete :q
-      output[:fq] = input.delete :fq
+      output[:fq] = input.delete(:fq) if input[:fq]
       
       if queries = input.delete(:queries)
         output[:q] = append_to_param output[:q], build_query(queries, false)

data/lib/rsolr-ext/response.rb

@@ -7,10 +7,12 @@ module RSolr::Ext::Response
   class Base < Mash
     
     attr :original_hash
+    attr_reader :request_path, :request_params
     
-    def initialize hash
+    def initialize hash, handler, request_params
       super hash
       @original_hash = hash
+      @request_path, @request_params = request_path, request_params
       extend Response# if self['response']
       extend Docs# if self['response'] and self['response']['docs']
       extend Facets# if self['facet_counts']
@@ -21,12 +23,16 @@ module RSolr::Ext::Response
       self['responseHeader']
     end
     
+    def rows
+      params[:rows].to_i
+    end
+    
     def params
-      header['params']
+      (header and header['params']) ? header['params'] : request_params
     end
     
     def ok?
-      header['status'] == 0
+      (header and header['status']) ? header['status'] == 0 : nil
     end
     
     def method_missing *args, &blk
@@ -43,7 +49,15 @@ module RSolr::Ext::Response
     
     # short cut to response['numFound']
     def total
-      response[:numFound]
+      response[:numFound].to_s.to_i
+    end
+    
+    def total
+      response[:numFound].to_s.to_i
+    end
+    
+    def start
+      response[:start].to_s.to_i
     end
     
   end

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

@@ -44,9 +44,9 @@ module RSolr::Ext::Response::Docs
     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
+    d.per_page = base.rows
+    d.start = base.start
+    d.total = base.total
   end
   
   def docs

data/spec/rsolr-ext_spec.rb

@@ -0,0 +1,216 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe RSolr::Ext do
+  
+  context RSolr::Client do
+    
+    let(:connection){RSolr.connect}
+    
+    it 'should now have a #find method' do
+      connection.should respond_to(:find)
+    end
+    
+    it 'should produce results from the #find method' do
+      c = connection
+      c.should_receive(:request).
+        with('/select', {: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)
+    end
+    
+    it 'should call the #find method with a custom request handler' do
+      c = connection
+      expected_response = {'response'=>{'docs' => []}, 'responseHeader' => {}}
+      # ok this is hacky... the raw method needs to go into a mixin dude
+      def expected_response.raw
+        {:path => '/select'}
+      end
+      c.should_receive(:request).
+        with('/select', {:q=>'*:*'}).
+          and_return(expected_response)
+      response = c.find '/select', :q=>'*:*'
+      response.raw[:path].should match(/\/select/)
+    end
+    
+    it 'should be ok' do
+      c = connection
+      c.should_receive(:request).
+        with('/select', :q=>'*:*').
+          and_return({'response'=>{'docs' => []}, 'responseHeader' => {'status'=>0}})
+      response = c.find :q=>'*:*'
+      response.should respond_to(:ok?)
+      response.ok?.should == true
+    end
+    
+    it 'should call the #luke method' do
+      c = connection
+      c.should_receive(:request).
+        with('/admin/luke', {"numTerms"=>0}).
+          and_return({"fields"=>nil, "index"=>nil, "info" => nil})
+      info = c.luke
+      info.should be_a(Mash)
+      info.should have_key('fields')
+      info.should have_key('index')
+      info.should have_key('info')
+    end
+  
+  end
+  
+  context 'requests' do
+
+    it 'should create a valid request' do
+      solr_params = RSolr::Ext::Request.map(
+        :page=>'2',
+        :per_page=>'10',
+        :phrases=>{:name=>'This is a phrase'},
+        :filters=>['test', {:price=>(1..10)}],
+        :phrase_filters=>{:manu=>['Apple']},
+        :queries=>'ipod',
+        :facets=>{:fields=>['cat', 'blah']},
+        :spellcheck => true
+      )
+      ["test", "price:[1 TO 10]", "manu:\"Apple\""].should == solr_params[:fq]
+      solr_params[:start].should == 10
+      solr_params[:rows].should == 10
+      solr_params[:q].should == "ipod name:\"This is a phrase\""
+      solr_params['facet.field'].should == ['cat', 'blah']
+      solr_params[:facet].should == true
+    end
+    
+    it 'should map fq using the phrase_filters mapping' do
+      solr_params = RSolr::Ext::Request.map(
+        :phrase_filters=>{:manu=>['Apple', 'ASG'], :color=>['red', 'blue']}
+      )
+      
+      solr_params[:fq].size.should == 4
+      solr_params[:fq].should include("color:\"red\"")
+      solr_params[:fq].should include("color:\"blue\"")
+      solr_params[:fq].should include("manu:\"Apple\"")
+      solr_params[:fq].should include("manu:\"ASG\"")
+      
+    end
+    
+    it 'should map :filters and :phrase_filters while keeping an existing :fq' do
+      solr_params = RSolr::Ext::Request.map(
+        :fq => 'blah blah',
+        :phrase_filters=>{:manu=>['Apple', 'ASG'], :color=>['red', 'blue']}
+      )
+      
+      solr_params[:fq].size.should == 5
+      solr_params[:fq].should include("blah blah")
+      solr_params[:fq].should include("color:\"red\"")
+      solr_params[:fq].should include("color:\"blue\"")
+      solr_params[:fq].should include("manu:\"Apple\"")
+      solr_params[:fq].should include("manu:\"ASG\"")
+    end
+    
+  end
+  
+  context 'response' do
+    
+    def create_response
+      raw_response = eval(mock_query_response)
+      RSolr::Ext::Response::Base.new(raw_response, '/select', raw_response['params'])
+    end
+    
+    it 'should create a valid response' do
+      r = create_response
+      r.should respond_to(:header)
+      r.ok?.should == true
+    end
+    
+    it 'should have accurate pagination numbers' do
+      r = create_response
+      r.rows.should == 11
+      r.total.should == 26
+      r.start.should == 0
+      r.docs.per_page.should == 11
+    end
+    
+    it 'should create a valid response class' do
+      r = create_response
+    
+      r.should respond_to(:response)
+      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.should be_a(RSolr::Ext::Response::Docs)
+      r.should be_a(RSolr::Ext::Response::Facets)
+    end
+    
+    it 'should create a doc with rsolr-ext methods' do
+      r = create_response
+      
+      doc = r.docs.first
+      doc.has?(:cat, /^elec/).should == true
+      doc.has?(:cat, 'elec').should_not == true
+      doc.has?(:cat, 'electronics').should == true
+      
+      doc.get(:cat).should == 'electronics, hard drive'
+      doc.get(:xyz).should == nil
+      doc.get(:xyz, :default=>'def').should == 'def'
+    end
+    
+    it 'should provide facet helpers' do
+      r = create_response
+      r.facets.size.should == 2
+    
+      field_names = r.facets.collect{|facet|facet.name}
+      field_names.include?('cat').should == true
+      field_names.include?('manu').should == true
+      
+      first_facet = r.facets.first
+      first_facet.name.should == 'cat'
+      
+      first_facet.items.size.should == 10
+      
+      expected = "electronics - 14, memory - 3, card - 2, connector - 2, drive - 2, graphics - 2, hard - 2, monitor - 2, search - 2, software - 2"
+      received = first_facet.items.collect do |item|
+        item.value + ' - ' + item.hits.to_s
+      end.join(', ')
+      
+      expected.should == received
+      
+      r.facets.each do |facet|
+        facet.respond_to?(:name).should == true
+        facet.items.each do |item|
+          item.respond_to?(:value).should == true
+          item.respond_to?(:hits).should == true
+        end
+      end
+      
+    end
+    
+    it 'should return the correct value when calling facet_by_field_name' do
+      r = create_response
+      facet = r.facet_by_field_name('cat')
+      facet.name.should == 'cat'
+    end
+    
+    it 'should provide the responseHeader params' do
+      raw_response = eval(mock_query_response)
+      raw_response['responseHeader']['params']['test'] = :test
+      r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', raw_response['params'])
+      r.params['test'].should == :test
+    end
+    
+    it 'should provide the solr-returned params and "rows" should be 11' do
+      raw_response = eval(mock_query_response)
+      r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', {})
+      r.params[:rows].to_s.should == '11'
+    end
+    
+    it 'should provide the ruby request params if responseHeader["params"] does not exist' do
+      raw_response = eval(mock_query_response)
+      raw_response.delete 'responseHeader'
+      r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', :rows => 999)
+      r.params[:rows].to_s.should == '999'
+    end
+    
+  end
+  
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rsolr-ext'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+  def mock_query_response
+    %({'responseHeader'=>{'status'=>0,'QTime'=>5,'params'=>{'facet.limit'=>'10','wt'=>'ruby','rows'=>'11','facet'=>'true','facet.field'=>['manu','cat'],'echoParams'=>'EXPLICIT','q'=>'*:*','facet.sort'=>'true'}},'response'=>{'numFound'=>26,'start'=>0,'docs'=>[{'id'=>'SP2514N','inStock'=>true,'manu'=>'Samsung Electronics Co. Ltd.','name'=>'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133','popularity'=>6,'price'=>92.0,'sku'=>'SP2514N','timestamp'=>'2009-03-20T14:42:49.795Z','cat'=>['electronics','hard drive'],'spell'=>['Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133'],'features'=>['7200RPM, 8MB cache, IDE Ultra ATA-133','NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor']},{'id'=>'6H500F0','inStock'=>true,'manu'=>'Maxtor Corp.','name'=>'Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300','popularity'=>6,'price'=>350.0,'sku'=>'6H500F0','timestamp'=>'2009-03-20T14:42:49.877Z','cat'=>['electronics','hard drive'],'spell'=>['Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300'],'features'=>['SATA 3.0Gb/s, NCQ','8.5ms seek','16MB cache']},{'id'=>'F8V7067-APL-KIT','inStock'=>false,'manu'=>'Belkin','name'=>'Belkin Mobile Power Cord for iPod w/ Dock','popularity'=>1,'price'=>19.95,'sku'=>'F8V7067-APL-KIT','timestamp'=>'2009-03-20T14:42:49.937Z','weight'=>4.0,'cat'=>['electronics','connector'],'spell'=>['Belkin Mobile Power Cord for iPod w/ Dock'],'features'=>['car power adapter, white']},{'id'=>'IW-02','inStock'=>false,'manu'=>'Belkin','name'=>'iPod & iPod Mini USB 2.0 Cable','popularity'=>1,'price'=>11.5,'sku'=>'IW-02','timestamp'=>'2009-03-20T14:42:49.944Z','weight'=>2.0,'cat'=>['electronics','connector'],'spell'=>['iPod & iPod Mini USB 2.0 Cable'],'features'=>['car power adapter for iPod, white']},{'id'=>'MA147LL/A','inStock'=>true,'includes'=>'earbud headphones, USB cable','manu'=>'Apple Computer Inc.','name'=>'Apple 60 GB iPod with Video Playback Black','popularity'=>10,'price'=>399.0,'sku'=>'MA147LL/A','timestamp'=>'2009-03-20T14:42:49.962Z','weight'=>5.5,'cat'=>['electronics','music'],'spell'=>['Apple 60 GB iPod with Video Playback Black'],'features'=>['iTunes, Podcasts, Audiobooks','Stores up to 15,000 songs, 25,000 photos, or 150 hours of video','2.5-inch, 320x240 color TFT LCD display with LED backlight','Up to 20 hours of battery life','Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video','Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication']},{'id'=>'TWINX2048-3200PRO','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail','popularity'=>5,'price'=>185.0,'sku'=>'TWINX2048-3200PRO','timestamp'=>'2009-03-20T14:42:49.99Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail'],'features'=>['CAS latency 2,	2-3-3-6 timing, 2.75v, unbuffered, heat-spreader']},{'id'=>'VS1GB400C3','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail','popularity'=>7,'price'=>74.99,'sku'=>'VS1GB400C3','timestamp'=>'2009-03-20T14:42:50Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail']},{'id'=>'VDBDB1A16','inStock'=>true,'manu'=>'A-DATA Technology Inc.','name'=>'A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM','popularity'=>5,'sku'=>'VDBDB1A16','timestamp'=>'2009-03-20T14:42:50.004Z','cat'=>['electronics','memory'],'spell'=>['A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM'],'features'=>['CAS latency 3,	 2.7v']},{'id'=>'3007WFP','inStock'=>true,'includes'=>'USB cable','manu'=>'Dell, Inc.','name'=>'Dell Widescreen UltraSharp 3007WFP','popularity'=>6,'price'=>2199.0,'sku'=>'3007WFP','timestamp'=>'2009-03-20T14:42:50.017Z','weight'=>401.6,'cat'=>['electronics','monitor'],'spell'=>['Dell Widescreen UltraSharp 3007WFP'],'features'=>['30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast']},{'id'=>'VA902B','inStock'=>true,'manu'=>'ViewSonic Corp.','name'=>'ViewSonic VA902B - flat panel display - TFT - 19"','popularity'=>6,'price'=>279.95,'sku'=>'VA902B','timestamp'=>'2009-03-20T14:42:50.034Z','weight'=>190.4,'cat'=>['electronics','monitor'],'spell'=>['ViewSonic VA902B - flat panel display - TFT - 19"'],'features'=>['19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution']},{'id'=>'0579B002','inStock'=>true,'manu'=>'Canon Inc.','name'=>'Canon PIXMA MP500 All-In-One Photo Printer','popularity'=>6,'price'=>179.99,'sku'=>'0579B002','timestamp'=>'2009-03-20T14:42:50.062Z','weight'=>352.0,'cat'=>['electronics','multifunction printer','printer','scanner','copier'],'spell'=>['Canon PIXMA MP500 All-In-One Photo Printer'],'features'=>['Multifunction ink-jet color photo printer','Flatbed scanner, optical scan resolution of 1,200 x 2,400 dpi','2.5" color LCD preview screen','Duplex Copying','Printing speed up to 29ppm black, 19ppm color','Hi-Speed USB','memory card: CompactFlash, Micro Drive, SmartMedia, Memory Stick, Memory Stick Pro, SD Card, and MultiMediaCard']}]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'manu'=>['inc',8,'apach',2,'belkin',2,'canon',2,'comput',2,'corp',2,'corsair',2,'foundat',2,'microsystem',2,'softwar',2],'cat'=>['electronics',14,'memory',3,'card',2,'connector',2,'drive',2,'graphics',2,'hard',2,'monitor',2,'search',2,'software',2]},'facet_dates'=>{}}})
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr-ext
 version: !ruby/object:Gem::Version 
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,20 +9,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 -05:00
+date: 2010-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rsolr
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.11.0
+        version: 0.12.1
     version: 
-description: An extension lib for RSolr
+description: A query/response extension lib for RSolr
 email: goodieboy@gmail.com
 executables: []
 
@@ -32,26 +42,26 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- LICENSE
+- README.rdoc
+- VERSION
 - lib/mash.rb
-- lib/rsolr-ext/connection.rb
+- lib/rsolr-ext.rb
+- lib/rsolr-ext/client.rb
 - lib/rsolr-ext/doc.rb
 - lib/rsolr-ext/model.rb
 - lib/rsolr-ext/request.rb
+- lib/rsolr-ext/response.rb
 - lib/rsolr-ext/response/docs.rb
 - lib/rsolr-ext/response/facets.rb
 - lib/rsolr-ext/response/spelling.rb
-- lib/rsolr-ext/response.rb
-- lib/rsolr-ext.rb
-- LICENSE
-- README.rdoc
-- rsolr-ext.gemspec
 has_rdoc: true
 homepage: http://github.com/mwmitchell/rsolr-ext
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -72,10 +82,9 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: An extension lib for RSolr
+summary: A query/response extension lib for RSolr
 test_files: 
-- test/connection_test.rb
-- test/request_test.rb
-- test/response_test.rb
-- test/test_unit_test_case.rb
-- test/helper.rb
+- spec/rsolr-ext_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- Rakefile

data/rsolr-ext.gemspec

@@ -1,40 +0,0 @@
-Gem::Specification.new do |s|
-  
-  s.name = "rsolr-ext"
-  s.version = "0.11.2"
-  s.date = "2010-01-07"
-  
-  s.summary = "An extension lib for RSolr"
-  s.email = "goodieboy@gmail.com"
-  s.homepage = "http://github.com/mwmitchell/rsolr-ext"
-  s.description = "An extension lib for RSolr"
-  s.has_rdoc = true
-  s.authors = ["Matt Mitchell"]
-  s.files = [
-    "lib/mash.rb",
-    "lib/rsolr-ext/connection.rb",
-    "lib/rsolr-ext/doc.rb",
-    "lib/rsolr-ext/model.rb",
-    "lib/rsolr-ext/request.rb",
-    "lib/rsolr-ext/response/docs.rb",
-    "lib/rsolr-ext/response/facets.rb",
-    "lib/rsolr-ext/response/spelling.rb",
-    "lib/rsolr-ext/response.rb",
-    "lib/rsolr-ext.rb",
-    "LICENSE",
-    "README.rdoc",
-    "rsolr-ext.gemspec"
-	]
-	s.test_files = [
-	  'test/connection_test.rb',
-	  '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)
-	
-	s.add_dependency("rsolr", ["=0.11.0"])
-	
-end

data/test/connection_test.rb

@@ -1,36 +0,0 @@
-class RSolrExtConnectionTest < Test::Unit::TestCase
-  
-  test 'the #connect method' do
-    connection = RSolr::Ext.connect
-    assert connection.respond_to?(:find)
-  end
-  
-  test 'the #find method' do
-    connection = RSolr::Ext.connect
-    response = connection.find :page=>3, :per_page=>10, :q=>'*:*'#, :page=>1, :per_page=>10
-    assert response.kind_of?(Mash)
-  end
-  
-  test 'the #find method with a custom request handler' do
-    connection = RSolr::Ext.connect
-    response = connection.find '/select', :q=>'*:*'
-    assert response.raw[:path]=~/\/select/
-  end
-  
-  test 'the response' do
-    connection = RSolr::Ext.connect
-    response = connection.find :q=>'*:*'
-    assert response.respond_to?(:ok?)
-    assert response.ok?
-    assert_equal response.docs[0][:id], response.docs[0].id
-  end
-  
-  test 'the #luke method' do
-    info = RSolr::Ext.connect.luke
-    assert info.kind_of?(Mash)
-    assert info.key?('fields')
-    assert info.key?('index')
-    assert info.key?('info')
-  end
-  
-end

data/test/helper.rb

@@ -1,3 +0,0 @@
-def mock_query_response
-  %({'responseHeader'=>{'status'=>0,'QTime'=>5,'params'=>{'facet.limit'=>'10','wt'=>'ruby','rows'=>'11','facet'=>'true','facet.field'=>['manu','cat'],'echoParams'=>'EXPLICIT','q'=>'*:*','facet.sort'=>'true'}},'response'=>{'numFound'=>26,'start'=>0,'docs'=>[{'id'=>'SP2514N','inStock'=>true,'manu'=>'Samsung Electronics Co. Ltd.','name'=>'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133','popularity'=>6,'price'=>92.0,'sku'=>'SP2514N','timestamp'=>'2009-03-20T14:42:49.795Z','cat'=>['electronics','hard drive'],'spell'=>['Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133'],'features'=>['7200RPM, 8MB cache, IDE Ultra ATA-133','NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor']},{'id'=>'6H500F0','inStock'=>true,'manu'=>'Maxtor Corp.','name'=>'Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300','popularity'=>6,'price'=>350.0,'sku'=>'6H500F0','timestamp'=>'2009-03-20T14:42:49.877Z','cat'=>['electronics','hard drive'],'spell'=>['Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300'],'features'=>['SATA 3.0Gb/s, NCQ','8.5ms seek','16MB cache']},{'id'=>'F8V7067-APL-KIT','inStock'=>false,'manu'=>'Belkin','name'=>'Belkin Mobile Power Cord for iPod w/ Dock','popularity'=>1,'price'=>19.95,'sku'=>'F8V7067-APL-KIT','timestamp'=>'2009-03-20T14:42:49.937Z','weight'=>4.0,'cat'=>['electronics','connector'],'spell'=>['Belkin Mobile Power Cord for iPod w/ Dock'],'features'=>['car power adapter, white']},{'id'=>'IW-02','inStock'=>false,'manu'=>'Belkin','name'=>'iPod & iPod Mini USB 2.0 Cable','popularity'=>1,'price'=>11.5,'sku'=>'IW-02','timestamp'=>'2009-03-20T14:42:49.944Z','weight'=>2.0,'cat'=>['electronics','connector'],'spell'=>['iPod & iPod Mini USB 2.0 Cable'],'features'=>['car power adapter for iPod, white']},{'id'=>'MA147LL/A','inStock'=>true,'includes'=>'earbud headphones, USB cable','manu'=>'Apple Computer Inc.','name'=>'Apple 60 GB iPod with Video Playback Black','popularity'=>10,'price'=>399.0,'sku'=>'MA147LL/A','timestamp'=>'2009-03-20T14:42:49.962Z','weight'=>5.5,'cat'=>['electronics','music'],'spell'=>['Apple 60 GB iPod with Video Playback Black'],'features'=>['iTunes, Podcasts, Audiobooks','Stores up to 15,000 songs, 25,000 photos, or 150 hours of video','2.5-inch, 320x240 color TFT LCD display with LED backlight','Up to 20 hours of battery life','Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video','Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication']},{'id'=>'TWINX2048-3200PRO','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail','popularity'=>5,'price'=>185.0,'sku'=>'TWINX2048-3200PRO','timestamp'=>'2009-03-20T14:42:49.99Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail'],'features'=>['CAS latency 2,	2-3-3-6 timing, 2.75v, unbuffered, heat-spreader']},{'id'=>'VS1GB400C3','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail','popularity'=>7,'price'=>74.99,'sku'=>'VS1GB400C3','timestamp'=>'2009-03-20T14:42:50Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail']},{'id'=>'VDBDB1A16','inStock'=>true,'manu'=>'A-DATA Technology Inc.','name'=>'A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM','popularity'=>5,'sku'=>'VDBDB1A16','timestamp'=>'2009-03-20T14:42:50.004Z','cat'=>['electronics','memory'],'spell'=>['A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM'],'features'=>['CAS latency 3,	 2.7v']},{'id'=>'3007WFP','inStock'=>true,'includes'=>'USB cable','manu'=>'Dell, Inc.','name'=>'Dell Widescreen UltraSharp 3007WFP','popularity'=>6,'price'=>2199.0,'sku'=>'3007WFP','timestamp'=>'2009-03-20T14:42:50.017Z','weight'=>401.6,'cat'=>['electronics','monitor'],'spell'=>['Dell Widescreen UltraSharp 3007WFP'],'features'=>['30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast']},{'id'=>'VA902B','inStock'=>true,'manu'=>'ViewSonic Corp.','name'=>'ViewSonic VA902B - flat panel display - TFT - 19"','popularity'=>6,'price'=>279.95,'sku'=>'VA902B','timestamp'=>'2009-03-20T14:42:50.034Z','weight'=>190.4,'cat'=>['electronics','monitor'],'spell'=>['ViewSonic VA902B - flat panel display - TFT - 19"'],'features'=>['19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution']},{'id'=>'0579B002','inStock'=>true,'manu'=>'Canon Inc.','name'=>'Canon PIXMA MP500 All-In-One Photo Printer','popularity'=>6,'price'=>179.99,'sku'=>'0579B002','timestamp'=>'2009-03-20T14:42:50.062Z','weight'=>352.0,'cat'=>['electronics','multifunction printer','printer','scanner','copier'],'spell'=>['Canon PIXMA MP500 All-In-One Photo Printer'],'features'=>['Multifunction ink-jet color photo printer','Flatbed scanner, optical scan resolution of 1,200 x 2,400 dpi','2.5" color LCD preview screen','Duplex Copying','Printing speed up to 29ppm black, 19ppm color','Hi-Speed USB','memory card: CompactFlash, Micro Drive, SmartMedia, Memory Stick, Memory Stick Pro, SD Card, and MultiMediaCard']}]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'manu'=>['inc',8,'apach',2,'belkin',2,'canon',2,'comput',2,'corp',2,'corsair',2,'foundat',2,'microsystem',2,'softwar',2],'cat'=>['electronics',14,'memory',3,'card',2,'connector',2,'drive',2,'graphics',2,'hard',2,'monitor',2,'search',2,'software',2]},'facet_dates'=>{}}})
-end

data/test/request_test.rb

@@ -1,50 +0,0 @@
-class RSolrExtRequestTest < Test::Unit::TestCase
-  
-  test 'standard request' do
-    solr_params = RSolr::Ext::Request.map(
-      :page=>'2',
-      :per_page=>'10',
-      :phrases=>{:name=>'This is a phrase'},
-      :filters=>['test', {:price=>(1..10)}],
-      :phrase_filters=>{:manu=>['Apple']},
-      :queries=>'ipod',
-      :facets=>{:fields=>['cat', 'blah']},
-      :spellcheck => true
-    )
-    assert_equal ["test", "price:[1 TO 10]", "manu:\"Apple\""], solr_params[:fq]
-    assert_equal 10, solr_params[:start]
-    assert_equal 10, solr_params[:rows]
-    assert_equal "ipod name:\"This is a phrase\"", solr_params[:q]
-    assert_equal ['cat', 'blah'], solr_params['facet.field']
-    assert_equal true, solr_params[:facet]
-  end
-  
-  test 'fq param using the phrase_filters mapping' do
-    solr_params = RSolr::Ext::Request.map(
-      :phrase_filters=>{:manu=>['Apple', 'ASG'], :color=>['red', 'blue']}
-    )
-    
-    assert_equal 4, solr_params[:fq].size
-    assert solr_params[:fq].include?("color:\"red\"")
-    assert solr_params[:fq].include?("color:\"blue\"")
-    assert solr_params[:fq].include?("manu:\"Apple\"")
-    assert solr_params[:fq].include?("manu:\"ASG\"")
-    
-  end
-  
-  test ':filters and :phrase_filters will play nice with :fq' do
-    solr_params = RSolr::Ext::Request.map(
-      :fq => 'blah blah',
-      :phrase_filters=>{:manu=>['Apple', 'ASG'], :color=>['red', 'blue']}
-    )
-    expected = {:fq=>["blah blah", "color:\"red\"", "color:\"blue\"", "manu:\"Apple\"", "manu:\"ASG\""]}
-    
-    assert_equal 5, solr_params[:fq].size
-    assert solr_params[:fq].include?("blah blah")
-    assert solr_params[:fq].include?("color:\"red\"")
-    assert solr_params[:fq].include?("color:\"blue\"")
-    assert solr_params[:fq].include?("manu:\"Apple\"")
-    assert solr_params[:fq].include?("manu:\"ASG\"")
-  end
-  
-end

data/test/response_test.rb

@@ -1,103 +0,0 @@
-class RSolrExtResponseTest < Test::Unit::TestCase
-  
-  test 'base response class' do
-    raw_response = eval(mock_query_response)
-    r = RSolr::Ext::Response::Base.new(raw_response)
-    assert r.respond_to?(:header)
-    assert r.ok?
-  end
-  
-  test 'standard response class' do
-    raw_response = eval(mock_query_response)
-    r = RSolr::Ext::Response::Base.new(raw_response)
-    
-    assert r.respond_to?(:response)
-    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)
-  end
-  
-  test 'standard response doc ext methods' do
-    raw_response = eval(mock_query_response)
-    r = RSolr::Ext::Response::Base.new(raw_response)
-    doc = r.docs.first
-    assert doc.has?(:cat, /^elec/)
-    assert ! doc.has?(:cat, 'elec')
-    assert doc.has?(:cat, 'electronics')
-    
-    assert 'electronics', doc.get(:cat)
-    assert_nil doc.get(:xyz)
-    assert_equal 'def', doc.get(:xyz, :default=>'def')
-  end
-  
-  test 'Response::Standard facets' do
-    raw_response = eval(mock_query_response)
-    r = RSolr::Ext::Response::Base.new(raw_response)
-    assert_equal 2, r.facets.size
-    
-    field_names = r.facets.collect{|facet|facet.name}
-    assert field_names.include?('cat')
-    assert field_names.include?('manu')
-    
-    first_facet = r.facets.first
-    assert_equal 'cat', first_facet.name
-    
-    assert_equal 10, first_facet.items.size
-    
-    expected = first_facet.items.collect do |item|
-      item.value + ' - ' + item.hits.to_s
-    end.join(', ')
-    assert_equal "electronics - 14, memory - 3, card - 2, connector - 2, drive - 2, graphics - 2, hard - 2, monitor - 2, search - 2, software - 2", expected
-    
-    r.facets.each do |facet|
-      assert facet.respond_to?(:name)
-      facet.items.each do |item|
-        assert item.respond_to?(:value)
-        assert item.respond_to?(:hits)
-      end
-    end
-    
-  end
-  
-  test 'response::standard facet_by_field_name' do
-    raw_response = eval(mock_query_response)
-    r = RSolr::Ext::Response::Base.new(raw_response)
-    facet = r.facet_by_field_name('cat')
-    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

data/test/test_unit_test_case.rb

@@ -1,18 +0,0 @@
-require 'test/unit'
-
-class Test::Unit::TestCase
-  
-  def self.test(name, &block)
-    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-    defined = instance_method(test_name) rescue false
-    raise "#{test_name} is already defined in #{self}" if defined
-    if block_given?
-      define_method(test_name, &block)
-    else
-      define_method(test_name) do
-        flunk "No implementation provided for #{name}"
-      end
-    end
-  end
-  
-end