sunspot 2.0.0 → 2.1.0

data/lib/sunspot/adapters.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Sunspot
   #
   # Sunspot works by saving references to the primary key (or natural ID) of
@@ -46,7 +48,7 @@ module Sunspot
     #   end
     #
     #   # then in your initializer
-    #   Sunspot::Adapters::InstanceAdapter.register(MyAdapter, File)
+    #   Sunspot::Adapters::InstanceAdapter.register(FileAdapter, File)
     #
     class InstanceAdapter
       def initialize(instance) #:nodoc:
@@ -119,16 +121,28 @@ module Sunspot
         #
         # Sunspot::NoAdapterError:: If no adapter is registered for this class
         #
-        def for(clazz) #:nodoc:
-          original_class_name = clazz.name
-          clazz.ancestors.each do |ancestor_class|
-            next if ancestor_class.name.nil? || ancestor_class.name.empty?
-            class_name = ancestor_class.name.to_sym
-            return instance_adapters[class_name] if instance_adapters[class_name]
-          end
-
+        def for(clazz)
+          adapter = registered_adapter_for(clazz) || registered_adapter_for_ancestors_of(clazz)
+          return adapter if adapter
           raise(Sunspot::NoAdapterError,
-                "No adapter is configured for #{original_class_name} or its superclasses. See the documentation for Sunspot::Adapters")
+                "No adapter is configured for #{clazz.name} or its superclasses. See the documentation for Sunspot::Adapters")
+        end
+
+        # Returns the directly-registered adapter for the specified class,
+        # if one exists, without searching the class's ancestors.
+        #
+        # === Parameters
+        #
+        # clazz<Class>:: The model class to be checked for the registered
+        #   adapter
+        #
+        # === Returns
+        #
+        # Class:: Subclass of InstanceAdapter, or nil if none found
+        #
+        def registered_adapter_for(clazz)
+          return nil if clazz.name.nil? || clazz.name.empty?
+          instance_adapters[clazz.name.to_sym]
         end
 
         def index_id_for(class_name, id) #:nodoc:
@@ -146,6 +160,16 @@ module Sunspot
         def instance_adapters #:nodoc:
           @instance_adapters ||= {}
         end
+
+        def registered_adapter_for_ancestors_of(clazz) # :nodoc:
+          clazz.ancestors.each do |ancestor_class|
+            if adapter = registered_adapter_for(ancestor_class)
+              register(adapter, clazz)
+              return adapter
+            end
+          end
+          nil
+        end
       end
     end
 
@@ -247,14 +271,27 @@ module Sunspot
         # Sunspot::NoAdapterError:: If no data accessor exists for the given class
         #
         def for(clazz) #:nodoc:
-          original_class_name = clazz.name
-          clazz.ancestors.each do |ancestor_class|
-            next if ancestor_class.name.nil? || ancestor_class.name.empty?
-            class_name = ancestor_class.name.to_sym
-            return data_accessors[class_name] if data_accessors[class_name]
-          end
+          accessor = registered_accessor_for(clazz) || registered_accessor_for_ancestors_of(clazz)
+          return accessor if accessor
           raise(Sunspot::NoAdapterError,
-                "No data accessor is configured for #{original_class_name} or its superclasses. See the documentation for Sunspot::Adapters")
+                "No data accessor is configured for #{clazz.name} or its superclasses. See the documentation for Sunspot::Adapters")
+        end
+
+        # Returns the directly-registered accessor for the specified class, if
+        # one exists, without searching the class's ancestors.
+        #
+        # === Parameters
+        #
+        # clazz<Class>:: The model class to be checked for the registered
+        #   data accessor
+        #
+        # === Returns
+        #
+        # Class:: Subclass of DataAccessor, or nil if none found
+        #
+        def registered_accessor_for(clazz)
+          return nil if clazz.name.nil? || clazz.name.empty?
+          data_accessors[clazz.name.to_sym]
         end
 
         protected
@@ -268,6 +305,16 @@ module Sunspot
         def data_accessors #:nodoc:
           @adapters ||= {}
         end
+
+        def registered_accessor_for_ancestors_of(clazz) # :nodoc:
+          clazz.ancestors.each do |ancestor_class|
+            if accessor = registered_accessor_for(ancestor_class)
+              register(accessor, clazz)
+              return accessor
+            end
+          end
+          nil
+        end
       end
     end
 

data/lib/sunspot/configuration.rb

@@ -22,7 +22,7 @@ module Sunspot
       def build #:nodoc:
         LightConfig.build do
           solr do
-            url 'http://127.0.0.1:8983/solr'
+            url 'http://127.0.0.1:8983/solr/default'
             read_timeout nil
             open_timeout nil
           end

