ddr-models 1.14.1 → 1.14.2

data/spec/factories/component_factories.rb

@@ -4,7 +4,7 @@ FactoryGirl.define do
     title [ "Test Component" ]
     sequence(:identifier) { |n| [ "cmp%05d" % n ] }
     after(:build) do |c|
-      c.upload File.new(File.join(Ddr::Models::Engine.root.to_s, "spec", "fixtures", "library-devil.tiff"))
+      c.upload File.new(File.join(Ddr::Models::Engine.root.to_s, "spec", "fixtures", "imageA.tif"))
     end
   end
 end

data/spec/factories/test_model_factories.rb

@@ -56,7 +56,7 @@ FactoryGirl.define do
     title [ "DulHydra Test Content Object" ]
     sequence(:identifier) { |n| [ "testcontent%05d" % n ] }
     after(:build) do |c|
-      c.upload File.join(Ddr::Models::Engine.root, "spec", "fixtures", "library-devil.tiff")
+      c.upload File.join(Ddr::Models::Engine.root, "spec", "fixtures", "imageA.tif")
     end
 
     factory :test_content_with_fixity_check do
@@ -68,7 +68,7 @@ FactoryGirl.define do
     title [ "DulHydra Test Omnibus Object" ]
     sequence(:identifier) { |n| [ "test%05d" % n ] }
     after(:build) do |c|
-      c.upload File.join(Ddr::Models::Engine.root, "spec", "fixtures", "library-devil.tiff")
+      c.upload File.join(Ddr::Models::Engine.root, "spec", "fixtures", "imageA.tif")
     end
   end
 

data/spec/managers/derivatives_manager_spec.rb

@@ -12,14 +12,14 @@ module Ddr
           include Ddr::Models::EventLoggable
           _save_callbacks.clear
         end
-        # class MultiresImageable < ContentBearing
-        #   include Ddr::Models::HasMultiresImage
-        #   _save_callbacks.clear
-        # end
+        class MultiresImageable < ContentBearing
+          include Ddr::Models::HasMultiresImage
+          _save_callbacks.clear
+        end
       end
 
       after(:all) do
-        # Ddr::Managers.send(:remove_const, :MultiresImageable)
+        Ddr::Managers.send(:remove_const, :MultiresImageable)
         Ddr::Managers.send(:remove_const, :ContentBearing)
       end
 
@@ -28,10 +28,10 @@ module Ddr
         context "not multires_image_able" do
           let(:object) { ContentBearing.new }
           context "content is image" do
-            let(:file) { fixture_file_upload("image1.tiff", "image/tiff") }
+            let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
             it "should generate a thumbnail and not a ptif" do
               expect(object.derivatives).to receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-              # expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+              expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
               object.derivatives.update_derivatives(:now)
             end
           end
@@ -39,7 +39,7 @@ module Ddr
             let(:file) { fixture_file_upload("sample.pdf", "application/pdf") }
             it "should generate a thumbnail and not a ptif" do
               expect(object.derivatives).to receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-              # expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+              expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
               object.derivatives.update_derivatives(:now)
             end
           end
@@ -47,34 +47,34 @@ module Ddr
             let(:file) { fixture_file_upload("sample.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document") }
             it "should generate neither a thumbnail nor a ptif" do
               expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-              # expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+              expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+              object.derivatives.update_derivatives(:now)
+            end
+          end
+        end
+        context "multires_image_able" do
+          let(:object) { MultiresImageable.new }
+          context "content is tiff image" do
+            let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
+            it "should generate a thumbnail and a ptif" do
+              expect(object.derivatives).to receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
+              expect(object.derivatives).to receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+              object.derivatives.update_derivatives(:now)
+            end
+          end
+          context "content is not tiff image" do
+            let(:file) { fixture_file_upload("sample.pdf", "application/pdf") }
+            it "should generate a thumbnail but not a ptif" do
+              expect(object.derivatives).to receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
+              expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
               object.derivatives.update_derivatives(:now)
             end
           end
         end
-        # context "multires_image_able" do
-        #   let(:object) { MultiresImageable.new }
-        #   context "content is tiff image" do
-        #     let(:file) { fixture_file_upload("image1.tiff", "image/tiff") }
-        #     it "should generate a thumbnail and a ptif" do
-        #       expect(object.derivatives).to receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-        #       expect(object.derivatives).to receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
-        #       object.derivatives.update_derivatives(:now)
-        #     end
-        #   end
-        #   context "content is not tiff image" do
-        #     let(:file) { fixture_file_upload("sample.pdf", "application/pdf") }
-        #     it "should generate a thumbnail but not a ptif" do
-        #       expect(object.derivatives).to receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-        #       expect(object.derivatives).to_not receive(:generate_derivative!).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
-        #       object.derivatives.update_derivatives(:now)
-        #     end
-        #   end
-        # end
       end
 
       describe "derivative generation" do
-        let(:file) { fixture_file_upload("image1.tiff", "image/tiff") }
+        let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
         before { object.upload! file }
         describe "thumbnail" do
           let(:object) { ContentBearing.create }
@@ -82,26 +82,27 @@ module Ddr
             expect(object.datastreams[Ddr::Datastreams::THUMBNAIL]).to_not be_present
             object.derivatives.generate_derivative! Ddr::Derivatives::DERIVATIVES[:thumbnail]
             expect(object.datastreams[Ddr::Datastreams::THUMBNAIL]).to be_present
+            expect(object.datastreams[Ddr::Datastreams::THUMBNAIL].size).to be > 0
+          end
+        end
+        describe "ptif" do
+          let(:object) { MultiresImageable.create }
+          it "should create content in the multires image datastream" do
+            expect(object.datastreams[Ddr::Datastreams::MULTIRES_IMAGE]).to_not be_present
+            object.derivatives.generate_derivative! Ddr::Derivatives::DERIVATIVES[:multires_image]
+            expect(object.datastreams[Ddr::Datastreams::MULTIRES_IMAGE]).to be_present
+            file_uri = object.datastreams[Ddr::Datastreams::MULTIRES_IMAGE].dsLocation
+            expect(File.size(Ddr::Utils.path_from_uri(file_uri))).to be > 0
           end
         end
-        # describe "ptif" do
-        #   let(:object) { MultiresImageable.create }
-        #   it "should create content in the multires image datastream" do
-        #     expect(object.datastreams[Ddr::Datastreams::MULTIRES_IMAGE]).to_not be_present
-        #     object.derivatives.generate_derivative! Ddr::Derivatives::DERIVATIVES[:multires_image]
-        #     expect(object.datastreams[Ddr::Datastreams::MULTIRES_IMAGE]).to be_present
-        #   end
-        # end
       end
 
       describe "event creation" do
-        let(:file) { fixture_file_upload("image1.tiff", "image/tiff") }
+        let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
         before { object.upload! file }
-        # let(:object) { MultiresImageable.create }
-        let(:object) { ContentBearing.create }
+        let(:object) { MultiresImageable.create }
         it "should create an update event for each derivative updated" do
-          # expect {object.derivatives.update_derivatives(:now) }.to change { object.update_events.count }.by(2)
-          expect {object.derivatives.update_derivatives(:now) }.to change { object.update_events.count }.by(1)
+          expect {object.derivatives.update_derivatives(:now) }.to change { object.update_events.count }.by(2)
         end
       end
 

data/spec/models/file_management_spec.rb

@@ -23,7 +23,7 @@ module Ddr
     RSpec.describe FileManagement, :type => :model do
 
       let(:object) { FileManageable.new(pid: 'test:543') }
-      let(:file) { fixture_file_upload("library-devil.tiff", "image/tiff") }
+      let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
 
       before(:all) do
         class FileManageable < ActiveFedora::Base
@@ -178,9 +178,9 @@ module Ddr
       end
 
       describe "#external_datastream_file_paths" do
-        let(:file1) { fixture_file_upload("image1.tiff", "image/tiff") }
-        let(:file2) { fixture_file_upload("image2.tiff", "image/tiff") }
-        let(:file3) { fixture_file_upload("image3.tiff", "image/tiff") }
+        let(:file1) { fixture_file_upload("imageA.tif", "image/tiff") }
+        let(:file2) { fixture_file_upload("imageB.tif", "image/tiff") }
+        let(:file3) { fixture_file_upload("imageC.tif", "image/tiff") }
         before do
           object.add_file(file1, "e_content")
           object.save
@@ -199,9 +199,9 @@ module Ddr
       end
 
       describe "cleanup on destroy" do
-        let(:file1) { fixture_file_upload("image1.tiff", "image/tiff") }
-        let(:file2) { fixture_file_upload("image2.tiff", "image/tiff") }
-        let(:file3) { fixture_file_upload("image3.tiff", "image/tiff") }
+        let(:file1) { fixture_file_upload("imageA.tif", "image/tiff") }
+        let(:file2) { fixture_file_upload("imageB.tif", "image/tiff") }
+        let(:file3) { fixture_file_upload("imageC.tif", "image/tiff") }
         before do
           object.add_file(file1, "e_content")
           object.save

