riiif 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8772e4a904c4e4a561352a0e1a449da790347522
-  data.tar.gz: adffd5861fe1daa395c5d012936208a623b2829c
+  metadata.gz: 6b8dc5c1ffd5532b680b26ff6958a02261700d3e
+  data.tar.gz: 7719e41b21ee91d52eefe4cd5347fb87db25b47c
 SHA512:
-  metadata.gz: d0498ffb73c9552a33819a7131ddfe0089525f95b273cd4eba70d8412ce1eb6598b4b8c9aee011b8cb43bb001f47ffeafc24b6a2ce3ae9a02e0a6190c338d0ff
-  data.tar.gz: 20150a2e02553cbff87f5cacc20868245ff12418763f9c046625ec45df6bf0503e119447e7ad493903bf673b88c0939adf19710463a0ee6471a72b6618beacf4
+  metadata.gz: 453bd022c4fb48291f987625db7c22d6709a7997bb26d9123da975b6ab7537776d847a7d618369788e3e756e08770a99aa29496126540a75a9ed1516b0666814
+  data.tar.gz: 1b96e14965119ee2454f3a44a144b572643af01a00616eff0e5b76fd1a604b1b58ed6f2185d02c33ba811cd8975baa9c8f68ab9c09c2a4139fe4d8e520810342

data/app/controllers/riiif/images_controller.rb

@@ -23,7 +23,7 @@ module Riiif
       data = image.render(image_request_params)
       headers['Access-Control-Allow-Origin'] = '*'
       # Set a Cache-Control header
-      expires_in cache_expires, public: false if status == :ok
+      expires_in cache_expires, public: public_cache? if status == :ok
       send_data data,
                 status: status,
                 type: Mime::Type.lookup_by_extension(params[:format]),
@@ -35,7 +35,7 @@ module Riiif
       if authorization_service.can?(:info, image)
         headers['Access-Control-Allow-Origin'] = '*'
         # Set a Cache-Control header
-        expires_in cache_expires, public: false
+        expires_in cache_expires, public: public_cache?
         render json: image.info.to_h.merge(server_info), content_type: 'application/ld+json'
       else
         render json: { error: 'unauthorized' }, status: :unauthorized

data/app/models/riiif/file.rb

@@ -33,21 +33,7 @@ module Riiif
 
     # @param [Transformation] transformation
     def extract(transformation)
-      command = 'convert'
-      command << " -crop #{transformation.crop}" if transformation.crop
-      command << " -resize #{transformation.size}" if transformation.size
-      if transformation.rotation
-        command << " -virtual-pixel white +distort srt #{transformation.rotation}"
-      end
-
-      case transformation.quality
-      when 'grey'
-        command << ' -colorspace Gray'
-      when 'bitonal'
-        command << ' -colorspace Gray'
-        command << ' -type Bilevel'
-      end
-      command << " #{path} #{transformation.format}:-"
+      command = command_factory.build(path, transformation)
       execute(command)
     end
 
@@ -57,5 +43,11 @@ module Riiif
 
     delegate :execute, to: Riiif::CommandRunner
     private :execute
+
+    private
+
+      def command_factory
+        ImagemagickCommandFactory
+      end
   end
 end

data/app/services/riiif/imagemagick_command_factory.rb

@@ -0,0 +1,52 @@
+module Riiif
+  # Builds a command to run a transformation using Imagemagick
+  class ImagemagickCommandFactory
+    # A helper method to instantiate and invoke build
+    # @param [String] path the location of the file
+    # @param [Transformation] transformation
+    # @param [Integer] compression (85) the compression level to use (set 0 for no compression)
+    # @return [String] a command for running imagemagick to produce the requested output
+    def self.build(path, transformation, compression: 85)
+      new(path, transformation, compression: compression).build
+    end
+
+    # A helper method to instantiate and invoke build
+    # @param [String] path the location of the file
+    # @param [Transformation] transformation
+    # @param [Integer] compression the compression level to use (set 0 for no compression)
+    def initialize(path, transformation, compression:)
+      @path = path
+      @transformation = transformation
+      @compression = compression
+    end
+
+    attr_reader :path, :transformation, :compression
+
+    # @return [String] a command for running imagemagick to produce the requested output
+    def build
+      command = 'convert'
+      command << " -crop #{transformation.crop}" if transformation.crop
+      command << " -resize #{transformation.size}" if transformation.size
+      if transformation.rotation
+        command << " -virtual-pixel white +distort srt #{transformation.rotation}"
+      end
+
+      case transformation.quality
+      when 'grey'
+        command << ' -colorspace Gray'
+      when 'bitonal'
+        command << ' -colorspace Gray'
+        command << ' -type Bilevel'
+      end
+      command << " -quality #{compression}" if use_compression?
+      command << " #{path} #{transformation.format}:-"
+      command
+    end
+
+    private
+
+      def use_compression?
+        compression > 0 && transformation.format == 'jpg'
+      end
+  end
+end

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/spec/models/riiif/image_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Riiif::Image do
   subject { described_class.new('world') }
   describe 'happy path' do
     before do
-      expect(subject.image).to receive(:execute).with("convert #{filename} jpg:-").and_return('imagedata')
+      expect(subject.image).to receive(:execute).with("convert -quality 85 #{filename} jpg:-").and_return('imagedata')
     end
     it 'renders' do
       expect(subject.render('size' => 'full', format: 'jpg')).to eq 'imagedata'

data/spec/services/riiif/imagemagick_command_factory_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+RSpec.describe Riiif::ImagemagickCommandFactory do
+  let(:path) { 'foo.tiff' }
+
+  describe '.build' do
+    subject { described_class.build(path, transformation) }
+
+    let(:transformation) do
+      Riiif::Transformation.new('region',
+                                'size',
+                                'quality',
+                                'rotation',
+                                format)
+    end
+
+    context "when it's a jpeg" do
+      let(:format) { 'jpg' }
+      it { is_expected.to match(/-quality 85/) }
+    end
+
+    context "when it's a tiff" do
+      let(:format) { 'tif' }
+      it { is_expected.not_to match(/-quality/) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -150,6 +150,7 @@ files:
 - app/models/riiif/image.rb
 - app/services/riiif/command_runner.rb
 - app/services/riiif/image_magick_info_extractor.rb
+- app/services/riiif/imagemagick_command_factory.rb
 - app/services/riiif/region/imagemagick/absolute_decoder.rb
 - app/services/riiif/region/imagemagick/full_decoder.rb
 - app/services/riiif/region/imagemagick/percentage_decoder.rb
@@ -179,6 +180,7 @@ files:
 - spec/models/riiif/image_spec.rb
 - spec/routing/redirect_spec.rb
 - spec/routing/resize_routes_spec.rb
+- spec/services/riiif/imagemagick_command_factory_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -214,6 +216,7 @@ test_files:
 - spec/models/riiif/image_spec.rb
 - spec/routing/redirect_spec.rb
 - spec/routing/resize_routes_spec.rb
+- spec/services/riiif/imagemagick_command_factory_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb