lib/spontaneous/site/search.rb in spontaneous-0.2.0.beta4 vs lib/spontaneous/site/search.rb in spontaneous-0.2.0.beta5

@@ -2,29 +2,19 @@
 
 class Spontaneous::Site
   module Search
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def index(name, &definition)
-        instance.index(name, &definition)
+    def indexer(revision)
+      indexer = S::Search::CompoundIndexer.new(revision, indexes.values)
+      begin
+        yield(indexer)
+      ensure
+        indexer.close
       end
+    end
 
-      def indexes
-        instance.indexes
-      end
-
-      def indexer(revision)
-        indexer = S::Search::CompoundIndexer.new(revision, indexes.values)
-        begin
-          yield(indexer)
-        ensure
-          indexer.close
-        end
-      end
-    end # ClassMethods
-
     def indexes
       @indexes ||= {}
     end
 
     def [](name)
@@ -34,10 +24,10 @@
     def []=(name, index)
       indexes[name.to_sym] = index
     end
 
     def index(name, &definition)
-      index = S::Search::Index.new(name, &definition)
+      index = S::Search::Index.new(self, name, &definition)
       self[name] = index
     end
   end
 end