rsolr-ext 0.12.0 → 0.12.1

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

data/lib/rsolr-ext/client.rb

@@ -38,4 +38,26 @@ module RSolr::Ext::Client
     self.request(path, params).to_mash
   end
   
+  # sends request to /admin/ping
+  def ping *args
+    path = args.first.is_a?(String) ? args.shift : '/admin/ping'
+    params = args.pop || {}
+    self.request(path, params).to_mash
+  end
+  
+  # Ping the server and make sure it is alright
+  #   solr.ping?
+  #
+  # It returns true if the server pings and the status is OK
+  # It returns false otherwise -- which probably cannot happen
+  # Or raises an exception if there is a failure to connect or
+  # the ping service is not activated in the solr server
+  #
+  # The default configuration point of the PingRequestHandler
+  # in the solr server of '/admin/ping' is assumed.
+  #
+  def ping?
+    ping['status'] == 'OK'
+  end
+  
 end

data/lib/rsolr-ext/model.rb

@@ -9,7 +9,23 @@
 # number_10 = Book.find_by_id(10)
 #
 module RSolr::Ext::Model
-
+  
+  # ripped from MongoMapper!
+  module Pluggable
+    
+    def plugins
+      @plugins ||= []
+    end
+    
+    def plugin(mod)
+      extend mod::ClassMethods     if mod.const_defined?(:ClassMethods)
+      include mod::InstanceMethods if mod.const_defined?(:InstanceMethods)
+      mod.configure(self)          if mod.respond_to?(:configure)
+      plugins << mod
+    end
+    
+  end
+  
   # Class level methods for altering object instances
   module Callbacks
     
@@ -37,11 +53,11 @@ module RSolr::Ext::Model
   
   #
   # Findable is a module that gets mixed into the SolrDocument *class* object.
-  # These methods will be available through the class like: SolrDocument.find and SolrDocument.find_by_id
+  # These methods will be available through the class: SolrDocument.find
   #
   module Findable
     
-    attr_accessor :connection, :default_params
+    attr_accessor :connection
     
     def connection
       @connection ||= RSolr::Ext.connect
@@ -49,41 +65,37 @@ module RSolr::Ext::Model
     
     # this method decorates the connection find method
     # and then creates new instance of the class that uses this module.
-    def find(*args)
-      decorate_response_docs connection.find(*args)
+    def find *args, &block
+      response = connection.find(*args)
+      response.docs.map {|doc|
+        d = self.new doc, response
+        yield d if block_given?
+        d
+      }
     end
     
-    # this method decorates the connection find_by_id method
-    # and then creates new instance of the class that uses this module.
-    def find_by_id(id, solr_params={}, opts={})
-      decorate_response_docs connection.find_by_id(id, solr_params, opts)
-    end
-  
-    protected
-  
-    def decorate_response_docs response
-      response['response']['docs'].map!{|d| self.new d }
-      response
-    end
-  
   end
   
   # Called by Ruby Module API
   # extends this *class* object
   def self.included(base)
+    base.extend Pluggable
     base.extend Callbacks
     base.extend Findable
     base.send :include, RSolr::Ext::Doc
   end
   
+  attr_reader :solr_response
+  
   # The original object passed in to the #new method
   attr :_source
   
   # Constructor **for the class that is getting this module included**
   # source_doc should be a hash or something similar
   # calls each of after_initialize blocks
-  def initialize(source_doc={})
+  def initialize(source_doc={}, solr_response=nil)
     @_source = source_doc.to_mash
+    @solr_response = solr_response
     self.class.hooks.each do |h|
       instance_eval &h
     end

data/lib/rsolr-ext/request.rb

@@ -66,12 +66,14 @@ module RSolr::Ext::Request
     # passed back into build_query (recursive)
     def build_query(value, quote_string=false)
       case value
-      when String,Symbol
+      when String,Symbol,Numeric
         quote_string ? quote(value.to_s) : value.to_s
       when Array
         value.collect do |v|
           build_query(v, quote_string)
         end.flatten
+      when Range
+        build_range(value)
       when Hash
         return value.collect do |(k,v)|
           if v.is_a?(Range)
@@ -105,4 +107,4 @@ module RSolr::Ext::Request
   extend QueryHelpers
   extend Params
   
-end
+end

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

@@ -3,23 +3,23 @@
 # response.spelling.words
 #
 module RSolr::Ext::Response::Spelling
-  
+
   def spelling
     @spelling ||= Base.new(self)
   end
-  
+
   class Base
-    
+
     attr :response
-    
+
     def initialize(response)
       @response = response
     end
-    
-    # returns an array of spelling suggestion for specific query words, 
+
+    # returns an array of spelling suggestion for specific query words,
     # as provided in the solr response.  Only includes words with higher
     # frequency of occurrence than word in original query.
-    # can't do a full query suggestion because we only get info for each word;  
+    # can't do a full query suggestion because we only get info for each word;
     # combination of words may not have results.
     # Thanks to Naomi Dushay!
     def words
@@ -29,37 +29,64 @@ module RSolr::Ext::Response::Spelling
         if spellcheck && spellcheck[:suggestions]
           suggestions = spellcheck[:suggestions]
           unless suggestions.nil?
-            # suggestions is an array: 
+            # suggestions is an array:
             #    (query term)
-            #    (hash of term info and term suggestion) 
+            #    (hash of term info and term suggestion)
             #    ...
             #    (query term)
-            #    (hash of term info and term suggestion) 
+            #    (hash of term info and term suggestion)
             #    'correctlySpelled'
             #    true/false
             #    collation
             #    (suggestion for collation)
-            i_stop = suggestions.index("correctlySpelled")
-            # step through array in 2s to get info for each term
-            0.step(i_stop-1, 2) do |i| 
-              term = suggestions[i]
-              term_info = suggestions[i+1]
-              # term_info is a hash:
-              #   numFound =>
-              #   startOffset =>
-              #   endOffset =>
-              #   origFreq =>
-              #   suggestion =>  { frequency =>, word => }
-              origFreq = term_info['origFreq']
-              suggFreq = term_info['suggestion']['frequency'] 
-              word_suggestions << term_info['suggestion']['word'] if suggFreq > origFreq
+            if suggestions.index("correctlySpelled") #if extended results
+              i_stop = suggestions.index("correctlySpelled")
+            elsif suggestions.index("collation")
+              i_stop = suggestions.index("collation")
+            else
+              i_stop = suggestions.length
             end
+              # step through array in 2s to get info for each term
+              0.step(i_stop-1, 2) do |i|
+                term = suggestions[i]
+                term_info = suggestions[i+1]
+                # term_info is a hash:
+                #   numFound =>
+                #   startOffset =>
+                #   endOffset =>
+                #   origFreq =>
+                #   suggestion =>  [{ frequency =>, word => }] # for extended results
+                #   suggestion => ['word'] # for non-extended results
+                origFreq = term_info['origFreq']
+                if suggestions.index("correctlySpelled")
+                  word_suggestions << term_info['suggestion'].map do |suggestion|
+                    suggestion['word'] if suggestion['freq'] > origFreq
+                  end
+                else
+                  # only extended suggestions have frequency so we just return all suggestions
+                  word_suggestions << term_info['suggestion']
+                end
+              end
           end
         end
-        word_suggestions.uniq
+        word_suggestions.flatten.compact.uniq
       )
     end
-    
+
+    def collation
+      # FIXME: DRY up with words
+      spellcheck = self.response[:spellcheck]
+        if spellcheck && spellcheck[:suggestions]
+          suggestions = spellcheck[:suggestions]
+          unless suggestions.nil?
+            if suggestions.index("collation")
+              suggestions[suggestions.index("collation") + 1]
+            end
+          end
+        end
+    end
+
   end
-  
-end
+
+end
+

data/lib/rsolr-ext/response.rb

@@ -13,10 +13,10 @@ module RSolr::Ext::Response
       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']
