active-fedora 3.0.7 → 3.1.0.pre1

data/spec/unit/datastream_concurrency_spec.rb

@@ -7,19 +7,20 @@ require 'ftools'
 describe ActiveFedora::Datastream do
   
   before(:each) do
-    Fedora::Repository.instance.expects(:nextid).returns("foo")
     @test_object = ActiveFedora::Base.new
-    @test_datastream = ActiveFedora::Datastream.new(:pid=>@test_object.pid, :dsid=>'abcd', :blob=>StringIO.new("hi there"))
+    @test_datastream = ActiveFedora::Datastream.new(@test_object.inner_object, 'abcd')
+    @test_datastream.content = 'hi there'
   end
   
   it "should provide #last_modified_in_repository" do
+    pending
     @test_datastream.should respond_to(:last_modified_in_repository)
   end
   
   it 'should update @last_modified when #save or #content is called' do 
     pending
-    Fedora::Repository.any_instance.stubs(:save)
-    Fedora::Repository.any_instance.stubs(:fetch_custom)
+    # ActiveFedora::Repository.any_instance.stubs(:save)
+    # ActiveFedora::Repository.any_instance.stubs(:fetch_custom)
     @test_datastream.expects(:last_modified=).times(2)
     @test_datastream.expects(:last_modified_in_repository).times(3)
     @test_datastream.save

data/spec/unit/datastream_spec.rb

@@ -7,29 +7,10 @@ require 'ftools'
 describe ActiveFedora::Datastream do
   
   before(:each) do
-    Fedora::Repository.instance.expects(:nextid).returns("foo")
     @test_object = ActiveFedora::Base.new
-    @test_datastream = ActiveFedora::Datastream.new(:pid=>@test_object.pid, :dsid=>'abcd', :blob=>StringIO.new("hi there"))
-  end
-
-  it "should implement delete" do
-    Fedora::Repository.instance.expects(:delete).with('foo/datastreams/abcd').returns(true).times(2)
-    @test_datastream.delete.should == true
-    ActiveFedora::Datastream.delete('foo', 'abcd').should == true
-  end
-  
-  it "should set control_group" do
-    xml=<<-EOF
-    <?xml version="1.0" encoding="UTF-8"?>
-    <foxml:datastream xmlns:foxml="foo" ID="Addelson_Frances19971114_FINAL.doc" STATE="A" CONTROL_GROUP="M" VERSIONABLE="true">
-        <foxml:datastreamVersion ID="Addelson_Frances19971114_FINAL.doc.0" LABEL="Addelson_Frances19971114_FINAL.doc" CREATED="2008-11-19T18:18:46.631Z" MIMETYPE="application/msword">
-          <foxml:contentLocation TYPE="INTERNAL_ID" REF="changeme:551+Addelson_Frances19971114_FINAL.doc+Addelson_Frances19971114_FINAL.doc.0"/>
-        </foxml:datastreamVersion>
-      </foxml:datastream>
-    EOF
-    n = ActiveFedora::Datastream.from_xml(ActiveFedora::Datastream.new, Nokogiri::XML::Document.parse(xml).root)
-    n.control_group.should == 'M'
-
+    @test_datastream = ActiveFedora::Datastream.new(@test_object.inner_object, 'abcd')
+    #:pid=>@test_object.pid, :dsid=>'abcd', :blob=>StringIO.new("hi there"))
+    @test_datastream.content = "hi there"
   end
 
   it "should escape dots in  to_param" do
@@ -45,7 +26,12 @@ describe ActiveFedora::Datastream do
   
   describe '#save' do
     it 'should call #before_save and #after_save' do
-      Fedora::Repository.instance.stubs(:save)
+      @mock_repo = mock('repository')
+      @mock_repo.stubs(:add_datastream).with(:versionable => true, :pid => nil, :dsid => 'abcd', :controlGroup => 'M', :dsState => 'A', :content => 'hi there', :checksumType => 'DISABLED')
+      @mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => nil)
+      @test_object.inner_object.stubs(:repository).returns(@mock_repo)
+      @test_object.inner_object.stubs(:pid).returns(@pid)
+
       @test_datastream.stubs(:last_modified_in_repository)
       @test_datastream.expects(:before_save)
       @test_datastream.expects(:after_save)
@@ -53,21 +39,24 @@ describe ActiveFedora::Datastream do
     end
     
     it "should set @dirty to false" do
-      Fedora::Repository.instance.stubs(:save)
-      #@test_datastream.stubs(:last_modified_in_repository)
+      @mock_repo = mock('repository')
+      @mock_repo.stubs(:add_datastream).with(:versionable => true, :pid => @test_object.pid, :dsid => 'abcd', :controlGroup => 'M', :dsState => 'A', :content => 'hi there', :checksumType => 'DISABLED')
+      @mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid)
+      @test_object.inner_object.stubs(:repository).returns(@mock_repo)
       @test_datastream.expects(:dirty=).with(false)
       @test_datastream.save
     end
   end
   
   describe '.content=' do
-    it "should update the content and ng_xml, marking the datastream as dirty" do
+    it "should update the content and ng_xml, marking the datastream as changed" do
       sample_xml = "<foo><xmlelement/></foo>"
-      @test_datastream.should_not be_dirty
-      @test_datastream.blob.should_not be_equivalent_to(sample_xml)
+      @test_datastream.instance_variable_get(:@changed_attributes).clear
+      @test_datastream.should_not be_changed
+      @test_datastream.content.should_not be_equivalent_to(sample_xml)
       @test_datastream.content = sample_xml
-      @test_datastream.should be_dirty
-      @test_datastream.blob.should be_equivalent_to(sample_xml)
+      @test_datastream.should be_changed
+      @test_datastream.content.should be_equivalent_to(sample_xml)
     end
   end
   
@@ -79,18 +68,13 @@ describe ActiveFedora::Datastream do
     end
   end 
   
-  describe ".dsid=" do
-    it "should set the datastream's dsid" do
-      @test_datastream.dsid = "foodsid"
-      @test_datastream.dsid.should == "foodsid"
-    end
-  end 
-  
-  it "should have mime_type accessors and should allow you to pass :mime_type OR :mimeType as an argument to initialize block" do
-    ds1 = ActiveFedora::Datastream.new(:mime_type=>"text/foo")    
-    ds1.mime_type.should == "text/foo"
-    ds2 = ActiveFedora::Datastream.new(:mime_type=>"text/bar")
-    ds2.mime_type.should == "text/bar"
+  it "should have mimeType accessors" do
+    ds1 = ActiveFedora::Datastream.new(nil, nil)#:mime_type=>"text/foo")    
+    ds1.mimeType = "text/foo"
+    ds1.mimeType.should == "text/foo"
+    ds2 = ActiveFedora::Datastream.new(nil, nil)#:mime_type=>"text/bar")
+    ds2.mimeType = "text/bar"
+    ds2.mimeType.should == "text/bar"
   end
 
   describe ".size" do
@@ -119,17 +103,13 @@ describe ActiveFedora::Datastream do
          <dsChecksum>none</dsChecksum>
          </datastreamProfile>"
       EOS
-      Fedora::Repository.instance.expects(:fetch_custom).with(@test_object.pid, "datastreams/#{@test_datastream.dsid}").returns(ds_profile)
-      @test_datastream.expects(:new_object?).returns(false)
-      @test_datastream.attributes.fetch(:dsSize,nil).should be_nil
+      @test_datastream.expects(:repository).returns(@mock_repo)
+      @mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid).returns(ds_profile)
       @test_datastream.size.should == "9999"
-      @test_datastream.attributes.fetch(:dsSize,nil).should_not be_nil
     end
 
     it "should default to an empty string if ds has not been saved" do
-      @test_datastream.attributes.fetch(:dsSize,nil).should be_nil
       @test_datastream.size.should be_nil
-      @test_datastream.attributes.fetch(:dsSize,nil).should be_nil
     end
   end
 

data/spec/unit/has_many_collection_spec.rb

@@ -17,9 +17,11 @@ describe ActiveFedora::Associations::HasManyAssociation do
   end
 
   it "should build" do
+    class Foo; end
     @owner = stub(:new_record? => false)
     @assoc = ActiveFedora::Associations::HasManyAssociation.new(@owner, @reflection)
     @assoc.should respond_to :build
+    Object.send(:remove_const, :Foo)
       
   end
 

data/spec/unit/inheritance_spec.rb

@@ -7,7 +7,7 @@ require 'active_fedora/qualified_dublin_core_datastream'
 
 describe ActiveFedora::Base do
   before(:each) do
-    Fedora::Repository.instance.stubs(:nextid).returns("_nextid_")
+    #Fedora::Repository.instance.stubs(:nextid).returns("_nextid_")
     class Foo < ActiveFedora::Base
       has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"foostream" do|m|
         m.field "foostream", :string
@@ -25,11 +25,11 @@ describe ActiveFedora::Base do
 
   it "doesn't overwrite stream specs" do
     f = Foo.new
-    f.datastreams.size.should == 2 #doesn't get dc until saved
-    streams = f.datastreams.values.map(&:class).sort
-#    streams.pop.name.should == "ActiveFedora::Datastream" #dc isn't here till saved
-    streams.pop.name.should == "ActiveFedora::MetadataDatastream"
-    streams.pop.name.should == "ActiveFedora::QualifiedDublinCoreDatastream"
+    f.datastreams.size.should == 3
+    streams = f.datastreams.values.map{|x| x.class.to_s}.sort
+    streams.pop.should == "ActiveFedora::RelsExtDatastream"
+    streams.pop.should == "ActiveFedora::QualifiedDublinCoreDatastream"
+    streams.pop.should == "ActiveFedora::MetadataDatastream"
   end
 
   it "should work for multiple types" do

data/spec/unit/metadata_datastream_spec.rb

@@ -18,7 +18,8 @@ describe ActiveFedora::MetadataDatastream do
   end
   
   before(:each) do
-    @test_ds = ActiveFedora::MetadataDatastream.new
+    @test_object = ActiveFedora::Base.new
+    @test_ds = ActiveFedora::MetadataDatastream.new(@test_object.inner_object, 'mdDs')
   end
   
   after(:each) do
@@ -39,12 +40,6 @@ describe ActiveFedora::MetadataDatastream do
     it "should provide .save" do
       @test_ds.should respond_to(:save)
     end
-    it "should persist the product of .to_xml in fedora" do
-      Fedora::Repository.instance.expects(:save)
-      @test_ds.expects(:to_xml).returns("fake xml")
-      @test_ds.expects(:blob=).with("fake xml")
-      @test_ds.save
-    end
   end
   
   describe ".update_indexed_attributes" do
@@ -201,22 +196,11 @@ describe ActiveFedora::MetadataDatastream do
     
   end
   
-  describe '.set_blob_for_save' do
-    it "should provide .set_blob_for_save" do
-      @test_ds.should respond_to(:set_blob_for_save)
-    end
-    
-    it "should set the blob to to_xml" do
-      @test_ds.expects(:blob=).with(@test_ds.to_xml)
-      @test_ds.set_blob_for_save
-    end
-  end
-  
   describe '#field' do
     
     before(:each) do
       class SpecDatastream < ActiveFedora::MetadataDatastream
-        def initialize
+        def initialize(inner_object, dsid)
         super
         field :publisher, :string
         field :coverage, :text
@@ -232,7 +216,7 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it 'should add corresponding field to the @fields hash and set the field :type ' do
-      sds = SpecDatastream.new
+      sds = SpecDatastream.new(nil, nil)
       sds.fields.should_not have_key(:bio)
       sds.field :bio, :text
       sds.fields.should have_key(:bio)
@@ -242,7 +226,7 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should insert custom element attrs into the xml stream" do
-      sds = SpecDatastream.new
+      sds = SpecDatastream.new(nil, nil)
       sds.mycomplicated_field_values='foo'
       sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
       expected_xml = '<fields><mycomplicated_field baz=\'bat\' foo=\'bar\'>foo</mycomplicated_field></fields>'
@@ -250,7 +234,7 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should add getters and setters and appenders with field name" do
-      local_test_ds = SpecDatastream.new
+      local_test_ds = SpecDatastream.new(nil, nil)
       local_test_ds.should respond_to(:publisher_values)
       local_test_ds.should respond_to(:publisher_append)
       local_test_ds.should respond_to(:publisher_values=)
@@ -267,8 +251,8 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should track field values at instance level, not at class level" do
-      local_test_ds1 = SpecDatastream.new
-      local_test_ds2 = SpecDatastream.new
+      local_test_ds1 = SpecDatastream.new(nil, nil)
+      local_test_ds2 = SpecDatastream.new(nil, nil)
       local_test_ds1.publisher_values = ["publisher1", "publisher2"]
       local_test_ds2.publisher_values = ["publisherA", "publisherB"]
       
