hydra-pbcore 2.2.0rc1 → 2.2.0

data/.gitignore

@@ -5,9 +5,11 @@
 .config
 .yardoc
 .rvmrc
+.ruby-version
 Gemfile.lock
 InstalledFiles
 _yardoc
+bin
 coverage
 doc/
 lib/bundler/man

data/hydra-pbcore.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
 
   # Dependencies
   gem.add_dependency('active-fedora')
+  gem.add_dependency('solrizer', '< 3.0.0')
   gem.add_development_dependency('yard')
   gem.add_development_dependency('redcarpet')
   # For Development

data/lib/hydra-pbcore.rb

@@ -66,6 +66,14 @@ module HydraPbcore
     Nokogiri::XML(xml)
   end
 
+  # Validates a supplied xml document against the PBCore schema.  This differs from 
+  # HydraPbcore::Methods.valid? which validates self, instead of the supplied argument.
+  # Argument must be a Nokogiri::XML::Document.
+  def self.is_valid? xml
+    xsd = Nokogiri::XML::Schema(open("http://pbcore.org/xsd/pbcore-2.0.xsd"))
+    xsd.validate(xml)
+  end
+
   autoload :Mapper
   autoload :Methods
   autoload :Conversions

data/lib/hydra_pbcore/methods.rb

@@ -4,18 +4,37 @@ module HydraPbcore::Methods
     self.find_by_terms(type.to_sym).slice(index.to_i).remove
   end
 
-  # Returns a new Nokogiri::XML object with the contents of self reordered and repackaged as a 
-  # valid pbcore xml document.
+  # Returns a new Nokogiri::XML object with the contents of self, plus any additional instanstations,
+  # reordered and repackaged as a  valid pbcore xml document.
   #
   # The original xml from the datastream is copied to a new Nokogiri object, then each node
-  # is added--in correct order--to a new blank, valid pbcore xml document.
-  def to_pbcore_xml
+  # is added--in correct order--to a new blank, valid pbcore xml document.  If additional
+  # instantiations are passed in as an array, those are correctly reordered as well, and
+  # included in the document
+  def to_pbcore_xml included_instantiations = Array.new, instantiations = Array.new
+
+    # Reorder any included instantations
+    included_instantiations.each do |i|
+      original_inst = Nokogiri::XML(i.to_xml)
+      new_inst = Nokogiri::XML("<pbcoreInstantiation/>")
+      HydraPbcore::InstantiationNodes.each do |node|
+        original_inst.search(node).each do |n|
+          new_inst.root.add_child(n)
+        end
+      end
+      instantiations << new_inst
+    end
+
+    # Reorder the document
     original = Nokogiri::XML(self.to_xml)
     new_doc = HydraPbcore.blank
     HydraPbcore::DocumentNodes.each do |node|
       original.search(node).each do |n|
         new_doc.root.add_child(n)
       end
+      if node.match("pbcoreInstantiation") && !instantiations.empty?
+        instantiations.collect { |i| new_doc.root.add_child(i.root.to_xml) }
+      end
     end
     return new_doc
   end

data/lib/hydra_pbcore/version.rb

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

data/spec/document_spec.rb

@@ -194,6 +194,23 @@ describe HydraPbcore::Datastream::Document do
       save_template @object_ds.to_pbcore_xml, "document_valid.xml"
       @object_ds.valid?.should == []
     end
+
+    describe "xml document with instantiations" do
+
+      before(:each) do
+        @digital  = HydraPbcore::Datastream::Instantiation.new(nil, nil)
+        @digital.define :digital
+        @physical = HydraPbcore::Datastream::Instantiation.new(nil, nil)
+        @physical.define :physical
+      end
+
+      it "should validate against the PBCore schema" do
+        save_template @object_ds.to_pbcore_xml([@digital, @physical]), "document_with_instantiations_valid.xml"
+        HydraPbcore.is_valid?(Nokogiri::XML(sample("document_with_instantiations_valid.xml"))).should be_true
+      end
+
+    end
+
   end  
 
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pbcore
 version: !ruby/object:Gem::Version
-  version: 2.2.0rc1
-  prerelease: 5
+  version: 2.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -27,6 +27,22 @@ 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: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -202,16 +218,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3789772575956433522
+      hash: 267528676452476624
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 267528676452476624
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Hydra gem that offers PBCore datastream definitions using OM