data/lib/sunspot/query/dismax.rb

@@ -30,7 +30,7 @@ module Sunspot
         params = { :q => @keywords }
         params[:fl] = '* score'
         params[:qf] = @fulltext_fields.values.map { |field| field.to_boosted_field }.join(' ')
-        params[:defType] = 'dismax'
+        params[:defType] = 'edismax'
         if @phrase_fields
           params[:pf] = @phrase_fields.map { |field| field.to_boosted_field }.join(' ')
         end
@@ -71,7 +71,7 @@ module Sunspot
         params.delete :fl
         keywords = params.delete(:q)
         options = params.map { |key, value| escape_param(key, value) }.join(' ')
-        "_query_:\"{!dismax #{options}}#{escape_quotes(keywords)}\""
+        "_query_:\"{!edismax #{options}}#{escape_quotes(keywords)}\""
       end
 
       #
@@ -82,7 +82,7 @@ module Sunspot
         boost_query
       end
 
-      # 
+      #
       # Add a boost function
       #
       def add_boost_function(function_query)
@@ -123,7 +123,7 @@ module Sunspot
 
 
       private
-      
+
       def escape_param(key, value)
         "#{key}='#{escape_quotes(Array(value).join(" "))}'"
       end

data/lib/sunspot/query/restriction.rb

@@ -273,10 +273,23 @@ module Sunspot
       # Results must have field with value included in given collection
       #
       class AnyOf < Base
+
+        def negated?
+          if @value.empty?
+            false
+          else
+            super
+          end
+        end
+
         private
 
         def to_solr_conditional
-          "(#{@value.map { |v| solr_value v } * ' OR '})"
+          if @value.empty?
+            "[* TO *]"
+          else
+            "(#{@value.map { |v| solr_value v } * ' OR '})"
+          end
         end
       end
 
@@ -285,10 +298,22 @@ module Sunspot
       # collection (only makes sense for fields with multiple values)
       #
       class AllOf < Base
+        def negated?
+          if @value.empty?
+            false
+          else
+            super
+          end
+        end
+        
         private
 
         def to_solr_conditional
-          "(#{@value.map { |v| solr_value v } * ' AND '})"
+          if @value.empty?
+            "[* TO *]"
+          else
+            "(#{@value.map { |v| solr_value v } * ' AND '})"
+          end
         end
       end
 

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spec/api/adapters_spec.rb

@@ -14,6 +14,12 @@ describe Sunspot::Adapters::InstanceAdapter do
       Sunspot::Adapters::InstanceAdapter::for(Module.new)
     end.should raise_error(Sunspot::NoAdapterError)
   end
+
+  it "registers adapters found by ancestor lookup with the descendant class" do
+    Sunspot::Adapters::InstanceAdapter::registered_adapter_for(UnseenModel).should be(nil)
+    Sunspot::Adapters::InstanceAdapter::for(UnseenModel)
+    Sunspot::Adapters::InstanceAdapter::registered_adapter_for(UnseenModel).should be(AbstractModelInstanceAdapter)
+  end
 end
 
 describe Sunspot::Adapters::DataAccessor do
@@ -30,6 +36,12 @@ describe Sunspot::Adapters::DataAccessor do
       Sunspot::Adapters::DataAccessor::for(Module.new)
     end.should raise_error(Sunspot::NoAdapterError)
   end
+
+  it "registers adapters found by ancestor lookup with the descendant class" do
+    Sunspot::Adapters::DataAccessor::registered_accessor_for(UnseenModel).should be(nil)
+    Sunspot::Adapters::DataAccessor::for(UnseenModel)
+    Sunspot::Adapters::DataAccessor::registered_accessor_for(UnseenModel).should be(AbstractModelDataAccessor)
+  end
 end
 
 describe Sunspot::Adapters::Registry do

data/spec/api/query/fulltext_examples.rb

@@ -10,21 +10,21 @@ shared_examples_for 'fulltext query' do
     search do
       keywords ''
     end
-    connection.should_not have_last_search_with(:defType => 'dismax')
+    connection.should_not have_last_search_with(:defType => 'edismax')
   end
 
   it 'ignores keywords if nil' do
     search do
       keywords nil
     end
-    connection.should_not have_last_search_with(:defType => 'dismax')
+    connection.should_not have_last_search_with(:defType => 'edismax')
   end
 
   it 'ignores keywords with only whitespace' do
     search do
       keywords "  \t"
     end
-    connection.should_not have_last_search_with(:defType => 'dismax')
+    connection.should_not have_last_search_with(:defType => 'edismax')
   end
 
   it 'gracefully ignores keywords block if keywords ignored' do
@@ -37,7 +37,7 @@ shared_examples_for 'fulltext query' do
     search do
       keywords 'keyword search'
     end
