hydra-pbcore 2.2.0 → 2.2.1

data/lib/hydra_pbcore/datastream/document.rb

@@ -106,11 +106,11 @@ class Document < ActiveFedora::OmDatastream
       t.coll_num(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Collection Number" })
       t.acc_num(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Accession Number" })
     end
-    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])
+    t.series(:proxy=>[:pbcoreRelation, :event_series], :index_as => [:searchable, :displayable])
+    t.collection(:proxy=>[:pbcoreRelation, :arch_coll], :index_as => [:searchable, :displayable])
+    t.archival_series(:proxy=>[:pbcoreRelation, :arch_ser], :index_as => [:searchable, :displayable])
+    t.collection_number(:proxy=>[:pbcoreRelation, :coll_num], :index_as => [:searchable, :displayable])
+    t.accession_number(:proxy=>[:pbcoreRelation, :acc_num], :index_as => [:searchable, :displayable])
 
     t.pbcoreCoverage
     # Terms for time and place

data/lib/hydra_pbcore/methods.rb

@@ -1,7 +1,19 @@
 module HydraPbcore::Methods
 
-  def remove_node(type, index = 0)
-    self.find_by_terms(type.to_sym).slice(index.to_i).remove
+  # Used to delete nodes based on their OM term defintion.
+  #
+  # Default behavior is to delete on the xml defining the term. In
+  # some cases, terms can have dependent xml that is part of the term's
+  # parent. For example, pbcoreReation templates use the 
+  # pbcoreRelation xml node to define a term, however the term's 
+  # definition is dependent on the xml inside pbcoreRelation. When
+  # we delete the term, the pbcoreRelation has to go along with it.
+  #
+  # In that case, we can pass the option:
+  #   :include_parent? => true
+  # Which will delete the term as well as its closest parent
+  def remove_node(type, index = 0, opts = {})
+    opts[:include_parent?] ? self.find_by_terms(type.to_sym).slice(index.to_i).parent.remove : self.find_by_terms(type.to_sym).slice(index.to_i).remove
   end
 
   # Returns a new Nokogiri::XML object with the contents of self, plus any additional instanstations,

data/lib/hydra_pbcore/version.rb

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

data/spec/fixtures/document_solr.xml

@@ -200,6 +200,66 @@
   <pbcoreDescriptionDocument-0-lc-subject-genre-display type="array">
     <pbcoreDescriptionDocument-0-lc-subject-genre-display>inserted</pbcoreDescriptionDocument-0-lc-subject-genre-display>
   </pbcoreDescriptionDocument-0-lc-subject-genre-display>
+  <pbcoreDescriptionDocument-series-t type="array">
+    <pbcoreDescriptionDocument-series-t>inserted</pbcoreDescriptionDocument-series-t>
+  </pbcoreDescriptionDocument-series-t>
+  <pbcoreDescriptionDocument-series-display type="array">
+    <pbcoreDescriptionDocument-series-display>inserted</pbcoreDescriptionDocument-series-display>
+  </pbcoreDescriptionDocument-series-display>
+  <pbcoreDescriptionDocument-0-series-t type="array">
+    <pbcoreDescriptionDocument-0-series-t>inserted</pbcoreDescriptionDocument-0-series-t>
+  </pbcoreDescriptionDocument-0-series-t>
+  <pbcoreDescriptionDocument-0-series-display type="array">
+    <pbcoreDescriptionDocument-0-series-display>inserted</pbcoreDescriptionDocument-0-series-display>
+  </pbcoreDescriptionDocument-0-series-display>
+  <pbcoreDescriptionDocument-collection-t type="array">
+    <pbcoreDescriptionDocument-collection-t>inserted</pbcoreDescriptionDocument-collection-t>
+  </pbcoreDescriptionDocument-collection-t>
+  <pbcoreDescriptionDocument-collection-display type="array">
+    <pbcoreDescriptionDocument-collection-display>inserted</pbcoreDescriptionDocument-collection-display>
+  </pbcoreDescriptionDocument-collection-display>
+  <pbcoreDescriptionDocument-0-collection-t type="array">
+    <pbcoreDescriptionDocument-0-collection-t>inserted</pbcoreDescriptionDocument-0-collection-t>
+  </pbcoreDescriptionDocument-0-collection-t>
+  <pbcoreDescriptionDocument-0-collection-display type="array">
+    <pbcoreDescriptionDocument-0-collection-display>inserted</pbcoreDescriptionDocument-0-collection-display>
+  </pbcoreDescriptionDocument-0-collection-display>
+  <pbcoreDescriptionDocument-archival-series-t type="array">
+    <pbcoreDescriptionDocument-archival-series-t>inserted</pbcoreDescriptionDocument-archival-series-t>
+  </pbcoreDescriptionDocument-archival-series-t>
+  <pbcoreDescriptionDocument-archival-series-display type="array">
+    <pbcoreDescriptionDocument-archival-series-display>inserted</pbcoreDescriptionDocument-archival-series-display>
+  </pbcoreDescriptionDocument-archival-series-display>
+  <pbcoreDescriptionDocument-0-archival-series-t type="array">
+    <pbcoreDescriptionDocument-0-archival-series-t>inserted</pbcoreDescriptionDocument-0-archival-series-t>
+  </pbcoreDescriptionDocument-0-archival-series-t>
+  <pbcoreDescriptionDocument-0-archival-series-display type="array">
+    <pbcoreDescriptionDocument-0-archival-series-display>inserted</pbcoreDescriptionDocument-0-archival-series-display>
+  </pbcoreDescriptionDocument-0-archival-series-display>
+  <pbcoreDescriptionDocument-collection-number-t type="array">
+    <pbcoreDescriptionDocument-collection-number-t>inserted</pbcoreDescriptionDocument-collection-number-t>
+  </pbcoreDescriptionDocument-collection-number-t>
+  <pbcoreDescriptionDocument-collection-number-display type="array">
+    <pbcoreDescriptionDocument-collection-number-display>inserted</pbcoreDescriptionDocument-collection-number-display>
+  </pbcoreDescriptionDocument-collection-number-display>
+  <pbcoreDescriptionDocument-0-collection-number-t type="array">
+    <pbcoreDescriptionDocument-0-collection-number-t>inserted</pbcoreDescriptionDocument-0-collection-number-t>
+  </pbcoreDescriptionDocument-0-collection-number-t>
+  <pbcoreDescriptionDocument-0-collection-number-display type="array">
+    <pbcoreDescriptionDocument-0-collection-number-display>inserted</pbcoreDescriptionDocument-0-collection-number-display>
+  </pbcoreDescriptionDocument-0-collection-number-display>
+  <pbcoreDescriptionDocument-accession-number-t type="array">
+    <pbcoreDescriptionDocument-accession-number-t>inserted</pbcoreDescriptionDocument-accession-number-t>
+  </pbcoreDescriptionDocument-accession-number-t>
+  <pbcoreDescriptionDocument-accession-number-display type="array">
+    <pbcoreDescriptionDocument-accession-number-display>inserted</pbcoreDescriptionDocument-accession-number-display>
+  </pbcoreDescriptionDocument-accession-number-display>
+  <pbcoreDescriptionDocument-0-accession-number-t type="array">
+    <pbcoreDescriptionDocument-0-accession-number-t>inserted</pbcoreDescriptionDocument-0-accession-number-t>
+  </pbcoreDescriptionDocument-0-accession-number-t>
+  <pbcoreDescriptionDocument-0-accession-number-display type="array">
+    <pbcoreDescriptionDocument-0-accession-number-display>inserted</pbcoreDescriptionDocument-0-accession-number-display>
+  </pbcoreDescriptionDocument-0-accession-number-display>
   <pbcoreDescriptionDocument-event-place-t type="array">
     <pbcoreDescriptionDocument-event-place-t>inserted</pbcoreDescriptionDocument-event-place-t>
   </pbcoreDescriptionDocument-event-place-t>

data/spec/methods_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe HydraPbcore::Methods do
+
+  before :each do
+    @object = HydraPbcore::Datastream::Document.new  
+  end
+
+  describe ".remove_node" do
+
+    it "should delete nodes given a term" do
+      @object.insert_publisher "bar"
+      @object.publisher.first.should == "bar"
+      @object.remove_node :publisher
+      @object.publisher.should be_empty      
+    end
+
+    it "should delete nodes all with their parents" do
+      @object.insert_relation("foo", "Archival Collection")
+      @object.collection.first.should == "foo"
+      @object.remove_node :collection, 0, {:include_parent? => TRUE} 
+      @object.find_by_terms(:pbcoreRelation).should be_empty
+    end
+
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pbcore
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -201,6 +201,7 @@ files:
 - spec/instantiation_spec.rb
 - spec/integration/conversions_spec.rb
 - spec/mapper_spec.rb
+- spec/methods_spec.rb
 - spec/spec_helper.rb
 - spec/templates_spec.rb
 - tmp/.gitkeep
@@ -218,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 267528676452476624
+      hash: -2492019924904625279
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 267528676452476624
+      hash: -2492019924904625279
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -269,6 +270,7 @@ test_files:
 - spec/instantiation_spec.rb
 - spec/integration/conversions_spec.rb
 - spec/mapper_spec.rb
+- spec/methods_spec.rb
 - spec/spec_helper.rb
 - spec/templates_spec.rb
 has_rdoc: