active-fedora 1.1.8 → 1.1.9

data/lib/active_fedora/rels_ext_datastream.rb

@@ -34,7 +34,6 @@ module ActiveFedora
       # node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/rdf:RDF/rdf:Description/*").each do |f|
       node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/rdf:RDF/rdf:Description/*", {"rdf"=>"http://www.w3.org/1999/02/22-rdf-syntax-ns#", "foxml"=>"info:fedora/fedora-system:def/foxml#"}).each do |f|
           r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>ActiveFedora::SemanticNode::PREDICATE_MAPPINGS.invert[f.name], :object=>f["resource"])
-          puts "adding #{r.inspect} to template"
           tmpl.add_relationship(r)
       end
       tmpl.send(:dirty=, false)

data/lib/hydra.rb

@@ -1,2 +1,2 @@
 module Hydra;end
-require "hydra/mods_article"
+require "hydra/sample_mods_datastream"

data/lib/hydra/sample_mods_datastream.rb

@@ -0,0 +1,100 @@
+require "hydra"
+module Hydra
+class Hydra::SampleModsDatastream < ActiveFedora::NokogiriDatastream       
+
+    # have to call this in order to set namespace & schema
+    root_property :mods, "mods", "http://www.loc.gov/mods/v3", :attributes=>["id", "version"], :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd"          
+
+    property :title_info, :path=>"titleInfo", 
+                :convenience_methods => {
+                  :main_title => {:path=>"title"},
+                  :language => {:path=>{:attribute=>"lang"}},                    
+                }
+    property :abstract, :path=>"abstract"
+    property :topic_tag, :path=>'subject',:default_content_path => "topic"
+
+    property :name_, :path=>"name", 
+                :attributes=>[:xlink, :lang, "xml:lang", :script, :transliteration, {:type=>["personal", "enumerated", "corporate"]} ],
+                :subelements=>["namePart", "displayForm", "affiliation", :role, "description"],
+                :default_content_path => "namePart",
+                :convenience_methods => {
+                  :date => {:path=>"namePart", :attributes=>{:type=>"date"}},
+                  :family_name => {:path=>"namePart", :attributes=>{:type=>"family"}},
+                  :first_name => {:path=>"namePart", :attributes=>{:type=>"given"}},
+                  :terms_of_address => {:path=>"namePart", :attributes=>{:type=>"termsOfAddress"}}
+                }
+
+    property :person, :variant_of=>:name_, :attributes=>{:type=>"personal"}
+    property :organizaton, :variant_of=>:name_, :attributes=>{:type=>"institutional"}
+    property :conference, :variant_of=>:name_, :attributes=>{:type=>"conference"}
+
+    property :role, :path=>"role",
+                :parents=>[:name_],
+                :convenience_methods => {
+                  :text => {:path=>"roleTerm", :attributes=>{:type=>"text"}},
+                  :code => {:path=>"roleTerm", :attributes=>{:type=>"code"}},                    
+                }
+
+    property :journal, :path=>'relatedItem', :attributes=>{:type=>"host"},
+                :subelements=>[:title_info, :origin_info, :issue],
+                :convenience_methods => {
+                  :issn => {:path=>"identifier", :attributes=>{:type=>"issn"}},
+                }
+
+    property :origin_info, :path=>'originInfo',
+                :subelements=>["publisher","dateIssued"]
+
+    property :issue, :path=>'part',
+                :subelements=>[:start_page, :end_page],
+                :convenience_methods => {
+                  :volume => {:path=>"detail", :attributes=>{:type=>"volume"}},
+                  :level => {:path=>"detail", :attributes=>{:type=>"level"}},
+                  :publication_date => {:path=>"date"}
+                }
+    property :start_page, :path=>"extent", :attributes=>{:unit=>"pages"}, :default_content_path => "start"
+    property :end_page, :path=>"extent", :attributes=>{:unit=>"pages"}, :default_content_path => "end"
+
+    generate_accessors_from_properties    
+    # accessor :title_info, :relative_xpath=>'oxns:titleInfo', :children=>[
+    #   {:main_title=>{:relative_xpath=>'oxns:title'}},         
+    #   {:language =>{:relative_xpath=>{:attribute=>"lang"} }}
+    #   ] 
+    # accessor :abstract
+    # accessor :topic_tag, :relative_xpath=>'oxns:subject/oxns:topic'
+    # accessor :person, :relative_xpath=>'oxns:name[@type="personal"]',  :children=>[
+    #   {:last_name=>{:relative_xpath=>'oxns:namePart[@type="family"]'}}, 
+    #   {:first_name=>{:relative_xpath=>'oxns:namePart[@type="given"]'}}, 
+    #   {:institution=>{:relative_xpath=>'oxns:affiliation'}}, 
+    #   {:role=>{:children=>[
+    #     {:text=>{:relative_xpath=>'oxns:roleTerm[@type="text"]'}},
+    #     {:code=>{:relative_xpath=>'oxns:roleTerm[@type="code"]'}}
+    #   ]}}
+    # ]
+    # accessor :organization, :relative_xpath=>'oxns:name[@type="institutional"]', :children=>[
+    #   {:role=>{:children=>[
+    #     {:text=>{:relative_xpath=>'oxns:roleTerm[@type="text"]'}},
+    #     {:code=>{:relative_xpath=>'oxns:roleTerm[@type="code"]'}}
+    #   ]}}
+    # ]
+    # accessor :conference, :relative_xpath=>'oxns:name[@type="conference"]', :children=>[
+    #   {:role=>{:children=>[
+    #     {:text=>{:relative_xpath=>'oxns:roleTerm[@type="text"]'}},
+    #     {:code=>{:relative_xpath=>'oxns:roleTerm[@type="code"]'}}
+    #   ]}}
+    # ]
+    # accessor :journal, :relative_xpath=>'oxns:relatedItem[@type="host"]', :children=>[
+    #     {:title=>{:relative_xpath=>'oxns:titleInfo/oxns:title'}}, 
+    #     {:publisher=>{:relative_xpath=>'oxns:originInfo/oxns:publisher'}},
+    #     {:issn=>{:relative_xpath=>'oxns:identifier[@type="issn"]'}}, 
+    #     {:date_issued=>{:relative_xpath=>'oxns:originInfo/oxns:dateIssued'}},
+    #     {:issue => {:relative_xpath=>"oxns:part", :children=>[          
+    #       {:volume=>{:relative_xpath=>'oxns:detail[@type="volume"]'}},
+    #       {:level=>{:relative_xpath=>'oxns:detail[@type="level"]'}},
+    #       {:start_page=>{:relative_xpath=>'oxns:extent[@unit="pages"]/oxns:start'}},
+    #       {:end_page=>{:relative_xpath=>'oxns:extent[@unit="pages"]/oxns:end'}},
+    #       {:publication_date=>{:relative_xpath=>'oxns:date'}}
+    #     ]}}
+    # ]    
+
+end
+end

data/spec/hydrangea_fixture_mods_article1.foxml.xml

@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<foxml:digitalObject VERSION="1.1" PID="hydrangea:fixture_mods_article1"
+xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
+<foxml:objectProperties>
+<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE=""/>
+<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+<foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-06-17T19:56:19.301Z"/>
+<foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-17T19:57:30.688Z"/>
+</foxml:objectProperties>
+<foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
+<foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2010-06-17T19:56:19.301Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
+<foxml:xmlContent>
+<audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+<audit:record ID="AUDREC1">
+<audit:process type="Fedora API-M"/>
+<audit:action>addDatastream</audit:action>
+<audit:componentID>descMetadata</audit:componentID>
+<audit:responsibility>fedoraAdmin</audit:responsibility>
+<audit:date>2010-06-17T19:56:22.150Z</audit:date>
+<audit:justification></audit:justification>
+</audit:record>
+<audit:record ID="AUDREC2">
+<audit:process type="Fedora API-M"/>
+<audit:action>addDatastream</audit:action>
+<audit:componentID>RELS-EXT</audit:componentID>
+<audit:responsibility>fedoraAdmin</audit:responsibility>
+<audit:date>2010-06-17T19:56:22.353Z</audit:date>
+<audit:justification></audit:justification>
+</audit:record>
+<audit:record ID="AUDREC3">
+<audit:process type="Fedora API-M"/>
+<audit:action>addDatastream</audit:action>
+<audit:componentID>rightsMetadata</audit:componentID>
+<audit:responsibility>fedoraAdmin</audit:responsibility>
+<audit:date>2010-06-17T19:56:23.335Z</audit:date>
+<audit:justification></audit:justification>
+</audit:record>
+<audit:record ID="AUDREC4">
+<audit:process type="Fedora API-M"/>
+<audit:action>addDatastream</audit:action>
+<audit:componentID>properties</audit:componentID>
+<audit:responsibility>fedoraAdmin</audit:responsibility>
+<audit:date>2010-06-17T19:56:23.477Z</audit:date>
+<audit:justification></audit:justification>
+</audit:record>
+<audit:record ID="AUDREC5">
+<audit:process type="Fedora API-M"/>
+<audit:action>modifyObject</audit:action>
+<audit:componentID></audit:componentID>
+<audit:responsibility>fedoraAdmin</audit:responsibility>
+<audit:date>2010-06-17T19:57:30.688Z</audit:date>
+<audit:justification></audit:justification>
+</audit:record>
+</audit:auditTrail>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2010-06-17T19:56:19.301Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="360">
+<foxml:xmlContent>
+<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+  <dc:identifier>hydrangea:fixture_mods_article1</dc:identifier>
+</oai_dc:dc>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="descMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="descMetadata.0" LABEL="" CREATED="2010-06-17T19:56:22.150Z" MIMETYPE="text/xml" SIZE="19">
+<foxml:xmlContent>
+  <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">
+
+      <titleInfo>
+          <nonSort>THE</nonSort>
+          <title>ARTICLE TITLE</title>
+          <subTitle>SUBTITLE</subTitle>
+      </titleInfo>
+      <titleInfo type="alternative">
+          <title>VARYING FORM OF TITLE</title>
+      </titleInfo>
+
+      <name type="personal">
+          <namePart type="family">FAMILY NAME</namePart>
+          <namePart type="given">GIVEN NAMES</namePart>
+          <namePart type="termsOfAddress">DR.</namePart>
+          <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>
+          </role>
+      </name>
+      <name type="personal">
+          <namePart type="family">Lacks</namePart>
+          <namePart type="given">Henrietta</namePart>
+          <displayForm>HeLa</displayForm>
+          <affiliation>Baltimore</affiliation>    
+          <role>
+              <roleTerm type="text">contributor</roleTerm>
+          </role>
+      </name>
+
+      <typeOfResource>text</typeOfResource>
+      <genre authority="local">journal article</genre>
+
+      <abstract>ABSTRACT</abstract>
+      <subject>
+          <topic>TOPIC 1</topic>
+          <topic>TOPIC 2</topic>
+      </subject>
+      <subject authority="AUTHORITY SOURCE (RFCD, LCSH)">
+          <topic>CONTROLLED TERM</topic>
+      </subject>
+
+      <language>
+          <languageTerm authority="iso639-2b" type="code">en-aus </languageTerm>
+      </language>
+
+      <physicalDescription>
+          <internetMediaType>application/pdf</internetMediaType>
+          <extent>36 p.</extent>
+      </physicalDescription>
+
+      <relatedItem type="host">
+          <titleInfo>
+              <title>TITLE OF HOST JOURNAL</title>
+          </titleInfo>
+          <originInfo>
+              <publisher>PUBLISHER</publisher>
+              <dateIssued>DATE</dateIssued>
+          </originInfo>
+          <identifier type="issn">0013-8908</identifier>    
+          <part>
+              <detail type="volume">
+                  <number>2</number>
+              </detail>
+              <detail type="level">
+                  <number>2</number>
+              </detail>
+              <extent unit="pages">
+                  <start>195</start>
+                  <end>230</end>
+              </extent>
+              <date>FEB. 2007</date>
+          </part>            
+      </relatedItem>
+
+      <identifier type="uri">http://URL.edu.au/</identifier>
+      <identifier type="doi">doi:10.1006/jmbi.1995.0238</identifier>
+      <location>
+          <url>http://URL.edu.au/</url>
+      </location>        
+      <accessCondition type="restrictionOnAccess">EMBARGO NOTE</accessCondition>
+      <accessCondition type="use and reproduction">OPEN ACCESS</accessCondition>
+
+  </mods>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="RELS-EXT.0" LABEL="" CREATED="2010-06-17T19:56:22.353Z" MIMETYPE="text/xml" SIZE="306">
+<foxml:xmlContent>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about="info:fedora/hydrangea:fixture_mods_article1">
+    <hasModel xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="info:fedora/afmodel:HydrangeaArticle"></hasModel>
+  </rdf:Description>
+</rdf:RDF>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="rightsMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="rightsMetadata.0" LABEL="" CREATED="2010-06-17T19:56:23.335Z" MIMETYPE="text/xml" SIZE="19">
+<foxml:xmlContent>
+  <rightsMetadata>
+      <copyright>
+        <human>(c)2009 The Hydra Project</human>
+        <human type="someSpecialisedType">Blah Blah</human>
+        <human type="aDifferentType">More blah</human>
+    		<machine><a rel="license" href="http://creativecommons.org/licenses/publicdomain/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/publicdomain/88x31.png" /></a><br />This work is in the <a rel="license" href="http://creativecommons.org/licenses/publicdomain/">Public Domain</a>.</machine>
+  	</copyright>
+  	<access type="discover">
+  		<human></human>
+  		<machine>
+  			<policy>hydra-policy:4502</policy>
+        <group>public</group>
+  		</machine>
+  	</access>
+  	<access type="read">
+  		<human></human>
+  		<machine>
+        <group>public</group>
+  		</machine>
+  	</access>
+  	<access type="edit">
+  		<human></human>
+  		<machine>
+        <person>researcher1</person>
+        <group>archivist</group>
+  		</machine>
+  	</access>
+    <access type="etc">
+            <!-- etc -->
+    </access>
+  	<use>
+  		<human>You are free to re-distribute this object, but you cannot change it or sell it. </human>
+  		<machine><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/us/88x31.png" /></a><br />This <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/Sound" rel="dc:type">work</span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/us/">Creative Commons Attribution-Noncommercial-No Derivative Works 3.0 United States License</a>.</machine>
+  	</use>
+
+  </rightsMetadata>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="properties" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="properties.0" LABEL="" CREATED="2010-06-17T19:56:23.477Z" MIMETYPE="text/xml" SIZE="19">
+<foxml:xmlContent>
+<fields></fields>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+</foxml:digitalObject>

data/spec/integration/full_featured_model_spec.rb

@@ -1,5 +1,4 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
-
 require 'rexml/document'
 require "hydra"
 
@@ -35,7 +34,7 @@ describe ActiveFedora::Base do
         #   m.root_property :myxml, "my_xml", "http://www.example.gov/schema/v3"
         # end
         
-        has_metadata :name=>"mods_article", :type=> Hydra::ModsArticle 
+        has_metadata :name=>"mods_article", :type=> Hydra::SampleModsDatastream 
         
         has_metadata :name => "dublin_core", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
           # Default :multiple => true

data/spec/integration/mods_article_integration_spec.rb

@@ -0,0 +1,45 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+# require File.join( File.dirname(__FILE__), "..", "samples", "models", "mods_article" )
+require "hydra"
+describe ActiveFedora::Base do
+
+  before(:all) do
+    class HydrangeaArticle < 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
+  end
+  
+  before(:each) do
+    @test_article = HydrangeaArticle.load_instance("hydrangea:fixture_mods_article1")
+  end
+  
+  describe ".update_indexed_attributes" do
+    before(:each) do
+      @test_article.update_indexed_attributes({[{:person=>0}, :first_name] => "GIVEN NAMES"}, :datastreams=>"descMetadata")
+    end
+    after(:each) do
+      @test_article.update_indexed_attributes({[{:person=>0}, :first_name] => "GIVEN NAMES"}, :datastreams=>"descMetadata")
+    end
+    it "should update the xml in the specified datatsream and save those changes to Fedora" do
+      @test_article.get_values_from_datastream("descMetadata", [{:person=>0}, :first_name]).should == ["GIVEN NAMES"]
+      test_args = {:params=>{[{:person=>0}, :first_name]=>{"0"=>"Replacement FirstName"}}, :opts=>{:datastreams=>"descMetadata"}}
+      @test_article.update_indexed_attributes(test_args[:params], test_args[:opts])
+      @test_article.get_values_from_datastream("descMetadata", [{:person=>0}, :first_name]).should == ["Replacement FirstName"]
+      @test_article.save
+      retrieved_article = HydrangeaArticle.load_instance("hydrangea:fixture_mods_article1")
+      retrieved_article.get_values_from_datastream("descMetadata", [{:person=>0}, :first_name]).should == ["Replacement FirstName"]
+    end
+  end
+end

data/spec/unit/base_extra_spec.rb

@@ -14,17 +14,24 @@ describe ActiveFedora::Base do
   describe ".metadata_streams" do
     it "should return all of the datastreams from the object that are kinds of MetadataDatastreams " do
       mock_mds1 = mock("metadata ds")
-      mock_mds1.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
       mock_mds2 = mock("metadata ds")
-      mock_mds2.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
       mock_fds = mock("file ds")
       mock_fds.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      @test_object.expects(:datastreams).returns({:foo => mock_mds1, :bar => mock_mds2, :baz => mock_fds})
+      mock_ngds = mock("nokogiri ds")
+      mock_ngds.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
+      mock_ngds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
+      
+      
+      [mock_mds1,mock_mds2].each {|ds| ds.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true) }
+      [mock_mds1,mock_mds2,mock_fds].each {|ds| ds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false) }
+      
+      @test_object.expects(:datastreams).returns({:foo => mock_mds1, :bar => mock_mds2, :baz => mock_fds, :bork=>mock_ngds})
       
       result = @test_object.metadata_streams
-      result.length.should == 2
+      result.length.should == 3
       result.should include(mock_mds1)
       result.should include(mock_mds2)
+      result.should include(mock_ngds)
     end
   end
   

data/spec/unit/base_spec.rb

@@ -231,11 +231,14 @@ describe ActiveFedora::Base do
     end
     it "should update solr index with all metadata if any MetadataDatastreams have changed" do
       Fedora::Repository.instance.stubs(:save)
-      mock1 = mock("ds1", :dirty? => true, :save => true, :kind_of? => ActiveFedora::MetadataDatastream)
+      dirty_ds = ActiveFedora::MetadataDatastream.new
+      dirty_ds.expects(:dirty?).returns(true)
+      dirty_ds.expects(:save).returns(true)
       mock2 = mock("ds2", :dirty? => false, :new_object? => false)
-      @test_object.stubs(:datastreams_in_memory).returns({:ds1 => mock1, :ds2 => mock2})
+      @test_object.stubs(:datastreams_in_memory).returns({:ds1 => dirty_ds, :ds2 => mock2})
       @test_object.expects(:update_index)
       @test_object.expects(:refresh)
+      
       @test_object.save
     end
     it "should NOT update solr index if no MetadataDatastreams have changed" do
@@ -246,18 +249,20 @@ describe ActiveFedora::Base do
       @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 RELS-EXT datastream has changed" do
       Fedora::Repository.instance.stubs(:save)
-      mock1 = mock("RELS-EXT", :dirty? => true, :save => true)
-      mock1.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      mock1.expects(:instance_of?).with(ActiveFedora::RelsExtDatastream).returns(true)
-      mock2 = mock("ds2", :dirty? => false, :new_object? => false)
-      @test_object.stubs(:datastreams_in_memory).returns({"RELS-EXT" => mock1, :ds2 => mock2})
+      rels_ext = ActiveFedora::RelsExtDatastream.new
+      rels_ext.expects(:dirty?).returns(true)
+      rels_ext.expects(:save).returns(true)
+      clean_ds = mock("ds2", :dirty? => false, :new_object? => false)
+      @test_object.stubs(:datastreams_in_memory).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
@@ -283,12 +288,11 @@ describe ActiveFedora::Base do
     end
 
     it "should call .to_xml on all MetadataDatastreams and return the resulting document" do
-      mock1 = mock("ds1", :to_xml)
-      mock2 = mock("ds2", :to_xml)
-      mock1.expects(:included_modules).returns( [ActiveFedora::MetadataDatastreamHelper] )
-      mock2.expects(:included_modules).returns( [ActiveFedora::MetadataDatastreamHelper] )
+      ds1 = ActiveFedora::MetadataDatastream.new
+      ds2 = ActiveFedora::MetadataDatastream.new
+      [ds1,ds2].each {|ds| ds.expects(:to_xml)}
 
-      @test_object.expects(:datastreams).returns({:ds1 => mock1, :ds2 => mock2})
+      @test_object.expects(:datastreams).returns({:ds1 => ds1, :ds2 => ds2})
       @test_object.to_xml
     end
   end
@@ -411,15 +415,52 @@ describe ActiveFedora::Base do
     f.pid.should == 'numbnuts:1'
 
   end
+  
+  describe "get_values_from_datastream" do
+    it "should look up the named datastream and call get_values with the given pointer/field_name" do
+      mock_ds = mock("Datastream", :get_values=>["value1", "value2"])
+      @test_object.stubs(:datastreams_in_memory).returns({"ds1"=>mock_ds})
+      @test_object.get_values_from_datastream("ds1", "--my xpath--").should == ["value1", "value2"]
+    end
+  end
+  
+  describe "update_datastream_attributes" do
+    it "should look up any datastreams specified as keys in the given hash and call update_attributes on the datastream" do
+      mock_desc_metadata = mock("descMetadata")
+      mock_properties = mock("properties")
+      mock_ds_hash = {'descMetadata'=>mock_desc_metadata, 'properties'=>mock_properties}
+      
+      ds_values_hash = {
+        "descMetadata"=>{ [{:person=>0}, :role]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"} },
+        "properties"=>{ "notes"=>"foo" }
+      }
+      m = FooHistory.new
+      m.stubs(:datastreams_in_memory).returns(mock_ds_hash)
+      mock_desc_metadata.expects(:update_attributes).with( ds_values_hash['descMetadata'] )
+      mock_properties.expects(:update_attributes).with( ds_values_hash['properties'] )
+      m.update_datastream_attributes( ds_values_hash )
+    end
+    it "should not do anything and should return an empty hash if the specified datastream does not exist" do
+      ds_values_hash = {
+        "nonexistentDatastream"=>{ "notes"=>"foo" }
+      }
+      m = FooHistory.new
+      untouched_xml = m.to_xml
+      m.update_datastream_attributes( ds_values_hash ).should == {}
+      m.to_xml.should == untouched_xml
+    end
+  end
+  
   describe "update_attributes" do
-    it "should be able to handle ds's without fields field" do
-      class Moo < ActiveFedora::Base;end
-      m = Moo.new
-      ds = mock('ds')
-      m.expects(:datastreams).returns({ :ds1=>ds})
-      ds.expects(:fields).returns(Hash.new)
-      m.update_attributes(:foo=>'bar')
+
+    it "should call .update_attributes on all metadata datastreams & nokogiri datastreams" do
+      m = FooHistory.new
+      att= {"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}
+      
+      m.metadata_streams.each {|ds| ds.expects(:update_attributes)}
+      m.update_attributes(att)
     end
+    
     it "should be able to update attr on text fields" do
       m = FooHistory.new
       m.should_not be_nil
@@ -474,92 +515,16 @@ describe ActiveFedora::Base do
   end
   
   describe "update_indexed_attributes" do
-    it "should work for text fields" do 
-      att= {"swank"=>{"-1"=>"mork", "1"=>"york"}}
-      n = FooHistory.new
-      result = n.update_indexed_attributes(att)
-      result.should == {"swank"=>{"1"=>"york", "0"=>"mork"}}
-      n.datastreams["someData"].swank_values.should == ['mork', 'york']
-      n.datastreams["someData"].swank_values.should == ['mork', 'york']
-      att= {"swank"=>{"-1"=>"dork"}}
-      result2 = n.update_indexed_attributes(att)
-      result2.should == {"swank"=>{"2"=>"dork"}}
-      n.datastreams["someData"].swank_values.should == ['mork', 'york', 'dork']
-    end
-    
-    it "should return the new index of any added values" do
-      n = FooHistory.new
-      n.datastreams["someData"].swank_values = ["my_val1","my_val2"]
-      result = n.update_indexed_attributes "swank"=>{"-1"=>"mork"}
-      result.should == {"swank"=>{"2"=>"mork"}}
-    end
-    
-    it "should return accurate response when multiple values have been added in a single run" do
-      pending
-      att= {"swank"=>{"-1"=>"mork", "0"=>"york"}}
-      n = FooHistory.new
-      n.update_indexed_attributes(att).should == {"swank"=>{"0"=>"york", "1"=>"mork"}}
-    end
-
-    it "should apply submitted hash to corresponding datastream values" do
-      att= {"fubar"=>{"-1"=>"mork", "0"=>"york"}}
-      n = FooHistory.new
-      n.update_indexed_attributes(att)
-      n.datastreams["someData"].fubar_values.should == ['mork', 'york']
-      n.datastreams["someData"].fubar_values.should == ['mork', 'york']
-
-      att= {"fubar"=>{"0"=>"zork", "1"=>"tork", "2"=>'mangle'}}
-      n.update_indexed_attributes(att)
-      n.datastreams["someData"].fubar_values.should == ['zork', 'tork', 'mangle']
-
-      att= {"fubar"=>{"0"=>"hork", "1"=>"tork", '-1'=>'dang'}}
-      result = n.update_indexed_attributes(att)
-      result.should == {"fubar"=>{"0"=>"hork", "1"=>"tork", '3'=>'dang'}}
-      n.datastreams["someData"].fubar_values.should == ['hork', 'tork', 'mangle', 'dang']
-
-      #really? should it hit all matching datastreams?
-      n.datastreams["withText"].fubar_values.should == ['hork', 'tork', 'mangle', 'dang']
-    end
-    
-    it "should deal gracefully with adding new values at explicitly declared indexes" do
-      n = FooHistory.new
-      n.datastreams["someData"].fubar_values = ["all", "for", "the"]
-      att = {"fubar"=>{"3"=>'glory'}}
-      result = n.update_indexed_attributes(att)
-      result.should == {"fubar"=>{"3"=>"glory"}}
-      n.datastreams["someData"].fubar_values.should == ["all", "for", "the", "glory"]
-      
-      n.datastreams["withText"].fubar_values.should == ["glory"]
-    end
-    
-    it "should allow deleting of values and should delete values so that to_xml does not return emtpy nodes" do
+    it "should call .update_indexed_attributes on all metadata datastreams & nokogiri datastreams" do
+      m = FooHistory.new
       att= {"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}
-      n = FooHistory.new
-      n.update_indexed_attributes(att)
-      n.datastreams["someData"].fubar_values.should == ['mork', 'york', 'mangle']
-      rexml = REXML::Document.new(n.datastreams["someData"].to_xml)
-      #puts rexml.root.elements.each {|el| el.to_s}
-      #puts rexml.root.elements.to_a.inspect
-      rexml.root.elements.to_a.length.should == 3
-      n.update_indexed_attributes({"fubar"=>{"1"=>""}})
-      n.datastreams["someData"].fubar_values.should == ['mork', 'mangle']
-      rexml = REXML::Document.new(n.datastreams["someData"].to_xml)
-      rexml.root.elements.to_a.length.should == 2
-      n.update_indexed_attributes({"fubar"=>{"0"=>:delete}})
-      n.datastreams["someData"].fubar_values.should == ['mangle']
-      rexml = REXML::Document.new(n.datastreams["someData"].to_xml)
-      rexml.root.elements.to_a.length.should == 1
       
-      n.datastreams["someData"].fubar_values = ["val1", nil, "val2"]
-      n.update_indexed_attributes({"fubar"=>{"1"=>""}})
-      n.datastreams["someData"].fubar_values.should == ["val1", "val2"]
+      m.datastreams_in_memory.each_value {|ds| ds.expects(:update_indexed_attributes)}
+      m.update_indexed_attributes(att)
     end
-    
-    
     it "should take a :datastreams argument" do 
       att= {"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}
       m = FooHistory.new
-
       m.update_indexed_attributes(att, :datastreams=>"withText")
       m.should_not be_nil
       m.datastreams['someData'].fubar_values.should == []