ddr-batch 2.0.0.alpha.1 → 2.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f604d559b09d360d0f9357113a314fbbe33d5777
-  data.tar.gz: 4ed2ac035ff250220a8b7b07e6766f338a9da348
+  metadata.gz: 824038c27b5269a2816f0d253891c345a69e42c6
+  data.tar.gz: 06b2646d38c6975037358d695ddd83d8a6231ad4
 SHA512:
-  metadata.gz: 8a495a43eb4b92a0753a1ac80ca16a08a40693f91de7928ff7a7de7c81dc6b8733c38063526f07cb027bc744adfca8bafd47b7bc9afc6dac33490859e56c51d6
-  data.tar.gz: 3c3abce0902a76666701f79c80f65fd7ef5d6b019cce4927a462a7dbb398b4c6218088584f5a82d3fc5aef4631485c8b542b5c5faf0612fddc634ed4e9fac0e4
+  metadata.gz: 293bf55a24e1fc20b7139af536965a1bff028e23c27033fca4b879c633c381faa39ef7b81d1c1888cb55d3811aaec7fec27f183ae7c0db7ddd43267e30386078
+  data.tar.gz: 66cbc236d73feb005e5c276b8072450462e121c69e81ebdf0fc46e36cef4e734bb28f8199b892cd220d75a769d1c245546db07354ee6f7413f2cf94a0c6ec4ec

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

@@ -31,8 +31,11 @@ module Ddr::Batch
         return pids
       end
 
+      def error_prefix
+        I18n.t('ddr.batch.errors.prefix', :identifier => identifier, :id => id)
+      end
+
       def validate
-        @error_prefix = I18n.t('ddr.batch.errors.prefix', :identifier => identifier, :id => id)
         errors = []
         errors += validate_model if model
         errors += validate_datastreams if batch_object_datastreams
@@ -66,7 +69,7 @@ module Ddr::Batch
         begin
           model.constantize
         rescue NameError
-          errs << "#{@error_prefix} Invalid model name: #{model}"
+          errs << "#{error_prefix} Invalid model name: #{model}"
         end
         return errs
       end
@@ -76,23 +79,23 @@ module Ddr::Batch
         batch_object_datastreams.each do |d|
           if model_datastream_keys.present?
             unless model_datastream_keys.include?(d.name.to_sym)
-              errs << "#{@error_prefix} Invalid datastream name for #{model}: #{d.name}"
+              errs << "#{error_prefix} Invalid datastream name for #{model}: #{d.name}"
             end
           end
           unless BatchObjectDatastream::PAYLOAD_TYPES.include?(d.payload_type)
-            errs << "#{@error_prefix} Invalid payload type for #{d.name} datastream: #{d.payload_type}"
+            errs << "#{error_prefix} Invalid payload type for #{d.name} datastream: #{d.payload_type}"
           end
           if d.payload_type.eql?(BatchObjectDatastream::PAYLOAD_TYPE_FILENAME)
             unless File.readable?(d.payload)
-              errs << "#{@error_prefix} Missing or unreadable file for #{d[:name]} datastream: #{d[:payload]}"
+              errs << "#{error_prefix} Missing or unreadable file for #{d[:name]} datastream: #{d[:payload]}"
             end
           end
           if d.checksum && !d.checksum_type
-            errs << "#{@error_prefix} Must specify checksum type if providing checksum for #{d.name} datastream"
+            errs << "#{error_prefix} Must specify checksum type if providing checksum for #{d.name} datastream"
           end
           if d.checksum_type
             unless Ddr::Datastreams::CHECKSUM_TYPES.include?(d.checksum_type)
-              errs << "#{@error_prefix} Invalid checksum type for #{d.name} datastream: #{d.checksum_type}"
+              errs << "#{error_prefix} Invalid checksum type for #{d.name} datastream: #{d.checksum_type}"
             end
           end
         end
@@ -102,44 +105,8 @@ module Ddr::Batch
       def validate_relationships
         errs = []
         batch_object_relationships.each do |r|
