riiif 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83e09f8e63165428baf455b3547e78819582ec2f
-  data.tar.gz: 2bb3a70107f4e4ab94c2561e4ab316b7b360beaa
+  metadata.gz: ad367b2b2d10b9b46d5944b0d69a3aaf62fe3cdc
+  data.tar.gz: 2546fdcfb0322e87f841bd4974b7ff6afbb7772c
 SHA512:
-  metadata.gz: 77d9392212565fe905219e1811dea64d8c090e2d5121508286936876b959915c1d9548463085c601e719adbcb7862d3f4cc6b830c2fbec6a23915f07789ca83b
-  data.tar.gz: 5a2a9866ac295b9a0739f43dcf3209b31c659a279a0afad4d6a7c804e4d8faf27237828363c219d9260f04669191cc5ed5e97d11ddb14a3b17476457b824bdd1
+  metadata.gz: cf4a63d5b3f3f81500979374454464cf17daf1b0bd14103a86d4d6e49f38e8aa25cb1f23d5065ce89da0cf5b327c893317b1d33509c760abd1e75965e60c4044
+  data.tar.gz: b918a8c2af312223d20e20cfbeb3e0b7b07b42e742f3bf88186791ae1c83937ebf84360ebccc27cce174938927c81967e9726b7ccb32f579d144368adeca4231

data/lib/riiif.rb

@@ -12,16 +12,12 @@ module Riiif
 
   class Error < RuntimeError; end
   class InvalidAttributeError < Error; end
-  class ImageNotFoundError < Error
-    attr_reader :original_exception
-    def initialize(orig = nil)
-      @original_exception = orig
-    end
-  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
 end

data/lib/riiif/http_file_resolver.rb

@@ -69,7 +69,7 @@ module Riiif
                   end
                 end
               rescue OpenURI::HTTPError => e
-                raise ImageNotFoundError, e
+                raise ImageNotFoundError, e.message
               end
             end
           end

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.2'.freeze
 end

data/spec/controllers/riiif/images_controller_spec.rb

@@ -5,6 +5,20 @@ describe Riiif::ImagesController do
   let(:filename) { File.expand_path('spec/samples/world.jp2') }
   routes { Riiif::Engine.routes }
 
+  describe '#error_image' do
+    context 'with unauthorized' do
+      around do |example|
+        old_value = Riiif.unauthorized_image
+        Riiif.unauthorized_image = filename
+        example.run
+        Riiif.unauthorized_image = old_value
+      end
+      subject { controller.send(:error_image, :unauthorized) }
+      it 'gives the path to the image' do
+        subject
+      end
+    end
+  end
   describe '#show' do
     it 'sends images to the service' do
       image = double

data/spec/models/riiif/http_file_resolver_spec.rb

@@ -17,7 +17,7 @@ describe Riiif::HTTPFileResolver do
     rescue Riiif::ImageNotFoundError => e
     end
     expect(e).to be_a Riiif::ImageNotFoundError
-    expect(e.original_exception).to be_an OpenURI::HTTPError
+    expect(e.message).to eq 'failure'
   end
 
   context 'when basic authentication credentials are set' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties