hydra-head 3.0.1 → 3.1.0.pre1

data/test_support/spec/integration/file_asset_spec.rb

@@ -11,129 +11,138 @@ end
 describe FileAsset do
   before(:each) do
     @file_asset = FileAsset.new
-    @image_asset = ImageAsset.new
-    @audio_asset = AudioAsset.new
-    @video_asset = VideoAsset.new
-    @asset1 = ActiveFedora::Base.new
-    @asset2 = ActiveFedora::Base.new
-    @asset3 = ActiveFedora::Base.new
-    @dummy_file_asset = DummyFileAsset.new
-    @asset1.save
-    @asset2.save
-    @asset3.save
-    @image_asset.save
-    @audio_asset.save
-    @video_asset.save
-    @dummy_file_asset.save
   end
-
   after(:each) do
     begin
     @file_asset.delete
     rescue
     end
-    begin
-    @asset1.delete
-    rescue
-    end
-    begin
-    @asset2.delete
-    rescue
-    end
-    begin
-    @asset3.delete
-    rescue
-    end
-    begin
-    @image_asset.delete
-    rescue
-    end
-    begin
-    @audio_asset.delete
-    rescue
-    end
-    begin
-    @video_asset.delete
-    rescue
-    end
-    begin
-    @dummy_file_asset.delete
-    rescue
-    end
   end
-
-  describe ".containers" do    
-    it "should return asset container objects via either inbound has_collection_member, inbound has_part, or outbound is_part_of relationships" do
-      #test all possible combinations...
-      #none
-      @file_asset.containers(:response_format=>:id_array).should == []
-      #is_part_of
-      @file_asset.part_of_append(@asset1)
-      @file_asset.containers(:response_format=>:id_array).should == [@asset1.pid]
-      #has_part + is_part_of
-      @asset2.parts_append(@file_asset)
-      @asset2.save
-      @file_asset.containers(:response_format=>:id_array).should == [@asset2.pid,@asset1.pid]
-      #has_part
-      @file_asset.part_of_remove(@asset1)
-      @file_asset.containers(:response_format=>:id_array).should == [@asset2.pid]      
-      #has_collection_member
-      @asset2.parts_remove(@file_asset)
+  describe "with parts" do
+    before(:each) do
+      @asset1 = ActiveFedora::Base.new
+      @asset2 = ActiveFedora::Base.new
+      @asset3 = ActiveFedora::Base.new
+      @asset1.save
       @asset2.save
-      @asset3.collection_members_append(@file_asset)
       @asset3.save
-      @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid]
-      #is_part_of + has_collection_member
-      @file_asset.part_of_append(@asset1)
-      @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset1.pid]
-      #has_part + has_collection_member      
-      @file_asset.part_of_remove(@asset1)
-      @asset2.parts_append(@file_asset)
-      @asset2.save
-      @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset2.pid]
-      #has_collection_member + has_part + is_part_of
-      @file_asset.part_of_append(@asset1)
-      @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset2.pid,@asset1.pid]
     end
-  end
 
-  describe ".containers_ids" do
-    it "should return an array of container ids instead of objects" do
-       #test all possible combinations...
-      #none
-      @file_asset.containers_ids.should == []
-      #is_part_of
-      @file_asset.part_of_append(@asset1)
-      @file_asset.containers_ids.should == [@asset1.pid]
+    after(:each) do
+      begin
+      @asset1.delete
+      rescue
+      end
+      begin
+      @asset2.delete
+      rescue
+      end
+      begin
+      @asset3.delete
+      rescue
+      end
+    end
+
+    describe ".containers" do    
+      it "should return asset container objects via either inbound has_collection_member, inbound has_part, or outbound is_part_of relationships" do
+        #test all possible combinations...
+        #none
+        @file_asset.containers(:response_format=>:id_array).should == []
+        #is_part_of
+        @file_asset.part_of_append(@asset1)
+        @file_asset.containers(:response_format=>:id_array).should == [@asset1.pid]
+        #has_part + is_part_of
+        @asset2.parts_append(@file_asset)
+        @asset2.save
+        @file_asset.containers(:response_format=>:id_array).should == [@asset2.pid,@asset1.pid]
+        #has_part
+        @file_asset.part_of_remove(@asset1)
+        @file_asset.containers(:response_format=>:id_array).should == [@asset2.pid]      
+        #has_collection_member
+        @asset2.parts_remove(@file_asset)
+        @asset2.save
+        @asset3.collection_members_append(@file_asset)
+        @asset3.save
+        @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid]
+        #is_part_of + has_collection_member
+        @file_asset.part_of_append(@asset1)
+        @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset1.pid]
+        #has_part + has_collection_member      
+        @file_asset.part_of_remove(@asset1)
+        @asset2.parts_append(@file_asset)
+        @asset2.save
+        @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset2.pid]
+        #has_collection_member + has_part + is_part_of
+        @file_asset.part_of_append(@asset1)
+        @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset2.pid,@asset1.pid]
+      end
+    end
+
+    describe ".containers_ids" do
+      it "should return an array of container ids instead of objects" do
+         #test all possible combinations...
+        #none
+        @file_asset.containers_ids.should == []
+        #is_part_of
+        @file_asset.part_of_append(@asset1)
+        @file_asset.containers_ids.should == [@asset1.pid]
+      end
     end
   end
 
-   describe ".to_solr" do
+  describe ".to_solr" do
     it "should load base fields correctly if active_fedora_model is FileAsset" do
       @file_asset.update_indexed_attributes({:title=>{0=>"testing"}})
       solr_doc = @file_asset.to_solr
       solr_doc["title_t"].should == ["testing"]
     end
 
-    it "should not load base fields twice for FileAsset if active_fedora_model is a class that is child of FileAsset" do
-      @image_asset.update_indexed_attributes({:title=>{0=>"testing"}})
-      #call Solrizer::Indexer.create_document since that produces the problem
-      @image_asset.save
-      solr_doc = ImageAsset.find_by_solr(@image_asset.pid).hits.first
-      solr_doc["title_t"].should == ["testing"]
-      @audio_asset.update_indexed_attributes({:title=>{0=>"testing"}})
-      #call Solrizer::Indexer.create_document since that produces the problem
-      @audio_asset.save
-      solr_doc = AudioAsset.find_by_solr(@audio_asset.pid).hits.first
-      solr_doc["title_t"].should == ["testing"]
-      @video_asset.update_indexed_attributes({:title=>{0=>"testing"}})
-      #call Solrizer::Indexer.create_document since that produces the problem
-      @video_asset.save
-      solr_doc = VideoAsset.find_by_solr(@video_asset.pid).hits.first
-      solr_doc["title_t"].should == ["testing"]
+    describe "with many kinds of assets" do
+      before(:each) do
+        @image_asset = ImageAsset.new
+        @audio_asset = AudioAsset.new
+        @video_asset = VideoAsset.new
+        @image_asset.save
+        @audio_asset.save
+        @video_asset.save
+      end
+      after do
+        begin
+        @image_asset.delete
+        rescue
+        end
+        begin
+        @audio_asset.delete
+        rescue
+        end
+        begin
+        @video_asset.delete
+        rescue
+        end
+      end 
+      it "should not load base fields twice for FileAsset if active_fedora_model is a class that is child of FileAsset" do
+  ## It's updating DC and descMetadata, because both have title.
+        @image_asset.update_indexed_attributes({:title=>{0=>"testing"}})
+        #call Solrizer::Indexer.create_document since that produces the problem
+        @image_asset.save
+        solr_doc = ImageAsset.find_by_solr(@image_asset.pid).hits.first
+        solr_doc["title_t"].should == ["testing"]
+        @audio_asset.update_indexed_attributes({:title=>{0=>"testing"}})
+        #call Solrizer::Indexer.create_document since that produces the problem
+        @audio_asset.save
+        solr_doc = AudioAsset.find_by_solr(@audio_asset.pid).hits.first
+        solr_doc["title_t"].should == ["testing"]
+        @video_asset.update_indexed_attributes({:title=>{0=>"testing"}})
+        #call Solrizer::Indexer.create_document since that produces the problem
+        @video_asset.save
+        solr_doc = VideoAsset.find_by_solr(@video_asset.pid).hits.first
+        solr_doc["title_t"].should == ["testing"]
+      end
     end
-
     it "should load base fields for FileAsset for model_only if active_fedora_model is not FileAsset but is not child of FileAsset" do
+      pending "I'm unconvinced as to the usefullness of this test. Why create as one type then reload as another? - Justin"
+      @dummy_file_asset = DummyFileAsset.new
+      @dummy_file_asset.save
       file_asset = FileAsset.load_instance(@dummy_file_asset.pid)
       ENABLE_SOLR_UPDATES = false
       #it should save change to Fedora, but not solr
@@ -141,10 +150,14 @@ describe FileAsset do
       file_asset.save
       ENABLE_SOLR_UPDATES = true
       solr_doc = DummyFileAsset.find_by_solr(@dummy_file_asset.pid).hits.first
-      solr_doc["title_t"].nil?.should == true
+      solr_doc["title_t"].should be_nil
       @dummy_file_asset.update_index
       solr_doc = DummyFileAsset.find_by_solr(@dummy_file_asset.pid).hits.first
       solr_doc["title_t"].should == ["testing"]
+      begin
+      @dummy_file_asset.delete
+      rescue
+      end
     end
   end
 end

data/test_support/spec/lib/active_fedora_helper_spec.rb

@@ -48,7 +48,7 @@ describe MediaShelf::ActiveFedoraHelper do
       solr_af_obj = helper.load_af_instance_from_solr(solr_doc)
       fed_af_obj = ActiveFedora::Base.load_instance(pid)
       #check both inbound and outbound match
-      fed_af_obj.outbound_relationships.should == solr_af_obj.outbound_relationships
+      fed_af_obj.outbound_relationships.to_hash.should == solr_af_obj.outbound_relationships.to_hash
       fed_af_obj.inbound_relationships.should == solr_af_obj.inbound_relationships
     end
   end

data/test_support/spec/models/audio_asset_spec.rb

@@ -4,7 +4,7 @@ require "active_fedora"
 describe AudioAsset do
   
   before(:each) do
-    Fedora::Repository.stubs(:instance).returns(stub_everything())
+#    Fedora::Repository.stubs(:instance).returns(stub_everything())
     @asset = AudioAsset.new
     @asset.stubs(:create_date).returns("2008-07-02T05:09:42.015Z")
     @asset.stubs(:modified_date).returns("2008-09-29T21:21:52.892Z")
@@ -17,7 +17,7 @@ describe AudioAsset do
   end
   
   it "should have a conforms_to relationship pointing to FileAsset" do
-    @asset.relationships[:self][:has_model].should include("info:fedora/afmodel:FileAsset")
+    @asset.ids_for_outbound(:has_model).should include("afmodel:FileAsset")
   end
   
-end
+end

data/test_support/spec/models/file_asset_spec.rb

@@ -4,7 +4,7 @@ require "active_fedora"
 describe FileAsset do
   
   before(:each) do
-    Fedora::Repository.stubs(:instance).returns(stub_everything())
+#    Fedora::Repository.stubs(:instance).returns(stub_everything())
     @file_asset = FileAsset.new
     @file_asset.stubs(:create_date).returns("2008-07-02T05:09:42.015Z")
     @file_asset.stubs(:modified_date).returns("2008-09-29T21:21:52.892Z")
@@ -35,8 +35,9 @@ describe FileAsset do
     end
   end
   
-  describe ".add_file" do
-    it "should call super.add_file"
-    it "should set the FileAsset's title and label to the file datastream's filename if they are currently empty"
+  describe 'label' do
+    asset = FileAsset.new
+    asset.label = 'image.jp2'
+    asset.label.should == 'image.jp2'
   end
-end
+end

data/test_support/spec/models/generic_content_spec.rb

@@ -4,7 +4,6 @@ require "active_fedora"
 describe GenericContent do
   
   before(:each) do
-    Fedora::Repository.stubs(:instance).returns(stub_everything())
     @hydra_content = GenericContent.new
   end
   
@@ -26,4 +25,4 @@ describe GenericContent do
     @hydra_content.should respond_to(:original=)
   end
   
-end
+end

data/test_support/spec/models/generic_image_spec.rb

@@ -4,7 +4,7 @@ require "active_fedora"
 describe GenericImage do
   
   before(:each) do
-    Fedora::Repository.stubs(:instance).returns(stub_everything())
+#    Fedora::Repository.stubs(:instance).returns(stub_everything())
     @hydra_image = GenericImage.new
 
   end

data/test_support/spec/models/hydra_rights_metadata_spec.rb

@@ -5,8 +5,10 @@ require "nokogiri"
 describe Hydra::RightsMetadata do
   
   before(:each) do
-    Fedora::Repository.stubs(:instance).returns(stub_everything())
-    @sample = Hydra::RightsMetadata.new
+    ActiveFedora::RubydoraConnection.stubs(:instance).returns(stub_everything())
+    obj = ActiveFedora::Base.new
+    @sample = Hydra::RightsMetadata.new(obj.inner_object, nil)
+    @sample.stubs(:content).returns('')
   end
   
   describe "permissions" do
@@ -125,7 +127,10 @@ describe Hydra::RightsMetadata do
     it "should solrize fixture content correctly" do
       fixture_xml = Nokogiri::XML::Document.parse( File.new(File.join( File.dirname(__FILE__), "../../fixtures/hydrangea_fixture_mods_article1.foxml.xml") ))
       fixture_rights = fixture_xml.xpath("//foxml:datastream[@ID='rightsMetadata']/foxml:datastreamVersion[last()]/foxml:xmlContent", {'foxml'=>"info:fedora/fedora-system:def/foxml#"}).first.to_xml
-      lsample = Hydra::RightsMetadata.from_xml(fixture_rights)
+      lsample = Hydra::RightsMetadata.new(nil, nil)
+      lsample.content = fixture_rights
+#      lsample.expects(:content).returns('')
+      lsample = Hydra::RightsMetadata.from_xml(fixture_rights, lsample)
       solr_doc = lsample.to_solr
       solr_doc["edit_access_person_t"].should == ["researcher1"]
       solr_doc["edit_access_group_t"].should == ["archivist"]

data/test_support/spec/models/image_asset_spec.rb

@@ -4,7 +4,7 @@ require "active_fedora"
 describe ImageAsset do
   
   before(:each) do
-    Fedora::Repository.stubs(:instance).returns(stub_everything())
+#    Fedora::Repository.stubs(:instance).returns(stub_everything())
     @asset = ImageAsset.new
     @asset.stubs(:create_date).returns("2008-07-02T05:09:42.015Z")
     @asset.stubs(:modified_date).returns("2008-09-29T21:21:52.892Z")
@@ -17,7 +17,7 @@ describe ImageAsset do
   end
   
   it "should have a conforms_to relationship pointing to FileAsset" do
-    @asset.relationships[:self][:has_model].should include("info:fedora/afmodel:FileAsset")
+    @asset.ids_for_outbound(:has_model).should include("afmodel:FileAsset")
   end
   
-end
+end

data/test_support/spec/models/mods_asset_spec.rb

@@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe ModsAsset do
   
   before(:each) do
-    Fedora::Repository.stubs(:instance).returns(stub_everything())
-    @asset = ModsAsset.new
+#    Fedora::Repository.stubs(:instance).returns(stub_everything())
+    @asset = ModsAsset.new nil
     # @asset.stubs(:create_date).returns("2008-07-02T05:09:42.015Z")
     # @asset.stubs(:modified_date).returns("2008-09-29T21:21:52.892Z")
   end
@@ -26,4 +26,4 @@ describe ModsAsset do
     @asset.relationships[:self][:has_model].should include("info:fedora/hydra-cModel:modsObject")
   end
   
-end
+end

data/test_support/spec/models/video_asset_spec.rb

@@ -4,7 +4,7 @@ require "active_fedora"
 describe VideoAsset do
   
   before(:each) do
-    Fedora::Repository.stubs(:instance).returns(stub_everything())
+#    Fedora::Repository.stubs(:instance).returns(stub_everything())
     @asset = VideoAsset.new
     @asset.stubs(:create_date).returns("2008-07-02T05:09:42.015Z")
     @asset.stubs(:modified_date).returns("2008-09-29T21:21:52.892Z")
@@ -17,7 +17,7 @@ describe VideoAsset do
   end
   
   it "should have a conforms_to relationship pointing to FileAsset" do
-    @asset.relationships[:self][:has_model].should include("info:fedora/afmodel:FileAsset")
+    @asset.ids_for_outbound(:has_model).should include("afmodel:FileAsset")
   end
   
-end
+end