-    connection.should have_last_search_with(:defType => 'dismax')
+    connection.should have_last_search_with(:defType => 'edismax')
   end
 
   it 'searches types in filter query if keywords used' do

data/spec/api/query/geo_examples.rb

@@ -41,11 +41,11 @@ shared_examples_for 'geohash query' do
       fulltext 'pizza', :fields => :title
       with(:coordinates).near(40.7, -73.5)
     end
-    expected = 
-      "{!dismax fl='* score' qf='title_text'}pizza (#{build_geo_query})"
+    expected =
+      "{!edismax fl='* score' qf='title_text'}pizza (#{build_geo_query})"
     connection.should have_last_search_including(
       :q,
-      %Q(_query_:"{!dismax qf='title_text'}pizza" (#{build_geo_query}))
+      %Q(_query_:"{!edismax qf='title_text'}pizza" (#{build_geo_query}))
     )
   end
 
@@ -57,7 +57,7 @@ shared_examples_for 'geohash query' do
     boost = options[:boost] || 1.0
     hash = 'dr5xx3nytvgs'
     (precision..12).map do |i|
-      phrase = 
+      phrase =
         if i == 12 then hash
         else "#{hash[0, i]}*"
         end

data/spec/api/session_proxy/class_sharding_session_proxy_spec.rb

@@ -68,7 +68,7 @@ describe Sunspot::SessionProxy::ClassShardingSessionProxy do
 
   [:dirty, :delete_dirty].each do |method|
     it "should be dirty if any of the sessions are dirty" do
-      @proxy.post_session.stub!(:"#{method}?").and_return(true)
+      @proxy.post_session.stub(:"#{method}?").and_return(true)
       @proxy.should send("be_#{method}")
     end
 

data/spec/api/session_proxy/retry_5xx_session_proxy_spec.rb

@@ -53,7 +53,7 @@ describe Sunspot::SessionProxy::Retry5xxSessionProxy do
 
     @sunspot_session.should_receive(:index).and_return do
       @sunspot_session.should_receive(:index).and_return do
-        @sunspot_session.stub!(:index).and_return(fake_success)
+        @sunspot_session.stub(:index).and_return(fake_success)
         raise e
       end
       raise e

data/spec/api/session_proxy/sharding_session_proxy_spec.rb

@@ -60,7 +60,7 @@ describe Sunspot::SessionProxy::ShardingSessionProxy do
 
   [:dirty, :delete_dirty].each do |method|
     it "should be dirty if any of the sessions are dirty" do
-      @proxy.sessions[0].stub!(:"#{method}?").and_return(true)
+      @proxy.sessions[0].stub(:"#{method}?").and_return(true)
       @proxy.should send("be_#{method}")
     end
 

data/spec/api/session_proxy/silent_fail_session_proxy_spec.rb

@@ -13,7 +13,7 @@ describe Sunspot::SessionProxy::ShardingSessionProxy do
   it "should call rescued_exception when an exception is caught" do
     SUPPORTED_METHODS.each do |method|
       e = FakeException.new(method)
-      @search_session.stub!(method).and_raise(e)
+      @search_session.stub(method).and_raise(e)
       @proxy.should_receive(:rescued_exception).with(method, e)
       @proxy.send(method)
     end

data/spec/api/session_spec.rb

@@ -77,7 +77,7 @@ describe 'Session' do
 
     it 'should open connection with defaults if nothing specified' do
       Sunspot.commit
-      connection.opts[:url].should == 'http://127.0.0.1:8983/solr'
+      connection.opts[:url].should == 'http://127.0.0.1:8983/solr/default'
     end
 
     it 'should open a connection with custom host' do
@@ -217,7 +217,7 @@ describe 'Session' do
 
   context 'session proxy' do
     it 'should send messages to manually assigned session proxy' do
-      stub_session = stub!('session')
+      stub_session = stub('session')
       Sunspot.session = stub_session
       post = Post.new
       stub_session.should_receive(:index).with(post)

data/spec/helpers/integration_helper.rb

@@ -1,7 +1,7 @@
 module IntegrationHelper
   def self.included(base)
     base.before(:all) do
-      Sunspot.config.solr.url = ENV['SOLR_URL'] || 'http://localhost:8983/solr'
+      Sunspot.config.solr.url = ENV['SOLR_URL'] || 'http://localhost:8983/solr/default'
       Sunspot.reset!(true)
     end
   end

data/spec/helpers/query_helper.rb

@@ -11,7 +11,7 @@ module QueryHelper
   def subqueries(param)
     q = connection.searches.last[:q]
     subqueries = []
-    subqueries = q.scan(%r(_query_:"\{!dismax (.*?)\}(.*?)"))
+    subqueries = q.scan(%r(_query_:"\{!edismax (.*?)\}(.*?)"))
     subqueries.map do |subquery|
       params = {}
       subquery[0].scan(%r((\S+?)='(.+?)')) do |key, value|

data/spec/integration/keyword_search_spec.rb

@@ -16,6 +16,34 @@ describe 'keyword search' do
       Sunspot.index!(@comment)
     end
 
+    context 'edismax' do
+      it 'matches with wildcards' do
+        results = Sunspot.search(Post) { keywords '*oas*' }.results
+        [0,2].each { |i| results.should include(@posts[i])}
+        [1].each { |i| results.should_not include(@posts[i])}
+      end
+
+      it 'matches multiple keywords on different fields with wildcards using subqueries' do
+        results = Sunspot.search(Post) do
+          keywords 'insuffic*',:fields=>[:title]
+          keywords 'win*',:fields=>[:body]
+        end.results
+        [0].each {|i| results.should include(@posts[i])}
+        [1,2].each {|i| results.should_not include(@posts[i])}
+      end
+
+      it 'matches with proximity' do
+        results = Sunspot.search(Post) { keywords '"wind buffer"~4' }.results
+        [0,1].each {|i| results.should_not include(@posts[i])}
+        [2].each {|i| results.should include(@posts[i])}
+      end
+
+      it 'does not match if not within proximity' do
+        results = Sunspot.search(Post) { keywords '"wind buffer"~1' }.results
+        results.should == []
+      end
+    end
+
     it 'matches a single keyword out of a single field' do
       results = Sunspot.search(Post) { keywords 'toast' }.results
       [0, 2].each { |i| results.should include(@posts[i]) }

data/spec/integration/scoped_search_spec.rb

@@ -266,6 +266,44 @@ describe 'scoped_search' do
       end.results.should == posts[0..1]
     end
 
+    it 'should return results, ignoring any restriction in a disjunction that has been passed an empty array' do
+      posts = (1..3).map { |i| Post.new(:blog_id => i)}
+      Sunspot.index!(posts)
+      Sunspot.search(Post) do
+        with(:blog_id, [])
+      end.results.should == posts
+    end
+
+    it 'should return results, ignoring any restriction in a negative disjunction that has been passed an empty array' do
+      posts = (1..3).map { |i| Post.new(:blog_id => i)}
+      Sunspot.index!(posts)
+      Sunspot.search(Post) do
+        without(:blog_id, [])
+      end.results.should == posts
+    end 
+
+    it 'should return results, ignoring any restriction in a conjunction that has been passed an empty array' do
+      posts = (1..3).map { |i| Post.new(:blog_id => i)}
+      Sunspot.index!(posts)
+      Sunspot.search(Post) do
+        all_of do
+          with(:blog_id, 1)
+          with(:blog_id, [])
+        end
+      end.results.should == posts[0..0]
+    end
+
+    it 'should return results, ignoring any restriction in a negative conjunction that has been passed an empty array' do
+      posts = (1..3).map { |i| Post.new(:blog_id => i)}
+      Sunspot.index!(posts)
+      Sunspot.search(Post) do
+        all_of do
+          with(:blog_id, 1)
+          without(:blog_id, [])
+        end
+      end.results.should == posts[0..0]
+    end
+
     it 'should return results that match a nested conjunction in a disjunction' do
       posts = [
         Post.new(:title => 'No', :blog_id => 1),
@@ -379,7 +417,7 @@ describe 'scoped_search' do
 
     it 'should order randomly (run this test again if it fails)' do
       result_sets = Array.new(2) do
-        Sunspot.search(Post) { order_by_random }.results.map do |result|
+        Sunspot.search(Post) { order_by(:random) }.results.map do |result|
           result.id
         end
       end

data/spec/mocks/adapters.rb

@@ -4,6 +4,9 @@ end
 class Model < AbstractModel
 end
 
+class UnseenModel < AbstractModel
+end
+
 class AbstractModelInstanceAdapter < Sunspot::Adapters::InstanceAdapter
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -82,7 +82,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -90,14 +90,13 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    Sunspot is a library providing a powerful, all-ruby API for the
-  Solr search engine. Sunspot manages the configuration of persistent\n    Ruby classes
-  for search and indexing and exposes Solr's most powerful features through a collection
-  of DSLs. Complex search operations\n    can be performed without hand-writing any
-  boolean queries or building Solr parameters by hand.\n"
+description: |2
+      Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent
+      Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations
+      can be performed without hand-writing any boolean queries or building Solr parameters by hand.
 email:
 - mat@patch.com
 executables: []
@@ -299,18 +298,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Library for expressive, powerful interaction with the Solr search engine