riiif 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5a681e454d7f72009fc0888840383238cb2645f
-  data.tar.gz: 7cb1cd8c2e6da79baf2999c9aa485365aeee1aff
+  metadata.gz: b0af476f4ae806dfd50b80d55822b1b4e737bca3
+  data.tar.gz: a19cc06b6257e2e8bfc20e10ebca47d842b71521
 SHA512:
-  metadata.gz: 32b165e6a1de5c69fd206efb98c6d3efe306d7c86de86a01e965ca08ad39d26d09fc9c814fa010986ced16d399fb8c146ef2e22b8874a3f874e3d4df6d508745
-  data.tar.gz: b619dc18d55f5df861a197bf8c530f437744dd973897f3440fdf33c2458e81dafa2254cbed9e9028e1e0f142de324b547d2c7148affe8684f81222e9a7d93fc9
+  metadata.gz: bcfa15704d359abae49010c15e118f24a4107c56d0f5839a5cb8494216dabf7e6b8207338988b13f54b4ed39d37fa8857e6426a5974d376011d5bcdc1a1036f9
+  data.tar.gz: 521ca263dd137a5a96e9d816f84576f04b3e175e0fc7c9382fdc33a88be375ff39a23b288645054f3c64142c9921fbd4c188ad8f0d57bccbf97ab7003ac96a60

data/README.md

@@ -129,37 +129,32 @@ Create an initializer like this in `config/initializers/riiif_initializer.rb`
 Riiif::Image.file_resolver = Riiif::HTTPFileResolver.new
 
 # This tells RIIIF how to resolve the identifier to a URI in Fedora
-DATASTREAM = 'imageContent'
 Riiif::Image.file_resolver.id_to_uri = lambda do |id| 
-  connection = ActiveFedora::Base.connection_for_pid(id)
-  host = connection.config[:url]
-  path = connection.api.datastream_content_url(id, DATASTREAM, {})
-  host + '/' + path
+  ActiveFedora::Base.id_to_uri(CGI.unescape(id)).tap do |url|
+    logger.info "Riiif resolved #{id} to #{url}"
+  end
 end
 
 # In order to return the info.json endpoint, we have to have the full height and width of
 # each image. If you are using hydra-file_characterization, you have the height & width 
 # cached in Solr. The following block directs the info_service to return those values:
-HEIGHT_SOLR_FIELD = 'height_isi'
-WIDTH_SOLR_FIELD = 'width_isi'
 Riiif::Image.info_service = lambda do |id, file|
-  resp = get_solr_response_for_doc_id id
-  doc = resp.first['response']['docs'].first
-  { height: doc[HEIGHT_SOLR_FIELD], width: doc[WIDTH_SOLR_FIELD] }
-end
-
-include Blacklight::SolrHelper
-def blacklight_config
-  CatalogController.blacklight_config
+  # id will look like a path to a pcdm:file
+  # (e.g. rv042t299%2Ffiles%2F6d71677a-4f80-42f1-ae58-ed1063fd79c7)
+  # but we just want the id for the FileSet it's attached to.
+
+  # Capture everything before the first slash
+  fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
+  resp = ActiveFedora::SolrService.get("id:#{fs_id}")
+  doc = resp['response']['docs'].first
+  raise "Unable to find solr document with id:#{fs_id}" unless doc
+  { height: doc['height_is'], width: doc['width_is'] }
 end
 
-### ActiveSupport::Benchmarkable (used in Blacklight::SolrHelper) depends on a logger method
-
 def logger
   Rails.logger
 end
 
-
 Riiif::Engine.config.cache_duration_in_days = 30
 ```
 

data/app/controllers/riiif/images_controller.rb

@@ -41,7 +41,7 @@ module Riiif
     # this is a workaround for https://github.com/rails/rails/issues/25087
     def redirect
       # This was attempted with just info_path, but it gave a NoMethodError
-      redirect_to Riiif::Engine.routes.url_helpers.info_path(params[:id])
+      redirect_to riiif.info_path(params[:id])
     end
 
     protected

data/app/models/riiif/image.rb

@@ -63,7 +63,7 @@ module Riiif
       ##
       # @param [ActiveSupport::HashWithIndifferentAccess] options
       def decode_options!(options)
-        raise ArgumentError, 'You must provide a format' unless options[:format]
+        raise ArgumentError, "You must provide a format. You provided #{options}" unless options[:format]
         options[:crop] = decode_region(options.delete(:region))
         options[:size] = decode_size(options.delete(:size))
         options[:quality] = decode_quality(options[:quality])

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A rails engine that support IIIF requests