cul_scv_hydra 0.22.6 → 0.22.7

data/lib/cul_hydra/controllers/datastreams.rb

@@ -0,0 +1,145 @@
+require 'cul_hydra/controllers/helpers/application_helper_behavior'
+module Cul::Hydra::Controllers
+  module Datastreams
+  extend ActiveSupport::Concern
+
+  included do
+    include Cul::Hydra::Controllers::Helpers::ApplicationHelperBehavior
+    include Hydra::AssetsControllerHelper
+    include Hydra::AssetsControllerHelper
+    include Hydra::FileAssetsHelper  
+    include Hydra::RepositoryController  
+    include MediaShelf::ActiveFedoraHelper
+    include Blacklight::SolrHelper
+    prepend_before_filter :sanitize_update_params
+  end
+  
+  def index
+    if params[:layout] == "false"
+      # action = "index_embedded"
+      layout = false
+    end
+    unless params[:asset_id].nil?
+      
+      # Including this line so permissions tests can be run against the container
+      @container_response, @document = get_solr_response_for_doc_id(params[:asset_id])
+      
+      # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
+      @container =  ActiveFedora::Base.load_instance(params[:asset_id])
+      @ds = @container.datastreams(params[:id])
+    else
+      # What are we doing here without a containing object?
+      raise "called DatastreamsController#index without containing object"
+    end
+    render :action=>params[:action], :layout=>layout
+  end
+  
+  def new
+    render :partial=>"new", :layout=>false
+  end
+  
+  # Creates and Saves a Datastream to contain the the Uploaded file 
+  def create
+    if params[:asset_id].nil?
+      raise "Cannot created a datastream without a containing object"
+    else
+      @container =  ActiveFedora::Base.load_instance(params[:asset_id])
+    end
+
+    if params[:id].nil?
+      raise "Cannot created a datastream without a datastream id"
+    end
+
+    if params.has_key?(:Filedata)
+      file_name = filename_from_params
+      mime_type = params[:mime_type] || mime_type(file_name)
+      @container.add_file_datastream(posted_file, :dsid=>params[:id], :label=>file_name, :mimeType=>mime_type, :size=>posted_file.size)
+      @container.save
+      # apply_depositor_metadata(@file_asset)
+    
+      flash[:notice] = "The file #{params[:Filename]} has been saved as #{params[:datastream_id]} in <a href=\"#{asset_url(@container.pid)}\">#{@container.pid}</a>."
+            
+      ## Apply any posted file metadata
+      unless params[:asset].nil?
+       # logger.debug("applying submitted file metadata: #{@sanitized_params.inspect}")
+       # apply_file_metadata
+      end
+      # If redirect_params has not been set, use {:action=>:index}
+      logger.debug "Created #{@container.pid}##{params[:datastream_id]}."
+    elsif params.has_key?(:Source)
+      file_name = filename_from_url(params[:Source])
+      mime_type = params[:mime_type] || mime_type(file_name)
+      ds_props = {:dsid=>params[:id], :label=>file_name, :mimeType=>mime_type, :dsLocation=>params[:Source]}
+      @container.add_datastream(ActiveFedora::Datastream.new(ds_props))
+      @container.save
+    
+      flash[:notice] = "#{params[:Source]} has been saved as #{params[:datastream_id]} in <a href=\"#{asset_url(@container.pid)}\">#{@container.pid}</a>."
+    else
+      flash[:notice] = "You must specify a file to upload or a source URL."
+    end
+    
+    unless params[:container_id].nil?
+      redirect_params = {:controller=>"catalog", :id=>params[:asset_id], :action=>:edit}
+    end
+    
+    redirect_params ||= {:action=>:index}
+    
+    redirect_to redirect_params
+  end
+  
+  # Datastream destroy method
+  def destroy
+    @container = ActiveFedora::Base.load_instance(params[:asset_id])
+    @container.datastreams[params[:datastream_id]].delete
+    render :text => "Deleted #{params[:datastream_id]} from #{params[:asset_id]}."
+    # Does the index need to be updated on delete here?
+    @container.save
+  end
+  
+  def update
+    self.create
+  end
+  
+  def show
+    @container = ActiveFedora::Base.find(params[:asset_id])
+    if (@container.nil?)
+      logger.warn("No such fedora object: " + params[:asset_id])
+      flash[:notice]= "No such fedora object."
+      redirect_to(:action => 'index', :q => nil , :f => nil)
+      return
+    else
+      # get array of parent (container) objects for this FileAsset
+      @downloadable = false
+      # A FileAsset is downloadable iff the user has read or higher access to a parent
+      @response, @document = get_solr_response_for_doc_id(params[:asset_id])
+      if reader?
+        @downloadable = true
+      end
+
+      if @downloadable
+        if @container.datastreams_in_memory.include?(params[:id])
+          ds = @container.datastreams_in_memory[params[:id]]
+          opts = {:filename => ds.label}
+          if params[:mime_type].nil?
+            opts[:type] = ds.attributes["mimeType"]
+          else
+            opts[:type] = params[:mime_type]
+          end
+          if params[:disposition].nil?
+            opts[:disposition] = "attachment"
+          else
+            opts[:disposition] = params[:disposition]
+          end
+          logger.debug opts.inspect
+          send_data ds.content, opts
+          return
+        end
+      else
+        flash[:notice]= "You do not have sufficient access privileges to download this document, which has been marked private."
+        redirect_to(:action => 'index', :q => nil , :f => nil)
+        return
+      end
+    end
+  end
+end
+end

data/lib/cul_hydra/controllers/helpers.rb

@@ -0,0 +1,10 @@
+module Cul::Hydra::Controllers::Helpers
+  autoload :Aggregates, 'cul_hydra/controllers/helpers/aggregates'
+  autoload :ActiveFedoraHelperBehavior, 'cul_hydra/controllers/helpers/active_fedora_helper_behavior'
+  autoload :ApplicationHelperBehavior, 'cul_hydra/controllers/helpers/application_helper_behavior'
+  autoload :DcMetadataHelperBehavior, 'cul_hydra/controllers/helpers/dc_metadata_helper_behavior'
+  autoload :HydraAssetsHelperBehavior, 'cul_hydra/controllers/helpers/hydra_assets_helper_behavior'
+  autoload :HydraAutocompleteHelperBehavior, 'cul_hydra/controllers/helpers/hydra_autocomplete_helper_behavior'
+  autoload :HydraUploaderHelperBehavior, 'cul_hydra/controllers/helpers/hydra_uploader_helper_behavior'
+  autoload :ResourcesHelperBehavior, 'cul_hydra/controllers/helpers/resources_helper_behavior'
+end

data/lib/{cul_scv_hydra → cul_hydra}/controllers/helpers/active_fedora_helper_behavior.rb

@@ -1,4 +1,4 @@
-module Cul::Scv::Hydra::Controllers::Helpers
+module Cul::Hydra::Controllers::Helpers
   module ActiveFedoraHelperBehavior
     def load_dc_document_from_solr(doc)
       pid = doc[:id] ? doc[:id] : doc[:id.to_s]

data/lib/{cul_scv_hydra → cul_hydra}/controllers/helpers/application_helper_behavior.rb

@@ -1,5 +1,5 @@
 # Methods added to this helper will be available to all templates in the application.
-module Cul::Scv::Hydra::Controllers::Helpers
+module Cul::Hydra::Controllers::Helpers
   module ApplicationHelperBehavior
     def load_dc_document_from_solr(doc)
       pid = doc[:id] ? doc[:id] : doc[:id.to_s]

data/lib/{cul_scv_hydra → cul_hydra}/controllers/helpers/dc_metadata_helper_behavior.rb

@@ -1,4 +1,4 @@
-module Cul::Scv::Hydra::Controllers::Helpers
+module Cul::Hydra::Controllers::Helpers
   module DcMetadataHelperBehavior
     def dcmi_types
       ['', 'Collection', 'Dataset', 'Event', 'Image', 'InteractiveResource',

data/lib/{cul_scv_hydra → cul_hydra}/controllers/helpers/hydra_assets_helper_behavior.rb

@@ -1,6 +1,6 @@
 #require 'mediashelf/active_fedora_helper'
 
-module Cul::Scv::Hydra::Controllers::Helpers::HydraAssetsHelperBehavior
+module Cul::Hydra::Controllers::Helpers::HydraAssetsHelperBehavior
 #  include MediaShelf::ActiveFedoraHelper
 
   def link_to_create_asset(link_label, content_type, container_id=nil)

data/lib/{cul_scv_hydra → cul_hydra}/controllers/helpers/hydra_autocomplete_helper_behavior.rb

@@ -1,4 +1,4 @@
-module Cul::Scv::Hydra::Controllers::Helpers
+module Cul::Hydra::Controllers::Helpers
 module HydraAutocompleteHelperBehavior
   def autocomplete_fedora_text_field(resource, datastream_name, field_key, opts={})
     field_name = field_name_for(field_key)

data/lib/{cul_scv_hydra → cul_hydra}/controllers/helpers/hydra_uploader_helper_behavior.rb

@@ -1,4 +1,4 @@
-module Cul::Scv::Hydra::Controllers::Helpers
+module Cul::Hydra::Controllers::Helpers
 module HydraUploaderHelperBehavior
   
   # Generate the appropriate url for posting uploads to

data/lib/{cul_scv_hydra → cul_hydra}/controllers/helpers/resources_helper_behavior.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'open-uri'
 require 'tempfile'
 require 'uri'
-module Cul::Scv::Hydra::Controllers::Helpers
+module Cul::Hydra::Controllers::Helpers
 module ResourcesHelperBehavior
   IMAGE_MIME_TYPES = [
     'image/bmp',

data/lib/cul_hydra/controllers/resources.rb

@@ -0,0 +1,161 @@
+module Cul::Hydra::Controllers
+module Resources
+  extend ActiveSupport::Concern
+
+  included do
+    include Hydra::AssetsControllerHelper
+    include Cul::Hydra::Controllers::Helpers::ResourcesHelperBehavior
+    include Hydra::Controller  
+    include Hydra::RepositoryController  
+    include MediaShelf::ActiveFedoraHelper
+    include Blacklight::SolrHelper
+    before_filter :load_fedora_document, :only=>[:update]
+    prepend_before_filter :sanitize_update_params
+  end
+
+  def index
+    if params[:layout] == "false"
+      # action = "index_embedded"
+      layout = false
+    end
+    if !params[:container_id].nil?
+      container_uri = "info:fedora/#{params[:container_id]}"
+      escaped_uri = container_uri.gsub(/(:)/, '\\:')
+      extra_controller_params =  {:q=>"cul_member_of_s:#{escaped_uri}"}
+      @response, @document_list = get_search_results( extra_controller_params )
+      
+      # Including this line so permissions tests can be run against the container
+      @container_response, @document = get_solr_response_for_doc_id(params[:container_id])
+      
+      # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
+      @container =  ActiveFedora::Base.load_instance(params[:container_id])
+      @solr_result = @container.file_objects(:response_format=>:solr)
+    else
+      # @solr_result = ActiveFedora::SolrService.instance.conn.query('has_model_field:info\:fedora/ldpd\:Resource', @search_params)
+      @solr_result = Resource.find_by_solr(:all)
+    end
+    render :action=>params[:action], :layout=>layout
+  end
+  
+  def new
+    render :partial=>"new", :layout=>false
+  end
+  
+  # Creates and Saves a File Asset to contain the the Uploaded file 
+  # If container_id is provided:
+  # * the File Asset will use RELS-EXT to assert that it's a part of the specified container
+  # * the method will redirect to the container object's edit view after saving
+  def create
+    if params.has_key?(:Filedata) or params.has_key?(:Fileurl)
+      flash[:notice] = process_files # "The file #{params[:Filename]} has been saved in <a href=\"#{asset_url(@resource.pid)}\">#{@resource.pid}</a>."
+    else
+      flash[:notice] = "You must specify a file to upload."
+    end
+    
+    if !params[:container_id].nil?
+      redirect_params = {:controller=>"catalog", :id=>params[:container_id], :action=>:edit}
+    end
+    
+    redirect_params ||= {:action=>:index}
+    
+    redirect_to redirect_params
+  end
+  
+  def update
+    if params.has_key?(:Filedata) or params.has_key?(:Fileurl)
+      flash[:notice] = update_file # "The file #{params[:Filename]} has been saved in <a href=\"#{asset_url(@resource.pid)}\">#{@resource.pid}</a>."
+    else
+      flash[:notice] = "You must specify a file to upload."
+    end
+    if !params[:id].nil?
+      redirect_params = {:controller=>"catalog", :id=>params[:id], :action=>:edit}
+    end
+    
+    redirect_params ||= {:action=>:index}
+    
+    redirect_to redirect_params
+  end
+    
+  def process_files
+    @resources = create_and_save_resources_from_params
+    notice = []
+    @resources.each do |resource|
+      apply_depositor_metadata(resource)
+      notice << "The file #{resource.label} has been saved in <a href=\"#{asset_url(resource.pid)}\">#{resource.pid}</a>."
+      if !params[:container_id].nil?
+        associate_resource_with_container(resource,params[:container_id])
+      end
+      ## Apply any posted file metadata
+      unless params[:asset].nil?
+        logger.debug("applying submitted file metadata: #{@sanitized_params.inspect}")
+        apply_posted_file_metadata(resource)
+      end
+      resource.save
+      logger.debug("Created #{resource.pid}.")
+    end
+  end
+  
+  def update_file
+    update_resource_from_params
+    apply_depositor_metadata(@document_fedora)
+    notice << "The file #{@document_fedora.label} has been saved in <a href=\"#{asset_url(@document_fedora.pid)}\">#{@document_fedora.pid}</a>."
+    unless params[:asset].nil?
+      logger.debug("applying submitted file metadata: #{@sanitized_params.inspect}")
+      apply_posted_file_metadata(@document_fedora)
+    end
+    @document_fedora.save
+    logger.debug("Created #{@document_fedora.pid}.")
+  end
+  # Common destroy method for all AssetsControllers 
+  def destroy
+    # The correct implementation, with garbage collection:
+    # if params.has_key?(:container_id)
+    #   container = ActiveFedora::Base.load_instance(params[:container_id]) 
+    #   container.file_objects_remove(params[:id])
+    #   FileAsset.garbage_collect(params[:id])
+    # else
+    
+    # The dirty implementation (leaves relationship in container object, deletes regardless of whether the file object has other containers)
+    ActiveFedora::Base.load_instance(params[:id]).delete 
+    flash[:notice] = "Deleted #{params[:id]}."
+    if !params[:container_id].nil?
+      redirect_params = {:controller=>"catalog", :id=>params[:container_id], :action=>:edit}
+    end
+    
+    redirect_params ||= {:action=>:index}
+    
+    redirect_to redirect_params
+  end
+  
+  
+  def show
+    @file_asset = Resource.find(params[:id])
+    if (@file_asset.nil?)
+      logger.warn("No such resource: " + params[:id])
+      flash[:notice]= "No such resource."
+      redirect_to(:action => 'index', :q => nil , :f => nil)
+    else
+      # get array of parent (container) objects for this FileAsset
+      @id_array = @file_asset.containers(:response_format => :id_array)
+      @downloadable = false
+      # A FileAsset is downloadable iff the user has read or higher access to a parent
+      @id_array.each do |pid|
+        @response, @document = get_solr_response_for_doc_id(pid)
+        if reader?
+          @downloadable = true
+          break
+        end
+      end
+
+      if @downloadable
+        if @file_asset.datastreams_in_memory.include?("CONTENT")
+          send_datastream @file_asset.datastreams_in_memory["CONTENT"]
+        end
+      else
+        flash[:notice]= "You do not have sufficient access privileges to download this document, which has been marked private."
+        redirect_to(:action => 'index', :q => nil , :f => nil)
+      end
+    end
+  end
+end
+end

data/lib/cul_hydra/controllers/static_image_aggregators.rb

@@ -0,0 +1,105 @@
+require 'cul_hydra/controllers/helpers/resources_helper_behavior'
+module Cul::Hydra::Controllers
+module StaticImageAggregators
+  extend ActiveSupport::Concern
+  
+  included do
+    include Hydra::AssetsControllerHelper
+    include Cul::Hydra::Controllers::Helpers::ResourcesHelperBehavior  
+    include Hydra::RepositoryController  
+    include MediaShelf::ActiveFedoraHelper
+    include Blacklight::SolrHelper
+    before_filter :require_fedora
+    prepend_before_filter :sanitize_update_params
+  end
+  
+  def index
+    if params[:layout] == "false"
+      # action = "index_embedded"
+      layout = false
+    end
+    if !params[:container_id].nil?
+      container_uri = "info:fedora/#{params[:container_id]}"
+      escaped_uri = container_uri.gsub(/(:)/, '\\:')
+      extra_controller_params =  {:q=>"cul_member_of_s:#{escaped_uri}"}
+      @response, @document_list = get_search_results( extra_controller_params )
+      
+      # Including this line so permissions tests can be run against the container
+      @container_response, @document = get_solr_response_for_doc_id(params[:container_id])
+      
+      # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
+      @container =  ActiveFedora::Base.load_instance(params[:container_id])
+      @solr_result = @container.file_objects(:response_format=>:solr)
+    else
+      # @solr_result = ActiveFedora::SolrService.instance.conn.query('has_model_field:info\:fedora/ldpd\:Resource', @search_params)
+      @solr_result = Resource.find_by_solr(:all)
+    end
+    render :action=>params[:action], :layout=>layout
+  end
+  
+  def new
+    @asset = StaticImageAggregator.new
+    apply_depositor_metadata(@asset)
+    set_collection_type(@asset, params[:content_type])
+    if !params[:container_id].nil?
+      associate_resource_with_container(@asset, params[:container_id])
+    end
+    @asset.save
+    @asset.refresh
+    msg = "Created a Static Image Aggregator with pid #{@asset.pid}. Now it's ready to be edited."
+    flash[:notice]= msg
+  
+    if params.has_key?(:Filedata)
+      @file_asset = create_and_save_resource_from_params
+      apply_depositor_metadata(@file_asset)
+    
+      flash[:notice] += " The file #{params[:Filename]} has been saved in <a href=\"#{asset_url(@file_asset.pid)}\">#{@file_asset.pid}</a>."
+            
+      if !params[:container_id].nil?
+        associate_resource_with_container(@file_asset, @asset.pid)
+      end
+    
+      ## Apply any posted file metadata
+      unless params[:asset].nil?
+        logger.debug("applying submitted file metadata: #{@sanitized_params.inspect}")
+        @metadata_update_response = update_document(@file_asset, @sanitized_params)
+      end
+      @file_asset.save
+      # If redirect_params has not been set, use {:action=>:index}
+      logger.debug "Created #{@file_asset.pid}."
+    end
+    @asset.save
+    
+    session[:scripts] = params[:combined] == "true"
+    redirect_to url_for(:action=>"edit", :id=>@asset.pid, :new_asset=>true, :controller=>'catalog')
+
+  end
+
+  # Common destroy method for all AssetsControllers 
+  def destroy
+    # The correct implementation, with garbage collection:
+    # if params.has_key?(:container_id)
+    #   container = ActiveFedora::Base.load_instance(params[:container_id]) 
+    #   container.file_objects_remove(params[:id])
+    #   FileAsset.garbage_collect(params[:id])
+    # else
+    
+    # The dirty implementation (leaves relationship in container object, deletes regardless of whether the file object has other containers)
+    ActiveFedora::Base.load_instance(params[:id]).delete 
+    render :text => "Deleted #{params[:id]} from #{params[:container_id]}."
+  end
+  
+  
+  def show
+    @image_agg = StaticImageAggregator.find(params[:id])
+    if (@image_agg.nil?)
+      logger.warn("No such object: " + params[:id])
+      flash[:notice]= "No such object."
+      redirect_to(:action => 'index', :q => nil , :f => nil)
+    else
+      @id_array = @image_agg.containers(:response_format => :id_array)
+    end
+    render :action=>params[:action], :layout=>(params[:layout]=="false")
+  end
+end
+end