Fix sunspot options for inheritence

Mat Brown · Mat Brown · commit ebe055fbeb1c · 2009-12-22T09:59:41.000-05:00
diff --git a/lib/sunspot/rails/session_proxy.rb b/lib/sunspot/rails/session_proxy.rb
@@ -6,7 +6,21 @@ class SessionProxy
       class <<self
         def instance
           synchronize do
-            @instance ||= new
+            @instance ||=
+              begin
+                configuration = Sunspot::Rails::Configuration.new
+                if configuration.has_master?
+                  new(configuration)
+                else
+                  session = Sunspot::Session.new
+                  session.config.solr.url = URI::HTTP.build(
+                    :host => configuration.hostname,
+                    :port => configuration.port,
+                    :path => configuration.path
+                  ).to_s
+                  session
+                end
+              end
           end
         end
 
@@ -24,8 +38,8 @@ def reset!
                :remove_by_id!, :remove_all, :remove_all!, :dirty?, :commit_if_dirty, :batch,
                :to => :write_session
 
-      def initialize
-        @configuration = Sunspot::Rails::Configuration.new
+      def initialize(configuration)
+        @configuration = configuration
       end
 
       private
diff --git a/lib/sunspot/rails/util.rb b/lib/sunspot/rails/util.rb
@@ -10,10 +10,20 @@ def sunspot_options
         
         def index_relevant_attribute_changed?( object )
           class_key = object.class.to_s.underscore.to_sym
-          ignore_attributes = (sunspot_options[class_key][:ignore_attribute_changes_of] || [])
+          ignore_attributes = sunspot_options_for(object.class)[:ignore_attribute_changes_of] || []
           !(object.changes.symbolize_keys.keys - ignore_attributes).blank?
         end
-        
+
+        private
+
+        def sunspot_options_for(clazz)
+          class_key = clazz.to_s.underscore.to_sym
+          if options = sunspot_options[class_key]
+            options
+          elsif superclass = clazz.superclass
+            sunspot_options_for(superclass)
+          end
+        end
       end
     end
   end
diff --git a/spec/mock_app/app/models/photo_post_with_auto.rb b/spec/mock_app/app/models/photo_post_with_auto.rb
@@ -0,0 +1,2 @@
+class PhotoPostWithAuto < PostWithAuto
+end
diff --git a/spec/util_spec.rb b/spec/util_spec.rb
@@ -12,4 +12,10 @@
     @post.should_receive(:changes).and_return(:updated_at => Date.tomorrow)
     Sunspot::Rails::Util.index_relevant_attribute_changed?(@post).should == false
   end
+
+  it "should know about relevant index attributes with subclasses" do
+    @post = PhotoPostWithAuto.new
+    @post.should_receive(:changes).and_return(:title => 'new_title')
+    Sunspot::Rails::Util.index_relevant_attribute_changed?(@post).should == true
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class PhotoPostWithAuto < PostWithAuto`
	`2`	`+end`