[Fixes #108] Only stores one class of a given name to avoid memory le…

…aks when classes are reloaded (e.g., Rails development mode)

sunspot/lib/sunspot.rb

@@ -14,7 +14,7 @@
 
 %w(util adapters configuration setup composite_setup text_field_setup field
    field_factory data_extractor indexer query search session session_proxy
-   type dsl).each do |filename|
+   type dsl class_set).each do |filename|
   require File.join(File.dirname(__FILE__), 'sunspot', filename)
 end
 
@@ -45,7 +45,7 @@ module Sunspot
 
   # Array to track classes that have been set up for searching.
   # Used by, e.g., Sunspot::Rails for reindexing all searchable classes.
-  @searchable = []
+  @searchable = ClassSet.new
 
   class <<self
     # 

sunspot/lib/sunspot/class_set.rb

@@ -0,0 +1,23 @@
+module Sunspot
+  class ClassSet
+    include Enumerable
+
+    def initialize
+      @name_to_klass = {}
+    end
+
+    def <<(klass)
+      @name_to_klass[klass.name.to_sym] = klass
+      self
+    end
+    alias_method :add, :<<
+
+    def each(&block)
+      @name_to_klass.values.each(&block)
+    end
+
+    def empty?
+      @name_to_klass.empty?
+    end
+  end
+end

sunspot/spec/api/class_set_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Sunspot::ClassSet do
+  it "is enumerable" do
+    class1, class2 = stub(:name => "Class1"), stub(:name => "Class2")
+
+    set = described_class.new
+    set << class1 << class2
+
+    set.to_a.should == [class1, class2]
+  end
+
+  it "replaces classes with the same name" do
+    set = described_class.new
+
+    class1 = stub(:name => "Class1")
+    set << class1
+    set.to_a.should == [class1]
+
+    class1_dup = stub(:name => "Class1")
+    set << class1_dup
+    set.to_a.should == [class1_dup]
+  end
+end