-      extend Spelling# if self['spellcheck']
+      extend Response
+      extend Docs
+      extend Facets
+      extend Spelling
     end
     
     def header

data/lib/rsolr-ext.rb

@@ -1,10 +1,6 @@
 # add this directory to the load path if it hasn't already been added
 
-lambda { |base|
-  $: << base unless $:.include?(base) || $:.include?(File.expand_path(base))
-}.call(File.dirname(__FILE__))
-
-require 'mash' unless defined?(Mash)
+require File.join(File.dirname(__FILE__), 'mash') unless defined?(Mash)
 
 unless Hash.respond_to?(:to_mash)
   class Hash

data/spec/rsolr-ext_spec.rb

@@ -1,26 +1,26 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe RSolr::Ext do
-  
+
   context RSolr::Client do
-    
-    let(:connection){RSolr.connect}
-    
+
+    let(:client){RSolr.connect}
+
     it 'should now have a #find method' do
-      connection.should respond_to(:find)
+      client.should respond_to(:find)
     end
-    
+
     it 'should produce results from the #find method' do
-      c = connection
+      c = client
       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
+      c = client
       expected_response = {'response'=>{'docs' => []}, 'responseHeader' => {}}
       # ok this is hacky... the raw method needs to go into a mixin dude
       def expected_response.raw
@@ -32,9 +32,9 @@ describe RSolr::Ext do
       response = c.find '/select', :q=>'*:*'
       response.raw[:path].should match(/\/select/)
     end
-    
+
     it 'should be ok' do
-      c = connection
+      c = client
       c.should_receive(:request).
         with('/select', :q=>'*:*').
           and_return({'response'=>{'docs' => []}, 'responseHeader' => {'status'=>0}})
@@ -42,9 +42,9 @@ describe RSolr::Ext do
       response.should respond_to(:ok?)
       response.ok?.should == true
     end
-    
+
     it 'should call the #luke method' do
-      c = connection
+      c = client
       c.should_receive(:request).
         with('/admin/luke', {"numTerms"=>0}).
           and_return({"fields"=>nil, "index"=>nil, "info" => nil})
@@ -54,9 +54,26 @@ describe RSolr::Ext do
       info.should have_key('index')
       info.should have_key('info')
     end
-  
+
+    it 'should forwad #ping? calls to the connection' do
+      client.connection.should_receive(:request).
+        with('/admin/ping', :wt => :ruby ).
+        and_return( :params => { :wt => :ruby },
+                    :status_code => 200,
+                    :body => "{'responseHeader'=>{'status'=>0,'QTime'=>44,'params'=>{'echoParams'=>'all','echoParams'=>'all','q'=>'solrpingquery','qt'=>'standard','wt'=>'ruby'}},'status'=>'OK'}" )
+      client.ping?
+    end
+
+    it 'should raise an error if the ping service is not available' do
+      client.connection.should_receive(:request).
+        with('/admin/ping', :wt => :ruby ).
+        # the first part of the what the message would really be
+        and_raise( RSolr::RequestError.new("Solr Response: pingQuery_not_configured_consider_registering_PingRequestHandler_with_the_name_adminping_instead__") )
+        lambda { client.ping? }.should raise_error( RSolr::RequestError )
+    end
+
   end
-  
+
   context 'requests' do
 
     it 'should create a valid request' do
@@ -77,26 +94,26 @@ describe RSolr::Ext do
       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\"")
@@ -104,22 +121,31 @@ describe RSolr::Ext do
       solr_params[:fq].should include("manu:\"Apple\"")
       solr_params[:fq].should include("manu:\"ASG\"")
     end
-    
+
+    it 'should map arrays of ranges in :phrase_filters' do
+        solr_params = RSolr::Ext::Request.map(
+          :phrase_filters=>{:range=>[1940..2020]}
+        )
+
+        solr_params[:fq].size.should == 1
+        solr_params[:fq].should include("range:[1940 TO 2020]")
+    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
@@ -127,10 +153,10 @@ describe RSolr::Ext do
       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
