delsolr 0.1.5 → 0.1.6

data/lib/delsolr/response.rb

@@ -90,13 +90,28 @@ module DelSolr
       # solr is super-weird about the way it returns suggestions,
       # hence this strangeness:
       # 'spellcheck'=>{'suggestions'=>['fishh',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['fish']},'collation','fish']}
-      def collation
-        @collation ||= begin
-          collation = nil
-          suggestions.in_groups_of(2) {|k,v| collation = v if k == 'collation'} if suggestions
-          collation
+      def collation_with_correction
+        @collation_with_correction ||= begin
+          collation, correction = nil, {}
+          if suggestions
+            (suggestions.length/2).times do |i|
+              k = suggestions[i*2]
+              v = suggestions[i*2+1]
+              collation = v if k == 'collation'
+              correction[k] = v['suggestion'][0] if v.is_a?(Hash)
+            end
+          end
+          {'collation' => collation, 'correction' => correction}
         end
       end
+
+      def correction
+        collation_with_correction['correction']
+      end
+
+      def collation
+        collation_with_correction['collation']
+      end
       
       # Returns the query time in ms
       def qtime

data/test/test_response.rb

@@ -92,7 +92,11 @@ class ResponseTest < Test::Unit::TestCase
       '9_widget'=>{},
       '10_widget'=>{},
       '11_widget'=>{},
-      '12_widget'=>{}}}
+      '12_widget'=>{}},
+      'spellcheck'=>{
+        'suggestions'=>[
+          'fishh',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['fish']},
+          'collation','fish']}}
   }
   
   def test_001
@@ -128,4 +132,14 @@ class ResponseTest < Test::Unit::TestCase
     assert(!r.respond_to?(:scores))
   end
 
+  def test_spellcheck
+    r = nil
+    qb = DelSolr::Client::QueryBuilder.new('standard', :query => {:index_type => 'widget'}, :facets => {:query => 'city_idm:19596', :prefix => {:key => 19596}} )
+    qb.request_string # need to generate this...
+    assert_nothing_raised { r = DelSolr::Client::Response.new(@@test_001, qb) }
+
+    assert_equal('fish', r.collation)
+    assert_equal('fish', r.correction['fishh'])
+  end
+
 end

metadata

@@ -1,38 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: delsolr
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.6
   prerelease: 
-  version: 0.1.5
 platform: ruby
-authors: 
+authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-11-02 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2009-11-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mocha
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2171652600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2171652600
 description: Ruby wrapper for Lucene Solr
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - License.txt
 - README.txt
 - lib/delsolr.rb
@@ -45,35 +40,32 @@ files:
 - test/test_helper.rb
 - test/test_query_builder.rb
 - test/test_response.rb
-has_rdoc: true
 homepage: http://github.com/avvo/delsolr
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: DelSolr is a light weight ruby wrapper for solr.  It's intention is to expose the full power of solr queries while keeping the interface as ruby-esque as possible.
-test_files: 
+summary: DelSolr is a light weight ruby wrapper for solr.  It's intention is to expose
+  the full power of solr queries while keeping the interface as ruby-esque as possible.
+test_files:
 - test/test_client.rb
 - test/test_helper.rb
 - test/test_query_builder.rb