cul_scv_hydra 0.13.3 → 0.14.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjA3NTcxODBmNDg0YTgyNDk2MjU5OWM1OGVhZmRhZWM5NjUwZDQ4Zg==
+    YzFmMmEyZjBlOGY1OWZhOGE5MWJlMGFkYzc4NTJlMWRlYTQyY2M1NA==
   data.tar.gz: !binary |-
-    MDlmN2UxNTg5YzM2ODZkYWU5MzI1ZGZlZTAxN2Y4MDNmMzM4ZjFmNQ==
+    M2QwNzhmZWY5YmU5NmE5NjRkZmNmNDE3NjdiYzJhMDk4NjBlNDczYQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2EwYzI1MzQ2NzgxMWRiYzQ4ZWI3MWE4ZGEwMjBlMjcxNmU3MjkwYzE0NWNi
-    MTBmZWMyNmQ1NzMwODAyYmM3NmUwYTY3NjFlNzJmZDU2MTg4ZTE2ZDMwOTU3
-    NDRkNDVlZmY0OTBlMDQ0YTk2NWQyODg3ZWRhN2MwYjE3YmYxMTQ=
+    ODcyYmRjODI2Mzk5OGU3YzY0YThiYTYyMzI4YTRhYmVlY2RhNmZmZjUwNDg5
+    OWYxMjU2YmZjNWI2NWRkNTlkMzhhYzEyN2YzNjViZGU3NWFkNzVlYjNjYzNk
+    NDRkYzE4ZTUzNjU0NTM2OGY5MDg5ZTk1NzBjZWY5ZDJlZDYyNGE=
   data.tar.gz: !binary |-
-    MGM3NGQxZDgxZjJkMjEzZWUzZjg3OGZlYWQ5NzM0MWUyOTAzOWRlNjlkMDRh
-    Y2NmM2VjOWRiYzU4ZTA4MzYxYmY0ZGJlM2M5Y2QzMGEyNjgyYTRmNGIxMDFh
-    N2YyNjYxZWFjMDUyMjk1Njg0ODVmNWMwNDk2Njc3YmYyNmFhYTg=
+    ZDA0ZTM2YTE0NDQ3NGVjZThiMTljNGE0NjA0YmNlMDE3NTFmZTA0Nzk0OTMw
+    NWNiYTg1ZjNiYWJkM2U1YmNlMDQzYjBjMDE5NjA4YTM3MGMyY2ZmNTNiOTI4
+    NTgyZTEyZjhiMWU2MjA5NjM4YzhiZTg4NTZmZTc2MzU1ZTRlNjY=

data/app/controllers/concerns/cul/scv/hydra/controller.rb

@@ -0,0 +1,22 @@
+module Cul::Scv::Hydra::Controller
+
+  def asset_path_from_config(asset)
+    Rails.configuration.assets.paths.each do |dir|
+      result = "#{dir}/#{asset}"
+      return result if File.exists?(result)
+    end
+    return nil
+  end
+
+  def asset_url(source)
+    URI.join(root_url, ActionController::Base.helpers.asset_path(source))
+  end
+
+  def http_client
+    unless @http_client
+      @http_client ||= HTTPClient.new
+    end
+    @http_client
+  end
+
+end

data/app/controllers/concerns/cul/scv/hydra/resolver.rb

@@ -0,0 +1,69 @@
+require 'blacklight'
+require 'active-fedora'
+module Cul::Scv::Hydra::Resolver
+  extend ActiveSupport::Concern
+
+  included do 
+    # Whenever an action raises SolrHelper::InvalidSolrID, this block gets executed.
+    # Hint: the SolrHelper #get_solr_response_for_doc_id method raises this error,
+    # which is used in the #show action here.
+    self.rescue_from Blacklight::Exceptions::InvalidSolrID, :with => :invalid_solr_id_error
+    # When RSolr::RequestError is raised, the rsolr_request_error method is executed.
+    # The index action will more than likely throw this one.
+    # Example, when the standard query parser is used, and a user submits a "bad" query.
+    self.rescue_from RSolr::Error::Http, :with => :rsolr_request_error
+  end
+
+  def get_solr_response_for_app_id(id=nil, extra_controller_params={})
+    id ||= params[:id]
+    solr_params = blacklight_config.default_document_solr_params.merge!(extra_controller_params)
+    solr_params[:fq] = "identifier_ssim:#{(id)}"
+    solr_response = find((blacklight_config.document_solr_request_handler || blacklight_config.qt), solr_params)
+    raise Blacklight::Exceptions::InvalidSolrID.new if solr_response.docs.empty?
+    document = SolrDocument.new(solr_response.docs.first, solr_response)
+    @response, @document = [solr_response, document]
+  end
+
+  def get
+    get_solr_response_for_app_id
+    action = params.delete(:action)
+    action.sub!(/s$/,'')
+    method_name = action + '_url'
+    url = send method_name.to_sym, @document[:id]
+    redirect_to url
+  end
+
+  # when solr (RSolr) throws an error (RSolr::RequestError), this method is executed.
+  def rsolr_request_error(exception)
+    if Rails.env == "development"
+      raise exception # Rails own code will catch and give usual Rails error page with stack trace
+    else
+      flash_notice = I18n.t('blacklight.search.errors.request_error')
+      # Set the notice flag if the flash[:notice] is already set to the error that we are setting.
+      # This is intended to stop the redirect loop error
+      notice = flash[:notice] if flash[:notice] == flash_notice
+      logger.error exception
+      unless notice
+        flash[:notice] = flash_notice
+        redirect_to root_path, :status => 500
+      else
+        render :file => "#{Rails.root}/public/500.html", :status => 500
+      end
+    end
+  end
+  
+  # when a request for /resolve/:action/BAD_SOLR_ID is made, this method is executed...
+  def invalid_solr_id_error
+    id = params.delete(:id)
+    flash[:notice] = I18n.t('blacklight.search.errors.invalid_solr_id') + " (#{id})"
+  	redirect_to(root_path)
+  end
+
+  def blacklight_solr
+    @solr ||=  RSolr.connect(blacklight_solr_config)
+  end
+
+  def blacklight_solr_config
+    Blacklight.solr_config
+  end
+end

data/app/controllers/concerns/cul/scv/hydra/thumbnails.rb

@@ -1,3 +1,4 @@
+require 'httpclient'
 module Cul::Scv::Hydra::Thumbnails
   # some thumbnail urls
   NO_THUMB = "cul_scv_hydra/crystal/file.png"
@@ -22,26 +23,32 @@ module Cul::Scv::Hydra::Thumbnails
     if r_obj.respond_to? :thumbnail_info
       url = r_obj.thumbnail_info
     else
-      url = {:url=>image_url(COLLECTION_THUMB),:mime=>'image/png'}
+      url = {:asset=>(COLLECTION_THUMB),:mime=>'image/png'}
     end
     if url[:asset]
-      url[:url] = asset_path_from_config(url[:asset])
+      #url = {:url=>asset_url(COLLECTION_THUMB),:mime=>'image/png'}
+      #redirect_to asset_url(url[:asset]).to_s, status: 302
+      #return
     end
-    puts "#{url[:url]} #{url[:mime]}"
+    Rails.logger.debug "thumbnail #{url[:url] || url[:asset]} #{url[:mime]}"
     filename = pid + '.' + url[:mime].split('/')[1].downcase
     h_cd = "filename=""#{CGI.escapeHTML(filename)}"""
     headers.delete "Cache-Control"
     headers["Content-Disposition"] = h_cd
     headers["Content-Type"] = url[:mime]
    
-    if url[:url].to_s =~ /^https?:/
+    if url[:asset]
+      full_path = Rails.application.assets.resolve(url[:asset]).to_path
+      render :status => 200, :text => File.read(full_path)
+      return
+    elsif url[:url].to_s =~ /^https?:/
       cl = http_client
       render :status => 200, :text => cl.get_content(url[:url])
       return
     else
       render :status => 200, :text => File.read(url[:url])
       return
-    end 
+    end
   end
 
   def jp2_thumbnail(pid)
@@ -52,16 +59,4 @@ module Cul::Scv::Hydra::Thumbnails
     return uri.sub(/info:fedora\//,'')
   end
   
-  def asset_path_from_config(asset)
-    Rails.configuration.assets.paths.each do |dir|
-      result = "#{dir}/#{asset}"
-      return result if File.exists?(result)
-    end
-    return nil
-  end
-
-  def image_asset_url(source)
-    URI.join(root_url, ActionController::Base.helpers.asset_path(source))
-  end
-
 end

data/app/models/concerns/cul/scv/hydra/models/aggregator.rb

@@ -31,42 +31,24 @@ module Cul::Scv::Hydra::Models::Aggregator
 
   def solr_members(opts={})
     opts = {:rows=>25,:response_format=>:solr}.merge(opts)
-    self.parts(opts)
-    #opts = {:rows=>25,:response_format=>:solr}.merge(opts)
-    #query = self.class.inbound_relationship_query(self.pid, "parts")
-    #solr_result = ::ActiveFedora::SolrService.instance.conn.query(query, :rows=>opts[:rows])
-    #if opts[:response_format] == :solr
-    #  return solr_result
-    #else
-    #  if opts[:response_format] == :id_array
-    #    id_array = []
-    #    solr_result.hits.each do |hit|
-    #      id_array << hit[SOLR_DOCUMENT_ID]
-    #    end
-    #    return id_array
-    #  elsif opts[:response_format] == :load_from_solr || self.load_from_solr
-    #    return ::ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
-    #  else
-    #    return ::ActiveFedora::SolrService.reify_solr_results(solr_result)
-    #  end
-    #end
+    r = self.parts(opts)
+    members = []
+    r.collect {|hit| members << SolrDocument.new(hit) } unless r.blank?
+    members
   end
 
   def members(opts={})
-    solr_members(opts)
+    parts(opts)
   end
 
   def member_ids(opts={})
-    opts = opts.merge({:response_format=>:id_array})
-    solr_members(opts)
+    solr_members(opts).collect {|hit| hit.id}
   end
 
   def thumbnail_info
-    r = self.parts.reader(:response_format => :solr)
-    members = []
-    r.collect {|hit| members << SolrDocument.new(hit) } unless r.blank?
+    members = solr_members
     if members.length == 0
-      return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
+      thumb = {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
     else
       thumb = nil
       unless datastreams['structMetadata'].new?
@@ -75,20 +57,22 @@ module Cul::Scv::Hydra::Models::Aggregator
         thumb =  thumb_from_members(members)
       end
     end
-    return thumb || {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
+    return thumb || {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
   end
 
   private
   def thumb_from_struct(members)
+    puts "thumb thumb_from_struct"
     sm = datastreams['structMetadata']
     first = sm.divs_with_attribute(false,'ORDER','1').first
     if first
       members.each do |member|
+        puts "looking for #{first["CONTENTIDS"]} in #{member["identifier_ssim"].inspect}"
         if member["identifier_ssim"].include? first["CONTENTIDS"]
           return thumb_from_solr_doc(member)
         end
       end
-      return nil
+      return thumb_from_solr_doc(members.first) if members.first
     else
       return nil
     end
@@ -114,8 +98,7 @@ module Cul::Scv::Hydra::Models::Aggregator
 
   def thumb_from_solr_doc(solr_doc)
     if solr_doc and (member =  ActiveFedora::Base.find(solr_doc.id, :cast=>true)).respond_to? :thumbnail_info
-      puts "thumb: " + (thumb = member.thumbnail_info).inspect
-      thumb
+      member.thumbnail_info
     else
       return nil
     end

data/app/models/concerns/cul/scv/hydra/models/common.rb

@@ -142,7 +142,7 @@ module Cul::Scv::Hydra::Models::Common
   end
 
   def thumbnail_info
-    {:url=>image_url("cul_scv_hydra/crystal/kmultiple.png"),:mime_type=>"image/png"}
+    {:asset=>("cul_scv_hydra/crystal/kmultiple.png"),:mime_type=>"image/png"}
   end
 
   private

data/app/models/concerns/cul/scv/hydra/models/image_resource.rb

@@ -72,7 +72,7 @@ module Cul::Scv::Hydra::Models::ImageResource
       url = "#{DJATOKA_BASE_URL}?#{options.map { |key, value|  "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"}.join("&")  }"
       {:url => url, :mime => t_parms["svc.format"]}
     else
-      return {:url=>image_url("cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
+      return {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
     end
   end
 end

data/app/models/content_aggregator.rb

@@ -1,17 +1,3 @@
 class ContentAggregator < GenericAggregator
-  
-  def thumbnail_info
-    _members = member_ids()
-    if _members.length > 1
-      return {:url=>image_url("cul_scv_hydra/crystal/kmultiple.png"),:mime=>'image/png'}
-    elsif _members.length == 0
-      return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
-    else
-      member = ActiveFedora::Base.find(_members[0], :cast=>true)
-      if member.respond_to? :thumbnail_info
-        return member.thumbnail_info
-      end
-    end
-    return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
-  end
+
 end

data/app/models/generic_resource.rb

@@ -79,7 +79,7 @@ class GenericResource < ::ActiveFedora::Base
       url = "#{DJATOKA_BASE_URL}?#{options.map { |key, value|  "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"}.join("&")  }"
       {:url => url, :mime => t_parms["svc.format"]}
     else
-      return {:url => image_url("cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
+      return {:asset => "cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
     end
   end
   

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.13.3'
+        VERSION = '0.14.0'
         def self.version
           VERSION
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +212,8 @@ files:
 - app/assets/images/cul_scv_hydra/crystal/mp3.png
 - app/assets/images/cul_scv_hydra/crystal/multimedia2.png
 - app/assets/images/cul_scv_hydra/crystal/video.png
+- app/controllers/concerns/cul/scv/hydra/controller.rb
+- app/controllers/concerns/cul/scv/hydra/resolver.rb
 - app/controllers/concerns/cul/scv/hydra/thumbnails.rb
 - app/models/bag_aggregator.rb
 - app/models/concerns/cul/scv/hydra/models.rb