@@ -141,40 +167,40 @@ describe RSolr::Ext do
       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|
@@ -182,35 +208,69 @@ describe RSolr::Ext do
           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
-    
+
+    it 'should provide spelling suggestions for regular spellcheck results' do
+      raw_response = eval(mock_response_with_spellcheck)
+      r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', {})
+      r.spelling.words.should include("dell")
+      r.spelling.words.should include("ultrasharp")
+    end
+
+    it 'should provide spelling suggestions for extended spellcheck results' do
+      raw_response = eval(mock_response_with_spellcheck_extended)
+      r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', {})
+      r.spelling.words.should include("dell")
+      r.spelling.words.should include("ultrasharp")
+    end
+
+    it 'should provide no spelling suggestions when extended results and suggestion frequency is the same as original query frequency' do
+      raw_response = eval(mock_response_with_spellcheck_same_frequency)
+      r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', {})
+      r.spelling.words.should == []
+    end
+
+    it 'should provide spelling suggestions for a regular spellcheck results with a collation' do
+      raw_response = eval(mock_response_with_spellcheck_collation)
+      r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', {})
+      r.spelling.words.should include("dell")
+      r.spelling.words.should include("ultrasharp")
+    end
+
+    it 'should provide spelling suggestion collation' do
+      raw_response = eval(mock_response_with_spellcheck_collation)
+      r = RSolr::Ext::Response::Base.new(raw_response, '/catalog', {})
+      r.spelling.collation.should == 'dell ultrasharp'
+    end
+
   end
-  
-end
+
+end
+

data/spec/spec_helper.rb

@@ -5,9 +5,28 @@ 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
+
+  # These spellcheck responses are all Solr 1.4 responses
+  def mock_response_with_spellcheck
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>9,'params'=>{'spellcheck'=>'true','spellcheck.collate'=>'true','wt'=>'ruby','q'=>'hell ultrashar'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['dell']},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'suggestion'=>['ultrasharp']},'collation','dell ultrasharp']}}|
+  end
+
+  def mock_response_with_spellcheck_extended
+     %|{'responseHeader'=>{'status'=>0,'QTime'=>8,'params'=>{'spellcheck'=>'true','spellcheck.collate'=>'true','wt'=>'ruby','spellcheck.extendedResults'=>'true','q'=>'hell ultrashar'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'origFreq'=>0,'suggestion'=>[{'word'=>'dell','freq'=>1}]},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'origFreq'=>0,'suggestion'=>[{'word'=>'ultrasharp','freq'=>1}]},'correctlySpelled',false,'collation','dell ultrasharp']}}|
+  end
+
+  def mock_response_with_spellcheck_same_frequency
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>8,'params'=>{'spellcheck'=>'true','spellcheck.collate'=>'true','wt'=>'ruby','spellcheck.extendedResults'=>'true','q'=>'hell ultrashar'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'origFreq'=>1,'suggestion'=>[{'word'=>'dell','freq'=>1}]},'ultrashard',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'origFreq'=>1,'suggestion'=>[{'word'=>'ultrasharp','freq'=>1}]},'correctlySpelled',false,'collation','dell ultrasharp']}}|
+  end
+
+  # it can be the case that extended results are off and collation is on
+  def mock_response_with_spellcheck_collation
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>3,'params'=>{'spellspellcheck.build'=>'true','spellcheck'=>'true','q'=>'hell','spellcheck.q'=>'hell ultrashar','wt'=>'ruby','spellcheck.collate'=>'true'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['dell']},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'suggestion'=>['ultrasharp']},'collation','dell ultrasharp']}}|
+  end
+
+end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr-ext
 version: !ruby/object:Gem::Version 
-  version: 0.12.0
+  prerelease: false
+  segments: 
+  - 0
+  - 12
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -05:00
+date: 2010-08-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rsolr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 1
         version: 0.12.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: A query/response extension lib for RSolr
 email: goodieboy@gmail.com
 executables: []
@@ -68,18 +81,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A query/response extension lib for RSolr