ddr-models 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd25ca1a87f36aa646b09de9fe52311735db39c9
-  data.tar.gz: d3d0b4ec50f9e35fbbccdb1ed2abc633ae9c6592
+  metadata.gz: f4cad288ab66e27f4a979008788abc101167edee
+  data.tar.gz: 4f2e67b23dc23c59b03af55688c68b911dcdb757
 SHA512:
-  metadata.gz: 167c0ac775721da5cba94ef7eb09b760eb9ad20796f869e3b613d22ad3b52ecc246b8cb93efa43017e18726e702c69ab888ef6e51013267fe18344a44d2fa0d8
-  data.tar.gz: 346fc64b0c5292893c88e0f032d46a0b622634023562a979f133c566c4ee174a066c598a87cfe29681d1d6f462ca57f46facfdbcfe022b0bb86651e80d5f31e9
+  metadata.gz: cfdf876d984f71747568ad4f02ffa0d5d3930e7236646367bcb84c0b17d377baaabfd772575f024c73378efcb43df0d1c9fd97a0854da2fdab125ed9e0b27dc1
+  data.tar.gz: 58e1ea9ab30fab595d3f1b8475f3cc9c80a46ab3af3093f419592fda2ca2847329a9d469c601c66db16f9a9e8e0728b2c2ed4ad065ddf17b2291ca867deb94d9

data/lib/ddr/derivatives/update_derivatives.rb

@@ -3,15 +3,17 @@ module Ddr::Derivatives
 
     def self.call(*args)
       event = ActiveSupport::Notifications::Event.new(*args)
+      payload = event.payload
+      return false if payload[:skip_update_derivatives]
       if event.name == "delete.repo_file" &&
-         !file_ids.include?(event.payload[:file_id])
+         !file_ids.include?(payload[:file_id])
         return false
       end
       if event.name =~ /\.repo_object\z/ &&
-         (file_ids & event.payload[:datastreams_changed]).empty?
+         (file_ids & payload[:datastreams_changed]).empty?
         return false
       end
-      obj = ActiveFedora::Base.find(event.payload[:pid])
+      obj = ActiveFedora::Base.find(payload[:pid])
       obj.derivatives.update_derivatives(:later)
     end
 

data/lib/ddr/models/base.rb

@@ -148,7 +148,8 @@ module Ddr
       def notify_update
         event_params = default_notification_payload.merge(
           attributes_changed: changes,
-          datastreams_changed: datastreams_changed.keys
+          datastreams_changed: datastreams_changed.keys,
+          skip_update_derivatives: cache.fetch(:skip_update_derivatives, false)
         )
         ActiveSupport::Notifications.instrument(UPDATE, event_params) do |payload|
           yield

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.7.1"
+    VERSION = "2.7.2"
   end
 end

data/spec/support/shared_examples_for_has_content.rb

@@ -78,6 +78,13 @@ RSpec.shared_examples "an object that can have content" do
           expect_any_instance_of(Ddr::Managers::DerivativesManager).to receive(:update_derivatives)
           subject.upload! file
         end
+        context "and it is saved with :skip_update_derivatives=>true" do
+          it "does not generate derivatives" do
+            expect_any_instance_of(Ddr::Managers::DerivativesManager).not_to receive(:update_derivatives)
+            subject.upload file
+            subject.save(skip_update_derivatives: true)
+          end
+        end
         context "and the file has not previously been characterized" do
           it "does not try to delete the existing characterization data" do
             expect(subject.fits).not_to receive(:delete)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -780,7 +780,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository