ddr-models 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c4212f81242423c5cc23aa8bcd3882c39b03cb
-  data.tar.gz: fe720229ff82b5bd7455cb50e8a8749801e35bfd
+  metadata.gz: cfbf34b5dc2a35a84fc605e90f375592e210494c
+  data.tar.gz: 0664f48be4dfc59601d3bbff7cd48ba64edab9a5
 SHA512:
-  metadata.gz: bea43010b15194c06143c3d39ead986d3d81b0601eda2f3213501b524e613b00b0048b0463fb2b6ee58f555d8fa257166ffaad4f6c6e513c5164fbffdcfa6728
-  data.tar.gz: f2003ea486423fbfa359bc24c4866ea3dfa3d5feb5b627f2bf6251c09351e5c3b6d490de5bdc1e6c33ecc4f5c1f62ae783a7ce9e5e9fda3761b921830d32578c
+  metadata.gz: 28e54cb29f53c664d7382e65d2da98e2d5914d92993a3e59034dcb0ef69d7b11b35df4294b954adc5939e5cd23657e2cac7a2a2c1077433ebf32388d1ec69348
+  data.tar.gz: 0f12f801b997855fa14f93a9ad1eff51ff5a80ae36e3ca2acdf1ba7506e4dfcf0fde3d1854eb309da0c4292ca99025127a4b27be11ed77ac316f7dee5d607e62

data/app/models/collection.rb

@@ -5,24 +5,26 @@
 # via an isGovernedBy relation.
 #
 class Collection < Ddr::Models::Base
-  
+
   include Hydra::AdminPolicyBehavior
-  
+
   include Ddr::Models::HasChildren
   include Ddr::Models::HasAttachments
-  
+
   has_attributes :default_license_title, datastream: Ddr::Datastreams::DEFAULT_RIGHTS, at: [:license, :title], multiple: false
   has_attributes :default_license_description, datastream: Ddr::Datastreams::DEFAULT_RIGHTS, at: [:license, :description], multiple: false
   has_attributes :default_license_url, datastream: Ddr::Datastreams::DEFAULT_RIGHTS, at: [:license, :url], multiple: false
-  
+
   has_many :children, property: :is_member_of_collection, class_name: 'Item'
   has_many :targets, property: :is_external_target_for, class_name: 'Target'
-  
+
   alias_method :items, :children
   alias_method :item_ids, :child_ids
-  
+
+  after_create :set_admin_policy
+
   validates_presence_of :title
-  
+
   # Returns the SolrDocuments for Components associated with the Collection through its member Items.
   #
   # @return A lazy enumerator of SolrDocuments.
@@ -35,7 +37,7 @@ class Collection < Ddr::Models::Base
     results = ActiveFedora::SolrService.query(query, fq: filter, rows: 100000)
     results.lazy.map {|doc| SolrDocument.new(doc)}
   end
-  
+
   # Returns the license attributes provided as default values for objects governed by the Collection.
   #
   # @return [Hash] the attributes, `:title`, `:description`, and `:url`.
@@ -44,7 +46,7 @@ class Collection < Ddr::Models::Base
       {title: default_license_title, description: default_license_description, url: default_license_url}
     end
   end
-  
+
   # Sets the default license attributes for objects governed by the Collection.
   def default_license=(new_license)
     raise ArgumentError unless new_license.is_a?(Hash) # XXX don't do this - not duck-typeable
@@ -53,7 +55,7 @@ class Collection < Ddr::Models::Base
     self.default_license_description = l[:description]
     self.default_license_url = l[:url]
   end
-  
+
   # Returns a list of entities (either users or groups) having a default access level on objects governed by the Collection.
   # 
   # @param type [String] the type of entity, "user" or "group".
@@ -62,11 +64,18 @@ class Collection < Ddr::Models::Base
   def default_entities_for_permission(type, access)
     default_permissions.collect { |p| p[:name] if p[:type] == type and p[:access] == access }.compact
   end
-  
+
   ["discover", "read", "edit"].each do |access|
     ["user", "group"].each do |type|
       define_method("default_#{access}_#{type}s") { default_entities_for_permission(type, access) }
     end
   end
 
+  private
+
+  def set_admin_policy
+    self.admin_policy = self
+    self.save
+  end
+
 end

data/db/migrate/20150109192134_drop_workflow_state.rb~

@@ -0,0 +1,11 @@
+class DropWorkflowState < ActiveRecord::Migration
+  def up
+    if table_exists?("workflow_states")
+      drop_table "workflow_states"
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20150110023410_drop_workflow_states.rb

@@ -0,0 +1,11 @@
+class DropWorkflowStates < ActiveRecord::Migration
+  def up
+    if table_exists?("workflow_states")
+      drop_table "workflow_states" 
+    end
+  end
+     
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20150110023410_drop_workflow_states.rb~

@@ -0,0 +1,4 @@
+class DropWorkflowStates < ActiveRecord::Migration
+  def change
+  end
+end

data/lib/ddr/auth/user.rb

@@ -31,7 +31,7 @@ module Ddr
       end
 
       def group_service
-        @group_service ||= GroupService.new
+        @group_service ||= RemoteGroupService.new
       end
 
       def to_s

data/lib/ddr/datastreams.rb

@@ -22,12 +22,13 @@ module Ddr
 
     CHECKSUM_TYPES = [ CHECKSUM_TYPE_MD5, CHECKSUM_TYPE_SHA1, CHECKSUM_TYPE_SHA256, CHECKSUM_TYPE_SHA384, CHECKSUM_TYPE_SHA512 ]
 
+    autoload :AdminMetadataDatastream
     autoload :ContentMetadataDatastream
     autoload :DescriptiveMetadataDatastream
-    autoload :PreservationMetadataDatastream
+    #autoload :PreservationMetadataDatastream
     autoload :PropertiesDatastream
     autoload :DatastreamBehavior
-    autoload :RoleAssignmentsDatastream
+    #autoload :RoleAssignmentsDatastream
 
   end
 end

data/lib/ddr/datastreams/admin_metadata_datastream.rb

@@ -0,0 +1,21 @@
+require "rdf-vocab"
+
+module Ddr
+  module Datastreams
+    class AdminMetadataDatastream < ActiveFedora::NtriplesRDFDatastream
+
+      property :permanent_id, predicate: Ddr::Vocab::Asset.permanentId
+      property :permanent_url, predicate: Ddr::Vocab::Asset.permanentUrl
+      property :original_filename, predicate: RDF::Vocab::PREMIS::V1.hasOriginalName
+      property :workflow_state, predicate: Ddr::Vocab::Asset.workflowState
+
+      Ddr::Vocab::Roles.each do |term|
+        property Ddr::Metadata::Vocabulary.term_name(Ddr::Vocab::Roles, term), 
+                 predicate: term do |index|
+          index.as :symbol
+        end
+      end
+
+    end
+  end
+end

data/lib/ddr/datastreams/admin_metadata_datastream.rb~

@@ -0,0 +1,13 @@
+module Ddr
+  module Datastreams
+    class AdminMetadataDatastream < ActiveFedora::NtriplesRDFDatastream
+
+      property :permanent_id, 
+      predicate: Ddr::Vocab::Preservation.permanentId
+
+      property :permanent_url, 
+      predicate: Ddr::Vocab::Preservation.permanentUrl
+
+    end
+  end
+end

data/lib/ddr/managers.rb

@@ -2,7 +2,10 @@ module Ddr
   module Managers
     extend ActiveSupport::Autoload
 
+    autoload :Manager
     autoload :PermanentIdManager
+    autoload :RoleManager
+    autoload :WorkflowManager
 
   end
 end

data/lib/ddr/managers/manager.rb

@@ -0,0 +1,14 @@
+module Ddr
+  module Managers
+    # @abstract
+    class Manager
+
+      attr_reader :object
+
+      def initialize(object)
+        @object = object
+      end
+
+    end
+  end
+end

data/lib/ddr/managers/manager.rb~

@@ -0,0 +1,14 @@
+module Ddr
+  module Managers
+    # @abstract
+    class Manager
+
+      attr_reader :object
+
+      def initialize
+        @object = object
+      end
+
+    end
+  end
+end

data/lib/ddr/managers/role_manager.rb

@@ -0,0 +1,31 @@
+module Ddr
+  module Managers
+    class RoleManager
+
+      attr_reader :object
+
+      def initialize(object)
+        @object = object
+      end
+
+      def principal_has_role?(principal, role)
+        ( principals(role) & Array(principal) ).any?
+      end
+
+      def principals(role)
+        object.adminMetadata.send(role)
+      end
+
+      def method_missing(method, *args)
+        if args.size == 0
+          begin 
+            return principals(method)
+          rescue NoMethodError
+          end
+        end
+        super
+      end
+
+    end
+  end
+end

data/lib/ddr/managers/role_manager.rb~

@@ -0,0 +1,21 @@
+module Ddr
+  module Managers
+    class RoleManager
+
+      attr_reader :object
+
+      def initialize(object)
+        @object = object
+      end
+
+      def principal_has_role?(principal, role)
+        ( principals(role) & Array(principal) ).any?
+      end
+
+      def principals(role)
+        object.adminMetadata.send(role)
+      end
+
+    end
+  end
+end

data/lib/ddr/managers/workflow_manager.rb

@@ -0,0 +1,33 @@
+module Ddr
+  module Managers
+    class WorkflowManager < Manager
+
+      PUBLISHED = "published"
+      UNPUBLISHED = "unpublished"
+
+      def published?
+        object.workflow_state == PUBLISHED
+      end
+      
+      def publish
+        object.workflow_state = PUBLISHED
+      end
+
+      def publish!
+        publish
+        object.save
+      end
+      
+      def unpublish
+        object.workflow_state = UNPUBLISHED
+      end
+
+      def unpublish!
+        unpublish
+        object.save
+      end
+
+    end
+  end
+end
+      

data/lib/ddr/managers/workflow_manager.rb~

@@ -0,0 +1,33 @@
+module Ddr
+  module Managers
+    class WorkflowManager < Manager
+
+      PUBLISHED = "published"
+      UNPUBLISHED = nil
+
+      def published?
+        object.workflow_state == PUBLISHED
+      end
+      
+      def publish
+        object.workflow_state = PUBLISHED
+      end
+
+      def publish!
+        publish
+        object.save
+      end
+      
+      def unpublish
+        object.workflow_state = UNPUBLISHED
+      end
+
+      def unpublish!
+        unpublish
+        object.save
+      end
+
+    end
+  end
+end
+      

data/lib/ddr/metadata.rb

@@ -5,7 +5,6 @@ module Ddr
     autoload :DukeTerms
     autoload :PremisEvent
     autoload :RDFVocabularyParser
-    autoload :RolesVocabulary
     autoload :Vocabulary
 
     PREDICATES = {

data/lib/ddr/metadata/#permanent_id_record.rb#

@@ -0,0 +1,13 @@
+module Ddr
+  module Metadata
+    class PermanentIdRecord
+
+      def self.find(id)
+        Ezid::Identifier.find(id)
+      end
+
+      
+
+    end
+  end
+end

data/lib/ddr/models.rb

@@ -20,7 +20,6 @@ require 'ddr/metadata'
 require 'ddr/notifications'
 require 'ddr/utils'
 require 'ddr/vocab'
-require 'ddr/workflow'
 
 module Ddr
   module Models
@@ -34,15 +33,13 @@ module Ddr
     autoload :ChecksumInvalid, 'ddr/models/error'
     autoload :FixityCheckable
     autoload :Governable
+    autoload :HasAdminMetadata
     autoload :HasAttachments
     autoload :HasChildren
     autoload :HasContent
     autoload :HasContentMetadata
-    autoload :HasPreservationMetadata
     autoload :HasProperties
-    autoload :HasRoleAssignments
     autoload :HasThumbnail
-    autoload :HasWorkflow
     autoload :Indexing
     autoload :FileManagement
     autoload :Licensable

data/lib/ddr/models/#has_ezid_identifier.rb#

@@ -0,0 +1,26 @@
+module Ddr
+  module Models
+    module HasEzidIdentifier
+
+      protected
+
+
+      def create_identifier
+        create_ezid
+      end
+
+      private
+
+      def create_ezid
+        metadata = Ddr::Metadata::Ezid.new(self)
+        ezid_identifier = Ezid::Identifier.create(metadata)
+        Ddr::Metadata::PermanentIdentifier.new(ezid_identifier.id)
+      end
+
+      def get_ezid
+        Ezid::Identifier.find(permanent_id.value)
+      end
+
+    end
+  end
+end

data/lib/ddr/models/#has_permanent_identifier.rb#

@@ -0,0 +1,9 @@
+module Ddr
+  module Models
+    module HasPermanentIdentifier
+
+      
+
+    end
+  end
+end