ddr-batch 1.2.0 → 1.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e82d997fde48ad251350b642c1e512653872545
-  data.tar.gz: 7e2f779cf6179d8d0aed43c8cb0c2014d763262a
+  metadata.gz: 24bb11b78d0e9c073aa229204b6ff596421b5b0b
+  data.tar.gz: 7dcf19a37649facfabe5c8c5efe3ca9b390a88dc
 SHA512:
-  metadata.gz: 78cd17bb2b5826bb9a13343f2ab35213b102a1ff3024211c21e50d4ed9b11521b0113dbab588bb0fc03f843f10ba00e0a88f373a759e35cdef88657a0bd9d589
-  data.tar.gz: 2ccc5e4249c45ae0cbdb964c1c617ad092b3a31c33f65e4a996a831028aaed5dd0bf3908b26084eab02552282ac3b9ceffa653dc748e59ea7ba0e6b3647b39d9
+  metadata.gz: 74e39bd73bbe80c30d0c835ecdaec3934af45ee88a059bfacf3c99c45c359312d06fb5d69b0404b66499370a050a7afefe3a0e97c534639a4297319ac7caeef4
+  data.tar.gz: e93061dce899944061f74ff52a54d72c8df9b91dfe40d64faa966d9f7f7d590f892f76ad745bca6a7f7cb2efd3815ecedede816a555622a187e087a93e7bb20c

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

@@ -278,11 +278,7 @@ module Ddr::Batch
           else
             ds_content = File.new(datastream[:payload])
           end
-          file_name = File.basename(datastream[:payload])
-          dsid = datastream[:name]
-          opts = { filename: file_name }
-          opts.merge({ mime_type: mime_type }) if mime_type
-          repo_object.add_file(ds_content, dsid, opts)
+          repo_object.add_file(ds_content, datastream[:name], mime_type: mime_type)
         end
         return repo_object
       end

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

@@ -4,11 +4,6 @@ module Ddr::Batch
 
     belongs_to :batch_object, :inverse_of => :batch_object_datastreams
 
-    DATASTREAMS = [ Ddr::Datastreams::CONTENT,
-                    Ddr::Datastreams::DESC_METADATA,
-                    Ddr::Datastreams::RIGHTS_METADATA,
-                    Ddr::Datastreams::STRUCT_METADATA ]
-
     OPERATION_ADD = "ADD" # add this datastream to the object -- considered an error if datastream already exists
     OPERATION_ADDUPDATE = "ADDUPDATE" # add this datastream to or update this datastream in the object
     OPERATION_UPDATE = "UPDATE" # update this datastream in the object -- considered an error if datastream does not already exist

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

@@ -37,6 +37,18 @@ module Ddr::Batch
           verified = false if value.eql?(VERIFICATION_FAIL)
         end
         update_attributes(:verified => verified)
+        Ddr::Events::ValidationEvent.new.tap do |event|
+          event.object = repo_object
+          event.failure! unless verified
+          event.summary = EVENT_SUMMARY % {
+              label: "Object update validation",
+              batch_id: id,
+              identifier: identifier,
+              model: model
+          }
+          event.detail = verification_outcome_detail.join("\n")
+          event.save!
+        end
         repo_object
       end
     end
@@ -78,9 +90,7 @@ module Ddr::Batch
             populate_datastream(repo_object, d)
           end
         end
-        if repo_object.save
-          repo_object.notify_event(:update, user: user, comment: event_log_comment)
-        end
+        repo_object.save!(user: user, comment: event_log_comment)
       rescue Exception => e
         logger.error("Error in updating repository object #{pid} for #{identifier} : : #{e}")
         raise e

data/app/services/ddr/batch/monitor_batch_finished.rb

@@ -6,6 +6,9 @@ module Ddr::Batch
         event = ActiveSupport::Notifications::Event.new(*args)
         batch = Ddr::Batch::Batch.find(event.payload[:batch_id])
         batch_finished(batch)
+        if batch.outcome == Ddr::Batch::Batch::OUTCOME_SUCCESS
+          ActiveSupport::Notifications.instrument('success.batch.batch.ddr', batch_id: batch.id)
+        end
       end
 
       private
@@ -13,7 +16,7 @@ module Ddr::Batch
       def batch_finished(batch)
         log_batch_finish(batch)
         update_batch(batch)
-        send_notification(batch) if batch.user && batch.user.email
+        send_email(batch) if batch.user && batch.user.email
       end
 
       def log_batch_finish(batch)
@@ -68,7 +71,7 @@ module Ddr::Batch
                       logfile: logfile)
       end
 
-      def send_notification(batch)
+      def send_email(batch)
         begin
           Ddr::Batch::BatchProcessorRunMailer.send_notification(batch).deliver!
         rescue => e

data/app/services/ddr/batch/process_batch.rb

@@ -49,10 +49,11 @@ module Ddr::Batch
     end
 
     def enqueue_item_component_ingest(batch_object)
-      batch_object_ids = [ batch_object.id ]
-      parent_rel_query = "object = '#{batch_object.pid}' AND name = '#{Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT}'"
-      parent_rel_recs = Ddr::Batch::BatchObjectRelationship.where(parent_rel_query)
-      parent_rel_recs.each { |parent_rel_rec| batch_object_ids << parent_rel_rec.batch_object_id}
+      query = [ "object = '#{batch_object.pid}'",
+                "batch_object_relationships.name = '#{Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT}'",
+                "batches.id = #{batch_object.batch.id}" ].join(' AND ')
+      recs = Ddr::Batch::BatchObjectRelationship.joins(batch_object: :batch).where(query)
+      batch_object_ids = recs.map { |rec| rec.batch_object.id }.unshift(batch_object.id)
       Resque.enqueue(BatchObjectsProcessorJob, batch_object_ids, operator_id)
     end
   end

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "1.2.0"
+    VERSION = "1.3.0.rc1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.13
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.13
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,6 @@ files:
 - app/jobs/ddr/batch/batch_processor_job.rb
 - app/mailers/ddr/batch/batch_processor_run_mailer.rb
 - app/models/ddr/batch/batch.rb
-- app/models/ddr/batch/batch_ability_definitions.rb
 - app/models/ddr/batch/batch_object.rb
 - app/models/ddr/batch/batch_object_attribute.rb
 - app/models/ddr/batch/batch_object_datastream.rb
@@ -232,12 +231,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.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Batch processing for Duke Digital Repository

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

@@ -1,14 +0,0 @@
-module Ddr::Batch
-  class BatchAbilityDefinitions < Ddr::Auth::AbilityDefinitions
-
-    def call
-      if authenticated?
-        can :manage, Batch, user_id: user.id
-      end
-      can :manage, Ddr::Batch::BatchObject do |batch_object|
-        can? :manage, batch_object.batch
-      end
-    end
-
-  end
-end