riiif 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9ad33e2e0d258079efa25eef4e206dd4099996dd
4
- data.tar.gz: 960a01a9a73dcf961ce4c945f6a2fcd64adca6ad
3
+ metadata.gz: be59d18f6377129fef45f1bedfd5a97e0c49838b
4
+ data.tar.gz: b7bdecc0a5ad3354ba72864d7550fb9b36e59fc3
5
5
  SHA512:
6
- metadata.gz: 4d6ead011f1e16fd7559fd67df911a1e964a4a8f17c73a549e4f9473b511021b675bbbe6b731cb86528a899138445a27427aab42e1a264ffb8e5b7d1869ba10d
7
- data.tar.gz: 58eea4d035b7ac49adb4fa8fc91537e76114ee76d025fde5538502e0bfb9c5e672cae5b109a9a63ad0ddbd853652820b9612b7ac2297c7055eb40ac29865cd47
6
+ metadata.gz: b5e12cb928aa79bd9888a881fb9331851506c0b5c61504e13956535405969701ef1c30477b1bd9b103c61d463a135747330491562e241dd9aa75693b47a89cf0
7
+ data.tar.gz: 4c13a191e50ea352bb1ef056f0467b2ea56fc767358b748e19f01af8349fbee8d8670fa07e34986ee0e959b4085ef3cba3a9dc76a116b07ce064c8b667766575
@@ -32,7 +32,7 @@ module Riiif
32
32
  image = model.new(image_id)
33
33
  if authorization_service.can?(:info, image)
34
34
  headers['Access-Control-Allow-Origin'] = '*'
35
- render json: image.info.merge(server_info), content_type: 'application/ld+json'
35
+ render json: image.info.to_h.merge(server_info), content_type: 'application/ld+json'
36
36
  else
37
37
  render json: { error: 'unauthorized' }, status: :unauthorized
38
38
  end
data/lib/riiif/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Riiif
2
- VERSION = '1.1.2'.freeze
2
+ VERSION = '1.1.3'.freeze
3
3
  end
@@ -102,7 +102,7 @@ describe Riiif::ImagesController do
102
102
  it 'returns info' do
103
103
  image = double
104
104
  expect(Riiif::Image).to receive(:new).with('abcd1234').and_return(image)
105
- expect(image).to receive(:info).and_return(width: 6000, height: 4000)
105
+ expect(image).to receive(:info).and_return(Riiif::ImageInformation.new(6000, 4000))
106
106
  get :info, params: { id: 'abcd1234', format: 'json' }
107
107
  expect(response).to be_successful
108
108
  json = JSON.parse(response.body)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: riiif
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Coyne
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-15 00:00:00.000000000 Z
11
+ date: 2017-03-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties