riiif 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ad33e2e0d258079efa25eef4e206dd4099996dd
-  data.tar.gz: 960a01a9a73dcf961ce4c945f6a2fcd64adca6ad
+  metadata.gz: be59d18f6377129fef45f1bedfd5a97e0c49838b
+  data.tar.gz: b7bdecc0a5ad3354ba72864d7550fb9b36e59fc3
 SHA512:
-  metadata.gz: 4d6ead011f1e16fd7559fd67df911a1e964a4a8f17c73a549e4f9473b511021b675bbbe6b731cb86528a899138445a27427aab42e1a264ffb8e5b7d1869ba10d
-  data.tar.gz: 58eea4d035b7ac49adb4fa8fc91537e76114ee76d025fde5538502e0bfb9c5e672cae5b109a9a63ad0ddbd853652820b9612b7ac2297c7055eb40ac29865cd47
+  metadata.gz: b5e12cb928aa79bd9888a881fb9331851506c0b5c61504e13956535405969701ef1c30477b1bd9b103c61d463a135747330491562e241dd9aa75693b47a89cf0
+  data.tar.gz: 4c13a191e50ea352bb1ef056f0467b2ea56fc767358b748e19f01af8349fbee8d8670fa07e34986ee0e959b4085ef3cba3a9dc76a116b07ce064c8b667766575

data/app/controllers/riiif/images_controller.rb

@@ -32,7 +32,7 @@ module Riiif
       image = model.new(image_id)
       if authorization_service.can?(:info, image)
         headers['Access-Control-Allow-Origin'] = '*'
-        render json: image.info.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/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 end

data/spec/controllers/riiif/images_controller_spec.rb

@@ -102,7 +102,7 @@ describe Riiif::ImagesController 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(width: 6000, height: 4000)
+      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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties