riiif 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f437c07332a02c21a6dee64125a02b1d124bdec
-  data.tar.gz: ac97febcbbfb128653e242a47120cfce675f40a0
+  metadata.gz: 5a89139fdccd2b6824042ae7bdae9880eb28d334
+  data.tar.gz: 7b13b9280123669a73aa533a50f218f9daccdb53
 SHA512:
-  metadata.gz: c876a1694e4d26f2bfccb67b1182fb8659410cf740fa0abacb3e796d9ab31f0044bc90bed00e788f6c205752a237eb84bac9f2f6cea42b559157a55c6a9c87f5
-  data.tar.gz: 3b5733068a706304b8dd2920fdd34dcf3853a2cef5bc7d9ef5dfcc4ccd568c5b7cb7bdf48f03fa4811331abae4418a5c9aa6d4c562c75ec541834568ac548935
+  metadata.gz: a3174488a09bcb1ecad59db2a8d7e338ab863af1d2a5afe07bbd746fd161ced2a0cf4bfc4ac85c9d4067fd41d089525e8419c0bc489be8f1cd8755e7718dfeed
+  data.tar.gz: 6afbc6db3a6029f38c35f46c204402c84de393ea1327fd3455e4ae0e798856e8c8726e9ad8e8e8526c5846392880d35c1ba60f45badb5a6c76d6942ef8cea323

data/app/controllers/riiif/images_controller.rb

@@ -33,10 +33,12 @@ module Riiif
     def info
       image = model.new(image_id)
       if authorization_service.can?(:info, image)
+        image_info = image.info
+        return render json: { error: 'no info' }, status: :not_found unless image_info.valid?
         headers['Access-Control-Allow-Origin'] = '*'
         # Set a Cache-Control header
         expires_in cache_expires, public: public_cache?
-        render json: image.info.to_h.merge(server_info), content_type: 'application/ld+json'
+        render json: image_info.to_h.merge(server_info), content_type: 'application/ld+json'
       else
         render json: { error: 'unauthorized' }, status: :unauthorized
       end

data/app/models/riiif/image_information.rb

@@ -0,0 +1,28 @@
+module Riiif
+  # This is the result of calling the Riiif.image_info service. It stores the height & width
+  class ImageInformation
+    def initialize(width, height)
+      @width = width
+      @height = height
+    end
+
+    attr_reader :width, :height
+
+    def to_h
+      { width: width, height: height }
+    end
+
+    # Image information is only valid if height and width are present.
+    # If an image info service doesn't have the value yet (not characterized perhaps?)
+    # then we wouldn't want to cache this value.
+    def valid?
+      width.present? && height.present?
+    end
+
+    def ==(other)
+      other.class == self.class &&
+        other.width == width &&
+        other.height == height
+    end
+  end
+end

data/lib/riiif/version.rb

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

data/lib/riiif.rb

@@ -13,11 +13,11 @@ module Riiif
   class Error < RuntimeError; end
   class InvalidAttributeError < Error; end
   class ImageNotFoundError < Error; end
+
   # This error is raised when Riiif can't convert an image
   class ConversionError < Error; end
 
   Transformation = Struct.new(:crop, :size, :quality, :rotation, :format)
-  ImageInformation = Struct.new(:width, :height)
   mattr_accessor :not_found_image # the image to use when a lookup fails
-  mattr_accessor :unauthorized_image # the image to use when a lookup fails
+  mattr_accessor :unauthorized_image # the image to use when a user doesn't have access
 end

data/spec/controllers/riiif/images_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'open-uri'
 
-describe Riiif::ImagesController do
+RSpec.describe Riiif::ImagesController do
   let(:filename) { File.expand_path('spec/samples/world.jp2') }
   routes { Riiif::Engine.routes }
 
@@ -19,6 +19,7 @@ describe Riiif::ImagesController do
       end
     end
   end
+
   describe '#show' do
     it 'sends images to the service' do
       image = double
@@ -131,23 +132,45 @@ describe Riiif::ImagesController do
   end
 
   describe 'info' do
-    it 'returns info' do
-      image = double
-      expect(Riiif::Image).to receive(:new).with('abcd1234').and_return(image)
-      expect(image).to receive(:info).and_return(Riiif::ImageInformation.new(6000, 4000))
-      get :info, params: { id: 'abcd1234', format: 'json' }
-      expect(response).to be_successful
-      json = JSON.parse(response.body)
-      expect(json).to eq '@context' => 'http://iiif.io/api/image/2/context.json',
-                         '@id' => 'http://test.host/abcd1234',
-                         'width' => 6000,
-                         'height' => 4000,
-                         'profile' => ['http://iiif.io/api/image/2/level1.json', 'formats' => %w(jpg png)],
-                         'protocol' => 'http://iiif.io/api/image'
-      expect(response.headers['Link']).to eq '<http://iiif.io/api/image/2/level1.json>;rel="profile"'
-      expect(response.headers['Content-Type']).to eq 'application/ld+json; charset=utf-8'
-      expect(response.headers['Access-Control-Allow-Origin']).to eq '*'
-      expect(response.headers['Cache-Control']).to eq "max-age=#{1.year.to_i}, private"
+    context 'the happy path' do
+      let(:image) { double }
+      let(:json) { JSON.parse(response.body) }
+
+      before do
+        allow(Riiif::Image).to receive(:new).with('abcd1234').and_return(image)
+        allow(image).to receive(:info).and_return(Riiif::ImageInformation.new(6000, 4000))
+      end
+
+      it 'returns info' do
+        get :info, params: { id: 'abcd1234', format: 'json' }
+        expect(response).to be_successful
+        expect(json).to eq '@context' => 'http://iiif.io/api/image/2/context.json',
+                           '@id' => 'http://test.host/abcd1234',
+                           'width' => 6000,
+                           'height' => 4000,
+                           'profile' => ['http://iiif.io/api/image/2/level1.json', 'formats' => %w(jpg png)],
+                           'protocol' => 'http://iiif.io/api/image'
+        expect(response.headers['Link']).to eq '<http://iiif.io/api/image/2/level1.json>;rel="profile"'
+        expect(response.headers['Content-Type']).to eq 'application/ld+json; charset=utf-8'
+        expect(response.headers['Access-Control-Allow-Origin']).to eq '*'
+        expect(response.headers['Cache-Control']).to eq "max-age=#{1.year.to_i}, private"
+      end
+    end
+
+    context 'when the info_service has an invalid result' do
+      let(:image) { double }
+      let(:json) { JSON.parse(response.body) }
+
+      before do
+        allow(Riiif::Image).to receive(:new).with('abcd1234').and_return(image)
+        allow(image).to receive(:info).and_return(Riiif::ImageInformation.new(nil, nil))
+      end
+
+      it 'returns an error' do
+        get :info, params: { id: 'abcd1234', format: 'json' }
+        expect(response).to be_not_found
+        expect(json).to eq 'error' => 'no info'
+      end
     end
 
     context 'with an unauthorized image' do

data/spec/models/riiif/image_information_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+RSpec.describe Riiif::ImageInformation do
+  describe '#valid?' do
+    subject { info.valid? }
+
+    context 'with valid dimensions' do
+      let(:info) { described_class.new(100, 200) }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with nil dimensions' do
+      let(:info) { described_class.new(nil, nil) }
+
+      it { is_expected.to be false }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -148,6 +148,7 @@ files:
 - app/controllers/riiif/images_controller.rb
 - app/models/riiif/file.rb
 - app/models/riiif/image.rb
+- app/models/riiif/image_information.rb
 - app/services/riiif/command_runner.rb
 - app/services/riiif/image_magick_info_extractor.rb
 - app/services/riiif/imagemagick_command_factory.rb
@@ -177,6 +178,7 @@ files:
 - spec/models/riiif/akubra_system_file_resolver_spec.rb
 - spec/models/riiif/file_system_file_resolver_spec.rb
 - spec/models/riiif/http_file_resolver_spec.rb
+- spec/models/riiif/image_information_spec.rb
 - spec/models/riiif/image_spec.rb
 - spec/routing/redirect_spec.rb
 - spec/routing/resize_routes_spec.rb
@@ -204,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A rails engine that support IIIF requests
@@ -213,6 +215,7 @@ test_files:
 - spec/models/riiif/akubra_system_file_resolver_spec.rb
 - spec/models/riiif/file_system_file_resolver_spec.rb
 - spec/models/riiif/http_file_resolver_spec.rb
+- spec/models/riiif/image_information_spec.rb
 - spec/models/riiif/image_spec.rb
 - spec/routing/redirect_spec.rb
 - spec/routing/resize_routes_spec.rb