sunspot 0.10.2 → 0.10.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.10.3 2009-10-15
+* Contiguous, not continuous
+* Fail fast if less-than-1 radius passed for local search
+
 == 0.10.2 2009-10-09
 * Add Sunspot.config.xml_builder option, which is passed to RSolr
 

data/README.rdoc

@@ -30,8 +30,7 @@ http://wiki.github.com/outoftime/sunspot
 
 == Installation
 
-  gem sources -a http://gems.github.com
-  gem install outoftime-sunspot
+  gem install sunspot
 
 In order to start the packaged Solr installation, run:
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 10
-:patch: 2
+:patch: 3
 :major: 0

data/lib/sunspot/query/highlighting.rb

@@ -27,8 +27,8 @@ module Sunspot
         if fragment_size = @options[:fragment_size]
           params[:"hl.fragsize"] = fragment_size
         end
-        if @options[:merge_continuous_fragments]
-          params[:"hl.mergeContinuous"] = 'true'
+        if @options[:merge_contiguous_fragments]
+          params[:"hl.mergeContiguous"] = 'true'
         end
         if @options[:phrase_highlighter]
           params[:"hl.usePhraseHighlighter"] = 'true'

data/lib/sunspot/query/local.rb

@@ -8,6 +8,9 @@ module Sunspot
     #
     class Local #:nodoc:
       def initialize(coordinates, radius)
+        if radius < 1
+          raise ArgumentError, "LocalSolr does not seem to support a radius of less than 1 mile."
+        end
         @coordinates, @radius = Util::Coordinates.new(coordinates), radius
       end
 

data/spec/api/query/highlighting_spec.rb

@@ -105,11 +105,11 @@ describe 'highlighted fulltext queries', :type => :query do
   it 'enables merging of continuous fragments' do
     session.search(Post) do
       keywords 'test' do
-        highlight :merge_continuous_fragments => true
+        highlight :merge_contiguous_fragments => true
       end
     end
     connection.should have_last_search_with(
-      :"hl.mergeContinuous" => 'true'
+      :"hl.mergeContiguous" => 'true'
     )
   end
 

data/spec/api/query/local_spec.rb

@@ -51,4 +51,12 @@ describe 'local query' do
       connection.should have_last_search_with(:lat => 40.7, :long => -73.5)
     end
   end
+
+  it 'raises ArgumentError if radius is less than 1' do
+    lambda do
+      session.search Post do
+        near [40, -70], 0.5
+      end
+    end.should raise_error(ArgumentError)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors: 
 - Mat Brown
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 -04:00
+date: 2009-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency