0
@@ -4,13 +4,12 @@ module StrokeDB
0
 
0
   class Store
0
     include Enumerable
0
-    attr_accessor :storage, :index_store, :uuid
0
+    attr_accessor :storage, :uuid
0
     attr_reader :timestamp
0
 
0
     def initialize(options = {})
0
       @options = options.stringify_keys
0
       @storage = @options['storage']
0
-      @index_store = @options['index']
0
       initialize_files
0
       autosync! unless @options['noautosync']
0
       raise "Missing chunk storage" unless @storage

0
@@ -4,7 +4,6 @@ describe "Playlist.has_many :songs association" do
0
 
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
     Playlist = Meta.new do
0
@@ -173,7 +172,6 @@ describe "Playlist.has_many :songs association with sort slot defined" do
0
 
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
     Playlist = Meta.new do
0
@@ -195,7 +193,6 @@ describe "Playlist.has_many :songs association with sort slot defined and revers
0
 
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
     Playlist = Meta.new do
0
@@ -218,7 +215,6 @@ describe "Namespace::Playlist.has_many :songs association" do
0
 
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Namespace') if defined?(Namespace)
0
     Namespace = Module.new
0
     Namespace.nsurl 'namespace'
0
@@ -243,7 +239,6 @@ describe "Playlist.has_many :rock_songs, :through => :songs, :conditions => { :g
0
 
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
     Playlist = Meta.new do
0
@@ -265,7 +260,6 @@ describe "Playlist.has_many :songs, :foreign_reference => :belongs_to_playlist a
0
 
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
     Playlist = Meta.new do
0
@@ -286,7 +280,6 @@ describe "Playlist.has_many :all_songs, :through => :songs association" do
0
 
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
 
0
@@ -308,7 +301,6 @@ describe "Playlist.has_many :authors, :through => [:songs,:authors] association"
0
 
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
 
0
@@ -335,7 +327,6 @@ end
0
 describe "Playlist.has_many :songs, :extend => MyExt association" do
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
     Object.send!(:remove_const,'MyExt') if defined?(MyExt)
0
@@ -357,7 +348,6 @@ end
0
 describe "Playlist.has_many :songs do .. end association" do
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
     Object.send!(:remove_const,'Playlist') if defined?(Playlist)
0
     Object.send!(:remove_const,'Song') if defined?(Song)
0
     Playlist = Meta.new do

0
@@ -2,7 +2,7 @@ describe "Meta module with on_initialization callback" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new do
0
@@ -37,7 +37,7 @@ describe "Meta module with on_load callback" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new do
0
       on_load do |obj|
0
@@ -64,7 +64,7 @@ describe "Meta module with before_save callback" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new do
0
@@ -86,7 +86,7 @@ describe "Meta module with after_save callback" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new do
0
@@ -109,7 +109,7 @@ describe "Meta module with on_new_document callback" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new do

0
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
0
 
0
 def setup
0
   setup_default_store
0
-  setup_index
0
+  
0
   Object.send!(:remove_const, 'Foo') if defined?(Foo)
0
   Object.send!(:remove_const, 'Bar') if defined?(Bar)
0
   Object.send!(:remove_const, 'User') if defined?(User)

0
@@ -4,7 +4,7 @@ describe "Document class" do
0
 
0
   before(:each) do
0
     @store = setup_default_store
0
-    setup_index
0
+    
0
   end
0
 
0
   it "should be able to find document by UUID" do
0
@@ -688,7 +688,7 @@ describe "Document with a single meta" do
0
   before(:each) do
0
     @store = setup_default_store
0
     setup_default_store
0
-    setup_index
0
+    
0
     Object.send!(:remove_const, "SomeMeta") if defined? ::SomeMeta
0
     ::SomeMeta = Meta.new(@store)
0
     @meta = ::SomeMeta
0
@@ -714,7 +714,7 @@ describe "Document with multiple metas" do
0
 
0
   before(:each) do
0
     @store = setup_default_store
