active-fedora 5.0.0 → 5.1.0

data/spec/integration/associations_spec.rb

@@ -32,41 +32,72 @@ describe ActiveFedora::Base do
         @book2.save
       end
 
-      it "should build" do
+      it "should build child" do
         new_book = @library.books.build({})
         new_book.should be_new_record
         new_book.should be_kind_of Book
+        new_book.library.should be_nil
+        @library.books.should == [new_book]
+        #TODO save the associated children too, requires something like ActiveRecord::AutosaveAssociation (ver 3.0.12) 
+        #@library.save
+        #new_book.library.should == @library
+      end
+
+      it "should not create children if the parent isn't saved" do
+        lambda {@library.books.create({})}.should raise_error ActiveFedora::RecordNotSaved, "You cannot call create unless the parent is saved"
+      end
+
+      it "should create children" do
+        @library.save!
+        new_book = @library.books.create({})
+        new_book.should_not be_new_record
+        new_book.should be_kind_of Book
+        new_book.library.should == @library
+      end
+
+      it "should build parent" do
+        new_library = @book.build_library({})
+        new_library.should be_new_record
+        new_library.should be_kind_of Library
+        @book.library.should == new_library
+      end
+
+      it "should create parent" do
+        new_library = @book.create_library({})
+        new_library.should_not be_new_record
+        new_library.should be_kind_of Library
+        @book.library.should == new_library
       end
 
       it "should let you shift onto the association" do
         @library.new_record?.should be_true
         @library.books.size == 0
-        @library.books.to_ary.should == []
+        @library.books.should == []
         @library.book_ids.should ==[]
         @library.books << @book
-        @library.books.to_a.should == [@book]
+        @library.books.should == [@book]
         @library.book_ids.should ==[@book.pid]
 
       end
 
       it "should let you set an array of objects" do
         @library.books = [@book, @book2]
-        @library.books.to_a.should == [@book, @book2]
+        @library.books.should == [@book, @book2]
         @library.save
 
         @library.books = [@book]
-        @library.books.to_a.should == [@book]
+        @library.books.should == [@book]
       
       end
       it "should let you set an array of object ids" do
         @library.book_ids = [@book.pid, @book2.pid]
-        @library.books.to_a.should == [@book, @book2]
+        @library.books.should == [@book, @book2]
       end
 
       it "setter should wipe out previously saved relations" do
         @library.book_ids = [@book.pid, @book2.pid]
         @library.book_ids = [@book2.pid]
-        @library.books.to_a.should == [@book2]
+        @library.books.should == [@book2]
         
       end
 
@@ -75,7 +106,7 @@ describe ActiveFedora::Base do
         @library.books = [@book, @book2]
         @library.save
         @library = Library.find(@library.pid)
-        @library.books.to_a.should == [@book, @book2]
+        @library.books.should == [@book, @book2]
       end
 
 
@@ -87,7 +118,7 @@ describe ActiveFedora::Base do
         @book2.save
 
         @library = Library.find(@library.pid)
-        @library.books.to_a.should == [@book, @book2]
+        @library.books.should == [@book, @book2]
       
         solr_resp =  @library.books(:response_format=>:solr)
         solr_resp.size.should == 2
@@ -138,7 +169,7 @@ describe ActiveFedora::Base do
         @book = Book.new
         @book.topics << @topic1
         @book.topics.map(&:pid).should == [@topic1.pid]
-        Topic.find(@topic1.pid).books.to_a.should == [] #Can't have saved it because @book isn't saved yet.
+        Topic.find(@topic1.pid).books.should == [] #Can't have saved it because @book isn't saved yet.
       end
       after do
         @topic1.delete
@@ -165,10 +196,10 @@ describe ActiveFedora::Base do
 
         @book.library.pid.should == @library.pid
         @library.books.reload
-        @library.books.to_a.should == [@book]
+        @library.books.should == [@book]
 
         @library2 = Library.find(@library.pid)
-        @library2.books.to_a.should == [@book]
+        @library2.books.should == [@book]
       end
 
       it "should have a count once it has been saved" do
@@ -177,7 +208,7 @@ describe ActiveFedora::Base do
 
         # @book.library.pid.should == @library.pid
         # @library.books.reload
-        # @library.books.to_a.should == [@book]
+        # @library.books.should == [@book]
 
         @library2 = Library.find(@library.pid)
         @library2.books.size.should == 2
@@ -226,11 +257,11 @@ describe ActiveFedora::Base do
         end
         it "should set relationships bidirectionally" do
           @book.topics << @topic1
-          @book.topics.to_a.should == [@topic1]
+          @book.topics.should == [@topic1]
           @book.relationships(:has_topic).should == [@topic1.internal_uri]
           @topic1.relationships(:has_topic).should == []
           @topic1.relationships(:is_topic_of).should == [@book.internal_uri]
-          Topic.find(@topic1.pid).books.to_a.should == [@book] #Can't have saved it because @book isn't saved yet.
+          Topic.find(@topic1.pid).books.should == [@book] #Can't have saved it because @book isn't saved yet.
         end
         it "should save new child objects" do
           @book.topics << Topic.new
@@ -370,4 +401,34 @@ describe ActiveFedora::Base do
       end
     end
   end
+
+
+
+  describe "when a object is deleted" do
+    before (:all) do
+      class MasterFile < ActiveFedora::Base
+        belongs_to :media_object, :property=>:is_part_of
+      end
+      class MediaObject < ActiveFedora::Base
+        has_many :parts, :class_name=>'MasterFile', :property=>:is_part_of
+      end
+    end
+
+    before :each do
+      @master = MasterFile.create
+      @media = MediaObject.create
+      @master.media_object = @media
+      @master.save
+      @master.reload
+
+    end
+
+    it "should also remove the relationships that point at that object" do
+      @media.delete
+      @master = MasterFile.find(@master.pid)
+      @master.relationships(:is_part_of).should == []
+    end
+  end
+
+
 end

data/spec/integration/base_spec.rb

@@ -12,11 +12,14 @@ describe "A base object with metadata" do
   describe "a new document" do
     before do
       @obj = MockAFBaseRelationship.new
+
       @obj.foo.person = "bob"
       @obj.save
     end
     it "should save the datastream." do
-      ActiveFedora::Base.find(@obj.pid, :cast=>true).foo.person.should == ['bob']
+      obj = ActiveFedora::Base.find(@obj.pid, :cast=>true)
+      obj.foo.should_not be_new
+      obj.foo.person.should == ['bob']
       ActiveFedora::SolrService.query("id:#{@obj.pid.gsub(":", "\\:")}", :fl=>'id person_t').first.should == {"id"=>@obj.pid, 'person_t'=>['bob']}
     end
   end
@@ -86,6 +89,31 @@ describe "A base object with metadata" do
       end
     end
   end
+
+  describe '#reload' do
+    before(:each) do
+      @object = MockAFBaseRelationship.new
+      @object.foo.person = 'bob'
+      @object.save
+
+      @object2 = @object.class.find(@object.pid)
+
+      @object2.foo.person = 'dave'
+      @object2.save
+    end
+    it 'should requery Fedora' do
+      @object.reload
+      @object.foo.person.should == ['dave']
+    end
+    it 'should raise an error if not persisted' do
+      @object = MockAFBaseRelationship.new
+      # You will want this stub or else it will be really chatty in your STDERR
+      @object.inner_object.logger.stubs(:error)
+      expect {
+        @object.reload
+      }.to raise_error(ActiveFedora::ObjectNotFoundError)
+    end
+  end
 end
 
 describe "Datastreams synched together" do
@@ -394,15 +422,12 @@ describe ActiveFedora::Base do
     end
 
     describe '#delete' do
-      it 'if inbound relationships exist should remove relationships from those inbound targets as well when deleting this object' do
-        @test_object2 = MockAFBaseRelationship.new
-        @test_object2.save
-        @test_object3 = MockAFBaseRelationship.new
-        @test_object3.save
-        @test_object4 = MockAFBaseRelationship.new
-        @test_object4.save
-        @test_object5 = MockAFBaseRelationship.new
-        @test_object5.save
+      before do
+        @test_object2 = MockAFBaseRelationship.create
+        @test_object3 = MockAFBaseRelationship.create
+        @test_object4 = MockAFBaseRelationship.create
+        @test_object5 = MockAFBaseRelationship.create
+        Deprecation.stubs(:warn)
         #append to relationship by 'testing'
         @test_object2.add_relationship_by_name("testing",@test_object3)
         @test_object2.add_relationship_by_name("testing2",@test_object4)
@@ -420,6 +445,9 @@ describe ActiveFedora::Base do
         @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
 
         @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
+    end
+
+    it 'if inbound relationships exist should remove relationships from those inbound targets as well when deleting this object' do
 
         @test_object2.delete
         #need to reload since removed from rels_ext in memory

data/spec/integration/datastreams_spec.rb

@@ -4,11 +4,33 @@ require 'active_fedora'
 require "rexml/document"
 
 describe ActiveFedora::Datastreams do
+  describe "serializing datastreams" do
+    before :all do
+      class TestingMetadataSerializing < ActiveFedora::Base
+        has_metadata :name => "nokogiri_autocreate_on", :autocreate => true, :type => ActiveFedora::NokogiriDatastream
+        has_metadata :name => "nokogiri_autocreate_off", :autocreate => false, :type => ActiveFedora::NokogiriDatastream
+      end
+    end
+
+    after :all do
+      Object.send(:remove_const, :TestingMetadataSerializing)
+    end
+
+    subject { TestingMetadataSerializing.new }
+
+    it "should work" do
+      subject.save(:validate => false)
+      subject.nokogiri_autocreate_on.should_not be_new
+      subject.nokogiri_autocreate_off.should be_new
+    end
+  end
+
+
   describe "#has_metadata" do
     before :all do
       class HasMetadata < ActiveFedora::Base
-        has_metadata :name => "with_versions", :label => "Versioned DS", :type => ActiveFedora::SimpleDatastream
-        has_metadata :name => "without_versions", :versionable => false, :type => ActiveFedora::SimpleDatastream
+        has_metadata :name => "with_versions", :autocreate => true, :label => "Versioned DS", :type => ActiveFedora::SimpleDatastream
+        has_metadata :name => "without_versions", :autocreate => true, :versionable => false, :type => ActiveFedora::SimpleDatastream
       end
     end
     after :all do

data/spec/integration/nokogiri_datastream_spec.rb

@@ -20,11 +20,26 @@ describe ActiveFedora::NokogiriDatastream do
     Object.send(:remove_const, :HydrangeaArticle2)
   end
 
+  describe "#changed?" do
+    it "should not be changed if the new xml matches the old xml" do
+      
+      @pid = "hydrangea:fixture_mods_article2"
+      @test_object = HydrangeaArticle2.find(@pid)
+
+      @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
+
+      @test_object.descMetadata.should_not be_changed
+    end
+  end
+
   describe '.term_values' do
     before do
-      @pid = "hydrangea:fixture_mods_article1"
-      @test_solr_object = ActiveFedora::Base.load_instance_from_solr(@pid)
+      @pid = "hydrangea:fixture_mods_article2"
+      @test_object = HydrangeaArticle2.find(@pid)
+      @test_object.descMetadata.content = File.read(fixture('mods_articles/hydrangea_article1.xml'))
+      @test_object.save
       @test_object = HydrangeaArticle2.find(@pid)
+      @test_solr_object = ActiveFedora::Base.load_instance_from_solr(@pid)
     end
 
     it "should return the same values whether getting from solr or Fedora" do
@@ -58,15 +73,18 @@ describe ActiveFedora::NokogiriDatastream do
   
   describe '.update_values' do
     before do
-      @pid = "hydrangea:fixture_mods_article1"
+      @pid = "hydrangea:fixture_mods_article2"
+      @test_object = HydrangeaArticle2.find(@pid)
+      @test_object.descMetadata.content = File.read(fixture('mods_articles/hydrangea_article1.xml'))
+      @test_object.save
       @test_object = HydrangeaArticle2.find(@pid)
     end
 
     it "should not be dirty after .update_values is saved" do
       @test_object.datastreams["descMetadata"].update_values([{:name=>0},{:role=>0},:text] =>"Funder")
-      @test_object.datastreams["descMetadata"].dirty?.should be_true
+      @test_object.datastreams["descMetadata"].should be_changed
       @test_object.save
-      @test_object.datastreams["descMetadata"].dirty?.should be_false
+      @test_object.datastreams["descMetadata"].should_not be_changed
       @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Funder"]
     end    
   end

data/spec/unit/base_extra_spec.rb

@@ -65,7 +65,6 @@ describe ActiveFedora::Base do
       mock_ss = mock("SolrService")
       mock_ss.stubs(:conn).returns(mock_conn)
       ActiveFedora::SolrService.stubs(:instance).returns(mock_ss)
-      @test_object.expects(:inbound_relationships).returns({})
       @test_object.delete
     end
 

data/spec/unit/base_spec.rb

@@ -81,14 +81,14 @@ describe ActiveFedora::Base do
   describe "With a test class" do
     before :all do
       class FooHistory < ActiveFedora::Base
-        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
+        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData", :autocreate => true do |m|
           m.field "fubar", :string
           m.field "swank", :text
         end
-        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText" do |m|
+        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText", :autocreate => true do |m|
           m.field "fubar", :text
         end
-        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel" do |m|
+        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel", :autocreate => true do |m|
           m.field "fubar", :text
         end 
         delegate :fubar, :to=>'withText'
@@ -244,7 +244,7 @@ describe ActiveFedora::Base do
 
       it "should update the RELS-EXT datastream and set the datastream as dirty when relationships are added" do
         mock_ds = mock("Rels-Ext")
-        mock_ds.expects(:dirty=).with(true).times(2)
+        mock_ds.stubs(:content_will_change!)
         @test_object.datastreams["RELS-EXT"] = mock_ds
         @test_object.add_relationship(:is_member_of, "info:fedora/demo:5")
         @test_object.add_relationship(:is_member_of, "info:fedora/demo:10")
@@ -398,46 +398,6 @@ describe ActiveFedora::Base do
         @test_object.add_datastream(dirty_ds)
         @test_object.expects(:update_index)
         
-        @test_object.save
-      end
-      it "should NOT update solr index if no SimpleDatastreams have changed" do
-        stub_ingest(@this_pid)
-        stub_add_ds(@this_pid, ['ds1', 'RELS-EXT'])
-        @test_object.save
-        @test_object.expects(:new_object?).returns(false).twice
-        ActiveFedora::DigitalObject.any_instance.stubs(:save)
-        mock1 = mock("ds1")
-        mock1.expects( :changed?).returns(false).at_least_once
-        mock1.expects(:serialize!)
-        mock2 = mock("ds2")
-        mock2.expects( :changed?).returns(false).at_least_once
-        mock2.expects(:serialize!)
-        @test_object.stubs(:datastreams).returns({:ds1 => mock1, :ds2 => mock2})
-        @test_object.expects(:update_index).never
-        @test_object.expects(:refresh)
-        @test_object.instance_variable_set(:@new_object, false)
-
-        @test_object.save
-      end
-      it "should update solr index if relationships have changed" do
-        stub_ingest(@this_pid)
-
-        rels_ext = ActiveFedora::RelsExtDatastream.new(@test_object.inner_object, 'RELS-EXT')
-        rels_ext.model = @test_object
-        rels_ext.expects(:changed?).returns(true).twice
-        rels_ext.expects(:save).returns(true)
-        rels_ext.expects(:serialize!)
-        clean_ds = mock("ds2", :digital_object=)
-        clean_ds.stubs(:dirty? => false, :changed? => false, :new? => false)
-        clean_ds.expects(:serialize!)
-        @test_object.datastreams["RELS-EXT"] = rels_ext
-        @test_object.datastreams[:clean_ds] = clean_ds
-  #      @test_object.inner_object.stubs(:datastreams).returns({"RELS-EXT" => rels_ext, :clean_ds => clean_ds})
-  #      @test_object.stubs(:datastreams).returns({"RELS-EXT" => rels_ext, :clean_ds => clean_ds})
-        @test_object.instance_variable_set(:@new_object, false)
-        @test_object.expects(:refresh)
-        @test_object.expects(:update_index)
-        
         @test_object.save
       end
     end
@@ -476,11 +436,11 @@ describe ActiveFedora::Base do
       it "should propagate modified datastreams to the adapted object" do
         @test_object = FooHistory.new()
         orig_ds = @test_object.datastreams['someData']
-        orig_ds.content="YYY"
+        orig_ds.content="<YYY/>"
         adapted = @test_object.adapt_to(FooAdaptation)
         adapted.datastreams.keys.should include 'someData'
         adapted.datastreams['someData'].should == orig_ds
-        adapted.datastreams['someData'].content.should == "YYY"
+        adapted.datastreams['someData'].content.strip.should == "<YYY/>"
         adapted.datastreams['someData'].changed?.should be_true
       end
       it "should use the datastream definitions from the adapted object" do
@@ -585,7 +545,7 @@ describe ActiveFedora::Base do
       it "should call .to_solr on the relationships rels-ext is dirty" do
         @test_object.add_relationship(:has_collection_member, "info:fedora/foo:member")
         rels_ext = @test_object.rels_ext
-        rels_ext.dirty?.should == true
+        rels_ext.should be_changed
         @test_object.expects(:solrize_relationships)
         @test_object.to_solr
       end

data/spec/unit/datastream_collections_spec.rb

@@ -212,7 +212,6 @@ describe ActiveFedora::DatastreamCollections do
       thumb1.pid.should == @test_object2.pid
       thumb1.dsLabel.should == 'minivan.jpg'
       f.rewind
-      @test_object2.thumbnail.first.content.should == f.read
       @test_object2.update_named_datastream("thumbnail",{:file=>f2,:dsid=>"THUMB1"})
       @test_object2.thumbnail.size.should == 1
       @test_object2.thumbnail_ids == ["THUMB1"]
@@ -226,8 +225,6 @@ describe ActiveFedora::DatastreamCollections do
       thumb1.dsid.should == 'THUMB1'
       thumb1.pid.should == @test_object2.pid
       thumb1.dsLabel.should == 'dino.jpg'
-      f2.rewind
-      @test_object2.thumbnail.first.content.should == f2.read
     end
   end
   describe '#named_datastreams_desc' do
@@ -293,8 +290,6 @@ describe ActiveFedora::DatastreamCollections do
       datastreams["thumbnail"].first.dsid.should == 'THUMB1'
       datastreams["thumbnail"].first.dsLabel.should == 'minivan.jpg'
       datastreams["thumbnail"].first.controlGroup.should == "M"
-      f.rewind
-      datastreams["thumbnail"].first.content.should == f.read
 
       datastreams["external"].size.should == 1
       datastreams["external"].first.dsid.should == "EXTERNAL1"
@@ -306,8 +301,6 @@ describe ActiveFedora::DatastreamCollections do
       datastreams["high"].first.dsLabel.should == 'dino.jpg'
       datastreams["high"].first.controlGroup.should == "M"
       datastreams["high"].first.dsid.should == "HIGH1"
-      f2.rewind
-      datastreams["high"].first.content.should == f2.read
     end
   end