hydra-pbcore 2.0.0 → 2.1.0

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - "1.9.3"

data/README.md

@@ -1,5 +1,7 @@
 # HydraPbcore
 
+[![Build Status](https://travis-ci.org/curationexperts/hydra-pbcore.png)](https://travis-ci.org/curationexperts/hydra-pbcore)
+
 A Hydra gem that offers PBCore datastream definitions using OM, as well as some other convenience
 methods such as inserting xml templates into existing documents and reordering your PBCore xml 
 elements so that you can export complete, valid PBCore documents.

data/Rakefile

@@ -1,8 +1,13 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
 # Rake task for getting an irb session
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -I lib -r hydra-pbcore.rb"
-end
+end
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/hydra-pbcore.gemspec

@@ -17,15 +17,12 @@ Gem::Specification.new do |gem|
   gem.version       = HydraPbcore::VERSION
 
   # Dependencies
-  gem.add_dependency('nokogiri')
-  gem.add_dependency('om')
   gem.add_dependency('active-fedora')
-  gem.add_dependency('solrizer')
   gem.add_development_dependency('yard')
   gem.add_development_dependency('redcarpet')
   # For Development
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'debugger'
   gem.add_development_dependency 'rdoc'
   gem.add_development_dependency 'equivalent-xml'
 end

data/lib/hydra_pbcore/conversions.rb

@@ -14,11 +14,9 @@
 module HydraPbcore::Conversions
 
   # Converts a HydraPbcore::Datastream::Deprecated::Document to a HydraPbcore::Datastream::Document
-  # - the existing pbcoreInstantiation node is removed
-  # - any pbcoreRelation or pbcoreRelationIdentifier is removed except for terms identifying "Event Series"
-  def to_document
-    raise "only works with HydraPbcore::Datastream::Deprecated::Document" unless self.kind_of?(HydraPbcore::Datastream::Deprecated::Document)
-    self.remove_node(:pbcoreInstantiation)
+  # - the existing pbcoreInstantiation node is removed and returned
+  def to_document xml = self.ng_xml
+    xml.search("//pbcoreInstantiation").remove
   end
 
   # Extracts the instantation from a HydraPbcore::Datastream::Deprecated::Document and returns
@@ -26,8 +24,7 @@ module HydraPbcore::Conversions
   # - removes all instantiationRelation nodes
   # - adds source="PBCore instantiationColors" to instantiationColors node
   # - extracts the pbcoreInstantiation node and returns new Instantiation object
-  def to_physical_instantiation(xml = self.ng_xml)
-    raise "only works with HydraPbcore::Datastream::Deprecated::Document" unless self.kind_of?(HydraPbcore::Datastream::Deprecated::Document)
+  def to_physical_instantiation xml = self.ng_xml 
     xml.search("//instantiationRelation").each do |node|  
       node.remove
     end
@@ -39,7 +36,6 @@ module HydraPbcore::Conversions
   # Converts a HydraPbcore::Datastream::Deprecated::Instantiation to a HydraPbcore::Datastream::Instantiation
   # Modifies the exiting xml to exclude any parent nodes of the pbcoreInstantiation node
   def to_instantiation
-    raise "only works with HydraPbcore::Datastream::Deprecated::Instantiation" unless self.kind_of?(HydraPbcore::Datastream::Deprecated::Instantiation)
     self.ng_xml = self.ng_xml.xpath("//pbcoreInstantiation").to_xml
   end
 
@@ -50,7 +46,7 @@ module HydraPbcore::Conversions
   #
   # Note: Since pbcoreRelation is used to indicated archival collection and series, this information should be copied to another kind
   # of datastream using an RDF relationship in Hydra.
-  def clean_document(xml = self.ng_xml)
+  def clean_document xml = self.ng_xml
     xml.search("//pbcoreRelation").each do |node|  
       node.remove unless is_event_series?(node)
     end
@@ -66,7 +62,7 @@ module HydraPbcore::Conversions
   end
 
   # Determines if the given node defines an event_series term
-  def is_event_series?(node)
+  def is_event_series? node
     unless node.at_xpath("pbcoreRelationIdentifier").nil?
       if node.at_xpath("pbcoreRelationIdentifier").attribute("annotation").to_s == "Event Series"
         return true
@@ -77,7 +73,7 @@ module HydraPbcore::Conversions
   # Determines if a coverage node that has no annotation attribute should be either an event_date term or an event_date term.
   # Returns the first instance of an annotation attribute, processing it so that may be sent directly to 
   # the datastream as a method.
-  def coverage_type(node)
+  def coverage_type node
     node.children.each do |c|
       return c.attribute("annotation").to_s.split.last.downcase unless c.attribute("annotation").nil?
     end

data/lib/hydra_pbcore/datastream/deprecated/document.rb

@@ -8,9 +8,6 @@ class Document < ActiveFedora::NokogiriDatastream
   set_terminology do |t|
     t.root(:path=>"pbcoreDescriptionDocument")
 
-    #
-    #  pbcoreDescription fields
-    #
     t.pbc_id(:path=>"pbcoreIdentifier", 
       :attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum", :annotation=>"PID" }
     )

data/lib/hydra_pbcore/datastream/document.rb

@@ -3,6 +3,7 @@ class Document < ActiveFedora::OmDatastream
 
   include HydraPbcore::Methods
   include HydraPbcore::Templates
+  include HydraPbcore::Conversions
 
   set_terminology do |t|
     t.root(:path=>"pbcoreDescriptionDocument")
@@ -11,7 +12,7 @@ class Document < ActiveFedora::OmDatastream
       :attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum", :annotation=>"PID" }
     )
 
-    t.main_title(:path=>"pbcoreTitle", :attributes=>{ :titleType=>"Main" }, :index_as => [:searchable, :displayable])
+    t.title(:path=>"pbcoreTitle", :attributes=>{ :titleType=>"Main" }, :index_as => [:searchable, :displayable])
     t.alternative_title(:path=>"pbcoreTitle", :attributes=>{ :titleType=>"Alternative" },
       :index_as => [:searchable, :displayable]
     )
@@ -26,7 +27,7 @@ class Document < ActiveFedora::OmDatastream
     )
 
     # This is only to display all subjects
-    t.subject_topic(:path=>"pbcoreSubject", :index_as => [:searchable, :facetable])
+    t.subject(:path=>"pbcoreSubject", :index_as => [:facetable])
 
     # Individual subject types defined for entry
     t.lc_subject(:path=>"pbcoreSubject", 
@@ -55,7 +56,7 @@ class Document < ActiveFedora::OmDatastream
         :index_as => [:searchable, :displayable]
     )
 
-    t.parts_list(:path=>"pbcoreDescription", 
+    t.contents(:path=>"pbcoreDescription", 
       :attributes=>{ 
         :descriptionType=>"Table of Contents",
         :descriptionTypeSource=>"pbcoreDescription/descriptionType",
@@ -66,7 +67,9 @@ class Document < ActiveFedora::OmDatastream
     )
 
     # This is only to display all genres
-    t.genres(:path=>"pbcoreGenre", :index_as => [:searchable, :facetable])
+    t.genre(:path=>"pbcoreGenre", :index_as => [:facetable])
+
+    t.asset_type(:path=>"pbcoreAssetType", :index_as => [:searchable, :facetable])
 
     # Individual genre types defined for entry
     t.getty_genre(:path=>"pbcoreGenre", 
@@ -93,14 +96,14 @@ class Document < ActiveFedora::OmDatastream
 
     # PBCore relation fields
     t.pbcoreRelation do
-      t.series(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Event Series" })
+      t.event_series(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Event Series" })
       t.arch_coll(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Archival Collection" })
       t.arch_ser(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Archival Series" })
       t.coll_num(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Collection Number" })
       t.acc_num(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Accession Number" })
     end
-    t.event_series(:ref=>[:pbcoreRelation, :series], :index_as => [:searchable, :displayable])
-    t.archival_collection(:ref=>[:pbcoreRelation, :arch_coll], :index_as => [:searchable, :displayable])
+    t.series(:ref=>[:pbcoreRelation, :event_series], :index_as => [:searchable, :displayable])
+    t.collection(:ref=>[:pbcoreRelation, :arch_coll], :index_as => [:searchable, :displayable])
     t.archival_series(:ref=>[:pbcoreRelation, :arch_ser], :index_as => [:searchable, :displayable])
     t.collection_number(:ref=>[:pbcoreRelation, :coll_num], :index_as => [:searchable, :displayable])
     t.accession_number(:ref=>[:pbcoreRelation, :acc_num], :index_as => [:searchable, :displayable])

data/lib/hydra_pbcore/datastream/instantiation.rb

@@ -3,6 +3,7 @@ class Instantiation < ActiveFedora::OmDatastream
 
   include HydraPbcore::Methods
   include HydraPbcore::Templates
+  include HydraPbcore::Conversions
 
   # Note: this is not a complete PBCore document, just an instantiation node
   set_terminology do |t|

data/lib/hydra_pbcore/version.rb

@@ -1,3 +1,3 @@
 module HydraPbcore
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/spec/document_spec.rb

@@ -17,7 +17,7 @@ describe HydraPbcore::Datastream::Document do
     it "should update the intitial fields" do
       [
         [:pbc_id],
-        [:main_title],
+        [:title],
         [:alternative_title],
         [:chapter],
         [:episode],
@@ -27,14 +27,14 @@ describe HydraPbcore::Datastream::Document do
         [:track],
         [:translation],
         [:summary],
-        [:parts_list],
+        [:contents],
         [:lc_subject],
         [:lc_name],
         [:rh_subject],
         [:getty_genre],
         [:lc_genre],
         [:lc_subject_genre],
-        [:event_series],
+        [:series],
         [:creator_name],
         [:creator_role],
         [:contributor_name],
@@ -42,8 +42,9 @@ describe HydraPbcore::Datastream::Document do
         [:publisher_name],
         [:publisher_role],
         [:note],
+        [:asset_type],
         [:rights_summary],
-        [:archival_collection],
+        [:collection],
         [:archival_series],
         [:collection_number],
         [:accession_number],
@@ -77,10 +78,10 @@ describe HydraPbcore::Datastream::Document do
     it "should have insert_relation" do
       @object_ds = HydraPbcore::Datastream::Document.new(nil, nil)
       @object_ds.insert_relation("My Collection", 'Archival Collection')
-      @object_ds.archival_collection.should == ['My Collection']
+      @object_ds.collection.should == ['My Collection']
 
       @object_ds.insert_relation("My event", 'Event Series')
-      @object_ds.event_series.should == ['My event']
+      @object_ds.series.should == ['My event']
 
       @object_ds.insert_relation("My series", 'Archival Series')
       @object_ds.archival_series.should == ['My series']
@@ -138,7 +139,7 @@ describe HydraPbcore::Datastream::Document do
       @object_ds.insert_relation("inserted", 'Collection Number')
 
       @object_ds.pbc_id               = "inserted"
-      @object_ds.main_title           = "inserted"
+      @object_ds.title                = "inserted"
       @object_ds.alternative_title    = "inserted"
       @object_ds.chapter              = "inserted"
       @object_ds.episode              = "inserted"
@@ -148,20 +149,21 @@ describe HydraPbcore::Datastream::Document do
       @object_ds.track                = "inserted"
       @object_ds.translation          = "inserted"
       @object_ds.summary              = "inserted"
-      @object_ds.parts_list           = "inserted"
+      @object_ds.contents             = "inserted"
       @object_ds.lc_subject           = "inserted"
       @object_ds.lc_name              = "inserted"
       @object_ds.rh_subject           = "inserted"
       @object_ds.getty_genre          = "inserted"
       @object_ds.lc_genre             = "inserted"
       @object_ds.lc_subject_genre     = "inserted"
-      @object_ds.event_series         = "inserted"
+      @object_ds.series               = "inserted"
       @object_ds.contributor_name     = "inserted"
       @object_ds.contributor_role     = "inserted"
       @object_ds.publisher_name       = "inserted"
       @object_ds.publisher_role       = "inserted"
       @object_ds.note                 = "inserted"
       @object_ds.rights_summary       = "inserted"
+      @object_ds.asset_type           = "Scene"
     end
 
     it "solr document should match an exemplar" do

data/spec/fixtures/document.xml

@@ -3,26 +3,6 @@
   <pbcoreTitle titleType="Main">inserted</pbcoreTitle>
   <pbcoreDescription descriptionType="Description" descriptionTypeSource="pbcoreDescription/descriptionType" descriptionTypeRef="http://pbcore.org/vocabularies/pbcoreDescription/descriptionType#description" annotation="Summary">inserted</pbcoreDescription>
   <pbcoreDescription descriptionType="Table of Contents" descriptionTypeSource="pbcoreDescription/descriptionType" descriptionTypeRef="http://pbcore.org/vocabularies/pbcoreDescription/descriptionType#table-of-contents" annotation="Parts List">inserted</pbcoreDescription>
-  <pbcoreRelation>
-    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
-    <pbcoreRelationIdentifier annotation="Event Series">inserted</pbcoreRelationIdentifier>
-  </pbcoreRelation>
-  <pbcoreRelation>
-    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
-    <pbcoreRelationIdentifier annotation="Archival Collection">inserted</pbcoreRelationIdentifier>
-  </pbcoreRelation>
-  <pbcoreRelation>
-    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
-    <pbcoreRelationIdentifier annotation="Archival Series">inserted</pbcoreRelationIdentifier>
-  </pbcoreRelation>
-  <pbcoreRelation>
-    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
-    <pbcoreRelationIdentifier annotation="Collection Number">inserted</pbcoreRelationIdentifier>
-  </pbcoreRelation>
-  <pbcoreRelation>
-    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
-    <pbcoreRelationIdentifier annotation="Accession Number">inserted</pbcoreRelationIdentifier>
-  </pbcoreRelation>
   <pbcoreRightsSummary>
     <rightsSummary>inserted</rightsSummary>
   </pbcoreRightsSummary>
@@ -55,6 +35,26 @@
     <coverage annotation="Event Date">2012-11-11</coverage>
     <coverageType>Temporal</coverageType>
   </pbcoreCoverage>
+  <pbcoreRelation>
+    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
+    <pbcoreRelationIdentifier annotation="Archival Collection">inserted</pbcoreRelationIdentifier>
+  </pbcoreRelation>
+  <pbcoreRelation>
+    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
+    <pbcoreRelationIdentifier annotation="Event Series">inserted</pbcoreRelationIdentifier>
+  </pbcoreRelation>
+  <pbcoreRelation>
+    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
+    <pbcoreRelationIdentifier annotation="Archival Series">inserted</pbcoreRelationIdentifier>
+  </pbcoreRelation>
+  <pbcoreRelation>
+    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
+    <pbcoreRelationIdentifier annotation="Accession Number">inserted</pbcoreRelationIdentifier>
+  </pbcoreRelation>
+  <pbcoreRelation>
+    <pbcoreRelationType source="PBCore relationType" ref="http://pbcore.org/vocabularies/relationType#is-part-of">Is Part Of</pbcoreRelationType>
+    <pbcoreRelationIdentifier annotation="Collection Number">inserted</pbcoreRelationIdentifier>
+  </pbcoreRelation>
   <pbcoreTitle titleType="Alternative">inserted</pbcoreTitle>
   <pbcoreTitle titleType="Chapter">inserted</pbcoreTitle>
   <pbcoreTitle titleType="Episode">inserted</pbcoreTitle>
@@ -69,4 +69,5 @@
   <pbcoreGenre source="The Getty Research Institute Art and Architecture Thesaurus" ref="http://www.getty.edu/research/tools/vocabularies/aat/index.html">inserted</pbcoreGenre>
   <pbcoreGenre source="Library of Congress Genre/Form Terms" ref="http://id.loc.gov/authorities/genreForms.html">inserted</pbcoreGenre>
   <pbcoreGenre source="Library of Congress Subject Headings" ref="http://id.loc.gov/authorities/subjects.html">inserted</pbcoreGenre>
-</pbcoreDescriptionDocument>
+  <pbcoreAssetType>Scene</pbcoreAssetType>
+</pbcoreDescriptionDocument>

data/spec/fixtures/document_solr.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hash>
-  <pbcoreDescriptionDocument-main-title-t type="array">
-    <pbcoreDescriptionDocument-main-title-t>inserted</pbcoreDescriptionDocument-main-title-t>
-  </pbcoreDescriptionDocument-main-title-t>
-  <pbcoreDescriptionDocument-main-title-display type="array">
-    <pbcoreDescriptionDocument-main-title-display>inserted</pbcoreDescriptionDocument-main-title-display>
-  </pbcoreDescriptionDocument-main-title-display>
-  <pbcoreDescriptionDocument-0-main-title-t type="array">
-    <pbcoreDescriptionDocument-0-main-title-t>inserted</pbcoreDescriptionDocument-0-main-title-t>
-  </pbcoreDescriptionDocument-0-main-title-t>
-  <pbcoreDescriptionDocument-0-main-title-display type="array">
-    <pbcoreDescriptionDocument-0-main-title-display>inserted</pbcoreDescriptionDocument-0-main-title-display>
-  </pbcoreDescriptionDocument-0-main-title-display>
+  <pbcoreDescriptionDocument-title-t type="array">
+    <pbcoreDescriptionDocument-title-t>inserted</pbcoreDescriptionDocument-title-t>
+  </pbcoreDescriptionDocument-title-t>
+  <pbcoreDescriptionDocument-title-display type="array">
+    <pbcoreDescriptionDocument-title-display>inserted</pbcoreDescriptionDocument-title-display>
+  </pbcoreDescriptionDocument-title-display>
+  <pbcoreDescriptionDocument-0-title-t type="array">
+    <pbcoreDescriptionDocument-0-title-t>inserted</pbcoreDescriptionDocument-0-title-t>
+  </pbcoreDescriptionDocument-0-title-t>
+  <pbcoreDescriptionDocument-0-title-display type="array">
+    <pbcoreDescriptionDocument-0-title-display>inserted</pbcoreDescriptionDocument-0-title-display>
+  </pbcoreDescriptionDocument-0-title-display>
   <pbcoreDescriptionDocument-alternative-title-t type="array">
     <pbcoreDescriptionDocument-alternative-title-t>inserted</pbcoreDescriptionDocument-alternative-title-t>
   </pbcoreDescriptionDocument-alternative-title-t>
@@ -108,26 +108,16 @@
   <pbcoreDescriptionDocument-0-translation-display type="array">
     <pbcoreDescriptionDocument-0-translation-display>inserted</pbcoreDescriptionDocument-0-translation-display>
   </pbcoreDescriptionDocument-0-translation-display>
-  <pbcoreDescriptionDocument-subject-topic-t type="array">
-    <pbcoreDescriptionDocument-subject-topic-t>inserted</pbcoreDescriptionDocument-subject-topic-t>
-    <pbcoreDescriptionDocument-subject-topic-t>inserted</pbcoreDescriptionDocument-subject-topic-t>
-    <pbcoreDescriptionDocument-subject-topic-t>inserted</pbcoreDescriptionDocument-subject-topic-t>
-  </pbcoreDescriptionDocument-subject-topic-t>
-  <pbcoreDescriptionDocument-subject-topic-facet type="array">
-    <pbcoreDescriptionDocument-subject-topic-facet>inserted</pbcoreDescriptionDocument-subject-topic-facet>
-    <pbcoreDescriptionDocument-subject-topic-facet>inserted</pbcoreDescriptionDocument-subject-topic-facet>
-    <pbcoreDescriptionDocument-subject-topic-facet>inserted</pbcoreDescriptionDocument-subject-topic-facet>
-  </pbcoreDescriptionDocument-subject-topic-facet>
-  <pbcoreDescriptionDocument-0-subject-topic-t type="array">
-    <pbcoreDescriptionDocument-0-subject-topic-t>inserted</pbcoreDescriptionDocument-0-subject-topic-t>
-    <pbcoreDescriptionDocument-0-subject-topic-t>inserted</pbcoreDescriptionDocument-0-subject-topic-t>
-    <pbcoreDescriptionDocument-0-subject-topic-t>inserted</pbcoreDescriptionDocument-0-subject-topic-t>
-  </pbcoreDescriptionDocument-0-subject-topic-t>
-  <pbcoreDescriptionDocument-0-subject-topic-facet type="array">
-    <pbcoreDescriptionDocument-0-subject-topic-facet>inserted</pbcoreDescriptionDocument-0-subject-topic-facet>
-    <pbcoreDescriptionDocument-0-subject-topic-facet>inserted</pbcoreDescriptionDocument-0-subject-topic-facet>
-    <pbcoreDescriptionDocument-0-subject-topic-facet>inserted</pbcoreDescriptionDocument-0-subject-topic-facet>
-  </pbcoreDescriptionDocument-0-subject-topic-facet>
+  <pbcoreDescriptionDocument-subject-facet type="array">
+    <pbcoreDescriptionDocument-subject-facet>inserted</pbcoreDescriptionDocument-subject-facet>
+    <pbcoreDescriptionDocument-subject-facet>inserted</pbcoreDescriptionDocument-subject-facet>
+    <pbcoreDescriptionDocument-subject-facet>inserted</pbcoreDescriptionDocument-subject-facet>
+  </pbcoreDescriptionDocument-subject-facet>
+  <pbcoreDescriptionDocument-0-subject-facet type="array">
+    <pbcoreDescriptionDocument-0-subject-facet>inserted</pbcoreDescriptionDocument-0-subject-facet>
+    <pbcoreDescriptionDocument-0-subject-facet>inserted</pbcoreDescriptionDocument-0-subject-facet>
+    <pbcoreDescriptionDocument-0-subject-facet>inserted</pbcoreDescriptionDocument-0-subject-facet>
+  </pbcoreDescriptionDocument-0-subject-facet>
   <pbcoreDescriptionDocument-lc-subject-display type="array">
     <pbcoreDescriptionDocument-lc-subject-display>inserted</pbcoreDescriptionDocument-lc-subject-display>
   </pbcoreDescriptionDocument-lc-subject-display>
@@ -158,38 +148,40 @@
   <pbcoreDescriptionDocument-0-summary-display type="array">
     <pbcoreDescriptionDocument-0-summary-display>inserted</pbcoreDescriptionDocument-0-summary-display>
   </pbcoreDescriptionDocument-0-summary-display>
-  <pbcoreDescriptionDocument-parts-list-t type="array">
-    <pbcoreDescriptionDocument-parts-list-t>inserted</pbcoreDescriptionDocument-parts-list-t>
-  </pbcoreDescriptionDocument-parts-list-t>
-  <pbcoreDescriptionDocument-parts-list-display type="array">
-    <pbcoreDescriptionDocument-parts-list-display>inserted</pbcoreDescriptionDocument-parts-list-display>
-  </pbcoreDescriptionDocument-parts-list-display>
-  <pbcoreDescriptionDocument-0-parts-list-t type="array">
-    <pbcoreDescriptionDocument-0-parts-list-t>inserted</pbcoreDescriptionDocument-0-parts-list-t>
-  </pbcoreDescriptionDocument-0-parts-list-t>
-  <pbcoreDescriptionDocument-0-parts-list-display type="array">
-    <pbcoreDescriptionDocument-0-parts-list-display>inserted</pbcoreDescriptionDocument-0-parts-list-display>
-  </pbcoreDescriptionDocument-0-parts-list-display>
-  <pbcoreDescriptionDocument-genres-t type="array">
-    <pbcoreDescriptionDocument-genres-t>inserted</pbcoreDescriptionDocument-genres-t>
-    <pbcoreDescriptionDocument-genres-t>inserted</pbcoreDescriptionDocument-genres-t>
-    <pbcoreDescriptionDocument-genres-t>inserted</pbcoreDescriptionDocument-genres-t>
-  </pbcoreDescriptionDocument-genres-t>
-  <pbcoreDescriptionDocument-genres-facet type="array">
-    <pbcoreDescriptionDocument-genres-facet>inserted</pbcoreDescriptionDocument-genres-facet>
-    <pbcoreDescriptionDocument-genres-facet>inserted</pbcoreDescriptionDocument-genres-facet>
-    <pbcoreDescriptionDocument-genres-facet>inserted</pbcoreDescriptionDocument-genres-facet>
-  </pbcoreDescriptionDocument-genres-facet>
-  <pbcoreDescriptionDocument-0-genres-t type="array">
-    <pbcoreDescriptionDocument-0-genres-t>inserted</pbcoreDescriptionDocument-0-genres-t>
-    <pbcoreDescriptionDocument-0-genres-t>inserted</pbcoreDescriptionDocument-0-genres-t>
-    <pbcoreDescriptionDocument-0-genres-t>inserted</pbcoreDescriptionDocument-0-genres-t>
-  </pbcoreDescriptionDocument-0-genres-t>
-  <pbcoreDescriptionDocument-0-genres-facet type="array">
-    <pbcoreDescriptionDocument-0-genres-facet>inserted</pbcoreDescriptionDocument-0-genres-facet>
-    <pbcoreDescriptionDocument-0-genres-facet>inserted</pbcoreDescriptionDocument-0-genres-facet>
-    <pbcoreDescriptionDocument-0-genres-facet>inserted</pbcoreDescriptionDocument-0-genres-facet>
-  </pbcoreDescriptionDocument-0-genres-facet>
+  <pbcoreDescriptionDocument-contents-t type="array">
+    <pbcoreDescriptionDocument-contents-t>inserted</pbcoreDescriptionDocument-contents-t>
+  </pbcoreDescriptionDocument-contents-t>
+  <pbcoreDescriptionDocument-contents-display type="array">
+    <pbcoreDescriptionDocument-contents-display>inserted</pbcoreDescriptionDocument-contents-display>
+  </pbcoreDescriptionDocument-contents-display>
+  <pbcoreDescriptionDocument-0-contents-t type="array">
+    <pbcoreDescriptionDocument-0-contents-t>inserted</pbcoreDescriptionDocument-0-contents-t>
+  </pbcoreDescriptionDocument-0-contents-t>
+  <pbcoreDescriptionDocument-0-contents-display type="array">
+    <pbcoreDescriptionDocument-0-contents-display>inserted</pbcoreDescriptionDocument-0-contents-display>
+  </pbcoreDescriptionDocument-0-contents-display>
+  <pbcoreDescriptionDocument-genre-facet type="array">
+    <pbcoreDescriptionDocument-genre-facet>inserted</pbcoreDescriptionDocument-genre-facet>
+    <pbcoreDescriptionDocument-genre-facet>inserted</pbcoreDescriptionDocument-genre-facet>
+    <pbcoreDescriptionDocument-genre-facet>inserted</pbcoreDescriptionDocument-genre-facet>
+  </pbcoreDescriptionDocument-genre-facet>
+  <pbcoreDescriptionDocument-0-genre-facet type="array">
+    <pbcoreDescriptionDocument-0-genre-facet>inserted</pbcoreDescriptionDocument-0-genre-facet>
+    <pbcoreDescriptionDocument-0-genre-facet>inserted</pbcoreDescriptionDocument-0-genre-facet>
+    <pbcoreDescriptionDocument-0-genre-facet>inserted</pbcoreDescriptionDocument-0-genre-facet>
+  </pbcoreDescriptionDocument-0-genre-facet>
+  <pbcoreDescriptionDocument-asset-type-t type="array">
+    <pbcoreDescriptionDocument-asset-type-t>Scene</pbcoreDescriptionDocument-asset-type-t>
+  </pbcoreDescriptionDocument-asset-type-t>
+  <pbcoreDescriptionDocument-asset-type-facet type="array">
+    <pbcoreDescriptionDocument-asset-type-facet>Scene</pbcoreDescriptionDocument-asset-type-facet>
+  </pbcoreDescriptionDocument-asset-type-facet>
+  <pbcoreDescriptionDocument-0-asset-type-t type="array">
+    <pbcoreDescriptionDocument-0-asset-type-t>Scene</pbcoreDescriptionDocument-0-asset-type-t>
+  </pbcoreDescriptionDocument-0-asset-type-t>
+  <pbcoreDescriptionDocument-0-asset-type-facet type="array">
+    <pbcoreDescriptionDocument-0-asset-type-facet>Scene</pbcoreDescriptionDocument-0-asset-type-facet>
+  </pbcoreDescriptionDocument-0-asset-type-facet>
   <pbcoreDescriptionDocument-getty-genre-display type="array">
     <pbcoreDescriptionDocument-getty-genre-display>inserted</pbcoreDescriptionDocument-getty-genre-display>
   </pbcoreDescriptionDocument-getty-genre-display>
@@ -318,12 +310,12 @@
   <pbcoreDescriptionDocument-0-note-t type="array">
     <pbcoreDescriptionDocument-0-note-t>inserted</pbcoreDescriptionDocument-0-note-t>
   </pbcoreDescriptionDocument-0-note-t>
-  <main-title-t type="array">
-    <main-title-t>inserted</main-title-t>
-  </main-title-t>
-  <main-title-display type="array">
-    <main-title-display>inserted</main-title-display>
-  </main-title-display>
+  <title-t type="array">
+    <title-t>inserted</title-t>
+  </title-t>
+  <title-display type="array">
+    <title-display>inserted</title-display>
+  </title-display>
   <alternative-title-t type="array">
     <alternative-title-t>inserted</alternative-title-t>
   </alternative-title-t>
@@ -372,16 +364,11 @@
   <translation-display type="array">
     <translation-display>inserted</translation-display>
   </translation-display>
-  <subject-topic-t type="array">
-    <subject-topic-t>inserted</subject-topic-t>
-    <subject-topic-t>inserted</subject-topic-t>
-    <subject-topic-t>inserted</subject-topic-t>
-  </subject-topic-t>
-  <subject-topic-facet type="array">
-    <subject-topic-facet>inserted</subject-topic-facet>
-    <subject-topic-facet>inserted</subject-topic-facet>
-    <subject-topic-facet>inserted</subject-topic-facet>
-  </subject-topic-facet>
+  <subject-facet type="array">
+    <subject-facet>inserted</subject-facet>
+    <subject-facet>inserted</subject-facet>
+    <subject-facet>inserted</subject-facet>
+  </subject-facet>
   <lc-subject-display type="array">
     <lc-subject-display>inserted</lc-subject-display>
   </lc-subject-display>
@@ -397,22 +384,23 @@
   <summary-display type="array">
     <summary-display>inserted</summary-display>
   </summary-display>
-  <parts-list-t type="array">
-    <parts-list-t>inserted</parts-list-t>
-  </parts-list-t>
-  <parts-list-display type="array">
-    <parts-list-display>inserted</parts-list-display>
-  </parts-list-display>
-  <genres-t type="array">
-    <genres-t>inserted</genres-t>
-    <genres-t>inserted</genres-t>
-    <genres-t>inserted</genres-t>
-  </genres-t>
-  <genres-facet type="array">
-    <genres-facet>inserted</genres-facet>
-    <genres-facet>inserted</genres-facet>
-    <genres-facet>inserted</genres-facet>
-  </genres-facet>
+  <contents-t type="array">
+    <contents-t>inserted</contents-t>
+  </contents-t>
+  <contents-display type="array">
+    <contents-display>inserted</contents-display>
+  </contents-display>
+  <genre-facet type="array">
+    <genre-facet>inserted</genre-facet>
+    <genre-facet>inserted</genre-facet>
+    <genre-facet>inserted</genre-facet>
+  </genre-facet>
+  <asset-type-t type="array">
+    <asset-type-t>Scene</asset-type-t>
+  </asset-type-t>
+  <asset-type-facet type="array">
+    <asset-type-facet>Scene</asset-type-facet>
+  </asset-type-facet>
   <getty-genre-display type="array">
     <getty-genre-display>inserted</getty-genre-display>
   </getty-genre-display>
@@ -422,18 +410,18 @@
   <lc-subject-genre-display type="array">
     <lc-subject-genre-display>inserted</lc-subject-genre-display>
   </lc-subject-genre-display>
-  <event-series-t type="array">
-    <event-series-t>inserted</event-series-t>
-  </event-series-t>
-  <event-series-display type="array">
-    <event-series-display>inserted</event-series-display>
-  </event-series-display>
-  <archival-collection-t type="array">
-    <archival-collection-t>inserted</archival-collection-t>
-  </archival-collection-t>
-  <archival-collection-display type="array">
-    <archival-collection-display>inserted</archival-collection-display>
-  </archival-collection-display>
+  <series-t type="array">
+    <series-t>inserted</series-t>
+  </series-t>
+  <series-display type="array">
+    <series-display>inserted</series-display>
+  </series-display>
+  <collection-t type="array">
+    <collection-t>inserted</collection-t>
+  </collection-t>
+  <collection-display type="array">
+    <collection-display>inserted</collection-display>
+  </collection-display>
   <archival-series-t type="array">
     <archival-series-t>inserted</archival-series-t>
   </archival-series-t>

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 # :nodoc
 require "hydra-pbcore"
-require "debugger"
 require "equivalent-xml"
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pbcore
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: om
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -59,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solrizer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -179,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -247,12 +200,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3521105165021581431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3521105165021581431
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -296,3 +255,4 @@ test_files:
 - spec/mapper_spec.rb
 - spec/spec_helper.rb
 - spec/templates_spec.rb
+has_rdoc: