cul_hydra 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e4652c6ba2ad83f7e8f3c6d5d53f2c9ed99b5b3
-  data.tar.gz: 74ada7de873eb687e9145528bd3bd7c4636f4001
+  metadata.gz: 5b4df6344182d2a1a44c6d286351a7f3a4236a8e
+  data.tar.gz: a5d69d3023b352af7193f8b1c1cb9cd7d72bacd2
 SHA512:
-  metadata.gz: c5e453ac0ca0f1585d6fe086f5d86148f2a6e8ad43bab2aa32cb53d341196d02f9513989837c2faf97bccc00986e895c547109533f2fa5d2cc054e6c819a20c6
-  data.tar.gz: 290debecb4e2a733e28dfbfb9633a85f4b445e80dfc1fccbe2b9fd548edeac946b70cbacd695999f86b273b1149dcc7a6072396bae0097c4c12d5481765508fe
+  metadata.gz: 64dd5669dd1b949e3a4d433f17f7bd3013ab1b148b0fd0e9fbc3bdaf1c31c7ea4b3f03ec5097971c8890038aea2b221991c160ac72a8bd695981cd5083c24f83
+  data.tar.gz: f20adce232a055aa7b688e21c552a08a7bde9670347348ae9b86edc9e2622edae4c6f99d12b7475c75efda5faeeb5325feb6b12fe1ded6f2e34fe2fb707dbe38

data/app/models/collection.rb

@@ -1,5 +1,6 @@
 class Collection < GenericAggregator
   include Pcdm::Models
+  include Pcdm::Models::Collections
   rdf_types(RDF::CUL.Aggregator)
   rdf_types(RDF::PCDM.Collection)
 

data/app/models/concerns/pcdm/models/collections.rb

@@ -0,0 +1,7 @@
+module Pcdm::Models::Collections
+  extend ActiveSupport::Concern
+  def compose_from(*collections)
+  	collections = collections.map {|c| (c.is_a? String) ? ActiveFedora::Base.find(c) : c }
+  	self.structMetadata.merge(*collections.map {|c| c.structMetadata})
+  end
+end

data/app/models/cul/hydra/datastreams/struct_metadata.rb

@@ -151,7 +151,37 @@ class StructMetadata < ::ActiveFedora::Datastream
     end
   end
 
+  def merge(*parts)
+    if bad_part = parts.detect {|p| !p.is_a? StructMetadata}
+      raise "Can only compose from other StructMetadata datastreams (#{bad_part.class})"
+    end
+
+    parts.each do |part|
+      part.struct_map.attributes.each do |att|
+        struct_map[att[0]] = att[1]
+      end
+      combine(part.struct_map,struct_map)
+    end
+    ng_xml_will_change!
+    self
+  end
+
   private
+  def combine(src, target)
+    src.children.each do |child|
+
+      if child['CONTENTIDS'] and c = target.children.detect {|n| n['CONTENTIDS'].eql?child['CONTENTIDS']}
+        child.attributes.each do |att|
+          c[att[0]] = c[att[1]]
+        end
+        combine(child,c)
+      elsif c = target.children.detect {|n| n['LABEL'].eql?child['LABEL'] and !n['CONTENTIDS']}
+        combine(child,c)
+      else
+        target.add_child(child.dup.unlink)
+      end
+    end
+  end
   def ancestors(node)
     current = node
     labels = []

data/fixtures/spec/STRUCTMAP/structmap-nested2.xml

@@ -0,0 +1,14 @@
+<mets:structMap TYPE="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Filesystem" LABEL="Device" xmlns:mets="http://www.loc.gov/METS/">
+<mets:div ORDER="1" LABEL="Leaf1">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0701r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0701v" />
+</div>
+<mets:div ORDER="2" LABEL="Leaf2">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0704r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0704v" />
+</div>
+<mets:div ORDER="2" LABEL="Leaf3">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0705r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0705v" />
+</div>
+</mets:structMap>

data/fixtures/spec/STRUCTMAP/structmap-nested3.xml

@@ -0,0 +1,17 @@
+<mets:structMap TYPE="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Filesystem" LABEL="Device" xmlns:mets="http://www.loc.gov/METS/">
+<mets:div ORDER="1" LABEL="Leaf1">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0701r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0701v" />
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0702r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0702v" />
+</div>
+<mets:div ORDER="2" LABEL="Leaf2">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0703r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0703v" />
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0704r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0704v" />
+</div>
+<mets:div ORDER="2" LABEL="Leaf3">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0705r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0705v" />
+</div>

data/lib/cul_hydra/version.rb

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
     def self.version
       VERSION
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -330,6 +330,7 @@ files:
 - app/models/concerns/nie/information_element.rb
 - app/models/concerns/ore/proxy.rb
 - app/models/concerns/pcdm/models.rb
+- app/models/concerns/pcdm/models/collections.rb
 - app/models/concerns/rdf/cul.rb
 - app/models/concerns/rdf/fcrepo3.rb
 - app/models/concerns/rdf/nfo.rb
@@ -446,6 +447,8 @@ files:
 - fixtures/spec/FOXML/static-image-aggregator.xml
 - fixtures/spec/STRUCTMAP/structmap-examples.xml
 - fixtures/spec/STRUCTMAP/structmap-nested.xml
+- fixtures/spec/STRUCTMAP/structmap-nested2.xml
+- fixtures/spec/STRUCTMAP/structmap-nested3.xml
 - fixtures/spec/STRUCTMAP/structmap-recto.xml
 - fixtures/spec/STRUCTMAP/structmap-seq.xml
 - fixtures/spec/STRUCTMAP/structmap-unlabeled-seq.xml
@@ -513,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL repository apps