hydra-derivatives 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc0683193a0c13d024d66551a3532a95cc107d5
-  data.tar.gz: f78c24977c2dfd89526c4f533fd9c2173b89f234
+  metadata.gz: 2c4f7de97aeaa9148272e2cc1e4d16bba7d33f4f
+  data.tar.gz: 867caa37665a6e477ab511435b501124b63f852a
 SHA512:
-  metadata.gz: eb535231a681ff02ac2b001cea44b1808e7e5118eab1ba83ebd2762c3f8d56e47d9ec09d63d2a3d7771569dc45ae9439d5646adbe6e440878433f4f5b1470d62
-  data.tar.gz: 485d2b03e2ea10ea43dd9e2836f43bc0823f190a19a6d5763d86356b37a11724c6a8690b72a2791bede8a9cd96f64a631edb8bcfb787eb1232e5098046199ba0
+  metadata.gz: fcc289306fd1d503078e74e149f3dc252f0b55c60e735fe9f650cd636e88d9be78d929f71ea3df138e30ae54bc1a166e22b447282bb2e644c44db64b9e70f07d
+  data.tar.gz: 2a0396315ec846b9a1457561810cf6c0decf3bed5b45a4f409854e8ab6df78de6a4600acab934494e78f2f3395bbd95f66f1f85f8ded36178025e8bddff9807b

data/History.md

@@ -1,3 +1,6 @@
+## 3.2.1 (2016-11-21)
+2016-11-17: Default to first page for pdf images [Adam Wead]
+
 ## 3.2.0 (2016-11-16)
 2016-11-08: Directive option for layer [Adam Wead]
 

data/README.md

@@ -89,10 +89,12 @@ Hydra::Derivatives::Video::Processor.config.jpeg.codec = '-vcodec mjpeg'
 
 When processing pdf files or images that may contain layers, you can select which layer you want
 to use. This is especially useful with multipage pdf files, which are flattened to ensure the
-background is correctly rendered. To choose the first layer or page for a pdf:
+background is correctly rendered. By default, the first page, or layer 0, is chosen when creating
+images from pdf files. If you want to choose a different page, such as the second page, you can
+set the layer directive:
 
 ```
-PdfDerivatives.create(filename, outputs: [{ label: :thumb, size: "100x100>", layer: 0 }]
+PdfDerivatives.create(filename, outputs: [{ label: :thumb, size: "100x100>", layer: 1 }]
 ```
 
 # Installation

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

data/lib/hydra/derivatives/processors/image.rb

@@ -59,9 +59,13 @@ module Hydra::Derivatives::Processors
       end
 
       def selected_layers(image)
-        layer_index = directives.fetch(:layer, false)
-        return image unless layer_index
-        image.layers[layer_index]
+        if image.type =~ /pdf/i
+          image.layers[directives.fetch(:layer, 0)]
+        elsif directives.fetch(:layer, false)
+          image.layers[directives.fetch(:layer)]
+        else
+          image
+        end
       end
   end
 end

data/spec/processors/image_spec.rb

@@ -5,37 +5,86 @@ describe Hydra::Derivatives::Processors::Image do
   subject { described_class.new(file_name, directives) }
 
   context "when arguments are passed as a hash" do
-    let(:mock_transformer) { double("MockTransformer") }
-    let(:mock_layer)       { double("MockLayer") }
+    before { allow(subject).to receive(:load_image_transformer).and_return(mock_image) }
 
-    before { allow(subject).to receive(:load_image_transformer).and_return(mock_transformer) }
+    context "with a multi-page pdf source file" do
+      let(:first_page)  { double("MockPage") }
+      let(:second_page) { double("MockPage") }
+      let(:mock_image)  { double("MockImageOfPdf", layers: [first_page, second_page]) }
 
-    context "using image directives" do
-      let(:directives) { { label: :thumb, size: "200x300>", format: 'png', quality: 75 } }
+      before { allow(mock_image).to receive(:type).and_return("PDF") }
 
