@@ -4,13 +4,12 @@ module StrokeDB class Store include Enumerable - attr_accessor :storage, :index_store, :uuid + attr_accessor :storage, :uuid attr_reader :timestamp def initialize(options = {}) @options = options.stringify_keys @storage = @options['storage'] - @index_store = @options['index'] initialize_files autosync! unless @options['noautosync'] raise "Missing chunk storage" unless @storage lib/strokedb/store.rb @@ -4,7 +4,6 @@ describe "Playlist.has_many :songs association" do before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) Playlist = Meta.new do @@ -173,7 +172,6 @@ describe "Playlist.has_many :songs association with sort slot defined" do before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) Playlist = Meta.new do @@ -195,7 +193,6 @@ describe "Playlist.has_many :songs association with sort slot defined and revers before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) Playlist = Meta.new do @@ -218,7 +215,6 @@ describe "Namespace::Playlist.has_many :songs association" do before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Namespace') if defined?(Namespace) Namespace = Module.new Namespace.nsurl 'namespace' @@ -243,7 +239,6 @@ describe "Playlist.has_many :rock_songs, :through => :songs, :conditions => { :g before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) Playlist = Meta.new do @@ -265,7 +260,6 @@ describe "Playlist.has_many :songs, :foreign_reference => :belongs_to_playlist a before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) Playlist = Meta.new do @@ -286,7 +280,6 @@ describe "Playlist.has_many :all_songs, :through => :songs association" do before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) @@ -308,7 +301,6 @@ describe "Playlist.has_many :authors, :through => [:songs,:authors] association" before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) @@ -335,7 +327,6 @@ end describe "Playlist.has_many :songs, :extend => MyExt association" do before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) Object.send!(:remove_const,'MyExt') if defined?(MyExt) @@ -357,7 +348,6 @@ end describe "Playlist.has_many :songs do .. end association" do before(:each) do setup_default_store - setup_index Object.send!(:remove_const,'Playlist') if defined?(Playlist) Object.send!(:remove_const,'Song') if defined?(Song) Playlist = Meta.new do spec/lib/strokedb/document/associations_spec.rb @@ -2,7 +2,7 @@ describe "Meta module with on_initialization callback" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new do @@ -37,7 +37,7 @@ describe "Meta module with on_load callback" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new do on_load do |obj| @@ -64,7 +64,7 @@ describe "Meta module with before_save callback" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new do @@ -86,7 +86,7 @@ describe "Meta module with after_save callback" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new do @@ -109,7 +109,7 @@ describe "Meta module with on_new_document callback" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new do spec/lib/strokedb/document/callbacks_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper' def setup setup_default_store - setup_index + Object.send!(:remove_const, 'Foo') if defined?(Foo) Object.send!(:remove_const, 'Bar') if defined?(Bar) Object.send!(:remove_const, 'User') if defined?(User) spec/lib/strokedb/document/coercions_spec.rb @@ -4,7 +4,7 @@ describe "Document class" do before(:each) do @store = setup_default_store - setup_index + end it "should be able to find document by UUID" do @@ -688,7 +688,7 @@ describe "Document with a single meta" do before(:each) do @store = setup_default_store setup_default_store - setup_index + Object.send!(:remove_const, "SomeMeta") if defined? ::SomeMeta ::SomeMeta = Meta.new(@store) @meta = ::SomeMeta @@ -714,7 +714,7 @@ describe "Document with multiple metas" do before(:each) do @store = setup_default_store - setup_index + @metas = [] 3.times do |i| @metas << Document.create!(:a => i, i => i, :name => i.to_s) spec/lib/strokedb/document/document_spec.rb @@ -90,7 +90,7 @@ describe "Meta module with name" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new @@ -117,7 +117,7 @@ describe "Meta module without name" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) @some_meta = Meta.new(:nsurl => "http://some/") @@ -135,7 +135,7 @@ describe "Meta module without constant definition" do before(:each) do setup_default_store - setup_index + @some_name = Meta.new(:name => 'SomeName') do def some end @@ -161,7 +161,7 @@ describe "Meta module within no module" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) end @@ -187,7 +187,7 @@ describe "Meta module within module" do before(:each) do setup_default_store - setup_index + module A nsurl "some url" end @@ -214,7 +214,7 @@ describe "Combined meta module" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'User') if defined?(User) Object.send!(:remove_const,'Buyer') if defined?(Buyer) @@ -259,7 +259,7 @@ describe "ImplementsSomeName with implements SomeName meta" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new(:some_slot => 'some_value') do @@ -312,7 +312,7 @@ describe "ImplementsSomeName with multiple implements" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new(:some_slot => 'some_value') do @@ -376,7 +376,7 @@ describe "Meta#named" do before(:each) do setup_default_store - setup_index + Object.send!(:remove_const,'SomeName') if defined?(SomeName) SomeName = Meta.new end spec/lib/strokedb/document/meta_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper' def validations_setup setup_default_store - setup_index + Object.send!(:remove_const, 'Foo') if defined?(Foo) Object.send!(:remove_const, 'Bar') if defined?(Bar) Object.send!(:remove_const, 'User') if defined?(User) spec/lib/strokedb/document/validations_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper' def setup setup_default_store - setup_index + Object.send!(:remove_const, 'Foo') if defined? Foo Object.send!(:remove_const, 'Bar') if defined? Bar end spec/lib/strokedb/document/virtualize_spec.rb @@ -68,7 +68,7 @@ describe "Non-empty store" do before(:each) do @store = setup_default_store - setup_index + @documents = [] 10.times do |i| @documents << Document.create!(:stuff => i) spec/lib/strokedb/stores/store_spec.rb @@ -4,7 +4,7 @@ describe "Adding meta" do before(:all) do setup_default_store - setup_index + Object.send!(:remove_const,'User') if defined?(User) Object.send!(:remove_const,'Buyer') if defined?(Buyer) User = StrokeDB::Meta.new spec/regression/meta_spec.rb @@ -20,7 +20,7 @@ def setup_default_store(store=nil) StrokeDB::MemoryStorage.new end - $store = StrokeDB::Store.new(:storage => @storage,:index => @index, :path => @path) + $store = StrokeDB::Store.new(:storage => @storage, :path => @path) StrokeDB.stub!(:default_store).and_return($store) StrokeDB.default_store end @@ -32,15 +32,6 @@ def stub_meta_in_store(store=nil) store.should_receive(:include?).with(NIL_UUID).any_number_of_times.and_return(true) end -def setup_index(store=nil) - store ||= StrokeDB.default_store - index_storage = StrokeDB::InvertedListFileStorage.new(:path => TEMP_STORAGES + '/inverted_list_storage') - index_storage.clear! - @index = StrokeDB::InvertedListIndex.new(index_storage) - @index.document_store = store - store.index_store = @index - @index -end Spec::Runner.configure do |config| config.after(:all) do spec/spec_helper.rb 518bb24eddf65171ba114cb02affa836077e16fc Oleg Andreev oleganza@idbns.com http://github.com/yrashk/strokedb/commit/962b10f4784610cbdbd6e408ec98b7a84051fa16 962b10f4784610cbdbd6e408ec98b7a84051fa16 2008-06-08T11:04:17-07:00 2008-06-08T11:04:17-07:00 removed setup_index spec helper cf8e501e12f96cd515ff3c62de6c12ec1a2f5cba Oleg Andreev oleganza@idbns.com