data/spec/support/shared_examples_for_has_content.rb

@@ -12,7 +12,7 @@ RSpec.shared_examples "an object that can have content" do
   end
 
   describe "indexing" do
-    let(:file) { fixture_file_upload("library-devil.tiff", "image/tiff") }
+    let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
     before { subject.upload file }
     it "should index the content ds control group" do
       expect(subject.to_solr).to include(Ddr::IndexFields::CONTENT_CONTROL_GROUP)
@@ -36,11 +36,11 @@ RSpec.shared_examples "an object that can have content" do
   end
 
   describe "adding a file" do
-    let(:file) { fixture_file_upload("library-devil.tiff", "image/tiff") }
+    let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
     context "defaults" do
       before { subject.add_file file, "content" }
       it "should have an original_filename" do
-        expect(subject.original_filename).to eq("library-devil.tiff")
+        expect(subject.original_filename).to eq("imageA.tif")
       end
       it "should have a content_type" do
         expect(subject.content_type).to eq("image/tiff")
@@ -69,7 +69,7 @@ RSpec.shared_examples "an object that can have content" do
 
       context "and it's a new object" do
         before { subject.add_file file, "content" }
-        let(:file) { fixture_file_upload("library-devil.tiff", "image/tiff") }
+        let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
         it "should generate derivatives" do
           expect(subject.derivatives).to receive(:update_derivatives)
           subject.save
@@ -77,8 +77,8 @@ RSpec.shared_examples "an object that can have content" do
       end
 
       context "and it's an existing object with content" do
-        before { subject.upload! fixture_file_upload('library-devil.tiff', 'image/tiff') }
-        let(:file) { fixture_file_upload("image1.tiff", "image/tiff") }
+        before { subject.upload! fixture_file_upload('imageA.tif', 'image/tiff') }
+        let(:file) { fixture_file_upload("imageB.tif", "image/tiff") }
         it "should generate derivatives" do
           expect(subject.derivatives).to receive(:update_derivatives)
           subject.upload! file
@@ -88,7 +88,7 @@ RSpec.shared_examples "an object that can have content" do
   end
 
   describe "#upload" do
-    let(:file) { fixture_file_upload("library-devil.tiff", "image/tiff") }
+    let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
     it "should add the file to the content datastream" do
       expect(subject).to receive(:add_file).with(file, "content", {})
       subject.upload(file)
@@ -96,7 +96,7 @@ RSpec.shared_examples "an object that can have content" do
   end
 
   describe "#upload!" do
-    let(:file) { fixture_file_upload("library-devil.tiff", "image/tiff") }
+    let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
     it "should add the file to the content datastream and save the object" do
       expect(subject).to receive(:add_file).with(file, "content", {}).and_call_original
       expect(subject).to receive(:save)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -435,6 +435,8 @@ files:
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/including_role_based_access_controls_enforcement_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
+- spec/derivatives/png_generator_spec.rb
+- spec/derivatives/ptif_generator_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -483,10 +485,11 @@ files:
 - spec/factories/target_factories.rb
 - spec/factories/test_model_factories.rb
 - spec/factories/user_factories.rb
-- spec/fixtures/image1.tiff
-- spec/fixtures/image2.tiff
-- spec/fixtures/image3.tiff
-- spec/fixtures/library-devil.tiff
+- spec/fixtures/16bit.tif
+- spec/fixtures/8bit.tif
+- spec/fixtures/imageA.tif
+- spec/fixtures/imageB.tif
+- spec/fixtures/imageC.tif
 - spec/fixtures/sample.docx
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
@@ -561,6 +564,8 @@ test_files:
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/including_role_based_access_controls_enforcement_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
+- spec/derivatives/png_generator_spec.rb
+- spec/derivatives/ptif_generator_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -609,10 +614,11 @@ test_files:
 - spec/factories/target_factories.rb
 - spec/factories/test_model_factories.rb
 - spec/factories/user_factories.rb
-- spec/fixtures/image1.tiff
-- spec/fixtures/image2.tiff
-- spec/fixtures/image3.tiff
-- spec/fixtures/library-devil.tiff
+- spec/fixtures/16bit.tif
+- spec/fixtures/8bit.tif
+- spec/fixtures/imageA.tif
+- spec/fixtures/imageB.tif
+- spec/fixtures/imageC.tif
 - spec/fixtures/sample.docx
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png