-      before { allow(subject).to receive(:write_image).with(mock_transformer) }
+      context "by default" do
+        let(:directives) { { label: :thumb, size: "200x300>", format: 'png', quality: 75 } }
 
-      it "uses the specified size and name and quality" do
-        expect(mock_transformer).to receive(:flatten)
-        expect(mock_transformer).to receive(:resize).with("200x300>")
-        expect(mock_transformer).to receive(:format).with("png")
-        expect(mock_transformer).to receive(:quality).with("75")
-        subject.process
+        it "uses the first page" do
+          expect(first_page).to receive(:flatten)
+          expect(second_page).not_to receive(:flatten)
+          expect(first_page).to receive(:resize).with("200x300>")
+          expect(second_page).not_to receive(:resize)
+          expect(first_page).to receive(:format).with("png")
+          expect(second_page).not_to receive(:format)
+          expect(first_page).to receive(:quality).with("75")
+          expect(second_page).not_to receive(:quality)
+          expect(subject).to receive(:write_image).with(first_page)
+          subject.process
+        end
+      end
+
+      context "when specifying a layer" do
+        let(:directives) { { label: :thumb, size: "200x300>", format: 'png', quality: 75, layer: 1 } }
+
+        it "uses the second page" do
+          expect(second_page).to receive(:flatten)
+          expect(first_page).not_to receive(:flatten)
+          expect(second_page).to receive(:resize).with("200x300>")
+          expect(first_page).not_to receive(:resize)
+          expect(second_page).to receive(:format).with("png")
+          expect(first_page).not_to receive(:format)
+          expect(second_page).to receive(:quality).with("75")
+          expect(first_page).not_to receive(:quality)
+          expect(subject).to receive(:write_image).with(second_page)
+          subject.process
+        end
       end
     end
 
-    context "using pdf directives" do
-      let(:directives) { { label: :thumb, size: "200x300>", format: 'pdf', layer: 0, quality: 75 } }
+    context "with an image source file" do
+      before { allow(mock_image).to receive(:type).and_return("JPEG") }
 
-      before { allow(subject).to receive(:write_image).with(mock_layer) }
+      context "by default" do
+        let(:mock_image) { double("MockImage") }
+        let(:directives) { { label: :thumb, size: "200x300>", format: 'png', quality: 75 } }
 
-      it "uses the specified size and name and quality" do
-        expect(mock_transformer).to receive(:layers).and_return([mock_layer])
-        expect(mock_layer).to receive(:flatten)
-        expect(mock_layer).to receive(:resize).with("200x300>")
-        expect(mock_layer).to receive(:format).with("pdf")
-        expect(mock_layer).to receive(:quality).with("75")
-        subject.process
+        it "uses the image file" do
+          expect(mock_image).not_to receive(:layers)
+          expect(mock_image).to receive(:flatten)
+          expect(mock_image).to receive(:resize).with("200x300>")
+          expect(mock_image).to receive(:format).with("png")
+          expect(mock_image).to receive(:quality).with("75")
+          expect(subject).to receive(:write_image).with(mock_image)
+          subject.process
+        end
+      end
+
+      context "when specifying a layer" do
+        let(:first_layer)  { double("MockPage") }
+        let(:second_layer) { double("MockPage") }
+        let(:mock_image)   { double("MockImage", layers: [first_layer, second_layer]) }
+        let(:directives)   { { label: :thumb, size: "200x300>", format: 'png', quality: 75, layer: 1 } }
+
+        it "uses the layer" do
+          expect(second_layer).to receive(:flatten)
+          expect(first_layer).not_to receive(:flatten)
+          expect(second_layer).to receive(:resize).with("200x300>")
+          expect(first_layer).not_to receive(:resize)
+          expect(second_layer).to receive(:format).with("png")
+          expect(first_layer).not_to receive(:format)
+          expect(second_layer).to receive(:quality).with("75")
+          expect(first_layer).not_to receive(:quality)
+          expect(subject).to receive(:write_image).with(second_layer)
+          subject.process
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler