hydra-pbcore 2.1.0 → 2.2.0rc1

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

@@ -1,6 +1,10 @@
 module HydraPbcore::Datastream::Deprecated
 class DigitalDocument < ActiveFedora::NokogiriDatastream
 
+  class_attribute :institution, :relator
+  self.institution = "Rock and Roll Hall of Fame and Museum"
+  self.relator     = "MARC relator terms"
+
   include HydraPbcore::Methods
   include HydraPbcore::Templates
   include HydraPbcore::Conversions
@@ -13,7 +17,7 @@ class DigitalDocument < ActiveFedora::NokogiriDatastream
       xml.pbcoreDescriptionDocument("xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance",
         "xsi:schemaLocation"=>"http://www.pbcore.org/PBCore/PBCoreNamespace.html") {
 
-        xml.pbcoreIdentifier(:source=>"Rock and Roll Hall of Fame and Museum", :annotation=>"PID")
+        xml.pbcoreIdentifier(:source=>self.institution, :annotation=>"PID")
         xml.pbcoreTitle(:titleType=>"Main")
         xml.pbcoreDescription(:descriptionType=>"Description",
           :descriptionTypeSource=>"pbcoreDescription/descriptionType",

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

@@ -1,6 +1,10 @@
 module HydraPbcore::Datastream::Deprecated
 class Document < ActiveFedora::NokogiriDatastream
 
+  class_attribute :institution, :relator
+  self.institution = "Rock and Roll Hall of Fame and Museum"
+  self.relator     = "MARC relator terms"
+
   include HydraPbcore::Methods
   include HydraPbcore::Templates
   include HydraPbcore::Conversions
@@ -9,7 +13,7 @@ class Document < ActiveFedora::NokogiriDatastream
     t.root(:path=>"pbcoreDescriptionDocument")
 
     t.pbc_id(:path=>"pbcoreIdentifier", 
-      :attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum", :annotation=>"PID" }
+      :attributes=>{ :source=>self.institution, :annotation=>"PID" }
     )
 
     t.title(:path=>"pbcoreTitle", :attributes=>{ :titleType=>"Main" }, :index_as => [:searchable, :displayable])
@@ -42,7 +46,7 @@ class Document < ActiveFedora::NokogiriDatastream
       :index_as => [:displayable]
     )
     t.rh_subject(:path=>"pbcoreSubject", 
-      :attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum" },
+      :attributes=>{ :source=>self.institution },
       :index_as => [:displayable]
     )
 
@@ -113,7 +117,7 @@ class Document < ActiveFedora::NokogiriDatastream
     t.contributor(:path=>"pbcoreContributor") do
       t.name_(:path=>"contributor")
       t.role_(:path=>"contributorRole", 
-        :attributes=>{ :source=>"MARC relator terms" }
+        :attributes=>{ :source=>self.relator }
       )
     end
     t.contributor_name(:proxy=>[:contributor, :name], :index_as => [:searchable, :facetable])
@@ -135,7 +139,7 @@ class Document < ActiveFedora::NokogiriDatastream
     t.pbcoreInstantiation do
       t.instantiationIdentifier(:attributes=>{ 
         :annotation=>"Barcode", 
-        :source=>"Rock and Roll Hall of Fame and Museum"
+        :source=>self.institution
       })
       t.instantiationDate(:attributes=>{ :dateType=>"created" })
       t.instantiationPhysical(:attributes=>{ :source=>"PBCore instantiationPhysical" })
@@ -209,7 +213,7 @@ class Document < ActiveFedora::NokogiriDatastream
       xml.pbcoreDescriptionDocument("xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance",
         "xsi:schemaLocation"=>"http://www.pbcore.org/PBCore/PBCoreNamespace.html") {
 
-        xml.pbcoreIdentifier(:source=>"Rock and Roll Hall of Fame and Museum", :annotation=>"PID")
+        xml.pbcoreIdentifier(:source=>self.institution, :annotation=>"PID")
         xml.pbcoreTitle(:titleType=>"Main")
         xml.pbcoreDescription(:descriptionType=>"Description",
           :descriptionTypeSource=>"pbcoreDescription/descriptionType",
@@ -247,7 +251,7 @@ class Document < ActiveFedora::NokogiriDatastream
         xml.pbcoreInstantiation {
 
           # Item details
-          xml.instantiationIdentifier(:annotation=>"Barcode", :source=>"Rock and Roll Hall of Fame and Museum")
+          xml.instantiationIdentifier(:annotation=>"Barcode", :source=>self.institution)
           xml.instantiationDate(:dateType=>"created")
           xml.instantiationPhysical(:source=>"PBCore instantiationPhysical")
           xml.instantiationStandard

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

@@ -1,6 +1,9 @@
 module HydraPbcore::Datastream::Deprecated
 class Instantiation < ActiveFedora::NokogiriDatastream
 
+  class_attribute :institution
+  self.institution = "Rock and Roll Hall of Fame and Museum"
+
   include HydraPbcore::Methods
   include HydraPbcore::Templates
   include HydraPbcore::Conversions
@@ -14,7 +17,7 @@ class Instantiation < ActiveFedora::NokogiriDatastream
       t.instantiationIdentifier(
         :attributes=>{
           :annotation=>"Filename",
-          :source=>"Rock and Roll Hall of Fame and Museum"
+          :source=>self.institution
         },
         :index_as => [:displayable]
       )
@@ -80,7 +83,7 @@ class Instantiation < ActiveFedora::NokogiriDatastream
       )
 
       t.instantiationRelation do
-        t.instantiationRelationIdentifier(:attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum" })
+        t.instantiationRelationIdentifier(:attributes=>{ :source=>self.institution })
       end
       # The file we're describing at the root of this document preceeds the file marked "next"
       t.next_inst(:ref => [:pbcoreInstantiation, :instantiationRelation],
@@ -199,13 +202,13 @@ class Instantiation < ActiveFedora::NokogiriDatastream
 
         # These fields are only added so that this document will be validated.  However, they
         # shouldn't be used for anything else here because they're in the parent Fedora object
-        xml.pbcoreIdentifier(:annotation=>"PID", :source=>"Rock and Roll Hall of Fame and Museum")
+        xml.pbcoreIdentifier(:annotation=>"PID", :source=>self.institution)
         xml.pbcoreTitle
         xml.pbcoreDescription
 
         xml.pbcoreInstantiation {
 
-          xml.instantiationIdentifier(:annotation=>"Filename", :source=>"Rock and Roll Hall of Fame and Museum")
+          xml.instantiationIdentifier(:annotation=>"Filename", :source=>self.institution)
           xml.instantiationDate(:dateType=>"created")
           xml.instantiationDigital(:source=>"EBU file formats")
           xml.instantiationLocation

data/lib/hydra_pbcore/datastream/document.rb

@@ -1,6 +1,10 @@
 module HydraPbcore::Datastream
 class Document < ActiveFedora::OmDatastream
 
+  class_attribute :institution, :relator
+  self.institution = "Rock and Roll Hall of Fame and Museum"
+  self.relator     = "MARC relator terms"
+
   include HydraPbcore::Methods
   include HydraPbcore::Templates
   include HydraPbcore::Conversions
@@ -9,7 +13,7 @@ class Document < ActiveFedora::OmDatastream
     t.root(:path=>"pbcoreDescriptionDocument")
 
     t.pbc_id(:path=>"pbcoreIdentifier", 
-      :attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum", :annotation=>"PID" }
+      :attributes=>{ :source=>self.institution, :annotation=>"PID" }
     )
 
     t.title(:path=>"pbcoreTitle", :attributes=>{ :titleType=>"Main" }, :index_as => [:searchable, :displayable])
@@ -42,7 +46,7 @@ class Document < ActiveFedora::OmDatastream
       :index_as => [:displayable]
     )
     t.rh_subject(:path=>"pbcoreSubject", 
-      :attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum" },
+      :attributes=>{ :source=>self.institution },
       :index_as => [:displayable]
     )
 
@@ -134,7 +138,7 @@ class Document < ActiveFedora::OmDatastream
     t.contributor(:path=>"pbcoreContributor") do
       t.name_(:path=>"contributor", :index_as => [:searchable, :facetable])
       t.role_(:path=>"contributorRole", 
-        :attributes=>{ :source=>"MARC relator terms" },
+        :attributes=>{ :source=>self.relator },
         :index_as => [:searchable, :displayable]
       )
     end
@@ -164,7 +168,7 @@ class Document < ActiveFedora::OmDatastream
       xml.pbcoreDescriptionDocument("xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance",
         "xsi:schemaLocation"=>"http://www.pbcore.org/PBCore/PBCoreNamespace.html") {
 
-        xml.pbcoreIdentifier(:source=>"Rock and Roll Hall of Fame and Museum", :annotation=>"PID")
+        xml.pbcoreIdentifier(:source=>self.institution, :annotation=>"PID")
         xml.pbcoreTitle(:titleType=>"Main")
         xml.pbcoreDescription(:descriptionType=>"Description",
           :descriptionTypeSource=>"pbcoreDescription/descriptionType",

data/lib/hydra_pbcore/datastream/instantiation.rb

@@ -1,6 +1,10 @@
 module HydraPbcore::Datastream
 class Instantiation < ActiveFedora::OmDatastream
 
+  class_attribute :institution, :address
+  self.institution = "Rock and Roll Hall of Fame and Museum"
+  self.address     = "Rock and Roll Hall of Fame and Museum,\n2809 Woodland Ave.,\nCleveland, OH, 44115\n216-515-1956\nlibrary@rockhall.org"
+
   include HydraPbcore::Methods
   include HydraPbcore::Templates
   include HydraPbcore::Conversions
@@ -13,7 +17,7 @@ class Instantiation < ActiveFedora::OmDatastream
       :path => "instantiationIdentifier",
       :attributes=>{
         :annotation=>"Filename",
-        :source=>"Rock and Roll Hall of Fame and Museum"
+        :source=>self.institution
       },
       :index_as => [:displayable]
     )
@@ -21,7 +25,7 @@ class Instantiation < ActiveFedora::OmDatastream
       :path => "instantiationIdentifier",
       :attributes=>{
         :annotation=>"Barcode",
-        :source=>"Rock and Roll Hall of Fame and Museum"
+        :source=>self.institution
       },
       :index_as => [:displayable]
     )
@@ -90,7 +94,7 @@ class Instantiation < ActiveFedora::OmDatastream
     )
 
     t.instantiationRelation do
-      t.instantiationRelationIdentifier(:attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum" })
+      t.instantiationRelationIdentifier(:attributes=>{ :source=>self.institution })
     end
     # The file we're describing at the root of this document preceeds the file marked "next"
     t.next_inst(:ref => [:pbcoreInstantiation, :instantiationRelation],

data/lib/hydra_pbcore/templates.rb

@@ -21,7 +21,7 @@ module HydraPbcore::Templates
       define_template :contributor do |xml, author, role|
         xml.pbcoreContributor {
           xml.contributor(author)
-          xml.contributorRole(role, :source=>"MARC relator terms") 
+          xml.contributorRole(role, :source=>self.relator) 
         }
       end
 
@@ -30,7 +30,7 @@ module HydraPbcore::Templates
           xml.instantiationRelationType(:annotation=>"One of a multi-part instantiation") {
             xml.text "Follows in Sequence"
           }
-          xml.instantiationRelationIdentifier(file, :source=>"Rock and Roll Hall of Fame and Museum")
+          xml.instantiationRelationIdentifier(file, :source=>self.institution)
         }
       end
 
@@ -39,7 +39,7 @@ module HydraPbcore::Templates
           xml.instantiationRelationType(:annotation=>"One of a multi-part instantiation") {
             xml.text "Precedes in Sequence"
           }
-          xml.instantiationRelationIdentifier(file, :source=>"Rock and Roll Hall of Fame and Museum")
+          xml.instantiationRelationIdentifier(file, :source=>self.institution)
         }
       end
 
@@ -108,7 +108,7 @@ module HydraPbcore::Templates
 
       xml.pbcoreInstantiation {
 
-        xml.instantiationIdentifier(:annotation=>"Filename", :source=>"Rock and Roll Hall of Fame and Museum")
+        xml.instantiationIdentifier(:annotation=>"Filename", :source=>self.institution)
         xml.instantiationDate(:dateType=>"created")
         xml.instantiationDigital(:source=>"EBU file formats")
         xml.instantiationLocation
@@ -163,12 +163,12 @@ module HydraPbcore::Templates
       xml.pbcoreInstantiation {
 
         # Item details
-        xml.instantiationIdentifier(:annotation=>"Barcode", :source=>"Rock and Roll Hall of Fame and Museum")
+        xml.instantiationIdentifier(:annotation=>"Barcode", :source=>self.institution)
         xml.instantiationDate(:dateType=>"created")
         xml.instantiationPhysical(:source=>"PBCore instantiationPhysical")
         xml.instantiationStandard
         xml.instantiationLocation {
-          xml.text "Rock and Roll Hall of Fame and Museum,\n2809 Woodland Ave.,\nCleveland, OH, 44115\n216-515-1956\nlibrary@rockhall.org"
+          xml.text self.address
         }
         xml.instantiationMediaType(:source=>"PBCore instantiationMediaType") {
           xml.text "Moving image"

data/lib/hydra_pbcore/version.rb

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

data/spec/templates_spec.rb

@@ -4,6 +4,11 @@ describe HydraPbcore::Templates do
   
   before :each do 
     class TestClass
+
+      class_attribute :institution, :relator, :address
+      self.institution = "Rock and Roll Hall of Fame and Museum"
+      self.relator     = "MARC relator terms"
+      self.address     = "Rock and Roll Hall of Fame and Museum,\n2809 Woodland Ave.,\nCleveland, OH, 44115\n216-515-1956\nlibrary@rockhall.org"
       
       def self.define_template arg
       end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pbcore
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.2.0rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Adam Wead
@@ -202,16 +202,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3521105165021581431
+      hash: 3789772575956433522
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3521105165021581431
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24