pbcore 0.2.0 → 0.3.0

data/lib/pbcore/instantiation/dimensions.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Dimensions < Element
+  class Instantiation::Dimensions < ContentElement
     element :instantiationDimensions, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/duration.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Duration < Element
+  class Instantiation::Duration < ContentElement
     element :instantiationDuration, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/essence_track/annotation.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::Annotation < Element
+  class Instantiation::EssenceTrack::Annotation < ContentElement
     element :essenceTrackAnnotation, as: :value
 
     attribute :annotationType, as: :type

data/lib/pbcore/instantiation/essence_track/aspect_ratio.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::AspectRatio < Element
+  class Instantiation::EssenceTrack::AspectRatio < ContentElement
     element :essenceTrackAspectRatio, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/essence_track/bit_depth.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::BitDepth < Element
+  class Instantiation::EssenceTrack::BitDepth < ContentElement
     element :essenceTrackBitDepth, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/essence_track/data_rate.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::DataRate < Element
+  class Instantiation::EssenceTrack::DataRate < ContentElement
     element :essenceTrackDataRate, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/essence_track/duration.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::Duration < Element
+  class Instantiation::EssenceTrack::Duration < ContentElement
     element :essenceTrackDuration, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/essence_track/encoding.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::Encoding < Element
+  class Instantiation::EssenceTrack::Encoding < ContentElement
     element :essenceTrackEncoding, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/essence_track/frame_rate.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::FrameRate < Element
+  class Instantiation::EssenceTrack::FrameRate < ContentElement
     element :essenceTrackFrameRate, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/essence_track/frame_size.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::FrameSize < Element
+  class Instantiation::EssenceTrack::FrameSize < ContentElement
     element :essenceTrackFrameSize, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/essence_track/identifier.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::Identifier < Element
+  class Instantiation::EssenceTrack::Identifier < ContentElement
     element :essenceTrackIdentifier, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/essence_track/language.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::Language < Element
+  class Instantiation::EssenceTrack::Language < ContentElement
     element :essenceTrackLanguage, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/essence_track/playback_speed.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::PlaybackSpeed < Element
+  class Instantiation::EssenceTrack::PlaybackSpeed < ContentElement
     element :essenceTrackPlaybackSpeed, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/essence_track/sampling_rate.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::SamplingRate < Element
+  class Instantiation::EssenceTrack::SamplingRate < ContentElement
     element :essenceTrackSamplingRate, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/essence_track/standard.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::Standard < Element
+  class Instantiation::EssenceTrack::Standard < ContentElement
     element :essenceTrackStandard, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/essence_track/time_start.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::TimeStart < Element
+  class Instantiation::EssenceTrack::TimeStart < ContentElement
     element :essenceTrackTimeStart, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/essence_track/type.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::EssenceTrack::Type < Element
+  class Instantiation::EssenceTrack::Type < ContentElement
     element :essenceTrackType, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/extension.rb

@@ -2,20 +2,29 @@ require 'pbcore/element'
 
 module PBCore
   class Instantiation::Extension < Element
-    autoload :Wrap,      'pbcore/instantiation/extension/wrap'
-    autoload :Embedded,  'pbcore/instantiation/extension/embedded'
+    autoload :Wrap,      'pbcore/extension/wrap'
+    autoload :Embedded,  'pbcore/extension/embedded'
 
     element :instantiationExtension, as: :value
-    # NOTE: the classes used for extensionWrap and extensionEmbedded elements
-    # here are the same as those used for PBCore::Extension, since everything
-    # inside has the same schema.
+    # NOTE: the classes used for <extensionWrap> and >extensionEmbedded>
+    # elements here are the same as those used for PBCore::Extension, since
+    # everything inside has the same schema.
     element :extensionWrap, as: :wrap, class: PBCore::Extension::Wrap
     element :extensionEmbedded, as: :embedded, class: PBCore::Extension::Embedded
 
     build_xml do |xml|
       xml.instantiationExtension(xml_attributes.compact) do |xml|
-        wrap.build(xml) if wrap
-        embedded.build(xml) if embedded
+        # <extensionWrap> and <extensionEmbedded> are mutually exclusive. Wrap
+        # takes precedence, so if you want to output <extensionEmbedded> make
+        # sure #wrap is set to nil.
+        # NOTE: Using #embedded will not produce round-trippable XML (i.e. XML
+        # that can be reparsed by the pbcore gem models.
+        # (See lib/pbcore/extension/embedded.rb)
+        if wrap
+          wrap.build(xml)
+        elsif embedded
+          embedded.build(xml)
+        end
       end
     end
   end

data/lib/pbcore/instantiation/file_size.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::FileSize < Element
+  class Instantiation::FileSize < ContentElement
     element :instantiationFileSize, as: :value
 
     attribute :unitsOfMeasure, as: :units_of_measure

data/lib/pbcore/instantiation/generations.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Generations < Element
+  class Instantiation::Generations < ContentElement
     element :instantiationGenerations, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/identifier.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Identifier < Element
+  class Instantiation::Identifier < ContentElement
     element :instantiationIdentifier, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/language.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Language < Element
+  class Instantiation::Language < ContentElement
     element :instantiationLanguage, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/location.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Location < Element
+  class Instantiation::Location < ContentElement
     element :instantiationLocation, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/media_type.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::MediaType < Element
+  class Instantiation::MediaType < ContentElement
     element :instantiationMediaType, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/physical.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Physical < Element
+  class Instantiation::Physical < ContentElement
     element :instantiationPhysical, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/relation/identifier.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::Relation::Identifier < Element
+  class Instantiation::Relation::Identifier < ContentElement
     element :instantiationRelationIdentifier, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/relation/type.rb

@@ -1,5 +1,5 @@
 module PBCore
-  class Instantiation::Relation::Type < Element
+  class Instantiation::Relation::Type < ContentElement
     element :instantiationRelationType, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/rights.rb

@@ -9,7 +9,6 @@ module PBCore
     element :rightsSummary, as: :summary, class: PBCore::Instantiation::Rights::Summary
     element :rightsLink, as: :link, class: PBCore::Instantiation::Rights::Link
 
-    # has_time_attributes_on :instantiationRights
     include PBCore::Attributes::TimeInterval
 
     build_xml do |xml|

data/lib/pbcore/instantiation/rights/link.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Rights::Link < Element
+  class Instantiation::Rights::Link < ContentElement
     element :rightsLink, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/rights/summary.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Rights::Summary < Element
+  class Instantiation::Rights::Summary < ContentElement
     element :rightsSummary, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/standard.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Standard < Element
+  class Instantiation::Standard < ContentElement
     element :instantiationStandard, as: :value
 
     attribute :profile, as: :profile

data/lib/pbcore/instantiation/time_start.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::TimeStart < Element
+  class Instantiation::TimeStart < ContentElement
     element :instantiationTimeStart, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation/tracks.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Instantiation::Tracks < Element
+  class Instantiation::Tracks < ContentElement
     element :instantiationTracks, as: :value
 
     build_xml do |xml|

data/lib/pbcore/instantiation_document.rb

@@ -36,7 +36,7 @@ module PBCore
     element  :instantiationLocation, as: :location, class: PBCore::Instantiation::Location
     element  :instantiationMediaType, as: :media_type, class: PBCore::Instantiation::MediaType
     elements :instantiationGenerations, as: :generations, class: PBCore::Instantiation::Generations
-    elements :instantiationTimeStart, as: :time_starts, class: PBCore::Instantiation::TimeStart
+    element  :instantiationTimeStart, as: :time_start, class: PBCore::Instantiation::TimeStart
     element  :instantiationFileSize, as: :file_size, class: PBCore::Instantiation::FileSize
     element  :instantiationDuration, as: :duration, class: PBCore::Instantiation::Duration
     element  :instantiationDataRate, as: :data_rate, class: PBCore::Instantiation::DataRate
@@ -65,7 +65,7 @@ module PBCore
         location.build(xml) if location
         media_type.build(xml) if media_type
         generations.each { |generations_element| generations_element.build(xml) }
-        time_starts.each { |time_start| time_start.build(xml) }
+        time_start.build(xml) if time_start
         file_size.build(xml) if file_size
         duration.build(xml) if duration
         data_rate.build(xml) if data_rate

data/lib/pbcore/publisher/publisher.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Publisher::Publisher < Element
+  class Publisher::Publisher < ContentElement
     element :publisher, as: :value
 
     attribute :affiliation, as: :affiliation

data/lib/pbcore/publisher/role.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Publisher::Role < Element
+  class Publisher::Role < ContentElement
     element :publisherRole, as: :value
 
     build_xml do |xml|

data/lib/pbcore/relation/identifier.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Relation::Identifier < Element
+  class Relation::Identifier < ContentElement
     element :pbcoreRelationIdentifier, as: :value
 
     build_xml do |xml|

data/lib/pbcore/relation/type.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Relation::Type < Element
+  class Relation::Type < ContentElement
     element :pbcoreRelationType, as: :value
 
     build_xml do |xml|

data/lib/pbcore/rights_summary/link.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class RightsSummary::Link < Element
+  class RightsSummary::Link < ContentElement
     element :rightsLink, as: :value
 
     build_xml do |xml|

data/lib/pbcore/rights_summary/summary.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class RightsSummary::Summary < Element
+  class RightsSummary::Summary < ContentElement
     element :rightsSummary, as: :value
 
     build_xml do |xml|

data/lib/pbcore/subject.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Subject < Element
+  class Subject < ContentElement
     element :pbcoreSubject, as: :value
     attribute :subjectType, as: :type
     attribute :subjectTypeRef, as: :type_ref

data/lib/pbcore/title.rb

@@ -1,7 +1,7 @@
 require 'pbcore/element'
 
 module PBCore
-  class Title < Element
+  class Title < ContentElement
     element :pbcoreTitle, as: :value
     attribute :titleType, as: :type
     attribute :titleTypeSource, as: :type_source

data/lib/pbcore/version.rb

@@ -1,3 +1,3 @@
 module PBCore
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/pbcore/vocab.rb

@@ -1,6 +1,12 @@
 module PBCore
   module Vocab
     class << self
+      def asset_types
+        [ "Album", "Animation", "Clip", "Collection", "Compilation", "Episode",
+          "Miniseries", "Program", "Promo", "Raw Footage", "Segment", "Series",
+          "Season", "Subseries" ]
+      end
+
       def date_types
         [ "accepted", "available", "available end", "available start",
           "broadcast", "captured", "created", "copyright", "deletion",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbcore
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Myers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -181,6 +181,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/pbcore-2.1.xsd
 - lib/pbcore.rb
 - lib/pbcore/annotation.rb
 - lib/pbcore/asset_date.rb
@@ -190,6 +191,7 @@ files:
 - lib/pbcore/attributes/time_interval.rb
 - lib/pbcore/audience_level.rb
 - lib/pbcore/audience_rating.rb
+- lib/pbcore/content_element.rb
 - lib/pbcore/contributor.rb
 - lib/pbcore/contributor/contributor.rb
 - lib/pbcore/contributor/role.rb
@@ -289,8 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: PBCore models and factories for Ruby