ddr-models 2.0.0.pre.1 → 2.0.0.pre.2

data/spec/models/has_struct_metadata_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Ddr
+  module Models
+    RSpec.describe HasStructMetadata, type: :model, structural_metadata: true do
+
+      describe "#structure" do
+        let(:item) { Item.new(pid: 'test:2') }
+        context "no existing structural metadata" do
+          it "should return nil" do
+            expect(item.structure).to eq(nil)
+          end
+        end
+        context "existing structural metadata" do
+          before { item.datastreams[Ddr::Datastreams::STRUCT_METADATA].content = simple_structure }
+          it "should return the structural metadata" do
+            expect(item.structure.to_xml).to be_equivalent_to(simple_structure)
+          end
+        end
+      end
+
+      describe "#build_default_structure" do
+        let(:item) { Item.new(pid: 'test:2') }
+        let(:components) { [ Component.new(pid: 'test:5', identifier: [ 'abc002' ]),
+                             Component.new(pid: 'test:6', identifier: [ 'abc001' ]),
+                             Component.new(pid: 'test:7', identifier: [ 'abc003' ])
+                           ] }
+        let(:expected) { FactoryGirl.build(:simple_structure) }
+        before { allow(item).to receive(:find_children) { simple_structure_query_response } }
+        it "should build the appropriate structural metadata" do
+          results = item.build_default_structure
+          expect(results).to be_equivalent_to(expected)
+        end
+      end
+
+    end
+  end
+end

data/spec/models/item_spec.rb

@@ -7,16 +7,4 @@ RSpec.describe Item, type: :model do
   it_behaves_like "it has an association", :has_many, :children, :is_part_of, "Component"
   it_behaves_like "a non-collection model"
 
-  context "has structured children" do
-    let!(:item) { Item.create }
-    let!(:comp1) { Component.create(parent: item, file_use: 'master', order: 2) }
-    let!(:comp2) { Component.create(parent: item, file_use: 'reference', order: 1) }
-    let!(:comp3) { Component.create(parent: item, file_use: 'master', order: 1) }
-    it "should group and order the children" do
-      results = item.children_by_file_use
-      expect(results['master']).to eq([ comp3, comp1 ])
-      expect(results['reference']).to eq([ comp2 ])
-    end
-  end
-
 end

data/spec/models/solr_document_spec.rb

@@ -69,4 +69,9 @@ RSpec.describe SolrDocument, type: :model do
     end
   end
 
+  describe "#display_format" do
+    before { subject[Ddr::IndexFields::DISPLAY_FORMAT] = "Image" }
+    its(:display_format) { should eq("Image") }
+  end
+
 end

data/spec/models/struct_div_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'support/structural_metadata_helper'
+
+module Ddr
+  module Models
+    RSpec.describe StructDiv, type: :model, structural_metadata: true do
+
+      # let(:structure) { FactoryGirl.build(:simple_structure) }
+      # let(:structDiv) { structure.struct_div_map['default'] }
+      let(:structmap_node) { nested_structure_document.xpath('//xmlns:structMap').first }
+      let(:struct_div) { described_class.new(structmap_node) }
+
+      describe "#initialize" do
+        it "should create the correct object" do
+          expect(struct_div.divs.size).to eq(2)
+          expect(struct_div.divs.first.label).to eq("Front")
+          expect(struct_div.divs.first.divs).to be_empty
+          expect(struct_div.divs.first.objs).to eq([ "test:5" ])
+          expect(struct_div.divs.last.label).to eq("Back")
+          expect(struct_div.divs.last.divs.size).to eq(2)
+          expect(struct_div.divs.last.objs).to be_empty
+          expect(struct_div.divs.last.divs.first.label).to eq("Top")
+          expect(struct_div.divs.last.divs.first.divs).to be_empty
+          expect(struct_div.divs.last.divs.first.objs).to eq([ "test:7" ])
+          expect(struct_div.divs.last.divs.last.label).to eq("Bottom")
+          expect(struct_div.divs.last.divs.last.divs).to be_empty
+          expect(struct_div.divs.last.divs.last.objs).to eq([ "test:6" ])
+        end
+      end
+
+      describe "#objects?" do
+        context "objects" do
+          it "should be true" do
+            expect(struct_div.divs[0].objects?).to be_truthy
+          end
+        end
+        context "no objects" do
+          it "should be false" do
+            expect(struct_div.objects?).to_not be_truthy
+          end
+        end
+      end
+      
+      describe "#object_pids" do
+        it "should return the object pids in order" do
+          expect(struct_div.divs.last.divs.first.object_pids).to eq([ 'test:7' ])
+          expect(struct_div.divs.last.divs.last.object_pids).to eq([ 'test:6' ])
+        end
+      end
+
+      describe "#objects" do
+        let(:repo_objects) { [ Component.new(pid: 'test:6'), Component.new(pid: 'test:7') ] }
+        before do
+          allow(ActiveFedora::Base).to receive(:find).with('test:6') { repo_objects.first }
+          allow(ActiveFedora::Base).to receive(:find).with('test:7') { repo_objects.last }
+        end
+        it "should return the Active Fedora objects in order" do
+          expect(struct_div.divs.last.divs.first.objects).to eq([ repo_objects.last ])
+          expect(struct_div.divs.last.divs.last.objects).to eq([ repo_objects.first ])
+        end
+      end
+
+    end
+  end
+end

