cul_scv_hydra 0.12.1 → 0.13.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OThmMDMzYmQxNWU0NTk2OGRlNDI0ZmUwNWZmYWZjYTViNzM2NmU3Yg==
+    YjA3NTcxODBmNDg0YTgyNDk2MjU5OWM1OGVhZmRhZWM5NjUwZDQ4Zg==
   data.tar.gz: !binary |-
-    ZGU4NTMxODQ0YTZkYjRhMzQ1MjFjYWQ2YzYzZTc5ZTk4NmU3N2ZhMQ==
+    MDlmN2UxNTg5YzM2ODZkYWU5MzI1ZGZlZTAxN2Y4MDNmMzM4ZjFmNQ==
 SHA512:
   metadata.gz: !binary |-
-    NWU5NGE1MDcwY2VkOThmZGNlYTVjNjlhYjNjN2QyNDk3Y2UzODE1MjZhNzVi
-    NzdkMmM3ZDExNDdjZDA1YzNhYjgwYzRjNGY0ZDE1NmI5NDI4ZWQ5YjNkN2Y2
-    ZjlkMzU0OTk4MTZiNWRkZWMzZmY2OTZmNDRkMjUyMWE2Njc4ZTQ=
+    Y2EwYzI1MzQ2NzgxMWRiYzQ4ZWI3MWE4ZGEwMjBlMjcxNmU3MjkwYzE0NWNi
+    MTBmZWMyNmQ1NzMwODAyYmM3NmUwYTY3NjFlNzJmZDU2MTg4ZTE2ZDMwOTU3
+    NDRkNDVlZmY0OTBlMDQ0YTk2NWQyODg3ZWRhN2MwYjE3YmYxMTQ=
   data.tar.gz: !binary |-
-    ZmFkY2VmOTQ5ODVjNzE5Y2M4MWM3OGM3N2NlMzI4YTkxYTdjNTE2MjBkMGE4
-    MTI5MDhhMDU3YjM2MjA1MzMwYTk3NzM4ZWRjZTY2MGQyYjdiNDQ3MDI3NmY2
-    ODQ2MTJmY2ZiODFhOGEwNGRjNzQxNzgyNWM2ZTNkOTVlYjI3Zjk=
+    MGM3NGQxZDgxZjJkMjEzZWUzZjg3OGZlYWQ5NzM0MWUyOTAzOWRlNjlkMDRh
+    Y2NmM2VjOWRiYzU4ZTA4MzYxYmY0ZGJlM2M5Y2QzMGEyNjgyYTRmNGIxMDFh
+    N2YyNjYxZWFjMDUyMjk1Njg0ODVmNWMwNDk2Njc3YmYyNmFhYTg=

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

@@ -0,0 +1,67 @@
+module Cul::Scv::Hydra::Thumbnails
+  # some thumbnail urls
+  NO_THUMB = "cul_scv_hydra/crystal/file.png"
+  BROKEN_THUMB = "cul_scv_hydra/crystal/file_broken.png"
+  COLLECTION_THUMB = "cul_scv_hydra/crystal/kmultiple.png"
+  AUDIO_THUMB = "cul_scv_hydra/crystal/sound.png"
+  # some rel predicates
+  FORMAT = "http://purl.org/dc/elements/1.1/format"
+  MEMBER_OF = "http://purl.oclc.org/NET/CUL/memberOf"
+  HAS_MODEL = "info:fedora/fedora-system:def/model#hasModel"
+  IMAGE_WIDTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageWidth"
+  IMAGE_LENGTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageLength"
+
+  def show
+    pid = params[:id].split(/@/)[0]
+    get_by_pid(pid)
+  end
+  
+  def get_by_pid(pid)
+    r_obj = ActiveFedora::Base.find(pid, :cast=>true)
+    
+    if r_obj.respond_to? :thumbnail_info
+      url = r_obj.thumbnail_info
+    else
+      url = {:url=>image_url(COLLECTION_THUMB),:mime=>'image/png'}
+    end
+    if url[:asset]
+      url[:url] = asset_path_from_config(url[:asset])
+    end
+    puts "#{url[:url]} #{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?:/
+      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
+
+  def jp2_thumbnail(pid)
+    {:url => ActiveFedora.fedora_config.credentials[:url] + '/objects/' + pid + '/methods/ldpd:sdef.Image/getView?max=250', :mime => 'image/jpeg'}
+  end
+
+  def pid_from_uri(uri)
+    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

@@ -56,7 +56,7 @@ module Cul::Scv::Hydra::Models::Aggregator
     solr_members(opts)
   end
 
-  def members_ids(opts={})
+  def member_ids(opts={})
     opts = opts.merge({:response_format=>:id_array})
     solr_members(opts)
   end
@@ -66,7 +66,7 @@ module Cul::Scv::Hydra::Models::Aggregator
     members = []
     r.collect {|hit| members << SolrDocument.new(hit) } unless r.blank?
     if members.length == 0
-      return {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
+      return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
     else
       thumb = nil
       unless datastreams['structMetadata'].new?
@@ -75,7 +75,7 @@ module Cul::Scv::Hydra::Models::Aggregator
         thumb =  thumb_from_members(members)
       end
     end
-    return thumb || {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
+    return thumb || {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'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 {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
+      return {:url=>image_url("cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
     end
   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 {:asset=>"crystal/file.png",:mime=>'image/png'}
+      return {:url => image_url("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.12.1'
+        VERSION = '0.13.3'
         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.12.1
+  version: 0.13.3
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -198,6 +198,7 @@ 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/thumbnails.rb
 - app/models/bag_aggregator.rb
 - app/models/concerns/cul/scv/hydra/models.rb
 - app/models/concerns/cul/scv/hydra/models/aggregator.rb