ddr-models 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d13512c16dbc5614aed4d587c3375ca5eeaae569
-  data.tar.gz: 5313f8521254400e02477b366e611e6bdcc0760d
+  metadata.gz: a1aeee77be1941cef872cdef9833e667f3e5c93e
+  data.tar.gz: cf6d46b137d160d69bef0f300a7230f223f7d7fc
 SHA512:
-  metadata.gz: a9daf7c810fc23b99f0e499d4bf019c686534448ee828ad0e494ef1a9d39cf4526bf82d002f6b2a59c1ae9c26340c404512b834fa739aac695580a27ccb64c3a
-  data.tar.gz: a125ce992ba484e01aca767adb4bfbb00c0525833da54fa6247dec99517fa9427ece4a1c7daf3c58ec406ef092216514a7d1a7edf0bbe60c598b7703c2adf9aa
+  metadata.gz: cbabe3f6c1a20248a908bd5b0e57f3ce6ac8bd3688d8dffa29008ed8a863fbafe0cc0c32a4183a3c908ca815af990982d2b284367f8f62a78880b1d49e96b366
+  data.tar.gz: b8900cd65a8d06bfb1395cd36f975cb51b7228342713800443f050ee984a0d7d9a6579c2c9e759a012eb8e6c45fda1070cdc42aa3f8a887233dd9917880596b3

data/lib/ddr/models/has_content.rb

@@ -40,7 +40,9 @@ module Ddr
 
         around_save :update_derivatives, if: :content_changed?
 
-        around_save :characterize_file, if: [ :content_changed?, "Ddr::Models.characterize_files?" ]
+        before_save if: :re_characterize? do
+          fits.delete
+        end
 
         after_add_file do
           if file_to_add.original_name && file_to_add.dsid == "content"
@@ -137,9 +139,8 @@ module Ddr
         derivatives.update_derivatives(:later)
       end
 
-      def characterize_file
-        yield
-        Resque.enqueue(Ddr::Jobs::FitsFileCharacterization, pid)
+      def re_characterize?
+        content_changed? && !fits.new?
       end
 
       def default_content_type

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.4.1"
+    VERSION = "2.4.2"
   end
 end

data/spec/support/shared_examples_for_has_content.rb

@@ -73,22 +73,6 @@ RSpec.shared_examples "an object that can have content" do
           expect(subject.derivatives).to receive(:update_derivatives)
           subject.save
         end
-        describe "file characterization" do
-          context "characterize files is false" do
-            before { allow(Ddr::Models).to receive(:characterize_files?) { false } }
-            it "should not enqueue a FITS file characterization job" do
-              expect(Resque).to_not receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
-              subject.save
-            end
-          end
-          context "characterize files is true" do
-            before { allow(Ddr::Models).to receive(:characterize_files?) { true } }
-            it "should enqueue a FITS file characterization job" do
-              expect(Resque).to receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
-              subject.save
-            end
-          end
-        end
       end
 
       context "and it's an existing object with content" do
@@ -98,20 +82,29 @@ RSpec.shared_examples "an object that can have content" do
           expect(subject.derivatives).to receive(:update_derivatives)
           subject.upload! file
         end
-        describe "file characterization" do
-          context "characterize files is false" do
-            before { allow(Ddr::Models).to receive(:characterize_files?) { false } }
-            it "should not enqueue a FITS file characterization job" do
-              expect(Resque).to_not receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
-              subject.upload! file
-            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)
+            subject.upload! file
           end
-          context "characterize files is true" do
-            before { allow(Ddr::Models).to receive(:characterize_files?) { true } }
-            it "should enqueue a FITS file characterization job" do
-              expect(Resque).to receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
-              subject.upload! file
-            end
+        end
+        context "and the file has new characterization data" do
+          before {
+            subject.fits.content = fixture_file_upload("fits/document.xml")
+          }
+          it "preserves the characterization data" do
+            subject.upload! file
+            expect(subject.reload.fits).to have_content
+          end
+        end
+        context "and the file has previously been characterized" do
+          before {
+            subject.fits.content = fixture_file_upload("fits/document.xml")
+            subject.save!
+          }
+          it "deletes the existing characterization data" do
+            subject.upload! file
+            expect(subject.reload.fits).to_not have_content
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails