active-fedora 1.2.6 → 1.2.7

data/spec/fixtures/mods_articles/hydrangea_article1.xml

@@ -1,13 +1,13 @@
 <mods version="3.0" xsi:schemaLocation="http://www.loc.gov/mods/v3
- http://www.loc.gov/standards/mods/v3/mods-3-0.xsd" xmlns="http://www.loc.gov/mods/v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   http://www.loc.gov/standards/mods/v3/mods-3-0.xsd" xmlns="http://www.loc.gov/mods/v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <titleInfo>
         <nonSort>THE</nonSort>
-        <title>ARTICLE TITLE HYDRANGEA ARTICLE 1</title>
+        <title>ARTICLE TITLE</title>
         <subTitle>SUBTITLE</subTitle>
     </titleInfo>
-    <titleInfo lang="finnish">
-        <title>Artikkelin otsikko Hydrangea artiklan 1</title>
+    <titleInfo type="alternative">
+        <title>VARYING FORM OF TITLE</title>
     </titleInfo>
 
     <name type="personal">
@@ -17,23 +17,31 @@
         <displayForm>NAME AS IT APPEARS</displayForm>
         <affiliation>FACULTY, UNIVERSITY</affiliation>    
         <role> 
-            <roleTerm authority="marcrelator" type="text">creator</roleTerm>
-        </role>
-        <role>
-            <roleTerm type="text">submitter</roleTerm>
+            <roleTerm authority="marcrelator" type="text">Creator</roleTerm>
         </role>
     </name>
-    
     <name type="personal">
-        <namePart type="family">Gautama</namePart>
-        <namePart type="given">Siddartha</namePart>
-        <namePart type="termsOfAddress">Prince</namePart>
-        <affiliation>Nirvana</affiliation>    
-        <role> 
-            <roleTerm authority="marcrelator" type="text">teacher</roleTerm>
+        <namePart type="family">Lacks</namePart>
+        <namePart type="given">Henrietta</namePart>
+        <displayForm>HeLa</displayForm>
+        <affiliation>Baltimore</affiliation>    
+        <role>
+            <roleTerm authority="marcrelator" type="text">Contributor</roleTerm>
         </role>
     </name>
-
+    <name type="corporate"> 
+      <namePart>NSF</namePart> 
+      <role> 
+        <roleTerm authority="marcrelator" type="text">Funder</roleTerm> 
+      </role> 
+    </name> 
+    <name type="conference"> 
+      <namePart>some conference</namePart> 
+      <role> 
+        <roleTerm authority="marcrelator" type="text">Host</roleTerm> 
+      </role> 
+    </name>
+      
     <typeOfResource>text</typeOfResource>
     <genre authority="local">journal article</genre>
 

data/spec/integration/base_spec.rb

@@ -5,6 +5,10 @@ class MockAFBaseRelationship < ActiveFedora::Base
   has_relationship "testing2", :has_member, :type=>MockAFBaseRelationship
   has_relationship "testing_inbound", :has_part, :type=>MockAFBaseRelationship, :inbound=>true
   has_relationship "testing_inbound2", :has_member, :type=>MockAFBaseRelationship, :inbound=>true
+  has_bidirectional_relationship "testing_bidirectional", :has_collection_member, :is_member_of_collection
+  #next 2 used to test objects on opposite end of bidirectional relationship
+  has_relationship "testing_inbound3", :has_collection_member, :inbound=>true
+  has_relationship "testing3", :is_member_of_collection
 end
 
 class MockAFBaseDatastream < ActiveFedora::Base
@@ -208,6 +212,33 @@ describe ActiveFedora::Base do
       rexml.root.elements["rdf:Description/isMemberOf[@rdf:resource='info:fedora/demo:10']"].attributes["xmlns"].should == 'info:fedora/fedora-system:def/relations-external#'
     end
   end
+
+  describe '.add_file_datastream' do
+
+   it "should set the correct mimeType if :mime_type, :mimeType, or :content_type passed in and path does not contain correct extension" do
+     f = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino_jpg_no_file_ext" ))
+     @test_object.add_file_datastream(f)
+     @test_object.save
+     test_obj = ActiveFedora::Base.load_instance(@test_object.pid)
+     #check case where nothing passed in does not have correct mime type
+     test_obj.datastreams["DS1"].attributes["mimeType"].should == "application/octet-stream"
+     @test_object2 = ActiveFedora::Base.new
+     @test_object2.add_file_datastream(f,{:mimeType=>"image/jpeg"})
+     @test_object2.save
+     test_obj = ActiveFedora::Base.load_instance(@test_object2.pid)
+     test_obj.datastreams["DS1"].attributes["mimeType"].should == "image/jpeg"
+     @test_object3 = ActiveFedora::Base.new
+     @test_object3.add_file_datastream(f,{:mime_type=>"image/jpeg"})
+     @test_object3.save
+     test_obj = ActiveFedora::Base.load_instance(@test_object3.pid)
+     test_obj.datastreams["DS1"].attributes["mimeType"].should == "image/jpeg"
+     @test_object4 = ActiveFedora::Base.new
+     @test_object4.add_file_datastream(f,{:content_type=>"image/jpeg"})
+     @test_object4.save
+     test_obj = ActiveFedora::Base.load_instance(@test_object4.pid)
+     test_obj.datastreams["DS1"].attributes["mimeType"].should == "image/jpeg"
+   end
+  end
   
   describe '.add_datastream' do
   
@@ -284,29 +315,41 @@ describe ActiveFedora::Base do
         model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
         #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
         @test_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],
-                                                              "testing2"=>[r4.object]},
-                                                            :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[]}}
-        @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
+                                                              "testing2"=>[r4.object],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                            :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+        @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
                                                            :inbound=>{"testing_inbound"=>[r2.object],
-                                                                      "testing_inbound2"=>[r5.object]}}
-        @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
-                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object]}}
+                                                                      "testing_inbound2"=>[r5.object],
+                                                                      "testing_bidirectional_inbound"=>[],
+                                                                      "testing_inbound3"=>[]}}
+        @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
+                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
         @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                    "testing2"=>[r3.object]},
-                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[]}}
+                                                                    "testing2"=>[r3.object],
+                                                                    "testing_bidirectional_outbound"=>[],
+                                                                    "testing3"=>[]},
+                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
         @test_object2.delete
         #need to reload since removed from rels_ext in memory
         @test_object5 = MockAFBaseRelationship.load_instance(@test_object5.pid)
       
         #check any test_object2 inbound rels gone from source
-        @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
+        @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
                                                             :inbound=>{"testing_inbound"=>[],
-                                                                       "testing_inbound2"=>[r5.object]}}
-        @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
-                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[]}}
+                                                                       "testing_inbound2"=>[r5.object],
+                                                                       "testing_bidirectional_inbound"=>[],
+                                                                       "testing_inbound3"=>[]}}
+        @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
         @test_object5.named_relationships(false).should == {:self=>{"testing"=>[],
-                                                                  "testing2"=>[r3.object]},
-                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[]}}
+                                                                  "testing2"=>[r3.object],
+                                                                  "testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
    
     end
   end
@@ -354,8 +397,10 @@ describe ActiveFedora::Base do
       #append to named relationship 'testing'
       @test_object2.testing_append(@test_object3)
       @test_object2.testing2_append(@test_object4)
+      @test_object2.testing3_append(@test_object5)
       @test_object5.testing_append(@test_object2)
       @test_object5.testing2_append(@test_object3)
+      @test_object5.testing_bidirectional_append(@test_object4)
       @test_object2.save
       @test_object5.save
       r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
@@ -366,26 +411,30 @@ describe ActiveFedora::Base do
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
       @test_object2.relationships(false).should == {:self=>{:has_model=>[model_rel.object],
                                                             :has_part=>[r3.object],
-                                                            :has_member=>[r4.object]},
+                                                            :has_member=>[r4.object],
+                                                            :is_member_of_collection=>[r5.object]},
                                                     :inbound=>{:has_part=>[r5.object]}}
       @test_object3.relationships(false).should == {:self=>{:has_model=>[model_rel.object]},
                                                     :inbound=>{:has_part=>[r2.object],
                                                                :has_member=>[r5.object]}}
       @test_object4.relationships(false).should == {:self=>{:has_model=>[model_rel.object]},
-                                                    :inbound=>{:has_member=>[r2.object]}}
+                                                    :inbound=>{:has_member=>[r2.object],:has_collection_member=>[r5.object]}}
       @test_object5.relationships(false).should == {:self=>{:has_model=>[model_rel.object],
                                                             :has_part=>[r2.object],
-                                                            :has_member=>[r3.object]},
-                                                    :inbound=>{}}
+                                                            :has_member=>[r3.object],
+                                                            :has_collection_member=>[r4.object]},
+                                                    :inbound=>{:is_member_of_collection=>[r2.object]}}
       #all inbound should now be empty if no parameter supplied to relationships
       @test_object2.relationships.should == {:self=>{:has_model=>[model_rel.object],
                                                             :has_part=>[r3.object],
-                                                            :has_member=>[r4.object]}}
+                                                            :has_member=>[r4.object],
+                                                            :is_member_of_collection=>[r5.object]}}
       @test_object3.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
       @test_object4.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
       @test_object5.relationships.should == {:self=>{:has_model=>[model_rel.object],
                                                             :has_part=>[r2.object],
-                                                            :has_member=>[r3.object]}}
+                                                            :has_member=>[r3.object],
+                                                            :has_collection_member=>[r4.object]}}
     end
   end
   
@@ -408,6 +457,7 @@ describe ActiveFedora::Base do
       @test_object2.testing2_append(@test_object4)
       @test_object5.testing_append(@test_object2)
       @test_object5.testing2_append(@test_object3)
+      #@test_object5.testing_bidirectional_append(@test_object4)
       @test_object2.save
       @test_object5.save
       r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
@@ -450,10 +500,14 @@ describe ActiveFedora::Base do
       r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.named_inbound_relationships.should == {"testing_inbound"=>[r5.object],"testing_inbound2"=>[]}
-      @test_object3.named_inbound_relationships.should == {"testing_inbound"=>[r2.object],"testing_inbound2"=>[r5.object]}
-      @test_object4.named_inbound_relationships.should == {"testing_inbound"=>[],"testing_inbound2"=>[r2.object]}
-      @test_object5.named_inbound_relationships.should == {"testing_inbound"=>[],"testing_inbound2"=>[]}
+      @test_object2.named_inbound_relationships.should == {"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}
+      @test_object3.named_inbound_relationships.should == {"testing_inbound"=>[r2.object],"testing_inbound2"=>[r5.object],
+                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}
+      @test_object4.named_inbound_relationships.should == {"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
+                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}
+      @test_object5.named_inbound_relationships.should == {"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}
     end
   end
   
@@ -485,23 +539,32 @@ describe ActiveFedora::Base do
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
       @test_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],
-                                                            "testing2"=>[r4.object]},
-                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[]}}
-      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
+                                                            "testing2"=>[r4.object],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
                                                     :inbound=>{"testing_inbound"=>[r2.object],
-                                                               "testing_inbound2"=>[r5.object]}}
-      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object]}}
+                                                               "testing_inbound2"=>[r5.object],
+                                                               "testing_bidirectional_inbound"=>[],
+                                                               "testing_inbound3"=>[]}}
+      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
+                                                               "testing_bidirectional_inbound"=>[], "testing_inbound3"=>[]}}
       @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                  "testing2"=>[r3.object]},
-                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[]}}
+                                                                  "testing2"=>[r3.object],
+                                                                  "testing_bidirectional_outbound"=>[],
+                                                                  "testing3"=>[]},
+                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                                     "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
       #all inbound should now be empty if no parameter supplied to relationships
       @test_object2.named_relationships.should == {:self=>{"testing"=>[r3.object],
-                                                            "testing2"=>[r4.object]}}
-      @test_object3.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[]}}
-      @test_object4.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[]}}
+                                                            "testing2"=>[r4.object],
+                                                            "testing_bidirectional_outbound"=>[],
+                                                            "testing3"=>[]}}
+      @test_object3.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]}}
+      @test_object4.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]}}
       @test_object5.named_relationships.should == {:self=>{"testing"=>[r2.object],
-                                                           "testing2"=>[r3.object]}}
+                                                           "testing2"=>[r3.object],"testing_bidirectional_outbound"=>[],"testing3"=>[]}}
     end
   end
   
@@ -533,16 +596,23 @@ describe ActiveFedora::Base do
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
       @test_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],
-                                                            "testing2"=>[r4.object]},
-                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[]}}
-      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
+                                                            "testing2"=>[r4.object],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
                                                     :inbound=>{"testing_inbound"=>[r2.object],
-                                                               "testing_inbound2"=>[r5.object]}}
-      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object]}}
+                                                               "testing_inbound2"=>[r5.object],
+                                                               "testing_bidirectional_inbound"=>[],
+                                                               "testing_inbound3"=>[]}}
+      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
+                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
       @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                  "testing2"=>[r3.object]},
-                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[]}}
+                                                                  "testing2"=>[r3.object],
+                                                                  "testing_bidirectional_outbound"=>[],
+                                                                  "testing3"=>[]},
+                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                                     "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
     end
   end
   
@@ -574,30 +644,45 @@ describe ActiveFedora::Base do
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
       @test_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],
-                                                            "testing2"=>[r4.object]},
-                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[]}}
-      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
+                                                            "testing2"=>[r4.object],
+                                                            "testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
                                                     :inbound=>{"testing_inbound"=>[r2.object],
-                                                               "testing_inbound2"=>[r5.object]}}
-      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object]}}
+                                                               "testing_inbound2"=>[r5.object],
+                                                               "testing_bidirectional_inbound"=>[],
+                                                               "testing_inbound3"=>[]}}
+      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
+                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
       @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                  "testing2"=>[r3.object]},
-                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[]}}
+                                                                  "testing2"=>[r3.object],
+                                                                  "testing_bidirectional_outbound"=>[],
+                                                                  "testing3"=>[]},
+                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                                     "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
       @test_object2.remove_named_relationship("testing",@test_object3)
       @test_object2.save
       #check now removed for both outbound and inbound
       @test_object2.named_relationships(false).should == {:self=>{"testing"=>[],
-                                                            "testing2"=>[r4.object]},
-                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[]}}
-      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
+                                                            "testing2"=>[r4.object],
+                                                            "testing_bidirectional_outbound"=>[],
+                                                            "testing3"=>[]},
+                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
                                                     :inbound=>{"testing_inbound"=>[],
-                                                               "testing_inbound2"=>[r5.object]}}
-      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object]}}
+                                                               "testing_inbound2"=>[r5.object],
+                                                                "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
+                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
       @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                  "testing2"=>[r3.object]},
-                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[]}}
+                                                                  "testing2"=>[r3.object],
+                                                                  "testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                                     "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
    
     end
   end

data/spec/integration/nokogiri_datastream_spec.rb

@@ -0,0 +1,60 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+require "hydra"
+require "solrizer"
+
+describe ActiveFedora::NokogiriDatastream do
+  
+  before(:all) do
+    class HydrangeaArticle2 < ActiveFedora::Base
+
+      has_relationship "parts", :is_part_of, :inbound => true
+
+      # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
+      # has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadata 
+
+      # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
+      has_metadata :name => "descMetadata", :type => Hydra::SampleModsDatastream
+
+      # A place to put extra metadata values
+      has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
+        m.field 'collection', :string
+      end
+    end
+
+    @pid = "hydrangea:fixture_mods_article1"
+    @test_solr_object = HydrangeaArticle2.load_instance_from_solr(@pid)
+    @test_object = HydrangeaArticle2.load_instance(@pid)
+  end
+
+  describe '.term_values' do
+
+    it "should return the same values whether getting from solr or Fedora" do
+      @test_solr_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
+      @test_solr_object.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
+      @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
+      @test_solr_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
+      @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
+      @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
+      ar = @test_solr_object.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
+      ar.length.should == 4
+      ar.include?("Creator").should == true
+      ar.include?("Contributor").should == true
+      ar.include?("Funder").should == true
+      ar.include?("Host").should == true
+
+      @test_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
+      @test_object.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
+      @test_object.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
+      @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
+      @test_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
+      @test_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
+      ar = @test_object.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
+      ar.length.should == 4
+      ar.include?("Creator").should == true
+      ar.include?("Contributor").should == true
+      ar.include?("Funder").should == true
+      ar.include?("Host").should == true
+    end
+  end
+  
+end

