outoftime-sunspot 0.8.3 → 0.8.4

data/README.rdoc

@@ -151,8 +151,9 @@ http://outoftime.lighthouseapp.com/projects/20339-sunspot
 
 == Contributors
 
-Mat Brown (mat@patch.com)
-Peer Allan
+* Mat Brown (mat@patch.com)
+* Peer Allan (peer.allan@gmail.com)
+* Dmitriy Dzema (dima@dzema.name)
 
 == License
 

data/TODO

@@ -6,6 +6,9 @@
 * Instantiated facets!
 * Direct access to adapter
 * sunspot-configure-solr
+* Text fields allow multiple
+* Don't allow ordering on multiple-allowed fields
+* Transactions
 * Switch to RSolr
 * Facet by type (?)
 * Query-based faceting (?)

data/VERSION.yml

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

data/lib/sunspot/adapters.rb

@@ -117,11 +117,12 @@ module Sunspot
         #
         def for(clazz) #:nodoc:
           original_class_name = clazz.name
-          while clazz != Object
-            class_name = clazz.name.to_sym
+          clazz.ancestors.each do |ancestor_class|
+            next if ancestor_class.name.empty?
+            class_name = ancestor_class.name.to_sym
             return instance_adapters[class_name] if instance_adapters[class_name]
-            clazz = clazz.superclass
           end
+
           raise(Sunspot::NoAdapterError,
                 "No adapter is configured for #{original_class_name} or its superclasses. See the documentation for Sunspot::Adapters")
         end
@@ -229,10 +230,10 @@ module Sunspot
         # Class:: Implementation of DataAccessor, or nil if none found
         #
         def for(clazz) #:nodoc:
-          while clazz != Object
-            class_name = clazz.name.to_sym
+          clazz.ancestors.each do |ancestor_class|
+            next if ancestor_class.name.empty?
+            class_name = ancestor_class.name.to_sym
             return data_accessors[class_name] if data_accessors[class_name]
-            clazz = clazz.superclass
           end
         end
 

data/spec/api/adapters_spec.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe Sunspot::Adapters::InstanceAdapter do
+  it "finds adapter by superclass" do
+    Sunspot::Adapters::InstanceAdapter::for(Model).should be(AbstractModelInstanceAdapter)
+  end
+
+  it "finds adapter by mixin" do
+    Sunspot::Adapters::InstanceAdapter::for(MixModel).should be(MixInModelInstanceAdapter)
+  end
+end
+
+describe Sunspot::Adapters::DataAccessor do
+  it "finds adapter by superclass" do
+    Sunspot::Adapters::DataAccessor::for(Model).should be(AbstractModelDataAccessor)
+  end
+
+  it "finds adapter by mixin" do
+    Sunspot::Adapters::DataAccessor::for(MixModel).should be(MixInModelDataAccessor)
+  end
+end

data/spec/mocks/adapters.rb

@@ -0,0 +1,32 @@
+class AbstractModel
+end
+
+class Model < AbstractModel
+end
+
+class AbstractModelInstanceAdapter < Sunspot::Adapters::InstanceAdapter
+end
+
+class AbstractModelDataAccessor < Sunspot::Adapters::DataAccessor
+end
+
+Sunspot::Adapters::InstanceAdapter.register(AbstractModelInstanceAdapter, AbstractModel)
+Sunspot::Adapters::DataAccessor.register(AbstractModelDataAccessor, AbstractModel)
+
+
+module MixInModel
+end
+
+class MixModel
+  include MixInModel
+end
+
+class MixInModelInstanceAdapter < Sunspot::Adapters::InstanceAdapter
+end
+
+class MixInModelDataAccessor < Sunspot::Adapters::DataAccessor
+end
+
+Sunspot::Adapters::InstanceAdapter.register(MixInModelInstanceAdapter, MixInModel)
+Sunspot::Adapters::DataAccessor.register(MixInModelDataAccessor, MixInModel)
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Mat Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -07:00
+date: 2009-06-09 00:00:00 -07:00
 default_executable: sunspot-solr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,7 @@ files:
 - solr/solr/conf/synonyms.txt
 - solr/start.jar
 - solr/webapps/solr.war
+- spec/api/adapters_spec.rb
 - spec/api/build_search_spec.rb
 - spec/api/indexer_spec.rb
 - spec/api/query_spec.rb
@@ -112,6 +113,7 @@ files:
 - spec/integration/scoped_search_spec.rb
 - spec/integration/spec_helper.rb
 - spec/integration/test_pagination.rb
+- spec/mocks/adapters.rb
 - spec/mocks/base_class.rb
 - spec/mocks/comment.rb
 - spec/mocks/mock_adapter.rb
@@ -163,6 +165,7 @@ test_files:
 - spec/integration/dynamic_fields_spec.rb
 - spec/integration/test_pagination.rb
 - spec/mocks/base_class.rb
+- spec/mocks/adapters.rb
 - spec/mocks/mock_adapter.rb
 - spec/mocks/user.rb
 - spec/mocks/post.rb
@@ -170,6 +173,7 @@ test_files:
 - spec/api/search_retrieval_spec.rb
 - spec/api/spec_helper.rb
 - spec/api/session_spec.rb
+- spec/api/adapters_spec.rb
 - spec/api/build_search_spec.rb
 - spec/api/indexer_spec.rb
 - spec/api/query_spec.rb