sunspot 1.1.0 → 1.2.0

data/lib/sunspot/search/abstract_search.rb

@@ -81,7 +81,7 @@ module Sunspot
             begin
               hits = if solr_response && solr_response['docs']
                 solr_response['docs'].map do |doc|
-                  Hit.new(doc, highlights_for(doc), distance_for(doc), self)
+                  Hit.new(doc, highlights_for(doc), self)
                 end
               end
               maybe_will_paginate(hits || [])
@@ -268,12 +268,6 @@ module Sunspot
         end
       end
   
-      def distance_for(doc)
-        if @solr_result['distances']
-          @solr_result['distances'][doc['id']]
-        end
-      end
-  
       def verified_hits
         @verified_hits ||= maybe_will_paginate(hits.select { |hit| hit.instance })
       end

data/lib/sunspot/search/hit.rb

@@ -3,8 +3,8 @@ module Sunspot
     # 
     # Hit objects represent the raw information returned by Solr for a single
     # document. As well as the primary key and class name, hit objects give
-    # access to stored field values, keyword relevance score, and geographical
-    # distance (for geographical search).
+    # access to stored field values, keyword relevance score, and keyword
+    # highlighting.
     #
     class Hit
       SPECIAL_KEYS = Set.new(%w(id type score)) #:nodoc:
@@ -23,17 +23,12 @@ module Sunspot
       #
       attr_reader :score
       #
-      # For geographical searches, this is the distance between the search
-      # centerpoint and the document's location. Otherwise, it's nil.
-      # 
-      attr_reader :distance
 
       attr_writer :result #:nodoc:
 
-      def initialize(raw_hit, highlights, distance, search) #:nodoc:
+      def initialize(raw_hit, highlights, search) #:nodoc:
         @class_name, @primary_key = *raw_hit['id'].match(/([^ ]+) (.+)/)[1..2]
         @score = raw_hit['score']
-        @distance = distance
         @search = search
         @stored_values = raw_hit
         @stored_cache = {}
@@ -104,7 +99,7 @@ module Sunspot
       private
 
       def setup
-        @setup ||= Sunspot::Setup.for(@class_name)
+        @setup ||= Sunspot::Setup.for(Util.full_const_get(@class_name))
       end
 
       def highlights_cache
@@ -126,7 +121,12 @@ module Sunspot
       def stored_value(field_name, dynamic_field_name)
         setup.stored_fields(field_name, dynamic_field_name).each do |field|
           if value = @stored_values[field.indexed_name]
-            return field.cast(value)
+            case value
+            when Array
+              return value.map { |item| field.cast(item) }
+            else
+              return field.cast(value)
+            end
           end
         end
         nil

data/lib/sunspot/search/query_facet.rb

@@ -38,7 +38,7 @@ module Sunspot
       private
 
       def sort_rows!(rows)
-        case @options[:sort] || (:count if @options[:limit])
+        case @options[:sort] || (:count if limit)
         when :count
           rows.sort! { |lrow, rrow| rrow.count <=> lrow.count }
         when :index
@@ -52,11 +52,16 @@ module Sunspot
             end
           end
         end
-        if @options[:limit]
-          rows.replace(rows.first(@options[:limit]))
+        if limit
+          rows.replace(rows.first(limit))
         end
         rows
       end
+
+      def limit
+        return @limit if defined?(@limit)
+        @limit = (@options[:limit].to_i if @options[:limit].to_i > 0)
+      end
     end
   end
 end

data/lib/sunspot/session.rb

@@ -107,6 +107,14 @@ module Sunspot
       connection.commit
     end
 
+    #
+    # See Sunspot.optimize
+    #
+    def optimize
+      @adds = @deletes = 0
+      connection.optimize
+    end
+
     # 
     # See Sunspot.remove
     #
@@ -115,9 +123,9 @@ module Sunspot
         types = objects
         conjunction = Query::Connective::Conjunction.new
         if types.length == 1
-          conjunction.add_restriction(TypeField.instance, Query::Restriction::EqualTo, types.first)
+          conjunction.add_positive_restriction(TypeField.instance, Query::Restriction::EqualTo, types.first)
         else
-          conjunction.add_restriction(TypeField.instance, Query::Restriction::AnyOf, types)
+          conjunction.add_positive_restriction(TypeField.instance, Query::Restriction::AnyOf, types)
         end
         dsl = DSL::Scope.new(conjunction, setup_for_types(types))
         Util.instance_eval_or_call(dsl, &block)

data/lib/sunspot/session_proxy.rb

@@ -27,6 +27,14 @@ module Sunspot
   module SessionProxy
     NotSupportedError = Class.new(StandardError)
 
+    autoload(
+      :AbstractSessionProxy,
+      File.join(
+        File.dirname(__FILE__),
+        'session_proxy',
+        'abstract_session_proxy'
+      )
+    )
     autoload(
       :ThreadLocalSessionProxy,
       File.join(
@@ -67,5 +75,13 @@ module Sunspot
         'id_sharding_session_proxy'
       )
     )
+    autoload(
+      :SilentFailSessionProxy,
+      File.join(
+        File.dirname(__FILE__),
+        'session_proxy',
+        'silent_fail_session_proxy'
+      )
+    )
   end
 end

data/lib/sunspot/session_proxy/master_slave_session_proxy.rb

@@ -18,7 +18,7 @@ module Sunspot
       attr_reader :slave_session
 
       delegate :batch, :commit, :commit_if_delete_dirty, :commit_if_dirty,
-               :config, :delete_dirty?, :dirty?, :index, :index!, :remove,
+               :config, :delete_dirty?, :dirty?, :index, :index!, :optimize, :remove,
                :remove!, :remove_all, :remove_all!, :remove_by_id,
                :remove_by_id!, :to => :master_session
       delegate :new_search, :search, :new_more_like_this, :more_like_this, :to => :slave_session

data/lib/sunspot/session_proxy/sharding_session_proxy.rb

@@ -119,6 +119,13 @@ module Sunspot
         all_sessions.each { |session| session.commit }
       end
 
+      # 
+      # Optimize all shards. See Sunspot.optimize
+      #
+      def optimize
+        all_sessions.each { |session| session.optimize }
+      end
+
       # 
       # Commit all dirty sessions. Only dirty sessions will be committed.
       #

data/lib/sunspot/session_proxy/silent_fail_session_proxy.rb

