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

data/lib/ddr/models/indexing.rb

@@ -19,6 +19,7 @@ module Ddr
           ADMIN_SET         => admin_set,
           ADMIN_SET_FACET   => admin_set_facet,
           COLLECTION_FACET  => collection_facet,
+          DISPLAY_FORMAT    => display_format,
           PERMANENT_ID   => permanent_id,
           PERMANENT_URL  => permanent_url,
           ACCESS_ROLE    => roles.to_json,

data/lib/ddr/models/solr_document.rb

@@ -212,6 +212,10 @@ module Ddr
          get(Ddr::IndexFields::ACCESS_ROLE)
       end
 
+      def display_format
+        get(Ddr::IndexFields::DISPLAY_FORMAT)
+      end
+
       private
 
       def targets_query

data/lib/ddr/models/struct_div.rb

@@ -0,0 +1,45 @@
+module Ddr
+  module Models
+    class StructDiv
+
+      attr_accessor :id, :label, :order, :orderlabel, :type, :objs, :divs
+
+      def initialize(structmap_or_div_node)
+        @id = structmap_or_div_node['ID']
+        @label = structmap_or_div_node['LABEL']
+        @order = structmap_or_div_node['ORDER']
+        @orderlabel = structmap_or_div_node['ORDERLABEL']
+        @type = structmap_or_div_node['TYPE']
+        @objs = obj_pids(structmap_or_div_node) if structmap_or_div_node.node_name == "div"
+        @divs = subdivs(structmap_or_div_node).sort
+      end
+
+      def <=>(other)
+        self.order.to_i <=> other.order.to_i
+      end
+
+      def objects?
+        objs.present?
+      end
+
+      def object_pids
+        objs
+      end
+
+      def objects
+        objs.map { |pid| ActiveFedora::Base.find(pid) }
+      end
+
+      private
+
+      def obj_pids(div_node)
+        div_node.xpath('xmlns:fptr').map { |fptr_node| fptr_node["CONTENTIDS"].gsub('info:fedora/', '') }
+      end
+
+      def subdivs(structmap_or_div_node)
+        structmap_or_div_node.xpath('xmlns:div').map { |div_node| Ddr::Models::StructDiv.new(div_node) }
+      end
+
+    end
+  end
+end

data/lib/ddr/models/structure.rb

@@ -0,0 +1,52 @@
+module Ddr
+  module Models
+    #
+    # Wraps a Nokogiri (XML) Document
+    #
+    class Structure < SimpleDelegator
+
+      def initialize(xml_doc=nil)
+        super
+      end
+
+      def struct_divs
+        @struct_divs ||= build_struct_divs(structMaps)
+      end
+
+      def structMap(type='default')
+        xpath("//xmlns:structMap[@TYPE='#{type}']").first
+      end
+
+      def as_xml_document
+        __getobj__
+      end
+
+      private
+
+      def structMaps
+        xpath("//xmlns:structMap")
+      end
+
+      def build_struct_divs(structMaps)
+        sdivs = {}
+        structMaps.each do |structMap|
+          type = structMap['TYPE'] || 'default'
+          raise StandardError, "Multiple '#{type}' structMaps" if sdivs[type].present?
+          sdivs[type] = Ddr::Models::StructDiv.new(structMap)
+        end
+        sdivs
+      end
+
+      def self.template
+        Nokogiri::XML(
+            '<mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+              <structMap TYPE="default" />
+            </mets>'
+            ) do |config|
+                config.noblanks
+              end
+      end
+
+    end
+  end
+end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.0.0.pre.1"
+    VERSION = "2.0.0.pre.2"
   end
 end

data/lib/ddr/vocab.rb

@@ -13,6 +13,7 @@ module Ddr
              end
 
     autoload :Asset
+    autoload :Display
     autoload :DukeTerms
     autoload :RDFVocabularyParser
     autoload :Roles

data/lib/ddr/vocab/display.rb

@@ -0,0 +1,11 @@
+module Ddr
+  module Vocab
+    class Display < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/display/")
+
+      property "format",
+        label: "Display Format",
+        comment: "Format to use when displaying the object."
+
+    end
+  end
+end

data/spec/auth/legacy_authorization_spec.rb

@@ -0,0 +1,94 @@
+module Ddr::Auth
+  RSpec.describe LegacyAuthorization do
+
+    subject { described_class.new(obj) }
+
+    before do
+      @deprecation_behavior = Deprecation.default_deprecation_behavior
+      Deprecation.default_deprecation_behavior = :silence
+    end
+
+    after do
+      Deprecation.default_deprecation_behavior = @deprecation_behavior
+    end
+
+
+    describe "with a Collection" do
+      let(:obj) { FactoryGirl.build(:collection) }
+
+      before do
+        obj.permissions_attributes = [{access: "edit", type: "person", name: "bob@example.com"}]
+        obj.default_permissions = [{access: "edit", type: "group", name: "Editors"},
+                                   {access: "discover", type: "group", name: "public"},
+                                   {access: "read", type: "group", name: "registered"}]
+      end
+
+      it "should convert the legacy authorization data to roles" do
+        expect(subject.to_roles)
+          .to eq(Roles::DetachedRoleSet.new(
+                  [ Roles::Role.build(type: "Curator", agent: "Editors", scope: "policy"),
+                    Roles::Role.build(type: "Viewer", agent: "public", scope: "policy"),
+                    Roles::Role.build(type: "Viewer", agent: "registered", scope: "policy"),
+                    Roles::Role.build(type: "Editor", agent: "bob@example.com", scope: "resource") ]
+                ))
+      end
+
+      it "should clear the legacy authorization data" do
+        subject.clear
+        expect(subject).to be_clear
+        expect(obj.permissions).to be_empty
+        expect(obj.default_permissions).to be_empty
+        expect(obj.adminMetadata.downloader).to be_empty
+      end
+
+      it "should migrate the legacy authorization data" do
+        subject.migrate
+        expect(subject).to be_clear
+        expect(obj.roles)
+          .to eq(Roles::DetachedRoleSet.new(
+                  [ Roles::Role.build(type: "Curator", agent: "Editors", scope: "policy"),
+                    Roles::Role.build(type: "Viewer", agent: "public", scope: "policy"),
+                    Roles::Role.build(type: "Viewer", agent: "registered", scope: "policy"),
+                    Roles::Role.build(type: "Editor", agent: "bob@example.com", scope: "resource") ]
+                ))
+      end
+    end
+
+    describe "with a Component" do
+      let(:obj) { FactoryGirl.build(:component) }
+
+      before do
+        obj.permissions_attributes = [{access: "edit", type: "person", name: "bob@example.com"}]
+        obj.adminMetadata.downloader = ["Downloaders", "sally@example.com"]
+      end
+
+      it "should convert the legacy authorization to roles" do
+        expect(subject.to_roles)
+          .to eq(Roles::DetachedRoleSet.new(
+                  [ Roles::Role.build(type: "Downloader", agent: "Downloaders", scope: "resource"),
+                    Roles::Role.build(type: "Downloader", agent: "sally@example.com", scope: "resource"),
+                    Roles::Role.build(type: "Editor", agent: "bob@example.com", scope: "resource") ]
+                ))
+      end
+
+      it "should clear the legacy authorization data" do
+        subject.clear
+        expect(subject).to be_clear
+        expect(obj.permissions).to be_empty
+        expect(obj.adminMetadata.downloader).to be_empty
+      end
+
+      it "should migrate the legacy authorization data" do
+        subject.migrate
+        expect(subject).to be_clear
+        expect(obj.roles)
+          .to eq(Roles::DetachedRoleSet.new(
+                  [ Roles::Role.build(type: "Downloader", agent: "Downloaders", scope: "resource"),
+                    Roles::Role.build(type: "Downloader", agent: "sally@example.com", scope: "resource"),
+                    Roles::Role.build(type: "Editor", agent: "bob@example.com", scope: "resource") ]
+                ))
+      end
+
+    end
+  end
+end

data/spec/auth/legacy_default_permissions_spec.rb

@@ -0,0 +1,37 @@
+module Ddr::Auth
+  RSpec.describe LegacyDefaultPermissions do
+
+    subject { described_class.new(obj) }
+
+    let(:obj) { FactoryGirl.build(:collection) }
+
+    before do
+      @deprecation_behavior = Deprecation.default_deprecation_behavior
+      Deprecation.default_deprecation_behavior = :silence
+      obj.default_permissions = [{access: "edit", type: "group", name: "Editors"},
+                                 {access: "discover", type: "group", name: "public"},
+                                 {access: "read", type: "person", name: "bob@example.com"}]
+    end
+    
+    after do
+      Deprecation.default_deprecation_behavior = @deprecation_behavior
+    end
+
+    it "should convert the default permissions to policy roles" do
+      expect(subject.to_roles)
+        .to eq(Roles::DetachedRoleSet.new(
+                [ Roles::Role.build(type: "Curator", agent: "Editors", scope: "policy"),
+                  Roles::Role.build(type: "Viewer", agent: "public", scope: "policy"),
+                  Roles::Role.build(type: "Viewer", agent: "bob@example.com", scope: "policy")
+                ]
+              ))
+    end
+
+    it "should clear the legacy default permissions" do
+      expect(obj.default_permissions).not_to be_empty
+      subject.clear
+      expect(obj.default_permissions).to be_empty
+    end
+
+  end
+end

data/spec/auth/legacy_permissions_spec.rb

@@ -1,7 +1,7 @@
 module Ddr::Auth
   RSpec.describe LegacyPermissions do
 
-    subject { described_class.new(obj.permissions) }
+    subject { described_class.new(obj) }
 
     let(:obj) { FactoryGirl.build(:item) }
 
@@ -17,19 +17,21 @@ module Ddr::Auth
       Deprecation.default_deprecation_behavior = @deprecation_behavior
     end
 
-    it "should be able to convert the permissions to policy roles" do
-      expect(subject.to_policy_roles)
-        .to eq(Roles::DetachedRoleSet.new([Roles::Role.build(type: "Editor", agent: "Editors", scope: "policy"),
-                                           Roles::Role.build(type: "Viewer", agent: "public", scope: "policy"),
-                                           Roles::Role.build(type: "Viewer", agent: "bob@example.com", scope: "policy")]))
+    it "should convert the permissions to resource roles" do
+      expect(subject.to_roles)
+        .to eq(Roles::DetachedRoleSet.new(
+                [ Roles::Role.build(type: "Editor", agent: "Editors", scope: "resource"),
+                  Roles::Role.build(type: "Viewer", agent: "public", scope: "resource"),
+                  Roles::Role.build(type: "Viewer", agent: "bob@example.com", scope: "resource")
+                ]
+              ))
     end
 
-    it "should be able to convert the permissions to resource roles" do
-      expect(subject.to_resource_roles)
-        .to eq(Roles::DetachedRoleSet.new([Roles::Role.build(type: "Editor", agent: "Editors", scope: "resource"),
-                                           Roles::Role.build(type: "Viewer", agent: "public", scope: "resource"),
-                                           Roles::Role.build(type: "Viewer", agent: "bob@example.com", scope: "resource")]))
+    it "should clear the legacy permissions" do
+      expect(obj.permissions).not_to be_empty
+      subject.clear
+      expect(obj.permissions).to be_empty
     end
-    
+
   end
 end

data/spec/auth/legacy_roles_spec.rb

@@ -0,0 +1,32 @@
+module Ddr::Auth
+  RSpec.describe LegacyRoles do
+
+    subject { described_class.new(obj) }
+
+    let(:obj) { FactoryGirl.build(:component) }
+
+    before do
+      @deprecation_behavior = Deprecation.default_deprecation_behavior
+      Deprecation.default_deprecation_behavior = :silence
+      obj.adminMetadata.downloader = ["bob@example.com", "Downloaders"]
+    end
+
+    after do
+      Deprecation.default_deprecation_behavior = @deprecation_behavior
+    end
+
+    it "should convert the legacy roles to new roles" do
+      expect(subject.to_roles)
+        .to eq(Roles::DetachedRoleSet.new(
+                [ Roles::Role.build(type: "Downloader", agent: "Downloaders", scope: "resource"),
+                  Roles::Role.build(type: "Downloader", agent: "bob@example.com", scope: "resource")
+                ]
+              ))
+    end
+
+    it "should clear the legacy roles" do
+      expect { subject.clear }.to change(obj.adminMetadata.downloader, :empty?).from(false).to(true)
+    end
+
+  end
+end