data/spec/unit/base_named_datastream_spec.rb

@@ -5,6 +5,8 @@ require "active_fedora"
 
 describe ActiveFedora::Base do
   
+  @@last_pid = 0
+
   def increment_pid
     @@last_pid += 1    
   end
@@ -577,4 +579,4 @@ describe ActiveFedora::Base do
       @test_object2.should respond_to(:external_ids)
     end
   end
-end
+end

data/spec/unit/nokogiri_datastream_spec.rb

@@ -10,7 +10,8 @@ describe ActiveFedora::NokogiriDatastream do
                       :empty_field => {:values => {}}
                       } 
     @sample_xml = XmlSimple.xml_in("<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>fake-date</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>")
-    
+
+    @solr_doc = {"id"=>"hydrange_article1","name_role_roleTerm_t"=>["creator","submitter","teacher"],"name_0_role_t"=>"\r\ncreator\r\nsubmitter\r\n","name_1_role_t"=>"\r\n teacher \r\n","name_0_role_0_roleTerm_t"=>"creator","name_0_role_1_roleTerm_t"=>"submitter","name_1_role_0_roleTerm_t"=>["teacher"]}
   end
   
   before(:each) do
@@ -98,7 +99,7 @@ describe ActiveFedora::NokogiriDatastream do
     end
     
     it "should return the new index of any added values" do
-      @mods_ds.get_values([{:title_info=>0},:main_title]).should == ["ARTICLE TITLE HYDRANGEA ARTICLE 1", "TITLE OF HOST JOURNAL"]
+      @mods_ds.get_values([{:title_info=>0},:main_title]).should == ["ARTICLE TITLE", "TITLE OF HOST JOURNAL"]
       result = @mods_ds.update_indexed_attributes [{"title_info"=>"0"},"main_title"]=>{"-1"=>"mork"}
       result.should == {"title_info_0_main_title"=>{"2"=>"mork"}}
     end
@@ -157,7 +158,7 @@ describe ActiveFedora::NokogiriDatastream do
     # end
     
     it "should set @dirty to true" do
-      @mods_ds.get_values([{:title_info=>0},:main_title]).should == ["ARTICLE TITLE HYDRANGEA ARTICLE 1", "TITLE OF HOST JOURNAL"]
+      @mods_ds.get_values([{:title_info=>0},:main_title]).should == ["ARTICLE TITLE", "TITLE OF HOST JOURNAL"]
       @mods_ds.update_indexed_attributes [{"title_info"=>"0"},"main_title"]=>{"-1"=>"mork"}
       @mods_ds.dirty?.should be_true
     end
@@ -278,5 +279,110 @@ describe ActiveFedora::NokogiriDatastream do
       @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)
+      @test_ds.internal_solr_doc.should == @solr_doc
+    end
+  end
+
+  describe '.get_values_from_solr' do
+    before(:each) do
+      @mods_ds = ActiveFedora::NokogiriDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+    end
+
+    it "should return empty array if internal_solr_doc not set" do
+      @mods_ds.get_values_from_solr(:name,:role,:roleTerm)
+    end
+ 
+    it "should return correct values from solr_doc given different term pointers" do
+      mock_term = mock("OM::XML::Term")
+      mock_term.stubs(:data_type).returns(:text)
+      mock_terminology = mock("OM::XML::Terminology")
+      mock_terminology.stubs(:retrieve_term).returns(mock_term)
+      ActiveFedora::NokogiriDatastream.stubs(:terminology).returns(mock_terminology)
+      @mods_ds.from_solr(@solr_doc)
+      term_pointer = [:name,:role,:roleTerm]
+      @mods_ds.get_values_from_solr(:name,:role,:roleTerm).should == ["creator","submitter","teacher"]
+      ar = @mods_ds.get_values_from_solr({:name=>0},:role,:roleTerm)
+      ar.length.should == 2
+      ar.include?("creator").should == true
+      ar.include?("submitter").should == true
+      @mods_ds.get_values_from_solr({:name=>1},:role,:roleTerm).should == ["teacher"]
+      @mods_ds.get_values_from_solr({:name=>0},{:role=>0},:roleTerm).should == ["creator"]
+      @mods_ds.get_values_from_solr({:name=>0},{:role=>1},:roleTerm).should == ["submitter"]
+      @mods_ds.get_values_from_solr({:name=>0},{:role=>2},:roleTerm).should == []
+      @mods_ds.get_values_from_solr({:name=>1},{:role=>0},:roleTerm).should == ["teacher"]
+      @mods_ds.get_values_from_solr({:name=>1},{:role=>1},:roleTerm).should == []
+      ar = @mods_ds.get_values_from_solr(:name,{:role=>0},:roleTerm)
+      ar.length.should == 2
+      ar.include?("creator").should == true
+      ar.include?("teacher").should == true
+      @mods_ds.get_values_from_solr(:name,{:role=>1},:roleTerm).should == ["submitter"]
+    end
+  end
+
+  describe '.has_solr_name?' do
+    it "should return true if the given key exists in the solr document passed in" do
+      @test_ds.has_solr_name?("name_0_role_0_roleTerm_t",@solr_doc).should == true
+      @test_ds.has_solr_name?(:name_0_role_0_roleTerm_t,@solr_doc).should == true
+      @test_ds.has_solr_name?("name_1_role_1_roleTerm_t",@solr_doc).should == false
+      #if not doc passed in should be new empty solr doc and always return false
+      @test_ds.has_solr_name?("name_0_role_0_roleTerm_t").should == false
+    end
+  end
+
+  describe '.is_hierarchical_term_pointer?' do
+    it "should return true only if the pointer passed in is an array that contains a hash" do
+      @test_ds.is_hierarchical_term_pointer?(*[:image,{:tag1=>1},:tag2]).should == true
+      @test_ds.is_hierarchical_term_pointer?(*[:image,:tag1,{:tag2=>1}]).should == true
+      @test_ds.is_hierarchical_term_pointer?(*[:image,:tag1,:tag2]).should == false
+      @test_ds.is_hierarchical_term_pointer?(nil).should == false      
+    end
+  end
+
+  describe '.update_values' do
+    before(:each) do
+      @mods_ds = ActiveFedora::NokogiriDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+    end
+
+    it "should throw an exception if we have initialized the internal_solr_doc." do
+      @mods_ds.from_solr(@solr_doc)
+      found_exception = false
+      begin
+        @mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
+      rescue
+        found_exception = true
+      end
+      found_exception.should == true
+    end
+
+    it "should update a value internally call OM::XML::TermValueOperators::update_values if internal_solr_doc is not set" do
+      @mods_ds.stubs(:om_update_values).once()
+      term_pointer = [:name,:role,:roleTerm]
+      @mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
+    end
+  end
+
+  describe '.term_values' do
+
+    before(:each) do
+      @mods_ds = ActiveFedora::NokogiriDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+    end
+
+    it "should call OM::XML::term_values if internal_solr_doc is not set and return values from xml" do
+      @mods_ds.stubs(:om_term_values).once()
+      term_pointer = [:name,:role,:roleTerm]
+      @mods_ds.term_values(*term_pointer)
+    end
+
+    # we will know this is working because solr_doc and xml are not synced so that wrong return mechanism can be detected
+    it "should call get_values_from_solr if internal_solr_doc is set" do
+      @mods_ds.from_solr(@solr_doc)
+      term_pointer = [:name,:role,:roleTerm]
+      @mods_ds.stubs(:get_values_from_solr).once()
+      @mods_ds.term_values(*term_pointer)
+    end
+  end
 end