@@ -277,19 +261,19 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should allow you to add field values using <<" do
-      local_test_ds1 = SpecDatastream.new
+      local_test_ds1 = SpecDatastream.new(nil, nil)
       local_test_ds1.publisher_values << "publisher1"
       local_test_ds1.publisher_values.should == ["publisher1"] 
     end
     
     it "should create setter that always turns non-arrays into arrays" do
-      local_test_ds = SpecDatastream.new
+      local_test_ds = SpecDatastream.new(nil, nil)
       local_test_ds.publisher_values = "Foo"
       local_test_ds.publisher_values.should == ["Foo"]
     end
     
     it "should create setter that sets datastream.dirty? to true" do
-      local_test_ds = SpecDatastream.new
+      local_test_ds = SpecDatastream.new(nil, nil)
       local_test_ds.should_not be_dirty
       local_test_ds.publisher_values = "Foo"
       local_test_ds.should be_dirty
@@ -303,7 +287,7 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should add any extra opts to the field hash" do
-      local_test_ds = SpecDatastream.new
+      local_test_ds = SpecDatastream.new(nil, nil)
       local_test_ds.field "myfield", :string, :foo => "foo", :bar => "bar"      
       local_test_ds.fields[:myfield].should have_key(:foo)
       local_test_ds.fields[:myfield][:foo].should == "foo"

data/spec/unit/model_spec.rb

@@ -19,7 +19,7 @@ describe ActiveFedora::Model do
   end
   
   before(:each) do 
-    Fedora::Repository.instance.stubs(:nextid).returns('_nextid_')
+    ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns('_nextid_')
     @test_instance = SpecModel::Basic.new
     @property = stub("myproperty", :name => "mock_prop", :instance_variable_name => "@mock_prop")
     SpecModel::Basic.extend(ActiveFedora::Model)
@@ -105,8 +105,8 @@ describe ActiveFedora::Model do
       mock_result.expects(:hits).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
       mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel\:\:Basic', :rows=>1001).returns(mock_result)
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
-      Fedora::Repository.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object1")
-      Fedora::Repository.instance.expects(:find_model).with("changeme:22", SpecModel::Basic).returns("Fake Object2")
+      ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object1")
+      ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:22", SpecModel::Basic).returns("Fake Object2")
       SpecModel::Basic.find(:all, :rows=>1001).should == ["Fake Object1", "Fake Object2"]
     end
     
@@ -116,7 +116,7 @@ describe ActiveFedora::Model do
       mock_result.expects(:hits).returns([{"id" => "changeme:30"}])
       mock_solr.expects(:query).with('id:changeme\:30').returns(mock_result)
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
-      Fedora::Repository.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object")
+      ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object")
     
       SpecModel::Basic.find("changeme:30").should == "Fake Object"
     end
@@ -126,7 +126,7 @@ describe ActiveFedora::Model do
       mock_result = mock("MockResult")
       mock_result.expects(:hits).returns([{"id" => "changeme:30"}])
       mock_solr.expects(:query).with('id:changeme\:30').returns(mock_result)
-      Fedora::Repository.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("fake object")
+      ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("fake object")
 
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
     
@@ -136,15 +136,15 @@ describe ActiveFedora::Model do
     describe"(:pid => xxx)" do 
       it "should pull the inner object from fedora if it already exists in fedora" do
         pending
-        Fedora::Repository.instance.expects(:save).never
+        ActiveFedora::RubydoraConnection.instance.expects(:save).never
         mock_obj = mock("Fedora Object")
-        Fedora::Repository.instance.expects(:find_objects).returns([mock_obj])
+        ActiveFedora::RubydoraConnection.instance.expects(:find_objects).returns([mock_obj])
         ActiveFedora::Base.new(:pid=>"test:1").inner_object.should equal(mock_obj)
       end
       it "should save the inner_object to fedora if it does not already exist" do
         pending
-        Fedora::Repository.instance.expects(:save)
-        Fedora::Repository.instance.expects(:find_objects).returns([])
+        ActiveFedora::RubydoraConnection.instance.expects(:save)
+        ActiveFedora::RubydoraConnection.instance.expects(:find_objects).returns([])
         ActiveFedora::Base.new(:pid=>"test:1")
       end
     end
@@ -179,7 +179,7 @@ describe ActiveFedora::Model do
     it "should use Repository.find_model to instantiate an object" do
       mock_repo = mock("repo")
       mock_repo.expects(:find_model).with("_PID_", SpecModel::Basic)
-      Fedora::Repository.expects(:instance).returns(mock_repo) 
+      ActiveFedora::RubydoraConnection.expects(:instance).returns(mock_repo) 
       SpecModel::Basic.load_instance("_PID_")
     end
   end

data/spec/unit/nokogiri_datastream_spec.rb

@@ -15,7 +15,13 @@ describe ActiveFedora::NokogiriDatastream do
   end
   
   before(:each) do
-    @test_ds = ActiveFedora::NokogiriDatastream.new(:blob=>"<test_xml/>")
+    mock_inner = mock('inner object')
+    @mock_repo = mock('repository')
+    @mock_repo.stubs(:datastream_dissemination=>'My Content')
+    mock_inner.stubs(:repository).returns(@mock_repo)
+    mock_inner.stubs(:pid)
+    @test_ds = ActiveFedora::NokogiriDatastream.new(mock_inner, "descMetadata")
+    @test_ds.content="<test_xml/>"
   end
   
   after(:each) do
@@ -31,12 +37,13 @@ describe ActiveFedora::NokogiriDatastream do
       @test_ds.ng_xml.should be_instance_of(Nokogiri::XML::Document)
     end
     it 'should load xml from blob if provided' do
-      test_ds1 = ActiveFedora::NokogiriDatastream.new(:blob=>"<xml><foo/></xml>")
+      test_ds1 = ActiveFedora::NokogiriDatastream.new(nil, 'ds1')
+      test_ds1.content="<xml><foo/></xml>"
       test_ds1.ng_xml.to_xml.should == "<?xml version=\"1.0\"?>\n<xml>\n  <foo/>\n</xml>\n"
     end
     it "should initialize from #xml_template if no xml is provided" do
       ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("<fake template/>")
-      ActiveFedora::NokogiriDatastream.new.ng_xml.should be_equivalent_to("<fake template/>")
+      ActiveFedora::NokogiriDatastream.new(nil, nil).ng_xml.should be_equivalent_to("<fake template/>")
     end
   end
   
@@ -49,7 +56,8 @@ describe ActiveFedora::NokogiriDatastream do
   describe ".update_indexed_attributes" do
     
     before(:each) do
-      @mods_ds = Hydra::ModsArticleDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+      @mods_ds = Hydra::ModsArticleDatastream.new(nil, 'descMetadata')
+      @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
     
     it "should apply submitted hash to corresponding datastream field values" do
@@ -170,7 +178,8 @@ describe ActiveFedora::NokogiriDatastream do
   describe ".get_values" do
     
     before(:each) do
-      @mods_ds = Hydra::ModsArticleDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+      @mods_ds = Hydra::ModsArticleDatastream.new(nil, 'modsDs')
+      @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
     
     it "should call lookup with field_name and return the text values from each resulting node" do
@@ -201,8 +210,9 @@ describe ActiveFedora::NokogiriDatastream do
   describe '#from_xml' do
     it "should work when a template datastream is passed in" do
       mods_xml = Nokogiri::XML::Document.parse( fixture(File.join("mods_articles", "hydrangea_article1.xml")) )
-      tmpl = Hydra::ModsArticleDatastream.new
+      tmpl = Hydra::ModsArticleDatastream.new(nil, nil)
       Hydra::ModsArticleDatastream.from_xml(mods_xml,tmpl).ng_xml.root.to_xml.should == mods_xml.root.to_xml
+      tmpl.dirty?.should be_false
     end
     it "should work when foxml datastream xml is passed in" do
       pending "at least for now, just updated Base.deserialize to feed in the xml content rather than the foxml datstream xml.  Possibly we can update MetadataDatstream to assume the same and leave it at that? -MZ 23-06-2010"
@@ -210,11 +220,6 @@ describe ActiveFedora::NokogiriDatastream do
       ds_xml = hydrangea_article_foxml.at_xpath("//foxml:datastream[@ID='descMetadata']")
       Hydra::ModsArticleDatastream.from_xml(ds_xml).ng_xml.to_xml.should == hydrangea_article_foxml.at_xpath("//foxml:datastream[@ID='descMetadata']/foxml:datastreamVersion[last()]/foxml:xmlContent").first_element_child.to_xml
     end
