hydra-pbcore 3.2.0 → 3.3.0

data/lib/hydra_pbcore/datastream/document.rb

@@ -94,20 +94,30 @@ class Document < ActiveFedora::OmDatastream
     )
 
     # PBCore relation fields
-    t.pbcoreRelation do
+    t.relation(:path => "pbcoreRelation") do
       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.collection(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Archival Collection" }) do
+        t.uri(:path => {:attribute => "ref"})
+        t.authority(:path => {:attribute => "source"})
+      end
+      t.series(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Archival Series" }) do
+        t.uri(:path => {:attribute => "ref"})
+        t.authority(:path => {:attribute => "source"})
+      end
       t.coll_num(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Collection Number" })
       t.acc_num(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Accession Number" })
       t.addl_coll(:path=>"pbcoreRelationIdentifier", :attributes=>{ :annotation=>"Additional Collection" })
     end
-    t.series(:ref=>[:pbcoreRelation, :event_series], :index_as => [:searchable, :displayable, :facetable])
-    t.collection(:ref=>[:pbcoreRelation, :arch_coll], :index_as => [:searchable, :displayable, :facetable])
-    t.additional_collection(:ref=>[:pbcoreRelation, :addl_coll], :index_as => [:searchable, :displayable, :facetable])
-    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(:ref=>[:relation, :event_series], :index_as => [:searchable, :displayable, :facetable])
+    t.collection(:ref=>[:relation, :collection], :index_as => [:searchable, :displayable, :facetable])
+    t.collection_uri(:proxy=>[:relation, :collection, :uri], :index_as => [:displayable])
+    t.collection_authority(:proxy=>[:relation, :collection, :authority], :index_as => [:displayable])
+    t.archival_series(:ref=>[:relation, :series], :index_as => [:searchable, :displayable, :facetable])
+    t.archival_series_uri(:proxy=>[:relation, :series, :uri], :index_as => [:displayable])
+    t.archival_series_authority(:proxy=>[:relation, :series, :authority], :index_as => [:displayable])
+    t.additional_collection(:ref=>[:relation, :addl_coll], :index_as => [:searchable, :displayable, :facetable])
+    t.collection_number(:ref=>[:relation, :coll_num], :index_as => [:searchable, :displayable])
+    t.accession_number(:ref=>[:relation, :acc_num], :index_as => [:searchable, :displayable])
 
     t.pbcoreCoverage
     # Terms for time and place

data/lib/hydra_pbcore/version.rb

@@ -1,3 +1,3 @@
 module HydraPbcore
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

data/spec/document_spec.rb

@@ -263,6 +263,66 @@ describe HydraPbcore::Datastream::Document do
 
     end
 
-  end  
+  end
+
+  describe "#collection_uri" do
+    it "should return the uri of the collection" do
+      @object_ds.is_part_of("Collection", {:annotation => "Archival Collection", :ref => "http://foo"})
+      @object_ds.collection.should == ["Collection"]
+      @object_ds.collection_uri.should == ["http://foo"]
+    end
+    it "should update the uri of a collection" do
+      @object_ds.is_part_of("Collection", {:annotation => "Archival Collection"})
+      @object_ds.collection_uri.should be_empty
+      @object_ds.relation.collection.uri = "http://foo"
+      @object_ds.collection_uri.should == ["http://foo"]
+      @object_ds.valid?.should be_true
+    end
+  end
+
+  describe "#collection_authority" do
+    it "should return the authority of the collection" do
+      @object_ds.is_part_of("Collection", {:annotation => "Archival Collection", :source => "Foo"})
+      @object_ds.collection.should == ["Collection"]
+      @object_ds.collection_authority.should == ["Foo"]
+    end
+    it "should update the authority of a collection" do
+      @object_ds.is_part_of("Collection", {:annotation => "Archival Collection"})
+      @object_ds.collection_authority.should be_empty
+      @object_ds.relation.collection.authority = "Foo!"
+      @object_ds.collection_authority.should == ["Foo!"]
+      @object_ds.valid?.should be_true
+    end
+  end
+
+  describe "#archival_series_uri" do
+    it "should return the uri of the archival_series" do
+      @object_ds.is_part_of("Series", {:annotation => "Archival Series", :ref => "http://foo"})
+      @object_ds.archival_series.should == ["Series"]
+      @object_ds.archival_series_uri.should == ["http://foo"]
+    end
+    it "should update the uri of a archival_series" do
+      @object_ds.is_part_of("Series", {:annotation => "Archival Series"})
+      @object_ds.archival_series_uri.should be_empty
+      @object_ds.relation.series.uri = "http://foo"
+      @object_ds.archival_series_uri.should == ["http://foo"]
+      @object_ds.valid?.should be_true
+    end
+  end
+
+  describe "#archival_series_authority" do
+    it "should return the authority of the archival_series" do
+      @object_ds.is_part_of("Series", {:annotation => "Archival Series", :source => "Foo"})
+      @object_ds.archival_series.should == ["Series"]
+      @object_ds.archival_series_authority.should == ["Foo"]
+    end
+    it "should update the authority of a archival_series" do
+      @object_ds.is_part_of("Series", {:annotation => "Archival Series"})
+      @object_ds.archival_series_authority.should be_empty
+      @object_ds.relation.series.authority = "Foo!"
+      @object_ds.archival_series_authority.should == ["Foo!"]
+      @object_ds.valid?.should be_true
+    end
+  end
 
 end

data/spec/fixtures/document_solr.xml

@@ -400,6 +400,15 @@
   <collection-sim type="array">
     <collection-sim>inserted</collection-sim>
   </collection-sim>
+  <archival-series-teim type="array">
+    <archival-series-teim>inserted</archival-series-teim>
+  </archival-series-teim>
+  <archival-series-ssm type="array">
+    <archival-series-ssm>inserted</archival-series-ssm>
+  </archival-series-ssm>
+  <archival-series-sim type="array">
+    <archival-series-sim>inserted</archival-series-sim>
+  </archival-series-sim>
   <additional-collection-teim type="array">
     <additional-collection-teim>inserted</additional-collection-teim>
   </additional-collection-teim>
@@ -409,12 +418,6 @@
   <additional-collection-sim type="array">
     <additional-collection-sim>inserted</additional-collection-sim>
   </additional-collection-sim>
-  <archival-series-teim type="array">
-    <archival-series-teim>inserted</archival-series-teim>
-  </archival-series-teim>
-  <archival-series-ssm type="array">
-    <archival-series-ssm>inserted</archival-series-ssm>
-  </archival-series-ssm>
   <collection-number-teim type="array">
     <collection-number-teim>inserted</collection-number-teim>
   </collection-number-teim>

data/spec/methods_spec.rb

@@ -19,7 +19,7 @@ describe HydraPbcore::Methods do
       @object.is_part_of("foo", {:annotation => "Archival Collection"})
       @object.collection.first.should == "foo"
       @object.remove_node :collection, 0, {:include_parent? => TRUE} 
-      @object.find_by_terms(:pbcoreRelation).should be_empty
+      @object.find_by_terms(:relation).should be_empty
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pbcore
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -223,12 +223,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -719992496300359709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -719992496300359709
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23