rhoconnect 3.4.5 → 4.0.0.beta.10

data/spec/server/stats_spec.rb

@@ -11,7 +11,7 @@ describe "Middleware" do
   
   before(:each) do
     @now = 10.0
-    Store.db.flushdb
+    Store.flush_all
     app = mock('app')
     app.stub!(:call)
     Rhoconnect.stats = true

data/spec/source_adapter_spec.rb

@@ -1,21 +1,32 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
-class Rhoconnect::SourceAdapter 
+class Rhoconnect::Model::Base 
   def inject_result(result) 
     @result = result
   end
   
-  def inject_tmpdoc(docname)
-    @tmp_docname = docname
+  def inject_tmpdoc(doctype)
+    @tmp_docname = doctype
     @stash_size = 0
   end
 end
 
-describe "SourceAdapter" do
+describe "loading Model" do
+  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
+    it "should load Model instance from user name" do
+      username = 'testuser'
+      model_instance = SimpleAdapter.load(username)
+      model_instance.class.name.should == 'SimpleAdapter'
+      model_instance.source.name.should == 'SimpleAdapter'
+    end
+  end
+end
+
+describe "Model" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
     before(:each) do
       @s = Source.load('SimpleAdapter',@s_params)
-      @sa = SourceAdapter.create(@s,nil)
+      @sa = Rhoconnect::Model::Base.create(@s)
     end
 
     def setup_adapter(name)
@@ -28,53 +39,67 @@ describe "SourceAdapter" do
       Source.create(fields,@s_params)
     end
 
-    it "should create SourceAdapter with source" do
+    it "should create model with source" do
       @sa.class.name.should == @s.name
     end
     
-    it "should create all existing pre-defined adapters" do
+    it "should create all existing pre-defined models" do
       Rhoconnect.predefined_sources.keys.sort.should == ['RhoInternalBenchmarkAdapter'].sort
       Rhoconnect.predefined_sources.each do |adapter_name, filename|
         pas = Source.load(adapter_name, @s_params)
         pas.should_not == nil
-        pa = SourceAdapter.create(pas)
+        pa = Rhoconnect::Model::Base.create(pas)
         pa.class.name.should == "Rhoconnect::#{adapter_name}"
       end
     end
     
-    it "should create DynamicAdapter" do
-      @sa1 = SourceAdapter.create(@s2)
-      @sa1.class.name.should == 'Rhoconnect::DynamicAdapter'
+    it "should create DynamicAdapterModel" do
+      @sa1 = Rhoconnect::Model::Base.create(@s2)
+      @sa1.class.name.should == 'Rhoconnect::Model::DynamicAdapterModel'
     end
     
     it "should capture exception in create" do
-      DynamicAdapter.should_receive(:new).once.and_raise(Exception)
-      lambda { @sa1 = SourceAdapter.create(@s2) }.should raise_error(Exception)
+      Rhoconnect::Model::DynamicAdapterModel.should_receive(:new).once.and_raise(Exception)
+      lambda { @sa1 = Rhoconnect::Model::Base.create(@s2) }.should raise_error(Exception)
     end
 
-    it "should fail to create SourceAdapter" do
+    it "should fail to create Bro-ken model" do
       broken_source = setup_adapter('Bro-ken')    
-      lambda { SourceAdapter.create(broken_source) }.should raise_error(Exception)
+      lambda { Rhoconnect::Model::Base.create(broken_source) }.should raise_error(Exception)
       broken_source.delete
     end
 
-    it "should create SourceAdapter with trailing spaces" do
+    it "should create model with trailing spaces" do
       s = setup_adapter('SimpleAdapter ')
-      SourceAdapter.create(s,nil).is_a?(SimpleAdapter).should be_true
+      Rhoconnect::Model::Base.create(s).is_a?(SimpleAdapter).should be_true
     end
 
-    describe "SourceAdapter methods" do
-      it "should execute SourceAdapter login method with source vars" do
+    describe "model methods" do
+      it "should execute Model login method with source vars" do
         @sa.login.should == true
       end
 
-      it "should execute SourceAdapter query method" do
+      it "should get Model data (:md)" do
+        expected = {'1'=>@product1,'2'=>@product2}
+        @s.put_data(:md, expected)
+        @sa.get_data.should == expected  
+      end
+
+      it "should get Model data from specific document" do
+        expected = {'4'=>@product1,'5'=>@product2}
+        Source.define_valid_doctypes([:md_custom])
+        @s.put_data(:md_custom, expected)
+        @sa.get_data(:md_custom).should == expected  
+        Source.valid_doctypes.delete(:md_custom)
+      end
+
+      it "should execute Model query method" do
         expected = {'1'=>@product1,'2'=>@product2}
         @sa.inject_result expected
         @sa.query.should == expected
       end
 
-      it "should execute SourceAdapter search method and modify params" do
+      it "should execute Model search method and modify params" do
         params = {:hello => 'world'}
         expected = {'1'=>@product1,'2'=>@product2}
         @sa.inject_result expected
@@ -82,12 +107,12 @@ describe "SourceAdapter" do
         params.should == {:hello => 'world', :foo => 'bar'}
       end
 
-      it "should execute SourceAdapter login with current_user" do
+      it "should execute Model login with current_user" do
         @sa.should_receive(:current_user).with(no_args()).and_return(@u)
         @sa.login
       end
 
-      it "should execute SourceAdapter sync method" do
+      it "should execute Model sync method" do
         expected = {'1'=>@product1,'2'=>@product2}
         @sa.inject_result expected
         @sa.do_query
@@ -109,21 +134,23 @@ describe "SourceAdapter" do
         Store.get_value(@s.docname(:md_size)).to_i.should == 0
       end
 
-      it "should execute SourceAdapter create method" do
+      it "should execute Model create method" do
         @sa.create(@product4).should == 'obj4'
       end
 
       it "should stash @result in store and set it to nil" do
         expected = {'1'=>@product1,'2'=>@product2}
+        Source.define_valid_doctypes(['tmpdoc'.to_sym])
         @sa.inject_result(expected)
         @sa.inject_tmpdoc('tmpdoc')
         @sa.stash_result
-        Store.get_data('tmpdoc').should == expected
+        @s.get_data('tmpdoc').should == expected
+        Source.valid_doctypes.delete('tmpdoc'.to_sym)
       end
 
-      describe "SourceAdapter metadata method" do
+      describe "Model metadata method" do
 
-        it "should execute SourceAdapter metadata method" do
+        it "should execute Model metadata method" do
           mock_metadata_method([SimpleAdapter]) do
             @sa.metadata.should == "{\"foo\":\"bar\"}"
           end

data/spec/source_spec.rb

@@ -63,10 +63,15 @@ describe "Source" do
   
     it "should delete master and all documents associated with source" do
       key = @s.docname('*')
-      set_state(key => @data)
+      Source.define_valid_doctypes([:md_source])
+      set_doc_state(@s, {:md_source => @data})
       @s.delete
-      verify_result(key => {})
-      Store.db.keys(key).should == []
+      i = 0
+      while i < Store.num_stores do
+        Store.get_store(i).keys(key).should == []
+        i += 1
+      end
+      Source.valid_doctypes.delete(:md_source)
       @s = Source.create(@s_fields,@s_params)
     end