-    it "should set @dirty to false" do
-      hydrangea_article_foxml = Nokogiri::XML::Document.parse( fixture("hydrangea_fixture_mods_article1.foxml.xml") )
-      ds_xml = hydrangea_article_foxml.at_xpath("//foxml:datastream[@ID='descMetadata']")
-      Hydra::ModsArticleDatastream.from_xml(ds_xml).dirty?.should be_false
-    end
   end
   
 
@@ -227,21 +232,22 @@ describe ActiveFedora::NokogiriDatastream do
       @test_ds.should respond_to(:save)
     end
     it "should persist the product of .to_xml in fedora" do
-      Fedora::Repository.instance.expects(:save)
+      @test_ds.expects(:new?).returns(true)
+      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :checksumType => 'DISABLED', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A')
       @test_ds.expects(:to_xml).returns("fake xml")
-      @test_ds.expects(:blob=).with("fake xml")
+      @test_ds.serialize!
       @test_ds.save
     end
   end
   
   describe '.content=' do
     it "should update the content and ng_xml, marking the datastream as dirty" do
-      @test_ds.should_not be_dirty
-      @test_ds.blob.should_not be_equivalent_to(@sample_raw_xml)
+      @test_ds.dirty = false  # pretend it isn't dirty to show that content= does it
+      @test_ds.content.should_not be_equivalent_to(@sample_raw_xml)
       @test_ds.ng_xml.to_xml.should_not be_equivalent_to(@sample_raw_xml)
       @test_ds.content = @sample_raw_xml
       @test_ds.should be_dirty
-      @test_ds.blob.should be_equivalent_to(@sample_raw_xml)
+      @test_ds.content.should be_equivalent_to(@sample_raw_xml)
       @test_ds.ng_xml.to_xml.should be_equivalent_to(@sample_raw_xml)
     end
   end
@@ -254,7 +260,7 @@ describe ActiveFedora::NokogiriDatastream do
       @test_ds.ng_xml.to_xml.should be_equivalent_to(@sample_raw_xml)
     end
     it "should mark the datastream as dirty" do
-      @test_ds.should_not be_dirty
+      @test_ds.dirty = false  # pretend it isn't dirty to show that content= does it
       @test_ds.ng_xml = @sample_raw_xml
       @test_ds.should be_dirty
     end
@@ -298,17 +304,6 @@ describe ActiveFedora::NokogiriDatastream do
     
   end
   
-  describe '.set_blob_for_save' do
-    it "should provide .set_blob_for_save" do
-      @test_ds.should respond_to(:set_blob_for_save)
-    end
-    
-    it "should set the blob to to_xml" do
-      @test_ds.expects(:blob=).with(@test_ds.to_xml)
-      @test_ds.set_blob_for_save
-    end
-  end
-
   describe '.from_solr' do
     it "should set the internal_solr_doc attribute to the solr document passed in" do 
       @test_ds.from_solr(@solr_doc)
@@ -318,7 +313,8 @@ describe ActiveFedora::NokogiriDatastream do
 
   describe '.get_values_from_solr' do
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+      @mods_ds = ActiveFedora::NokogiriDatastream.new(nil, nil)
+      @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 
     it "should return empty array if internal_solr_doc not set" do
@@ -373,7 +369,8 @@ describe ActiveFedora::NokogiriDatastream do
 
   describe '.update_values' do
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+      @mods_ds = ActiveFedora::NokogiriDatastream.new(nil, nil)
+      @mods_ds.content= fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 
     it "should throw an exception if we have initialized the internal_solr_doc." do
@@ -394,8 +391,8 @@ describe ActiveFedora::NokogiriDatastream do
     end
 
     it "should set @dirty to true" do
-      mods_ds = Hydra::ModsArticleDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
-      mods_ds.dirty?.should be_false
+      mods_ds = Hydra::ModsArticleDatastream.new(nil, nil)
+      mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
       mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
       mods_ds.dirty?.should be_true
     end
@@ -404,7 +401,8 @@ describe ActiveFedora::NokogiriDatastream do
   describe '.term_values' do
 
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+      @mods_ds = ActiveFedora::NokogiriDatastream.new(nil, nil)
+      @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 
     it "should call OM::XML::term_values if internal_solr_doc is not set and return values from xml" do