riiif 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a89139fdccd2b6824042ae7bdae9880eb28d334
-  data.tar.gz: 7b13b9280123669a73aa533a50f218f9daccdb53
+  metadata.gz: 06e630fd475317ef90d8bb9989f8ea82e7aa29bf
+  data.tar.gz: f61946e5c03cc23a82ea29457ad6dd9030488a2b
 SHA512:
-  metadata.gz: a3174488a09bcb1ecad59db2a8d7e338ab863af1d2a5afe07bbd746fd161ced2a0cf4bfc4ac85c9d4067fd41d089525e8419c0bc489be8f1cd8755e7718dfeed
-  data.tar.gz: 6afbc6db3a6029f38c35f46c204402c84de393ea1327fd3455e4ae0e798856e8c8726e9ad8e8e8526c5846392880d35c1ba60f45badb5a6c76d6942ef8cea323
+  metadata.gz: 82d4bf6a8c91cb17c3627bbdb488cc9c1d0e5788b2ef81f727c4d6d62c01de6ec1b671c9b7962bb7c02519706e22eeb791a3b25b026c57b9c3b9c3aeda5cadd4
+  data.tar.gz: 90e275799a60adf067aaf5f4ea1888a3d81e5855a3c9db15c3ccb75f690037ec942362588e707f3b2fa1bce11193253f6902ea8e933131b42b220cb682e7b0cf

data/README.md

@@ -63,6 +63,15 @@ This file resolver caches the network files, so you will want to clear out the o
 Using a script like this would be a good idea: https://github.com/pulibrary/loris/blob/607567b921404a15a2111fbd7123604f4fdec087/bin/loris-cache_clean.sh
 By default the cache is located in `tmp/network_files`. You can set the cache path like this: `Riiif::Image.file_resolver.cache_path = '/var/cache'`
 
+### GraphicsMagick
+
+To use [GraphicsMagick](http://www.graphicsmagick.org/) instead of ImageMagick
+
+    Riiif::ImagemagickCommandFactory.external_command = "gm convert"
+    Riiif::ImageMagickInfoExtractor.external_command  = "gm identify"
+
+You will of course need to install GraphicsMagick on your system.
+
 ## Usage
 
 Add the routes to your application by inserting the following line into `config/routes.rb`
@@ -173,12 +182,12 @@ Riiif::Engine.config.cache_duration_in_days = 30
 ```
 #### Special note for Passenger and Apache users
 If you are running riiif in Passenger under Apache, you must set the following in your virtual host definition:
- 
+
 ```
 AllowEncodedSlashes NoDecode
 ```
 
-You may also need to set the following in your virtual host definition, either at the top level, or within a 
+You may also need to set the following in your virtual host definition, either at the top level, or within a
 Location block for a specific path. See the [Passenger configuration reference](https://www.phusionpassenger.com/library/config/apache/reference/#passengerallowencodedslasheshttps://www.phusionpassenger.com/library/config/apache/reference/#passengerallowencodedslashes) for more info.
 
 ```

data/app/services/riiif/image_magick_info_extractor.rb

@@ -1,12 +1,16 @@
 module Riiif
   # Get height and width information using imagemagick to interrogate the file
   class ImageMagickInfoExtractor
+    # perhaps you want to use GraphicsMagick instead, set to "gm identify"
+    class_attribute :external_command
+    self.external_command = 'identify'
+
     def initialize(path)
       @path = path
     end
 
     def extract
-      height, width = Riiif::CommandRunner.execute("identify -format %hx%w #{@path}").split('x')
+      height, width = Riiif::CommandRunner.execute("#{external_command} -format %hx%w #{@path}[0]").split('x')
       { height: Integer(height), width: Integer(width) }
     end
   end

data/app/services/riiif/imagemagick_command_factory.rb

@@ -3,6 +3,10 @@
 module Riiif
   # Builds a command to run a transformation using Imagemagick
   class ImagemagickCommandFactory
+    # perhaps you want to use GraphicsMagick instead, set to "gm convert"
+    class_attribute :external_command
+    self.external_command = 'convert'
+
     # A helper method to instantiate and invoke build
     # @param [String] path the location of the file
     # @param [Transformation] transformation
@@ -33,15 +37,11 @@ module Riiif
 
     # @return [String] a command for running imagemagick to produce the requested output
     def build
-      [command, crop, size, rotation, colorspace, quality, sampling, metadata, output].join
+      [external_command, crop, size, rotation, colorspace, quality, sampling, metadata, output].join
     end
 
     private
 
-      def command
-        'convert'
-      end
-
       def use_compression?
         compression > 0 && jpeg?
       end

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '1.4.4'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/spec/models/riiif/image_spec.rb

@@ -75,14 +75,14 @@ RSpec.describe Riiif::Image do
 
       it 'handles percent geometry' do
         expect(Riiif::CommandRunner).to receive(:execute)
-          .with("identify -format %hx%w #{filename}").and_return('131x175')
+          .with("identify -format %hx%w #{filename}[0]").and_return('131x175')
         expect(Riiif::CommandRunner).to receive(:execute).with("convert -crop 80%x70+18+13 -strip #{filename} png:-")
         subject.render(region: 'pct:10,10,80,70', format: 'png')
       end
 
       it 'handles square geometry' do
         expect(Riiif::CommandRunner).to receive(:execute)
-          .with("identify -format %hx%w #{filename}").and_return('131x175')
+          .with("identify -format %hx%w #{filename}[0]").and_return('131x175')
         expect(Riiif::CommandRunner).to receive(:execute).with("convert -crop 131x131+22+0 -strip #{filename} png:-")
         subject.render(region: 'square', format: 'png')
       end

data/spec/services/riiif/imagemagick_command_factory_spec.rb

@@ -23,5 +23,19 @@ RSpec.describe Riiif::ImagemagickCommandFactory do
       let(:format) { 'tif' }
       it { is_expected.not_to match(/-quality/) }
     end
+
+    describe '#external_command' do
+      let(:format) { 'jpg' }
+      around do |example|
+        orig = described_class.external_command
+        described_class.external_command = 'gm convert'
+
+        example.run
+
+        described_class.external_command = orig
+      end
+
+      it { is_expected.to match(/\Agm convert/) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A rails engine that support IIIF requests