ddr-batch 1.0.2 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7070e57201c4afad9a4bf93028b4abe94d2bd820
-  data.tar.gz: 3553c64cd90f2b04de837008dad6500a0af06e8d
+  metadata.gz: 2c090fcbdee8f9e2e6861a5b5a79cb0766ae420c
+  data.tar.gz: f441540385d72a68ca2ab832f519481c3a77a58b
 SHA512:
-  metadata.gz: 2251199e9fa97080b64b13b5e4dc160589fb6127e46f0c8ec5e2f21615b00fc00bb635615276536261c1fd7e581f12dd5ecea4ca5a8c1181a8aa2a5fff066222
-  data.tar.gz: 4fa4a48200cbcb0d7cdd6344e901dd315115f2a579189b9de5880a2cc2942b139f9633d9230df8c7da9c904e4c57a7d2f1b6f646ab8beefc2e98a0efda1b8e9a
+  metadata.gz: 4b4a3c317a19cd1a03fa30c679c0a847c9c6f918e55a52248ac5eb31f9f3320e7e6b9b055cebc0ac82e28b6cc48eec66a7d031a35eb6bc7dd14e772374ed0c48
+  data.tar.gz: 5956b006e1ac730ebbbb1d8a3d9904d6fe6a9d46ea5994e279f5aa7e3f552d90e0a2fd5d79e35972b8b5ea43f084df0a4ee82b4e446c91e7e016bc273bc937fe

data/app/models/ddr/batch/batch_object.rb

@@ -8,6 +8,7 @@ module Ddr::Batch
       has_many :batch_object_attributes, -> { order "id ASC" }, inverse_of: :batch_object, dependent: :destroy
       has_many :batch_object_datastreams, inverse_of: :batch_object, dependent: :destroy
       has_many :batch_object_relationships, inverse_of: :batch_object, dependent: :destroy
+      has_many :batch_object_roles, inverse_of: :batch_object, dependent: :destroy
 
       VERIFICATION_PASS = "PASS"
       VERIFICATION_FAIL = "FAIL"
@@ -172,6 +173,11 @@ module Ddr::Batch
               verifications["#{r.name} relationship is correct"] = verify_relationship(repo_object, r)
             end
           end
+          unless batch_object_roles.empty?
+            batch_object_roles.each do |r|
+              verifications["#{r.role_scope} #{r.role_type} #{r.agent} role is correct"] = verify_role(repo_object, r)
+            end
+          end
           result = Ddr::Actions::FixityCheck.execute repo_object
           verifications["Fixity check"] = result.success ? VERIFICATION_PASS : VERIFICATION_FAIL
         end
@@ -228,6 +234,11 @@ module Ddr::Batch
         end
       end
 
+      def verify_role(repo_object, role)
+        role_hash = {  "role_type"=>[ role.role_type ], "agent"=>[ role.agent ], "scope"=>[ role.role_scope ] }
+        repo_object.roles.role_set.map(&:to_h).include?(role_hash) ? VERIFICATION_PASS : VERIFICATION_FAIL
+      end
+
       def add_attribute(repo_object, attribute)
         repo_object.datastreams[attribute.datastream].add_value(attribute.name, attribute.value)
         return repo_object
@@ -245,6 +256,11 @@ module Ddr::Batch
         return repo_object
       end
 
+      def add_role(repo_object, role)
+        repo_object.roles.grant(scope: role.role_scope, type: role.role_type, agent: role.agent)
+        return repo_object
+      end
+
       def populate_datastream(repo_object, datastream)
         case datastream[:payload_type]
         when BatchObjectDatastream::PAYLOAD_TYPE_BYTES

data/app/models/ddr/batch/batch_object_role.rb

@@ -0,0 +1,26 @@
+module Ddr::Batch
+
+  class BatchObjectRole < ActiveRecord::Base
+    belongs_to :batch_object, :inverse_of => :batch_object_roles
+
+    OPERATION_ADD = "ADD".freeze  # Add the principal and role to the object in the indicated scope
+    OPERATIONS = [ OPERATION_ADD ].freeze
+
+    validates :operation, inclusion: { in: OPERATIONS }
+    validate :valid_role, if: :operation_requires_valid_role?
+    validate :policy_role_scope_only_for_collections, if: "role_scope == Ddr::Auth::Roles::POLICY_SCOPE"
+
+    def operation_requires_valid_role?
+      [ OPERATION_ADD ].include? operation
+    end
+
+    def valid_role
+      Ddr::Auth::Roles::Role.build(type: role_type, agent: agent, scope: role_scope).valid?
+    end
+
+    def policy_role_scope_only_for_collections
+      errors.add(:role_scope, "policy role scope is valid only for Collections") unless batch_object.model == "Collection"
+    end
+  end
+
+end

data/app/models/ddr/batch/ingest_batch_object.rb

@@ -88,6 +88,7 @@ module Ddr::Batch
         batch_object_attributes.each { |a| repo_object = add_attribute(repo_object, a) }
         batch_object_datastreams.each { |d| repo_object = populate_datastream(repo_object, d) }
         batch_object_relationships.each { |r| repo_object = add_relationship(repo_object, r) }
+        batch_object_roles.each { |r| repo_object = add_role(repo_object, r) }
         repo_object.save
       rescue Exception => e1
         logger.fatal("Error in creating repository object #{repo_object.pid} for #{identifier} : #{e1}")

data/db/migrate/20160816164010_create_batch_object_roles.rb

@@ -0,0 +1,15 @@
+class CreateBatchObjectRoles < ActiveRecord::Migration
+  def change
+    unless table_exists?(:batch_object_roles)
+      create_table :batch_object_roles do |t|
+        t.integer  "batch_object_id"
+        t.string   "operation"
+        t.string   "agent"
+        t.string   "role_type"
+        t.string   "role_scope"
+        t.datetime "created_at"
+        t.datetime "updated_at"
+      end
+    end
+  end
+end

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "1.0.2"
+    VERSION = "1.1.0.rc1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -183,6 +183,7 @@ files:
 - app/models/ddr/batch/batch_object_attribute.rb
 - app/models/ddr/batch/batch_object_datastream.rb
 - app/models/ddr/batch/batch_object_relationship.rb
+- app/models/ddr/batch/batch_object_role.rb
 - app/models/ddr/batch/ingest_batch_object.rb
 - app/models/ddr/batch/update_batch_object.rb
 - app/scripts/ddr/batch/batch_processor.rb
@@ -195,6 +196,7 @@ files:
 - db/migrate/20150828202118_create_batch_object_attributes.rb
 - db/migrate/20150828202200_create_batch_object_datastreams.rb
 - db/migrate/20150828202240_create_batch_object_relationships.rb
+- db/migrate/20160816164010_create_batch_object_roles.rb
 - lib/ddr-batch.rb
 - lib/ddr/batch.rb
 - lib/ddr/batch/batch_user.rb
@@ -216,12 +218,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Batch processing for Duke Digital Repository