hydra-derivatives 3.1.4 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9fe68ff09c49cf6061b2ef193ad428302dfac25
-  data.tar.gz: 1c0d21de93c9616a4d97cf4b8f6c46f68a66d96e
+  metadata.gz: 9dc0683193a0c13d024d66551a3532a95cc107d5
+  data.tar.gz: f78c24977c2dfd89526c4f533fd9c2173b89f234
 SHA512:
-  metadata.gz: 62bc8d5e8265a6f85214a530af6a6d36469473db17485b36a1cd622822ae591208ea5fa994ff2b23b4c1f5ab31d20131deb98061348941c47599be0ca403a2ee
-  data.tar.gz: d74669b4b6ec7c9b713ee33b72f35e7d43f4acfbc44a675ef162b6e8194c2df0363f17d9da958441209587118cdaa34b2d7c35688752a489acc6d563a1b76994
+  metadata.gz: eb535231a681ff02ac2b001cea44b1808e7e5118eab1ba83ebd2762c3f8d56e47d9ec09d63d2a3d7771569dc45ae9439d5646adbe6e440878433f4f5b1470d62
+  data.tar.gz: 485d2b03e2ea10ea43dd9e2836f43bc0823f190a19a6d5763d86356b37a11724c6a8690b72a2791bede8a9cd96f64a631edb8bcfb787eb1232e5098046199ba0

data/.travis.yml

@@ -17,6 +17,5 @@ notifications:
   irc:
     channels:
       - "irc.freenode.org#scholarsphere"
-      - "irc.freenode.org#projecthydra"
     template:
       - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"

data/History.md

@@ -1,3 +1,41 @@
+## 3.2.0 (2016-11-16)
+2016-11-08: Directive option for layer [Adam Wead]
+
+## 3.1.4 (2016-10-13)
+2016-10-13: Convert documents to pdf and jpg, fixes #109 [Adam Wead]
+
+2016-09-30: Flatten images when resizing, fixes #110 [Adam Wead]
+
+2016-09-29: Adding Rubocop to manage our style [Adam Wead]
+
+## 3.1.3 (2016-09-13)
+2016-09-13: Loosen dependecy to allow active-fedora 11 [Justin Coyne]
+
+## 3.1.2 (2016-08-09)
+2016-07-28: Bumping version of Ruby to 2.2.5 for updated ActiveSupport [Esmé Cowles]
+
+2016-07-11: Allow for Rails 5 [Trey Pendragon]
+
+## 3.1.1 (2016-05-18)
+2016-05-10: Use `Dir.tmpdir` to get a platform-specific tmp dir [Chris Beer]
+
+## 3.1.0 (2016-05-10)
+2016-05-10: Allow hydra-derivatives to work with active-fedora 10 [Justin Coyne]
+
+2016-05-10: Update solr schema for Solr 6 compatibility [Chris Beer]
+
+## 3.0.2 (2016-05-04)
+2016-04-26: Update FITS version in README [Michael J. Giarlo]
+
+## 3.0.1 (2016-03-24)
+2016-03-24: Solr/Fedora Wrapper [Trey Pendragon]
+
+2016-03-24: Allow for Mime-Types 3.0 [Trey Pendragon]
+
+2015-10-21: Silence Kakadu messages. [Trey Terrell]
+
+2015-10-20: Fix srgb_profile_path. [Trey Terrell]
+
 ## 3.0.0 (2015-10-07)
 2015-10-07: Update to the containerized builds on travis [Justin Coyne]
 

data/README.md

@@ -83,6 +83,18 @@ Hydra::Derivatives::Video::Processor.config.mkv.codec = '-vcodec ffv1'
 Hydra::Derivatives::Video::Processor.config.jpeg.codec = '-vcodec mjpeg'
 ```
 
+### Additional Directives
+
+#### Layers
+
+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:
+
+```
+PdfDerivatives.create(filename, outputs: [{ label: :thumb, size: "100x100>", layer: 0 }]
+```
+
 # Installation
 
 Just add `gem 'hydra-derivatives'` to your Gemfile.

data/VERSION

@@ -1 +1 @@
-3.1.4
+3.2.0

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

@@ -28,7 +28,7 @@ module Hydra::Derivatives::Processors
       end
 
       def create_image
-        xfrm = load_image_transformer
+        xfrm = selected_layers(load_image_transformer)
         yield(xfrm) if block_given?
         xfrm.format(directives.fetch(:format))
         xfrm.quality(quality.to_s) if quality
@@ -57,5 +57,11 @@ module Hydra::Derivatives::Processors
       def quality
         directives.fetch(:quality, nil)
       end
+
+      def selected_layers(image)
+        layer_index = directives.fetch(:layer, false)
+        return image unless layer_index
+        image.layers[layer_index]
+      end
   end
 end

data/spec/processors/image_spec.rb

@@ -5,20 +5,38 @@ describe Hydra::Derivatives::Processors::Image do
   subject { described_class.new(file_name, directives) }
 
   context "when arguments are passed as a hash" do
-    let(:directives)       { { label: :thumb, size: "200x300>", format: 'png', quality: 75 } }
     let(:mock_transformer) { double("MockTransformer") }
+    let(:mock_layer)       { double("MockLayer") }
 
-    before do
-      allow(subject).to receive(:load_image_transformer).and_return(mock_transformer)
-      allow(subject).to receive(:write_image).with(mock_transformer)
+    before { allow(subject).to receive(:load_image_transformer).and_return(mock_transformer) }
+
+    context "using image directives" do
+      let(:directives) { { label: :thumb, size: "200x300>", format: 'png', quality: 75 } }
+
+      before { allow(subject).to receive(:write_image).with(mock_transformer) }
+
+      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
+      end
     end
 
-    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
+    context "using pdf directives" do
+      let(:directives) { { label: :thumb, size: "200x300>", format: 'pdf', layer: 0, quality: 75 } }
+
+      before { allow(subject).to receive(:write_image).with(mock_layer) }
+
+      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
+      end
     end
   end
 

metadata

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