data/spec/factories/structure_factories.rb

@@ -0,0 +1,27 @@
+require 'support/structural_metadata_helper'
+
+FactoryGirl.define do
+
+  factory :structure, class: Ddr::Models::Structure do
+
+    factory :simple_structure do
+      initialize_with do
+        new(simple_structure_document)
+      end
+    end
+
+    factory :nested_structure do
+      initialize_with do
+        new(nested_structure_document)
+      end
+    end
+
+    factory :multiple_struct_maps_structure do
+      initialize_with do
+        new(multiple_struct_maps_structure_document)
+      end
+    end
+
+  end
+
+end

data/spec/jobs/migrate_legacy_authorization_spec.rb

@@ -0,0 +1,43 @@
+module Ddr::Jobs
+  RSpec.describe MigrateLegacyAuthorization do
+
+    let(:obj) { FactoryGirl.build(:collection) }
+
+    before do
+      @deprecation_behavior = Deprecation.default_deprecation_behavior
+      Deprecation.default_deprecation_behavior = :silence
+      obj.permissions_attributes = [{access: "edit", type: "person", name: "bob@example.com"}]
+      obj.adminMetadata.downloader = ["Downloaders", "sally@example.com"]
+      obj.default_permissions = [{access: "edit", type: "group", name: "Editors"},
+                                 {access: "discover", type: "group", name: "public"},
+                                 {access: "read", type: "group", name: "registered"}]
+      obj.save!
+    end
+
+    after do
+      Deprecation.default_deprecation_behavior = @deprecation_behavior
+    end
+
+    it "should migrate the authorization data to roles" do
+      Resque.enqueue(described_class, obj.pid)
+      obj.reload
+      expect(obj.legacy_authorization).to be_clear
+      expect(obj.roles)
+        .to eq(Ddr::Auth::Roles::DetachedRoleSet.new(
+                [ Ddr::Auth::Roles::Role.build(type: "Curator", agent: "Editors", scope: "policy"),
+                  Ddr::Auth::Roles::Role.build(type: "Viewer", agent: "public", scope: "policy"),
+                  Ddr::Auth::Roles::Role.build(type: "Viewer", agent: "registered", scope: "policy"),
+                  Ddr::Auth::Roles::Role.build(type: "Editor", agent: "bob@example.com", scope: "resource"),
+                  Ddr::Auth::Roles::Role.build(type: "Downloader", agent: "Downloaders", scope: "resource"),
+                  Ddr::Auth::Roles::Role.build(type: "Downloader", agent: "sally@example.com", scope: "resource")
+                ]
+              ))
+      event = obj.update_events.last
+      expect(event).to be_success
+      expect(event.summary).to eq("Legacy authorization data migrated to roles")
+      expect(event.detail).to match(/LEGACY AUTHORIZATION DATA/)
+      expect(event.detail).to match(/ROLES/)
+    end
+
+  end
+end

data/spec/models/has_admin_metadata_spec.rb

@@ -101,9 +101,11 @@ module Ddr
         describe "indexing" do
           let(:permanent_id) { "ark:/99999/fk4zzz" }
           let(:permanent_url) { "http://id.library.duke.edu/ark:/99999/fk4zzz" }
+          let(:display_format) { "Image" }
           before do
             subject.permanent_id = permanent_id
             subject.permanent_url = permanent_url
+            subject.display_format = display_format
           end
           it "should index the permanent id value" do
             expect(subject.to_solr[Ddr::IndexFields::PERMANENT_ID]).to eq(permanent_id)
@@ -111,6 +113,9 @@ module Ddr
           it "should index the permanent url" do
             expect(subject.to_solr[Ddr::IndexFields::PERMANENT_URL]).to eq(permanent_url)
           end
+          it "should index the display format" do
+            expect(subject.to_solr[Ddr::IndexFields::DISPLAY_FORMAT]).to eq(display_format)
+          end
         end
 
       end