Merge pull request #51 from curationexperts/no_merge_method_bug

Fixes #50: undefined method merge for struct Riiif::ImageInformation
sul-dlss · Mar 16, 2017 · 6d1b816 · 6d1b816
2 parents e052ecb + 997c8de
commit 6d1b816
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/riiif/images_controller.rb b/app/controllers/riiif/images_controller.rb
@@ -32,7 +32,7 @@ def info
       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

diff --git a/spec/controllers/riiif/images_controller_spec.rb b/spec/controllers/riiif/images_controller_spec.rb
@@ -102,7 +102,7 @@
     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)