-          obj_model = nil
-          unless BatchObjectRelationship::OBJECT_TYPES.include?(r[:object_type])
-            errs << "#{@error_prefix} Invalid object_type for #{r[:name]} relationship: #{r[:object_type]}"
-          end
-          if r[:object_type].eql?(BatchObjectRelationship::OBJECT_TYPE_PID)
-            if batch.present? && batch.found_pids.keys.include?(r[:object])
-              obj_model = batch.found_pids[r[:object]]
-            else
-              begin
-                obj = ActiveFedora::Base.find(r[:object], :cast => true)
-                obj_model = obj.class.name
-                if batch.present?
-                  batch.add_found_pid(obj.pid, obj_model)
-                end
-              rescue ActiveFedora::ObjectNotFoundError
-                pid_in_batch = false
-                if batch.present?
-                  if batch.pre_assigned_pids.include?(r[:object])
-                    pid_in_batch = true
-                  end
-                end
-                unless pid_in_batch
-                  errs << "#{@error_prefix} #{r[:name]} relationship object does not exist: #{r[:object]}"
-                end
-              end
-            end
-            if obj_model
-              relationship_reflection = Ddr::Utils.relationship_object_reflection(model, r[:name])
-              if relationship_reflection
-                klass = Ddr::Utils.reflection_object_class(relationship_reflection)
-                if klass
-                  errs << "#{@error_prefix} #{r[:name]} relationship object #{r[:object]} exists but is not a(n) #{klass}" unless batch.found_pids[r[:object]].eql?(klass.name)
-                end
-              else
-                errs << "#{@error_prefix} #{model} does not define a(n) #{r[:name]} relationship"
-              end
-            end
-          end
+          r.valid?
+          errs += r.errors.messages.values.map { |msg| "#{error_prefix} msg" }
         end
         return errs
       end
@@ -147,8 +114,8 @@ module Ddr::Batch
       def verify_repository_object
         verifications = {}
         begin
-          repo_object = ActiveFedora::Base.find(pid, :cast => true)
-        rescue ActiveFedora::ObjectNotFound
+          repo_object = ActiveFedora::Base.find(pid)
+        rescue ActiveFedora::ObjectNotFoundError
           verifications["Object exists in repository"] = VERIFICATION_FAIL
         else
           verifications["Object exists in repository"] = VERIFICATION_PASS
@@ -221,11 +188,23 @@ module Ddr::Batch
       end
 
       def verify_relationship(repo_object, relationship)
+        # if PID, proceed as below
+        # if AR rec ID,
+        #   retrieve AR rec
+        #   if AR rec has PID, proceed as below using AR rec PID
+        #   if not, error (should not occur)
+        repo_object_id = case
+                           when relationship.object_rec_id?
+                             referent = batch.batch_objects.find(relationship.object)
+                             referent.pid
+                           when relationship.object_repo_id?
+                             relationship.object
+                         end
         relationship_reflection = Ddr::Utils.relationship_object_reflection(model, relationship.name)
         relationship_object_class = Ddr::Utils.reflection_object_class(relationship_reflection)
         relationship_object = repo_object.send(relationship.name)
         if !relationship_object.nil? &&
-            relationship_object.pid.eql?(relationship.object) &&
+            relationship_object.pid.eql?(repo_object_id) &&
             relationship_object.is_a?(relationship_object_class)
           VERIFICATION_PASS
         else
@@ -275,11 +254,19 @@ module Ddr::Batch
       end
 
       def add_relationship(repo_object, relationship)
-        relationship_object = case relationship[:object_type]
-        when BatchObjectRelationship::OBJECT_TYPE_PID
-          ActiveFedora::Base.find(relationship[:object], :cast => true)
+        repo_object_id = case
+                           when relationship.object_rec_id?
+                             referent = batch.batch_objects.find(relationship[:object])
+                             referent.pid
+                           when relationship.object_repo_id?
+                             relationship[:object]
+                         end
+        if repo_object_id.present?
+          relationship_object = ActiveFedora::Base.find(repo_object_id)
+          repo_object.send("#{relationship[:name]}=", relationship_object)
+        else
+          raise Ddr::Batch::Error, "Unable to determine repository ID for relationship #{relationship.id}"
         end
-        repo_object.send("#{relationship[:name]}=", relationship_object)
         return repo_object
       end
 

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

@@ -1,7 +1,6 @@
 module Ddr::Batch
-
   class BatchObjectRelationship < ActiveRecord::Base
-#    attr_accessible :name, :object, :object_type, :operation, :batch_object
+
     belongs_to :batch_object, :inverse_of => :batch_object_relationships
 
     RELATIONSHIP_ADMIN_POLICY = "admin_policy"
@@ -15,12 +14,85 @@ module Ddr::Batch
       RELATIONSHIP_COMPONENT, RELATIONSHIP_ATTACHED_TO ]
 
     OPERATION_ADD = "ADD"
-    OPERATION_UPDATE = "UPDATE"
     OPERATION_DELETE = "DELETE"
+    OPERATION_UPDATE = "UPDATE"
 
-    OBJECT_TYPE_PID = "PID"
+    OPERATIONS = [ OPERATION_ADD, OPERATION_DELETE, OPERATION_UPDATE ]
 