data/spec/models/structure_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'support/structural_metadata_helper'
+
+module Ddr
+  module Models
+    RSpec.describe Structure, type: :model, structural_metadata: true do
+
+      describe "#struct_divs" do
+        let(:structure) { FactoryGirl.build(:multiple_struct_maps_structure) }
+        let(:struct_divs) { structure.struct_divs }
+        it "should include struct divs for each struct map" do
+          expect(struct_divs.keys).to match_array([ 'default', 'reverse' ])
+          expect(struct_divs['default']).to be_a(Ddr::Models::StructDiv)
+          expect(struct_divs['reverse']).to be_a(Ddr::Models::StructDiv)
+        end
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require "database_cleaner"
 require "tempfile"
 require "resque"
 require "cancan/matchers"
+require 'equivalent-xml/rspec_matchers'
 
 Resque.inline = true
 

data/spec/support/structural_metadata_helper.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+def simple_structure_document
+  Nokogiri::XML(simple_structure) do |config|
+    config.noblanks
+  end
+end
+
+def nested_structure_document
+  Nokogiri::XML(nested_structure) do |config|
+    config.noblanks
+  end
+end
+
+def multiple_struct_maps_structure_document
+  Nokogiri::XML(multiple_struct_maps_structure) do |config|
+    config.noblanks
+  end
+end
+
+def simple_structure
+  <<-eos
+    <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+      <structMap TYPE="default">
+        <div ORDER="1">
+          <fptr CONTENTIDS="info:fedora/test:6" />
+        </div>
+        <div ORDER="2">
+          <fptr CONTENTIDS="info:fedora/test:5" />
+        </div>
+        <div ORDER="3">
+          <fptr CONTENTIDS="info:fedora/test:7" />
+        </div>
+      </structMap>
+    </mets>
+  eos
+end
+
+def nested_structure
+  <<-eos
+    <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+      <structMap TYPE="default">
+        <div ORDER="1" LABEL="Front">
+          <fptr CONTENTIDS="info:fedora/test:5" />
+        </div>
+        <div ORDER="2" LABEL="Back">
+          <div ORDER="1" LABEL="Top">
+            <fptr CONTENTIDS="info:fedora/test:7" />
+          </div>    
+          <div ORDER="2" LABEL="Bottom">
+            <fptr CONTENTIDS="info:fedora/test:6" />
+          </div>    
+        </div>
+      </structMap>
+    </mets>
+  eos
+end
+
+def multiple_struct_maps_structure
+  <<-eos
+    <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+      <structMap TYPE="default">
+        <div ORDER="1" LABEL="Front">
+          <fptr CONTENTIDS="info:fedora/test:5" />
+        </div>
+        <div ORDER="2" LABEL="Back">
+          <div ORDER="1" LABEL="Top">
+            <fptr CONTENTIDS="info:fedora/test:7" />
+          </div>    
+          <div ORDER="2" LABEL="Bottom">
+            <fptr CONTENTIDS="info:fedora/test:6" />
+          </div>    
+        </div>
+      </structMap>
+      <structMap TYPE="reverse">
+        <div ORDER="1" LABEL="Back">
+          <div ORDER="1" LABEL="Bottom">
+            <fptr CONTENTIDS="info:fedora/test:6" />
+          </div>
+          <div ORDER="2" LABEL="Top">
+            <fptr CONTENTIDS="info:fedora/test:7" />
+          </div>    
+        </div>
+        <div ORDER="2" LABEL="Front">
+          <fptr CONTENTIDS="info:fedora/test:5" />
+        </div>
+      </structMap>
+    </mets>
+  eos
+
+end
+
+def simple_structure_query_response
+  [{"system_create_dtsi"=>"2015-06-17T21:04:24Z", "system_modified_dtsi"=>"2015-06-17T21:04:56Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:6", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:56Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:6+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bf84faa89d6b25924bc06357f7c33347a602e2ec8df9c1020ec98015fe571760\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:56Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:6+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"4d227bc972634ba2126eefff207fb3b35f6ff802a210ad7945d2ec60360076dd\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:04:24Z\",\"objLastModDate\":\"2015-06-17T21:04:24Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A6/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A6/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc001"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc001", "internal_uri_ssi"=>"info:fedora/test:6", "identifier_ssi"=>"abc001", "access_role_ssi"=>"[]", "_version_"=>1504261016868880384, "timestamp"=>"2015-06-17T21:04:56.958Z"}, {"system_create_dtsi"=>"2015-06-17T21:03:58Z", "system_modified_dtsi"=>"2015-06-17T21:04:54Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:5", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:54Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:5+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7f1cbe6e435991ae3bba134e52e7a275af8a232b209ac725fa54fdd81bb973\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:54Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:5+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"8b106726ca2d39d9a2e187fc9da2e58b25bd3553031012515ae31cf4fbe520e9\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:03:58Z\",\"objLastModDate\":\"2015-06-17T21:03:58Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A5/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A5/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc002"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc002", "internal_uri_ssi"=>"info:fedora/test:5", "identifier_ssi"=>"abc002", "access_role_ssi"=>"[]", "_version_"=>1504261014501195776, "timestamp"=>"2015-06-17T21:04:54.701Z"}, {"system_create_dtsi"=>"2015-06-17T21:04:46Z", "system_modified_dtsi"=>"2015-06-17T21:04:59Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:7", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:59Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:7+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"cb385ff9a55b5fe24e8c2a8159fc928e3ee582ef312955132d34282676102a6a\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:59Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:7+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"523ee1e5d55d188bd17b2789e4c9109c8f9d0170b63af1219de8a74d4f32966a\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:04:46Z\",\"objLastModDate\":\"2015-06-17T21:04:46Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A7/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A7/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc003"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc003", "internal_uri_ssi"=>"info:fedora/test:7", "identifier_ssi"=>"abc003", "access_role_ssi"=>"[]", "_version_"=>1504261019487174656, "timestamp"=>"2015-06-17T21:04:59.455Z"}]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.1
+  version: 2.0.0.pre.2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -384,8 +384,11 @@ files:
 - lib/ddr/auth/groups.rb
 - lib/ddr/auth/inherited_roles.rb
 - lib/ddr/auth/ldap_gateway.rb
-- lib/ddr/auth/legacy_permissions.rb
-- lib/ddr/auth/legacy_roles.rb
+- lib/ddr/auth/legacy/abstract_legacy_permissions.rb
+- lib/ddr/auth/legacy/legacy_authorization.rb
+- lib/ddr/auth/legacy/legacy_default_permissions.rb
+- lib/ddr/auth/legacy/legacy_permissions.rb
+- lib/ddr/auth/legacy/legacy_roles.rb
 - lib/ddr/auth/permissions.rb
 - lib/ddr/auth/remote_groups.rb
 - lib/ddr/auth/resource_roles.rb
@@ -427,6 +430,7 @@ files:
 - lib/ddr/events/virus_check_event.rb
 - lib/ddr/index_fields.rb
 - lib/ddr/jobs.rb
+- lib/ddr/jobs/migrate_legacy_authorization.rb
 - lib/ddr/jobs/permanent_id.rb
 - lib/ddr/managers.rb
 - lib/ddr/managers/derivatives_manager.rb
@@ -456,11 +460,14 @@ files:
 - lib/ddr/models/indexing.rb
 - lib/ddr/models/licensable.rb
 - lib/ddr/models/solr_document.rb
+- lib/ddr/models/struct_div.rb
+- lib/ddr/models/structure.rb
 - lib/ddr/models/version.rb
 - lib/ddr/notifications.rb
 - lib/ddr/utils.rb
 - lib/ddr/vocab.rb
 - lib/ddr/vocab/asset.rb
+- lib/ddr/vocab/display.rb
 - lib/ddr/vocab/duke_terms.rb
 - lib/ddr/vocab/rdf_vocabulary_parser.rb
 - lib/ddr/vocab/roles.rb
@@ -476,7 +483,10 @@ files:
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
 - spec/auth/ldap_gateway_spec.rb
+- spec/auth/legacy_authorization_spec.rb
+- spec/auth/legacy_default_permissions_spec.rb
 - spec/auth/legacy_permissions_spec.rb
+- spec/auth/legacy_roles_spec.rb
 - spec/auth/roles/detached_role_set_spec.rb
 - spec/auth/roles/property_role_set_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
@@ -542,6 +552,7 @@ files:
 - spec/factories/event_factories.rb
 - spec/factories/item_factories.rb
 - spec/factories/role_factories.rb
+- spec/factories/structure_factories.rb
 - spec/factories/target_factories.rb
 - spec/factories/test_model_factories.rb
 - spec/factories/user_factories.rb
@@ -554,6 +565,7 @@ files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/helpers/models_helper_spec.rb
+- spec/jobs/migrate_legacy_authorization_spec.rb
 - spec/managers/derivatives_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
@@ -565,8 +577,11 @@ files:
 - spec/models/file_management_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
+- spec/models/has_struct_metadata_spec.rb
 - spec/models/item_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/models/struct_div_spec.rb
+- spec/models/structure_spec.rb
 - spec/models/target_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/spec_helper.rb
@@ -584,6 +599,7 @@ files:
 - spec/support/shared_examples_for_licensable.rb
 - spec/support/shared_examples_for_non_collection_models.rb
 - spec/support/shared_examples_for_role_sets.rb
+- spec/support/structural_metadata_helper.rb
 - spec/utils_spec.rb
 homepage: https://github.com/duke-libraries/ddr-models
 licenses:
@@ -621,7 +637,10 @@ test_files:
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
 - spec/auth/ldap_gateway_spec.rb
+- spec/auth/legacy_authorization_spec.rb
+- spec/auth/legacy_default_permissions_spec.rb
 - spec/auth/legacy_permissions_spec.rb
+- spec/auth/legacy_roles_spec.rb
 - spec/auth/roles/detached_role_set_spec.rb
 - spec/auth/roles/property_role_set_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
@@ -687,6 +706,7 @@ test_files:
 - spec/factories/event_factories.rb
 - spec/factories/item_factories.rb
 - spec/factories/role_factories.rb
+- spec/factories/structure_factories.rb
 - spec/factories/target_factories.rb
 - spec/factories/test_model_factories.rb
 - spec/factories/user_factories.rb
@@ -699,6 +719,7 @@ test_files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/helpers/models_helper_spec.rb
+- spec/jobs/migrate_legacy_authorization_spec.rb
 - spec/managers/derivatives_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
@@ -710,8 +731,11 @@ test_files:
 - spec/models/file_management_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
+- spec/models/has_struct_metadata_spec.rb
 - spec/models/item_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/models/struct_div_spec.rb
+- spec/models/structure_spec.rb
 - spec/models/target_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/spec_helper.rb
@@ -729,4 +753,5 @@ test_files:
 - spec/support/shared_examples_for_licensable.rb
 - spec/support/shared_examples_for_non_collection_models.rb
 - spec/support/shared_examples_for_role_sets.rb
+- spec/support/structural_metadata_helper.rb
 - spec/utils_spec.rb

data/lib/ddr/auth/legacy_permissions.rb

@@ -1,39 +0,0 @@
-module Ddr
-  module Auth
-    class LegacyPermissions
-
-      attr_reader :permissions
-
-      LEGACY_PERMISSION_ROLE_MAP = {
-        "discover" => Roles::VIEWER,
-        "read"     => Roles::VIEWER,
-        "edit"     => Roles::EDITOR
-      }
-
-      def initialize(permissions)
-        @permissions = permissions
-      end
-
-      def to_resource_roles
-        to_roles(Roles::RESOURCE_SCOPE)
-      end
-
-      def to_policy_roles
-        to_roles(Roles::POLICY_SCOPE)
-      end
-
-      # @param scope [String] the scope to assign to each role
-      # @return [Ddr::Auth::Roles::RoleSet]
-      def to_roles(scope)
-        roles = permissions.map do |perm|
-          access, agent = perm[:access], perm[:name]
-          Roles::Role.build type: LEGACY_PERMISSION_ROLE_MAP[access],
-                            agent: agent,
-                            scope: scope
-        end
-        Roles::DetachedRoleSet.new(roles)
-      end
-
-    end
-  end
-end

data/lib/ddr/auth/legacy_roles.rb

@@ -1,33 +0,0 @@
-module Ddr
-  module Auth
-    module LegacyRoles
-      extend ActiveSupport::Concern
-
-      LEGACY_ROLES = [:administrator, :editor, :downloader, :contributor]
-
-      # @return [Ddr::Auth::Roles::RoleSet]
-      def legacy_downloader_to_resource_roles
-        roles = adminMetadata.downloader.map do |name|
-          Roles::Role.build type: Roles::DOWNLOADER, agent: name, scope: Roles::RESOURCE_SCOPE
-        end
-        Roles::DetachedRoleSet.new(roles)
-      end
-
-      def principal_has_role?(principal, role)
-        warn "[DEPRECATION] `principal_has_role?` is deprecated and should not be used with role-based access control."
-        ( principals(role) & Array(principal) ).any?
-      end
-
-      def principals(role)
-        warn "[DEPRECATION] `principals(role)` is deprecated and should not be used with role-based access control." \
-             " If need be, access the legacy role directly on `adminMetadata` by property name."
-        if LEGACY_ROLES.include?(role)
-          adminMetadata.send(role)
-        else
-          raise ArgumentError, "#{role.inspect} is not a legacy role."
-        end
-      end
-
-    end
-  end
-end