active-fedora 1.1.6 → 1.1.7

data/History.txt

@@ -1,3 +1,9 @@
+1.1.7 
+
+Nokogiri Datastream support using Nokogiri and OM::XML.  Includes indexing of xml contents into solr based on accessors declared using OM::XML:Accessor module.
+You now have the option of calling has_metadata without passing in a block
+
+
 1.1.6
 
 Bug #959: Base.delete fails to delete objects from Solr even when ENABLE_SOLR_UPDATES == true

data/Rakefile

@@ -21,6 +21,8 @@ begin
     gem.add_dependency('mime-types', '>= 1.16')
     gem.add_dependency('multipart-post')
     gem.add_dependency('nokogiri')
+    gem.add_dependency('om', '>= 0.1.4')
+    # gem.add_dependency('yaml')
 
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "mocha", ">= 1.2.9"

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.6"
+  s.version = "1.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-06-14}
+  s.date = %q{2010-06-23}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [
@@ -209,8 +209,8 @@ Gem::Specification.new do |s|
      "lib/fedora/generic_search.rb",
      "lib/fedora/repository.rb",
      "lib/hydra.rb",
-     "lib/hydra_libs/mods_datastream.rb",
-     "lib/hydra_libs/opinionated_mods_document.rb",
+     "lib/hydra/mods_article.rb",
+     "lib/hydra/opinionated_mods_document.rb",
      "lib/ruby-fedora.rb",
      "lib/util/class_level_inheritable_attributes.rb",
      "script/console",
@@ -221,7 +221,9 @@ Gem::Specification.new do |s|
      "solr/config/solrconfig-1.5.xml",
      "spec/fixtures/changeme155.xml",
      "spec/fixtures/dino.jpg",
+     "spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml",
      "spec/fixtures/minivan.jpg",
+     "spec/fixtures/mods_articles/hydrangea_article1.xml",
      "spec/fixtures/oh_qdc.xml",
      "spec/fixtures/test_12.foxml.xml",
      "spec/integration/base_file_management_spec.rb",
@@ -262,7 +264,6 @@ Gem::Specification.new do |s|
      "spec/unit/inheritance_spec.rb",
      "spec/unit/metadata_datastream_spec.rb",
      "spec/unit/model_spec.rb",
-     "spec/unit/mods_datastream_spec.rb",
      "spec/unit/nokogiri_datastream_spec.rb",
      "spec/unit/property_spec.rb",
      "spec/unit/qualified_dublin_core_datastream_spec.rb",
@@ -281,7 +282,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rubyfedora}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.}
   s.test_files = [
     "spec/integration/base_file_management_spec.rb",
@@ -319,7 +320,6 @@ Gem::Specification.new do |s|
      "spec/unit/inheritance_spec.rb",
      "spec/unit/metadata_datastream_spec.rb",
      "spec/unit/model_spec.rb",
-     "spec/unit/mods_datastream_spec.rb",
      "spec/unit/nokogiri_datastream_spec.rb",
      "spec/unit/property_spec.rb",
      "spec/unit/qualified_dublin_core_datastream_spec.rb",
@@ -337,12 +337,13 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<solr-ruby>, [">= 0.0.6"])
       s.add_runtime_dependency(%q<xml-simple>, [">= 1.0.12"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<om>, [">= 0.1.4"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 1.2.9"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
@@ -352,6 +353,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<om>, [">= 0.1.4"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 1.2.9"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
@@ -362,6 +364,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<om>, [">= 0.1.4"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 1.2.9"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])

data/lib/active_fedora/base.rb

@@ -353,7 +353,14 @@ module ActiveFedora
           doc.xpath("//foxml:datastream[@ID='#{name}']").each do |node|
             # datastreams remain marked as new if the foxml doesn't have an entry for that datastream
             ds.new_object = false
-            proto.datastreams[name]=ds.class.from_xml(ds, node)          
+            # Nokogiri Datstreams use a new syntax for .from_xml (tmpl is optional!) and expects the actual xml content rather than the foxml datstream xml
+            # NB: Base.deserialize, or a separately named method, should set any other info from the foxml if necessary though by this point it's all been grabbed elsewhere... 
+            if ds.kind_of?(ActiveFedora::NokogiriDatastream) 
+              node = node.search('./foxml:datastreamVersion[last()]/foxml:xmlContent/*').first
+              proto.datastreams[name]=ds.class.from_xml(node, ds)
+            else
+              proto.datastreams[name]=ds.class.from_xml(ds, node)          
+            end
           end
         end
         proto.inner_object.new_object = false
@@ -529,7 +536,10 @@ module ActiveFedora
             attributes = {:label=>""}
           end
           ds = ar.first.new(:dsid=>name)
-          ar.last.call(ds)
+          # If you called has_metadata with a block, pass the block into the Datastream class
+          if ar.last.class == Proc
+            ar.last.call(ds)
+          end
           ds.attributes = attributes.merge(ds.attributes)
           self.add_datastream(ds)
         end

data/lib/active_fedora/metadata_datastream.rb

@@ -38,15 +38,15 @@ module ActiveFedora
     #   return xml.to_s
     # end
     # 
-    # # @tmpl ActiveFedora::MetadataDatastream
-    # # @node Nokogiri::XML::Node
-    # def self.from_xml(tmpl, node) # :nodoc:
-    #   node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/fields/node()").each do |f|
-    #       tmpl.send("#{f.name}_append", f.text) unless f.class == Nokogiri::XML::Text
-    #   end
-    #   tmpl.send(:dirty=, false)
-    #   tmpl
-    # end
+    # @tmpl ActiveFedora::MetadataDatastream
+    # @node Nokogiri::XML::Node
+    def self.from_xml(tmpl, node) # :nodoc:
+      node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/fields/node()").each do |f|
+          tmpl.send("#{f.name}_append", f.text) unless f.class == Nokogiri::XML::Text
+      end
+      tmpl.send(:dirty=, false)
+      tmpl
+    end
     
     # This method generates the various accessor and mutator methods on self for the datastream metadata attributes.
     # each field will have the 3 magic methods:

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -12,16 +12,6 @@ module ActiveFedora::MetadataDatastreamHelper
       @@classFields
     end
     
-    # @tmpl ActiveFedora::MetadataDatastream
-    # @node Nokogiri::XML::Node
-    def from_xml(tmpl, node) # :nodoc:
-      node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/fields/node()").each do |f|
-          tmpl.send("#{f.name}_append", f.text) unless f.class == Nokogiri::XML::Text
-      end
-      tmpl.send(:dirty=, false)
-      tmpl
-    end
-    
   end
   
   def self.included(klass)
@@ -75,22 +65,6 @@ module ActiveFedora::MetadataDatastreamHelper
         end
       end
     end
-    
-    # fields.each_pair do |field,field_info|
-    #       el = REXML::Element.new("#{field.to_s}")
-    #         if field_info[:element_attrs]
-    #           field_info[:element_attrs].each{|k,v| el.add_attribute(k.to_s, v.to_s)}
-    #         end
-    #       field_info[:values].each do |val|
-    #         el = el.clone
-    #         el.text = val.to_s
-    #         if xml.class == REXML::Document
-    #           xml.root.elements.add(el)
-    #         else
-    #           xml.add(el)
-    #         end
-    #       end
-    #     end
     return builder.to_xml
   end
   

data/lib/active_fedora/nokogiri_datastream.rb

@@ -1,60 +1,93 @@
 require "nokogiri"
+require  "om"
 #this class represents a MetadataDatastream, a special case of ActiveFedora::Datastream
 class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
-  
+    
   include ActiveFedora::MetadataDatastreamHelper
-  
-  self.xml_model = Nokogiri::XML::Document
-  
+  include OM::XML
+    
   attr_accessor :ng_xml
   
   #constructor, calls up to ActiveFedora::Datastream's constructor
   def initialize(attrs=nil)
     super
     @fields={}
-    @ng_xml = self.class.xml_model.new()
+    self.class.from_xml(blob, self)
+  end
+  
+  
+  def to_xml(xml = self.ng_xml)
+    ng_xml = self.ng_xml
+    if ng_xml.root.nil? && self.class.respond_to?(:root_property_ref) && !self.class.root_property_ref.nil?
+      ng_xml = self.class.generate(self.class.root_property_ref, "")
+      if xml.root.nil?
+        xml = ng_xml
+      end
+    end
+
+    unless xml == ng_xml || ng_xml.root.nil?
+      if xml.kind_of?(Nokogiri::XML::Document)
+          xml.root.add_child(ng_xml.root)
+      elsif xml.kind_of?(Nokogiri::XML::Node)
+          xml.add_child(ng_xml.root)
+      else
+          raise "You can only pass instances of Nokogiri::XML::Node into this method.  You passed in #{xml}"
+      end
+    end
+    
+    return xml.to_xml {|config| config.no_declaration}
   end
   
   def to_solr(solr_doc = Solr::Document.new) # :nodoc:
-    fields.each do |field_key, field_info|
-      if field_info.has_key?(:values) && !field_info[:values].nil?
-        field_symbol = generate_solr_symbol(field_key, field_info[:type])
-        field_info[:values].each do |val|             
-          solr_doc << Solr::Field.new(field_symbol => val)
-        end
+    
+    unless self.class.accessors.nil?
+      self.class.accessors.each_pair do |accessor_name,accessor_info|
+        solrize_accessor(accessor_name, accessor_info, :solr_doc=>solr_doc)
       end
     end
 
     return solr_doc
   end
   
-  def to_xml(xml = REXML::Document.new("<fields />")) #:nodoc:
-    fields.each_pair do |field,field_info|
-      el = REXML::Element.new("#{field.to_s}")
-        if field_info[:element_attrs]
-          field_info[:element_attrs].each{|k,v| el.add_attribute(k.to_s, v.to_s)}
-        end
-      field_info[:values].each do |val|
-        el = el.clone
-        el.text = val.to_s
-        if xml.class == REXML::Document
-          xml.root.elements.add(el)
-        else
-          xml.add(el)
-        end
+  def solrize_accessor(accessor_name, accessor_info, opts={})
+    solr_doc = opts.fetch(:solr_doc, Solr::Document.new)
+    parents = opts.fetch(:parents, [])
+    
+    accessor_pointer = parents+[accessor_name]
+  
+    if accessor_info.nil?
+      accessor_info = self.class.accessor_info(accessor_pointer)
+      if accessor_info.nil?
+        raise "No accessor is defined for #{accessor_info.select}"
+      end
+    end
+  
+    # prep children hash
+    child_accessors = accessor_info.fetch(:children, {})
+    xpath = self.class.accessor_xpath(*accessor_pointer)
+    nodeset = lookup(xpath)
+    
+    nodeset.each do |node|
+      # create solr fields
+      solrize_node(node, accessor_pointer, solr_doc)
+      child_accessors.each_pair do |child_accessor_name, child_accessor_info|
+        solrize_accessor(child_accessor_name, child_accessor_info, opts={:solr_doc=>solr_doc, :parents=>parents+[{accessor_name=>nodeset.index(node)}] })
       end
     end
-    return xml.to_s
+    
   end
   
-  # @tmpl ActiveFedora::MetadataDatastream
-  # @node Nokogiri::XML::Node
-  def self.from_xml(tmpl, node) # :nodoc:
-    node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/fields/node()").each do |f|
-        tmpl.send("#{f.name}_append", f.text) unless f.class == Nokogiri::XML::Text
+  def solrize_node(node, accessor_pointer, solr_doc = Solr::Document.new)
+    generic_field_name_base = self.class.accessor_generic_name(*accessor_pointer)
+    generic_field_name = generate_solr_symbol(generic_field_name_base, :text)
+    
+    solr_doc << Solr::Field.new(generic_field_name => node.text)
+    
+    if accessor_pointer.length > 1
+      hierarchical_field_name_base = self.class.accessor_hierarchical_name(*accessor_pointer)
+      hierarchical_field_name = generate_solr_symbol(hierarchical_field_name_base, :text)
+      solr_doc << Solr::Field.new(hierarchical_field_name => node.text)
     end
-    tmpl.send(:dirty=, false)
-    tmpl
   end
 
 end

data/lib/active_fedora/solr_service.rb

@@ -1,5 +1,6 @@
 require 'solr'
 require "active_fedora/solr_mapper"
+require "yaml"
 module ActiveFedora 
   class SolrService
       

data/lib/hydra.rb

@@ -1,2 +1,2 @@
-# module Hydra;end
-require "hydra_libs/mods_datastream"
+module Hydra;end
+require "hydra/mods_article"

data/lib/hydra/mods_article.rb

@@ -0,0 +1,49 @@
+module Hydra
+class ModsArticle < 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"          
+    
+    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/lib/hydra/opinionated_mods_document.rb

@@ -0,0 +1,14 @@
+class OpinionatedModsDocument < Nokogiri::XML::Document
+  
+  include OM::XML      
+     
+  self.schema_url = "http://www.loc.gov/standards/mods/v3/mods-3-2.xsd"
+  
+  # Could add support for multiple root declarations.  
+  #  For now, assume that any modsCollections have already been broken up and fed in as individual mods documents
+  # root :mods_collection, :path=>"modsCollection", 
+  #           :attributes=>[],
+  #           :subelements => :mods
+  root_property :mods, "mods", "http://www.loc.gov/mods/v3", :attributes=>["id", "version"]          
+            
+end

data/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml

@@ -0,0 +1,187 @@
+<?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>
+
+      <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:ModsArticle"></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>
+  <fields>
+    <discover_access_group>public</discover_access_group>
+    <read_access_group>public</read_access_group>
+    <edit_access_group>researcher</edit_access_group>
+    <edit_access_group>archivist</edit_access_group>
+    <edit_access>researcher1</edit_access>
+  </fields>
+</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>