@@ -0,0 +1,42 @@
+require File.join(File.dirname(__FILE__), 'abstract_session_proxy')
+
+module Sunspot
+  module SessionProxy
+    class SilentFailSessionProxy < AbstractSessionProxy
+      
+      attr_reader :search_session
+      
+      delegate :new_search, :search, :config,
+                :new_more_like_this, :more_like_this,
+                :delete_dirty, :delete_dirty?,
+                :to => :search_session
+      
+      def initialize(search_session = Sunspot.session)
+        @search_session = search_session
+      end
+      
+      def rescued_exception(method, e)
+        $stderr.puts("Exception in #{method}: #{e.message}")
+      end
+
+      SUPPORTED_METHODS = [
+        :batch, :commit, :commit_if_dirty, :commit_if_delete_dirty, :dirty?,
+        :index!, :index, :optimize, :remove!, :remove, :remove_all!, :remove_all,
+        :remove_by_id!, :remove_by_id
+      ]
+
+      SUPPORTED_METHODS.each do |method|
+        module_eval(<<-RUBY)
+          def #{method}(*args, &block)
+            begin
+              search_session.#{method}(*args, &block)
+            rescue => e
+              self.rescued_exception(:#{method}, e)
+            end
+          end
+        RUBY
+      end
+      
+    end
+  end
+end

data/lib/sunspot/session_proxy/thread_local_session_proxy.rb

@@ -17,7 +17,7 @@ module Sunspot
       attr_reader :config
       @@next_id = 0
 
-      delegate :batch, :commit, :commit_if_delete_dirty, :commit_if_dirty, :delete_dirty?, :dirty?, :index, :index!, :new_search, :remove, :remove!, :remove_all, :remove_all!, :remove_by_id, :remove_by_id!, :search, :more_like_this, :new_more_like_this, :to => :session
+      delegate :batch, :commit, :commit_if_delete_dirty, :commit_if_dirty, :delete_dirty?, :dirty?, :index, :index!, :new_search, :optimize, :remove, :remove!, :remove_all, :remove_all!, :remove_by_id, :remove_by_id!, :search, :more_like_this, :new_more_like_this, :to => :session
 
       # 
       # Optionally pass an existing Sunspot::Configuration object. If none is

data/lib/sunspot/setup.rb

@@ -77,15 +77,6 @@ module Sunspot
       end
     end
 
-    # 
-    # The coordinates field factory is used for populating the coordinate fields
-    # of documents during index, but does not actually generate fields (since
-    # the field names used in search are static).
-    #
-    def set_coordinates_field(name = nil, &block)
-      @coordinates_field_factory = FieldFactory::Coordinates.new(name, &block)
-    end
-
     # 
     # Add a document boost to documents at index time. Document boost can be
     # static (the same for all documents of this class), or extracted on a per-
@@ -234,7 +225,6 @@ module Sunspot
     def all_field_factories
       all_field_factories = []
       all_field_factories.concat(field_factories).concat(text_field_factories).concat(dynamic_field_factories)
-      all_field_factories << @coordinates_field_factory if @coordinates_field_factory
       all_field_factories
     end
 
@@ -319,13 +309,7 @@ module Sunspot
       #   Setup instance associated with the given class or its nearest ancestor
       #   
       def for(clazz) #:nodoc:
-        class_name =
-          if clazz.respond_to?(:name)
-            clazz.name
-          else
-            clazz
-          end
-        setups[class_name.to_sym] || self.for(clazz.superclass) if clazz
+        setups[clazz.name.to_sym] || self.for(clazz.superclass) if clazz
       end
 
       protected

data/lib/sunspot/type.rb

@@ -1,3 +1,10 @@
+require 'singleton'
+begin
+  require 'geohash'
+rescue LoadError => e
+  require 'pr_geohash'
+end
+
 module Sunspot
   # 
   # This module contains singleton objects that represent the types that can be
@@ -58,12 +65,7 @@ module Sunspot
     end
 
     class AbstractType #:nodoc:
-      class <<self
-        def instance
-          @instance ||= new
-        end
-        private :new
-      end
+      include Singleton
 
       def accepts_dynamic?
         true
@@ -317,11 +319,41 @@ module Sunspot
           true
         when 'false'
           false
+        when true, false
+          string
         end
       end
     end
     register BooleanType, TrueClass, FalseClass
 
+    # 
+    # The Location type encodes geographical coordinates as a GeoHash.
+    # The data for this type must respond to the `lat` and `lng` methods; you
+    # can use Sunspot::Util::Coordinates as a wrapper if your source data does
+    # not follow this API.
+    #
+    # Location fields are most usefully searched using the
+    # Sunspot::DSL::RestrictionWithType#near method; see that method for more
+    # information on geographical search.
+    #
+    # ==== Example
+    #
+    #   Sunspot.setup(Post) do
+    #     location :coordinates do
+    #       Sunspot::Util::Coordinates.new(coordinates[0], coordinates[1])
+    #     end
+    #   end
+    #
+    class LocationType < AbstractType
+      def indexed_name(name)
+        "#{name}_s"
+      end
+
+      def to_indexed(value)
+        GeoHash.encode(value.lat.to_f, value.lng.to_f, 12)
+      end
+    end
+
     class ClassType < AbstractType
       def indexed_name(name) #:nodoc:
         'class_name'

data/lib/sunspot/util.rb

@@ -108,6 +108,20 @@ module Sunspot
         end
       end
 
+      # 
+      # When generating boosts, Solr requires that the values be in standard
+      # (not scientific) notation. We would like to ensure a minimum number of
+      # significant digits (i.e., digits that are not prefix zeros) for small
+      # float values.
+      #
+      def format_float(f, digits)
+        if f < 1
+          sprintf('%.*f', digits - Math.log10(f), f)
+        else
+          f.to_s
+        end
+      end
+
       # 
       # Perform a deep merge of hashes, returning the result as a new hash.
       # See #deep_merge_into for rules used to merge the hashes
@@ -182,35 +196,7 @@ module Sunspot
       end
     end
 
-    class Coordinates #:nodoc:
-      def initialize(coords)
-        @coords = coords
-      end
-
-      def lat
-        if @coords.respond_to?(:first)
-          @coords.first
-        elsif @coords.respond_to?(:lat)
-          @coords.lat
-        else
-          @coords.latitude
-        end.to_f
-      end
-
-      def lng
-        if @coords.respond_to?(:last)
-          @coords.last
-        elsif @coords.respond_to?(:lng)
-          @coords.lng
-        elsif @coords.respond_to?(:lon)
-          @coords.lon
-        elsif @coords.respond_to?(:long)
-          @coords.long
-        elsif @coords.respond_to?(:longitude)
-          @coords.longitude
-        end.to_f
-      end
-    end
+    Coordinates = Struct.new(:lat, :lng)
 
     class ContextBoundDelegate
       class <<self
@@ -237,12 +223,16 @@ module Sunspot
         @__receiver__, @__calling_context__ = receiver, calling_context
       end
 
+      def id
+        @__calling_context__.__send__(:id)
+      end
+
       def method_missing(method, *args, &block)
         begin
-          @__receiver__.send(method.to_sym, *args, &block)
+          @__receiver__.__send__(method.to_sym, *args, &block)
         rescue ::NoMethodError => e
           begin
-            @__calling_context__.send(method.to_sym, *args, &block)
+            @__calling_context__.__send__(method.to_sym, *args, &block)
           rescue ::NoMethodError
             raise(e)
           end

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/solr/solr/conf/solrconfig.xml

@@ -442,9 +442,6 @@
        <str name="version">2.1</str>
         -->
     </lst>
-    <arr name="last-components">
-      <str>spatial</str>
-    </arr>
   </requestHandler>
   <!-- Please refer to http://wiki.apache.org/solr/SolrReplication for details on configuring replication -->
   <!-- remove the <lst name="master"> section if this is just a slave -->
@@ -928,7 +925,6 @@
     <healthcheck type="file">server-enabled</healthcheck>
     -->
   </admin>
-  <searchComponent name="spatial" class="me.outofti.solrspatiallight.SpatialQueryComponent"/>
   <requestHandler class="solr.MoreLikeThisHandler" name="/mlt">
     <lst name="defaults">
       <str name="mlt.mintf">1</str>

data/spec/api/binding_spec.rb

@@ -9,6 +9,14 @@ describe "DSL bindings" do
     value.should == 'value'
   end
 
+  it 'should give access to calling context\'s id method in search DSL' do
+    value = nil
+    session.search(Post) do
+      value = id
+    end
+    value.should == 16
+  end
+
   it 'should give access to calling context\'s methods in nested DSL block' do
     value = nil
     session.search(Post) do
@@ -35,4 +43,8 @@ describe "DSL bindings" do
   def test_method
     'value'
   end
+
+  def id
+    16
+  end
 end