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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d565342bb60d8c8f1ef2bec253ddee97fac27630
-  data.tar.gz: bdfdbf6bcbad33fe4326a04eda9c69609f4c1913
+  metadata.gz: daeaeb1ce7b02969ac1ba49962844211e7269aa5
+  data.tar.gz: 64a81704bbaf023d596eba10c943285fef47dff7
 SHA512:
-  metadata.gz: 9c09bd351bead65d23191b7202edc4374d89b233537f77a2005f367bc6c935a58f987a99ba3553cc975448794102ce3f93ae531da8e64955d2fbd79733390786
-  data.tar.gz: d973cfcb6e2398e14f5b8ac0fff52768086b6cac0a2bbd6ea20c8138c5326314e3856b6097fb3a8247107cdea8f7cc2215279a0c03a23fc0f06d1758c60d7ad7
+  metadata.gz: 4bf9a10f346187f78ac98e17b6ec36fc739b7d67983fdc0c62b07edc0fb15d96aee79fb7b1f768daaed39e55fe1caad3615c13291927755e012510f995cd06b6
+  data.tar.gz: 9c3b5476c2fe4450edb2c5026af2ffc09703cbd19ba9ec487cf95d025e7e526c5b16911e80465ee2569e3ab29f4daa531a47e164ecf5e8564033e520976a83d7

data/app/models/collection.rb

@@ -78,16 +78,6 @@ class Collection < Ddr::Models::Base
     end
   end
 
-  def set_policy_roles_from_legacy_data
-    roles.revoke *(roles.in_policy_scope)
-    roles.grant *(legacy_default_permissions.to_policy_roles)
-  end
-  alias_method :set_policy_roles, :set_policy_roles_from_legacy_data
-
-  def legacy_default_permissions
-    Ddr::Auth::LegacyPermissions.new(default_permissions)
-  end
-
   def grant_roles_to_creator(creator)
     roles.grant type: Ddr::Auth::Roles::CURATOR, agent: creator.agent, scope: Ddr::Auth::Roles::RESOURCE_SCOPE
     roles.grant type: Ddr::Auth::Roles::CURATOR, agent: creator.agent, scope: Ddr::Auth::Roles::POLICY_SCOPE

data/app/models/item.rb

@@ -6,6 +6,7 @@
 class Item < Ddr::Models::Base
 
   include Ddr::Models::HasChildren
+  include Ddr::Models::HasStructMetadata
 
   has_many :children, property: :is_part_of, class_name: 'Component'
   belongs_to :parent, property: :is_member_of_collection, class_name: 'Collection'
@@ -20,16 +21,4 @@ class Item < Ddr::Models::Base
   alias_method :collection_id, :parent_id
   alias_method :collection=, :parent=
 
-  def children_by_file_use
-    file_uses = {}
-    sort_key = "#{Ddr::IndexFields::FILE_USE} ASC, #{Ddr::IndexFields::ORDER} ASC"
-    results = ActiveFedora::SolrService.query(association_query(:children), rows: 999999, sort: sort_key)
-    objs = ActiveFedora::SolrService.lazy_reify_solr_results(results)
-    objs.each do |obj|
-      file_uses[obj.file_use] ||= []
-      file_uses[obj.file_use] << obj
-    end
-    file_uses
-  end
-
 end

data/lib/ddr/auth.rb

@@ -21,8 +21,6 @@ module Ddr
     autoload :Groups
     autoload :InheritedRoles
     autoload :LdapGateway
-    autoload :LegacyPermissions
-    autoload :LegacyRoles
     autoload :Permissions
     autoload :RemoteGroups
     autoload :ResourceRoles
@@ -44,6 +42,14 @@ module Ddr
       autoload :SuperuserAbilityDefinitions
     end
 
+    autoload_under 'legacy' do
+      autoload :AbstractLegacyPermissions
+      autoload :LegacyAuthorization
+      autoload :LegacyDefaultPermissions
+      autoload :LegacyPermissions
+      autoload :LegacyRoles
+    end
+
     # Name of group whose members are authorized to act as superuser
     mattr_accessor :superuser_group
 

data/lib/ddr/auth/legacy/abstract_legacy_permissions.rb

@@ -0,0 +1,17 @@
+require "delegate"
+
+module Ddr::Auth
+  class AbstractLegacyPermissions < SimpleDelegator
+
+    def to_roles
+      source.each_with_object(Roles::DetachedRoleSet.new) do |perm, role_set|
+        role_set.grant(role(perm))
+      end
+    end
+
+    def role(permission)
+      Roles::Role.build type: role_type(permission[:access]), agent: permission[:name], scope: scope
+    end
+
+  end
+end

data/lib/ddr/auth/legacy/legacy_authorization.rb

@@ -0,0 +1,44 @@
+require "delegate"
+
+module Ddr::Auth
+  class LegacyAuthorization < SimpleDelegator
+
+    def to_roles
+      sources.map(&:to_roles).reduce(&:merge)
+    end
+
+    def clear
+      sources.each(&:clear)
+    end
+
+    def clear?
+      sources.all? { |auth| auth.source.empty? }
+    end
+
+    def migrate
+      migrated = inspect
+      roles.grant *to_roles
+      clear
+      ["LEGACY AUTHORIZATION DATA", migrated, "ROLES", roles.serialize.inspect].join("\n\n")
+    end
+
+    def inspect
+      sources.map { |auth| auth.inspect }.join("\n")
+    end
+
+    private
+
+    def sources
+      wrappers.map { |wrapper| wrapper.new(self) }
+    end
+
+    def wrappers
+      classes = [ LegacyPermissions, LegacyRoles ]
+      if respond_to? :default_permissions
+        classes << LegacyDefaultPermissions
+      end
+      classes
+    end
+
+  end
+end

data/lib/ddr/auth/legacy/legacy_default_permissions.rb

@@ -0,0 +1,33 @@
+module Ddr::Auth
+  class LegacyDefaultPermissions < AbstractLegacyPermissions
+
+    def source
+      default_permissions
+    end
+
+    def role_type(access)
+      case access
+      when "discover"
+        Roles::VIEWER
+      when "read"
+        Roles::VIEWER
+      when "edit"
+        Roles::CURATOR
+      end
+    end
+
+    def scope
+      Roles::POLICY_SCOPE
+    end
+
+    def clear
+      defaultRights.clear_permissions!
+      defaultRights.content = defaultRights.to_xml
+    end
+
+    def inspect
+      "DEFAULT PERMISSIONS: #{source.inspect}"
+    end
+
+  end
+end

data/lib/ddr/auth/legacy/legacy_permissions.rb

@@ -0,0 +1,33 @@
+module Ddr::Auth
+  class LegacyPermissions < AbstractLegacyPermissions
+
+    def source
+      permissions
+    end
+
+    def role_type(access)
+      case access
+      when "discover"
+        Roles::VIEWER
+      when "read"
+        Roles::VIEWER
+      when "edit"
+        Roles::EDITOR
+      end
+    end
+
+    def scope
+      Roles::RESOURCE_SCOPE
+    end
+
+    def clear
+      rightsMetadata.clear_permissions!
+      rightsMetadata.content = rightsMetadata.to_xml
+    end
+
+    def inspect
+      "PERMISSIONS: #{source.map(&:to_hash).inspect}"
+    end
+
+  end
+end

data/lib/ddr/auth/legacy/legacy_roles.rb

@@ -0,0 +1,25 @@
+require "delegate"
+
+module Ddr::Auth
+  class LegacyRoles < SimpleDelegator
+
+    def source
+      adminMetadata.downloader
+    end
+
+    def to_roles
+      source.each_with_object(Roles::DetachedRoleSet.new) do |agent, memo|
+        memo.grant Roles::Role.build(type: Roles::DOWNLOADER, agent: agent, scope: Roles::RESOURCE_SCOPE)
+      end
+    end
+
+    def clear
+      source.clear
+    end
+
+    def inspect
+      "DOWNLOADER: #{source.inspect}"
+    end
+
+  end
+end

data/lib/ddr/auth/roles/role_set.rb

@@ -77,7 +77,7 @@ module Ddr::Auth
       end
 
       def ==(other)
-        if self.class == other.class
+        if other.is_a? RoleSet
           self.to_set == other.to_set
         else
           super

data/lib/ddr/datastreams/administrative_metadata_datastream.rb

@@ -26,6 +26,8 @@ module Ddr
 
       property :admin_set, predicate: Ddr::Vocab::Asset.adminSet
 
+      property :display_format, predicate: Ddr::Vocab::Display.format
+
     end
   end
 end

data/lib/ddr/datastreams/structural_metadata_datastream.rb

@@ -2,23 +2,10 @@ require "rdf/vocab"
 
 module Ddr
   module Datastreams
-    class StructuralMetadataDatastream < MetadataDatastream
-
-      # analogous to METS fileSec "USE" attribute
-      property :file_use, predicate: Ddr::Vocab::Asset.fileUse do |index|
-        index.as :stored_sortable
-      end
-
-      # analogous to METS fileSec "SEQ" or structMap "ORDER" attribute
-      property :order, predicate: Ddr::Vocab::Asset.order do |index|
-        index.as :stored_sortable
+    class StructuralMetadataDatastream < ActiveFedora::Datastream
+      def self.default_attributes
+        super.merge({ mimeType: 'text/xml', dsLabel: 'Structural metadata for this object' })
       end
-
-      # analogous to METS fileSec "GROUPID" attribute
-      property :file_group, predicate: Ddr::Vocab::Asset.fileGroup do |index|
-        index.as :stored_sortable
-      end
-
     end
   end
 end

data/lib/ddr/index_fields.rb

@@ -17,6 +17,7 @@ module Ddr
     DEFAULT_LICENSE_DESCRIPTION = solr_name :default_license_description, type: :string
     DEFAULT_LICENSE_TITLE       = solr_name :default_license_title, type: :string
     DEFAULT_LICENSE_URL         = solr_name :default_license_url, type: :string
+    DISPLAY_FORMAT              = solr_name :display_format, :stored_sortable
     EXTRACTED_TEXT              = solr_name :extracted_text, :searchable, type: :text
     FILE_GROUP                  = solr_name :struct_metadata__file_group, :stored_sortable
     FILE_USE                    = solr_name :struct_metadata__file_use, :stored_sortable

data/lib/ddr/jobs.rb

@@ -3,6 +3,7 @@ module Ddr
     extend ActiveSupport::Autoload
 
     autoload :PermanentId
+    autoload :MigrateLegacyAuthorization
 
     autoload_at 'ddr/jobs/permanent_id' do
       autoload :MakeUnavailable

data/lib/ddr/jobs/migrate_legacy_authorization.rb

@@ -0,0 +1,23 @@
+module Ddr::Jobs
+  class MigrateLegacyAuthorization
+
+    @queue = :migration
+
+    SUMMARY = "Legacy authorization data migrated to roles"
+
+    def self.perform(pid)
+      obj = ActiveFedora::Base.find(pid)
+      event_args = { pid: pid, summary: SUMMARY }
+      begin
+        event_args[:detail] = obj.legacy_authorization.migrate
+        obj.save!
+      rescue Exception => e
+        event_args[:exception] = e
+        raise e
+      ensure
+        Ddr::Events::UpdateEvent.create(event_args)
+      end
+    end
+
+  end
+end

data/lib/ddr/models.rb

@@ -48,6 +48,8 @@ module Ddr
     autoload :FileManagement
     autoload :Licensable
     autoload :SolrDocument
+    autoload :Structure
+    autoload :StructDiv
 
     # Base directory of default external file store
     mattr_accessor :external_file_store

data/lib/ddr/models/access_controllable.rb

@@ -17,7 +17,6 @@ module Ddr
       end
 
       def copy_permissions_from(other)
-        # XXX active-fedora < 7.0
         warn "[DEPRECATION] `copy_permissions_from` is deprecated" \
              " and should not be used with role-based access control" \
              " (#{caller.first})."

data/lib/ddr/models/base.rb

@@ -56,6 +56,10 @@ module Ddr
         false
       end
 
+      def legacy_authorization
+        Ddr::Auth::LegacyAuthorization.new(self)
+      end
+
     end
   end
 end

data/lib/ddr/models/has_admin_metadata.rb

@@ -10,6 +10,7 @@ module Ddr
           control_group: "M"
 
         has_attributes :admin_set,
+                       :display_format,
                        :local_id,
                        :permanent_id,
                        :permanent_url,
@@ -23,14 +24,12 @@ module Ddr
         around_destroy :update_permanent_id_on_destroy, if: "permanent_id.present?"
       end
 
-      include Ddr::Auth::LegacyRoles
-
       def permanent_id_manager
         @permanent_id_manager ||= Ddr::Managers::PermanentIdManager.new(self)
       end
 
       def roles
-        @roles ||= Ddr::Auth::Roles::PropertyRoleSet.new(adminMetadata.access_role)
+        Ddr::Auth::Roles::PropertyRoleSet.new(adminMetadata.access_role)
       end
 
       def workflow
@@ -67,10 +66,6 @@ module Ddr
         Resque.enqueue(Ddr::Jobs::PermanentId::MakeUnavailable, @permanent_id, "deleted")
       end
 
-      def legacy_permissions
-        Ddr::Auth::LegacyPermissions.new(permissions)
-      end
-
     end
   end
 end

data/lib/ddr/models/has_struct_metadata.rb

@@ -3,51 +3,54 @@ module Ddr
     module HasStructMetadata
       extend ActiveSupport::Concern
 
-      FILE_USE_MASTER = 'master'
-      FILE_USE_REFERENCE = 'reference'
-
       included do
-        has_metadata "structMetadata",
-                     type: Ddr::Datastreams::StructuralMetadataDatastream,
-                     versionable: true,
-                     control_group: "M"
+        has_file_datastream name: Ddr::Datastreams::STRUCT_METADATA,
+                            type: Ddr::Datastreams::StructuralMetadataDatastream
+      end
 
-        has_attributes :file_group, :file_use, :order,
-                       datastream: "structMetadata", multiple: false
+      def structure
+        unless @structure
+          if datastreams[Ddr::Datastreams::STRUCT_METADATA].content
+            @structure = Ddr::Models::Structure.new(Nokogiri::XML(datastreams[Ddr::Datastreams::STRUCT_METADATA].content))
+          end
+        end
+        @structure
       end
 
-      def assign_struct_metadata!
-        self.file_use = default_file_use if file_use.blank?
-        self.order = default_order if order.nil?
-        self.file_group = default_file_group if file_group.blank?
-        save! if changed?
+      def build_default_structure
+        structure = Ddr::Models::Structure.new(Ddr::Models::Structure.template)
+        children = find_children
+        children.each do |child|
+          add_to_struct_map(structure, child)
+        end
+        structure
       end
 
       private
 
-      def default_file_use
-        if has_content?
-          master_file? ? FILE_USE_MASTER : FILE_USE_REFERENCE
-        end
+      def find_children
+        query = association_query(:children)
+        sort = "#{Ddr::IndexFields::LOCAL_ID} ASC, #{Ddr::IndexFields::OBJECT_CREATE_DATE} ASC"
+        ActiveFedora::SolrService.query(query, sort: sort, rows: 999999)
       end
 
-      def default_order
-        siblings.size + 1
+      def add_to_struct_map(stru, child)
+        div = create_div(stru)
+        create_fptr(stru, div, child['id'])
       end
 
-      def default_file_group
-        identifier.first if has_content?
+      def create_div(stru)
+        div_count = stru.structMap('default').xpath('xmlns:div').size
+        div = Nokogiri::XML::Node.new('div', stru.as_xml_document)
+        div['ORDER'] = div_count + 1
+        stru.structMap('default').add_child(div)
+        div
       end
 
-      def siblings
-        if respond_to?(:parent) && parent.present?
-          if file_use && parent.respond_to?(:children_by_file_use)
-            sibs = parent.children_by_file_use[file_use]
-          else
-            sibs = parent.children
-          end
-        end
-        sibs || []
+      def create_fptr(stru, div, pid)
+        fptr = Nokogiri::XML::Node.new('fptr', stru.as_xml_document)
+        fptr['CONTENTIDS'] = "info:fedora/#{pid}"
+        div.add_child(fptr)
       end
 
     end