0
-    setup_index
0
+    
0
     @metas = []
0
     3.times do |i|
0
       @metas << Document.create!(:a => i, i => i, :name => i.to_s)

0
@@ -90,7 +90,7 @@ describe "Meta module with name" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
 
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new
0
@@ -117,7 +117,7 @@ describe "Meta module without name" do
0
     
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     @some_meta = Meta.new(:nsurl => "http://some/")
0
@@ -135,7 +135,7 @@ describe "Meta module without constant definition" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     @some_name = Meta.new(:name => 'SomeName') do
0
       def some
0
       end
0
@@ -161,7 +161,7 @@ describe "Meta module within no module" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
   end
0
@@ -187,7 +187,7 @@ describe "Meta module within module" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     module A
0
       nsurl "some url"
0
     end
0
@@ -214,7 +214,7 @@ describe "Combined meta module" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     
0
     Object.send!(:remove_const,'User') if defined?(User)
0
     Object.send!(:remove_const,'Buyer') if defined?(Buyer)
0
@@ -259,7 +259,7 @@ describe "ImplementsSomeName with implements SomeName meta" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
 
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new(:some_slot => 'some_value') do
0
@@ -312,7 +312,7 @@ describe "ImplementsSomeName with multiple implements" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
 
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new(:some_slot => 'some_value') do
0
@@ -376,7 +376,7 @@ describe "Meta#named" do
0
   
0
   before(:each) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     Object.send!(:remove_const,'SomeName') if defined?(SomeName)
0
     SomeName = Meta.new
0
   end

0
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
0
 
0
 def validations_setup
0
   setup_default_store
0
-  setup_index
0
+  
0
   Object.send!(:remove_const, 'Foo') if defined?(Foo)
0
   Object.send!(:remove_const, 'Bar') if defined?(Bar)
0
   Object.send!(:remove_const, 'User') if defined?(User)

0
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
0
 
0
 def setup
0
   setup_default_store
0
-  setup_index
0
+  
0
   Object.send!(:remove_const, 'Foo') if defined? Foo
0
   Object.send!(:remove_const, 'Bar') if defined? Bar
0
 end

0
@@ -68,7 +68,7 @@ describe "Non-empty store" do
0
 
0
   before(:each) do
0
     @store = setup_default_store
0
-    setup_index
0
+    
0
     @documents = []
0
     10.times do |i|
0
       @documents << Document.create!(:stuff => i)

0
@@ -4,7 +4,7 @@ describe "Adding meta" do
0
   
0
   before(:all) do
0
     setup_default_store
0
-    setup_index
0
+    
0
     Object.send!(:remove_const,'User') if defined?(User)
0
     Object.send!(:remove_const,'Buyer') if defined?(Buyer)
0
     User = StrokeDB::Meta.new

0
@@ -20,7 +20,7 @@ def setup_default_store(store=nil)
0
     StrokeDB::MemoryStorage.new
0
   end
0
 
0
-  $store = StrokeDB::Store.new(:storage => @storage,:index => @index, :path => @path)
0
+  $store = StrokeDB::Store.new(:storage => @storage, :path => @path)
0
   StrokeDB.stub!(:default_store).and_return($store)
0
   StrokeDB.default_store
0
 end
0
@@ -32,15 +32,6 @@ def stub_meta_in_store(store=nil)
0
   store.should_receive(:include?).with(NIL_UUID).any_number_of_times.and_return(true)
0
 end
0
 
0
-def setup_index(store=nil)
0
-  store ||= StrokeDB.default_store
0
-  index_storage = StrokeDB::InvertedListFileStorage.new(:path => TEMP_STORAGES + '/inverted_list_storage')
0
-  index_storage.clear!
0
-  @index = StrokeDB::InvertedListIndex.new(index_storage)
0
-  @index.document_store = store
0
-  store.index_store = @index
0
-  @index
0
-end
0
 
0
 Spec::Runner.configure do |config|
0
   config.after(:all) do