-    OBJECT_TYPES = [ OBJECT_TYPE_PID ]
-  end
+    OBJECT_TYPE_REC_ID = "REC_ID"
+    OBJECT_TYPE_REPO_ID = "REPO_ID"
+
+    OBJECT_TYPES = [ OBJECT_TYPE_REC_ID, OBJECT_TYPE_REPO_ID ]
+
+    validates_presence_of :object, :batch_object
+
+    validates_inclusion_of :name, in: RELATIONSHIPS, message: 'Invalid relationship name'
+    validates_inclusion_of :operation, in: OPERATIONS, message: 'Invalid relationship operation'
+    validates_inclusion_of :object_type, in: OBJECT_TYPES, message: 'Invalid relationship object type'
+    validate :record_must_be_in_batch, if: :object_rec_id?
+    validate :repo_object_must_exist, if: :object_repo_id?
+    validate :relationship_name_must_be_valid_for_model
+
+    delegate :batch, to: :batch_object
+    delegate :batch_objects, to: :batch
+    delegate :found_pids, to: :batch
+    delegate :add_found_pid, to: :batch
 
+    def object_rec_id?
+      object_type == OBJECT_TYPE_REC_ID
+    end
+
+    def object_repo_id?
+      object_type == OBJECT_TYPE_REPO_ID
+    end
+
+    def record_must_be_in_batch
+      batch_objects.find(object).present?
+    rescue ActiveRecord::RecordNotFound
+        errors.add(:object, "#{object} not found in this batch")
+    end
+
+    def repo_object_must_exist
+      unless found_pids.keys.include?(object)
+        obj = ActiveFedora::Base.find(object)
+        add_found_pid(obj.id, obj.class.name)
+      end
+    rescue ActiveFedora::ObjectNotFoundError
+      errors.add(:object, "#{object} not found in repository")
+    end
+
+    def relationship_name_must_be_valid_for_model
+      unless Ddr::Utils.relationship_object_reflection(batch_object.model, name).present?
+        errors.add(:name, "#{batch_object.model} does not define a(n) #{name} relationship")
+      end
+    end
+
+    def object_model_must_be_correct_for_relationship
+      if relationship_reflection = Ddr::Utils.relationship_object_reflection(batch_object.model, name)
+        klass = Ddr::Utils.reflection_object_class(relationship_reflection)
+        if klass.present?
+          unless object_model == klass.name
+            errors.add(:object, "#{name} relationship object #{object} exists but is not a(n) #{klass}")
+          end
+        end
+      end
+    end
+
+    private
+
+    def object_model
+      case object_type
+        when OBJECT_TYPE_REC_ID
+          batch_objects.find(object).model
+        when OBJECT_TYPE_REPO_ID
+          if found_pids.keys.include?(object)
+            found_pids[object]
+          else
+            obj = ActiveFedora::Base.find(object)
+            add_found_pid(obj.id, obj.class.name)
+          end
+      end
+    end
+
+  end
 end

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

@@ -0,0 +1,6 @@
+module Ddr::Batch
+
+  # Base class for custom Ddr::Batch exceptions
+  class Error < StandardError; end
+
+end

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

@@ -4,8 +4,7 @@ module Ddr::Batch
 
     def local_validations
       errors = []
-      errors << "#{@error_prefix} Model required for INGEST operation" unless model
-      errors += validate_pre_assigned_pid if pid
+      errors << "#{error_prefix} Model required for INGEST operation" unless model
       errors
     end
 
@@ -28,12 +27,6 @@ module Ddr::Batch
 
     private
 
-    def validate_pre_assigned_pid
-      errs = []
-      errs << "#{@error_prefix} #{pid} already exists in repository" if ActiveFedora::Base.exists?(pid)
-      return errs
-    end
-
     def ingest(user, opts = {})
       repo_object = create_repository_object
       if !repo_object.nil? && !repo_object.new_record?

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

@@ -4,12 +4,12 @@ module Ddr::Batch
 
     def local_validations
       errs = []
-      errs << "#{@error_prefix} PID required for UPDATE operation" unless pid
+      errs << "#{error_prefix} PID required for UPDATE operation" unless pid
       if pid
         if ActiveFedora::Base.exists?(pid)
-          errs << "#{@error_prefix} #{batch.user.user_key} not permitted to edit #{pid}" unless batch.user.can?(:edit, ActiveFedora::Base.find(pid, :cast => true))
+          errs << "#{error_prefix} #{batch.user.user_key} not permitted to edit #{pid}" unless batch.user.can?(:edit, ActiveFedora::Base.find(pid, :cast => true))
         else
-          errs << "#{@error_prefix} PID #{pid} not found in repository" unless ActiveFedora::Base.exists?(pid)
+          errs << "#{error_prefix} PID #{pid} not found in repository" unless ActiveFedora::Base.exists?(pid)
         end
       end
       errs

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "2.0.0.alpha.1"
+    VERSION = "2.0.0.alpha.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.1
+  version: 2.0.0.alpha.2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-03 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/error.rb
 - app/models/ddr/batch/ingest_batch_object.rb
 - app/models/ddr/batch/update_batch_object.rb
 - app/scripts/ddr/batch/batch_processor.rb