ddr-models 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cf8b40bd52079862750467ee9bc03e43208e871
-  data.tar.gz: 82d98b1e9957e594817279341b757b4d79a60995
+  metadata.gz: e01bbd2e47ba6a38f71653a7abcac2db6b73e438
+  data.tar.gz: 4e5eb3511d2e31f86879fd1b8d2ff9ab12f994ef
 SHA512:
-  metadata.gz: 60c81c48f1f0d0182ca33559c0c0d4f61f3ba9f4ebfff82e870903ae4b53c4edadc754afbfcee57f7f16422ac6c17a59bbf42846d1dc4cdcbca3edf06b150805
-  data.tar.gz: f9df42eca800507982c210c3b606973af618c6d48c563d5a46481badd987f75d977d69a79448249590e5d8571ba5b2d6e8411b02c0cbd59bddc31781a5f64262
+  metadata.gz: 8cee3c59573413499ff0a3362aa75b811e177a3119612e2805102e96dc7d49b2cbfc96fbcde6bdf95a7df74a98176042790b2bf18c22ae3d3099c470c6071143
+  data.tar.gz: 7225dd1b450f4491cc3fe079ee3b17bc55382665c945be0667bcd722ba95162a654f1ab733748a0f8ff4ac5ba167a760faeb761df42d0e2ef816440602219fe5

data/lib/ddr/managers/derivatives_manager.rb

@@ -112,7 +112,7 @@ module Ddr
         return false unless object.has_content?
         case derivative.name
         when :multires_image
-          object.content_type == "image/tiff"
+          object.content_type == "image/tiff" || object.content_type == "image/jpeg"
         when :thumbnail
           object.image?
         else

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.4.5"
+    VERSION = "2.4.6"
   end
 end

data/spec/managers/derivatives_manager_spec.rb

@@ -57,6 +57,14 @@ module Ddr
             end
             context "content is not tiff image" do
               let(:file) { fixture_file_upload("bird.jpg", "image/jpeg") }
+              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 or jpeg image" do
+              let(:file) { fixture_file_upload("arrow1rightred_e0.gif", "image/gif") }
               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])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails