hydra-head 4.1.3 → 5.0.0.pre1

data/app/controllers/downloads_controller.rb

@@ -1,20 +0,0 @@
-class DownloadsController < ApplicationController
-    include Hydra::Controller::RepositoryControllerBehavior
-    include Hydra::AssetsControllerHelper
-    helper :downloads
-    
-    # Note: Actual downloads are handled by the index method insead of the show method
-    # in order to avoid ActionController being clever with the filenames/extensions/formats.
-    # To download a datastream, pass the datastream id as ?document_id=#{dsid} in the url
-    def index
-      ActiveSupport::Deprecation.warn("DownloadsController is deprecated. Please use FileAssetsController or create a model specific DownloadsController in your own hydra-head.")
-      fedora_object = ActiveFedora::Base.find(params[:asset_id])
-      if params[:download_id]
-        @datastream = fedora_object.datastreams[params[:download_id]]
-        send_datastream @datastream
-      else
-        @datastreams = downloadables( fedora_object )
-      end
-    end
-    
-end

data/app/controllers/hydra/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  def current_ability
-    @current_ability ||= Ability.new(current_user, session)
-  end
-end

data/app/controllers/hydra/assets_controller.rb

@@ -1,12 +0,0 @@
-require 'deprecation'
-class Hydra::AssetsController < ApplicationController
-  extend Deprecation
-
-  self.deprecation_horizon = 'hydra-head 5.x'
-    include Hydra::Controller::AssetsControllerBehavior
-
-  def initialize *args
-    Deprecation.warn(Hydra::AssetsController, "Hydra::AssetsController is deprecated and will be removed from #{self.class.deprecation_horizon}")
-    super
-  end
-end

data/app/controllers/hydra/contributors_controller.rb

@@ -1,115 +0,0 @@
-require 'deprecation'
-class Hydra::ContributorsController < ApplicationController
-  extend Deprecation
-
-  self.deprecation_horizon = 'hydra-head 5.x'
-  include Hydra::Controller::RepositoryControllerBehavior
-  include Hydra::AssetsControllerHelper
-  include Hydra::SubmissionWorkflow
-  include Hydra::AccessControlsEnforcement
-  
-  before_filter :load_document, :only => :update 
-  before_filter :enforce_access_controls
-
-  def initialize *args
-    Deprecation.warn(Hydra::ContributorsController, "Hydra::ContributorsController is deprecated and will be removed from #{self.class.deprecation_horizon}")
-    super
-  end
-  
-  # Display form for adding a new Contributor
-  # If contributor_type is provided, renders the appropriate "new" form
-  # If contributor_type is not provided, renders a form for selecting which type of contributor to add
-  # If format is .inline, this renders without layout so you can embed it in a page
-  def new
-    
-    # Only load the document if you need to
-    if params.has_key?(:contributor_type) 
-      @document_fedora = load_document_from_id(params[:asset_id])
-      @next_contributor_index = @document_fedora
-    end
-    
-    respond_to do |format|
-      format.html { render :file=>"contributors/new" , :layout=>true}
-      format.inline { render :partial=>"contributors/new", :layout=>false }
-    end
-  end
-  deprecation_deprecate :new
-  
-  def create
-    @document_fedora = load_document_from_id(params[:asset_id])
-    
-    ct = params[:contributor_type]
-    inserted_node, new_node_index = @document_fedora.insert_contributor(ct)
-    @document_fedora.save
-    partial_name = "contributors/edit_#{ct}"
-    respond_to do |format|
-      format.html { 
-        redirect_to edit_catalog_path(params[:asset_id], :anchor=>"#{params[:contributor_type]}_#{new_node_index}")
-      }
-      format.inline { render :partial=>partial_name, :formats=>[:html], :locals=>{"edit_#{ct}".to_sym =>inserted_node, "edit_#{ct}_counter".to_sym =>new_node_index}, :layout=>false }
-    end
-    
-  end
-  deprecation_deprecate :create
-  
-  # Not sure how the #create method was intended to work, but this seems like it works and takes a hybrid approach to how the contributors were handled between this and the AssetsController work.
-  def update
-    if params[:id].nil?  
-      params[:id] = params[:asset_id]
-    end
-    # generates sanatized params from params hash to update the doc with
-    sanitize_update_params
-    @response = update_document(@document,@sanitized_params)
-    @document.save
-    flash[:notice] = "Your changes have been saved."
-    if params.has_key? :add_another_author
-      redirect_to edit_catalog_path(params[:asset_id], :wf_step => :contributor, :add_contributor => true)
-    else
-      redirect_to next_step(params[:asset_id])
-    end
-  end
-  deprecation_deprecate :update
-  
-  def destroy
-    af_model = retrieve_af_model(params[:content_type], :default=>ModsAsset)
-    @document_fedora = af_model.find(params[:asset_id])
-    authorize! :edit, @document_fedora
-    @document_fedora.remove_contributor(params[:contributor_type], params[:index])
-    result = @document_fedora.save
-    if request.xhr?
-      render :text=>result.inspect
-    else
-      redirect_to edit_catalog_path(params[:asset_id], :wf_step => :contributor)
-    end
-  end
-  deprecation_deprecate :destroy
-  
-  protected 
-  
-  # validate the mods assets when they are sumbitted
-  # The first author requires an ID field.
-  # All authors require a First & Last name.
-  def mods_assets_update_validation
-    i = 0
-    desc_metadata = params[:asset][:descMetadata]
-    unless desc_metadata.nil?
-      while desc_metadata.has_key? "person_#{i}_computing_id".to_sym
-        if desc_metadata["person_#{i}_first_name".to_sym]["0"].blank? or desc_metadata["person_#{i}_last_name".to_sym]["0"].blank?
-          flash[:error] = "The First and Last names are required for all authors."
-          return false
-        end
-        i += 1
-      end
-    end
-    return true
-  end
-  deprecation_deprecate :mods_assets_update_validation
-  
-  private
-  
-  def load_document_from_id(asset_id)
-    af_model = retrieve_af_model(params[:content_type], :default=>ModsAsset)
-    af_model.find(asset_id)
-  end
-  
-end

data/app/controllers/hydra/file_assets_controller.rb

@@ -1,3 +0,0 @@
-class Hydra::FileAssetsController < ApplicationController
-  include Hydra::Controller::FileAssetsBehavior
-end

data/app/controllers/hydra/permissions_controller.rb

@@ -1,117 +0,0 @@
-require 'deprecation'
-class Hydra::PermissionsController < ApplicationController
-  extend Deprecation
-  self.deprecation_horizon = 'hydra-head 5.x'
-
-  def initialize *args
-    Deprecation.warn(Hydra::PermissionsController, "Hydra::PermissionsController is deprecated and will be removed from #{self.class.deprecation_horizon}")
-    super
-  end
-
-  include Hydra::AssetsControllerHelper
-  include Hydra::SubmissionWorkflow
-  include Hydra::AccessControlsEnforcement
-  
-  before_filter :enforce_access_controls
-  
-  def index
-    @document_fedora=ActiveFedora::Base.find(params[:asset_id], :cast=>true)
-    
-    respond_to do |format|
-      format.html 
-      format.inline { render :partial=>"hydra/permissions/index", :format=>"html" }
-    end
-  end
-  deprecation_deprecate :index
-  
-  def new
-    respond_to do |format|
-      format.html 
-      format.inline { render :partial=>"hydra/permissions/new" }
-    end
-  end
-  deprecation_deprecate :new
-  
-  def edit
-    @document_fedora=ActiveFedora::Base.find(params[:asset_id], :cast=>true)
-    
-    respond_to do |format|
-      format.html 
-      format.inline {render :action=>"edit", :layout=>false}
-    end
-  end
-  deprecation_deprecate :edit
-  
-  # Create a new permissions entry
-  # expects permission["actor_id"], permission["actor_type"] and permission["access_level"] as params. ie.   :permission=>{"actor_id"=>"_person_id_","actor_type"=>"person","access_level"=>"read"}
-  def create
-    @document_fedora=ActiveFedora::Base.find(params[:asset_id], :cast=>true)
-
-    access_actor_type = params["permission"]["actor_type"]
-    actor_id = params["permission"]["actor_id"]
-    access_level = params["permission"]["access_level"]
-  
-    # update the datastream's values
-    result = @document_fedora.rightsMetadata.permissions({access_actor_type => actor_id}, access_level)
-    @document_fedora.save
-    
-    flash[:notice] = "#{actor_id} has been granted #{access_level} permissions for #{params[:asset_id]}"
-    
-    respond_to do |format|
-      format.html do 
-        if params.has_key?(:add_permission)
-          redirect_to :back
-        else
-          redirect_to next_step(params[:asset_id])
-        end
-        
-      end
-      format.inline { render :partial=>"hydra/permissions/edit_person_permissions", :locals=>{:person_id=>actor_id}}
-    end
-
-  end
-  deprecation_deprecate :create
-  
-  # Updates the permissions for all actors in a hash.  Can specify as many groups and persons as you want
-  # ie. :permission => {"group"=>{"group1"=>"discover","group2"=>"edit"}, {"person"=>{"person1"=>"read"}}}
-  def update
-    if params[:id].nil?  
-      pid = params[:asset_id]
-    else
-      pid = params[:id]
-    end
-    
-    @document_fedora=ActiveFedora::Base.find(pid, :cast=>true)
-    
-    # update the datastream's values
-    result = @document_fedora.rightsMetadata.update_permissions(params[:permission])
-    
-    @document_fedora.save
-    
-    
-    flash[:notice] = "The permissions have been updated."
-    
-    respond_to do |format|
-      format.html do
-        if params.has_key?(:add_permission)
-          redirect_to edit_catalog_path(pid, :wf_step => :permissions, :add_permission => true)
-        else
-          redirect_to next_step(pid)
-        end
-      end
-      format.inline do
-        # This should be replaced ...
-        if params[:permission].has_key?(:group)
-          access_actor_type = "group"
-        else
-          access_actor_type = "person"
-        end
-        actor_id = params["permission"][access_actor_type].first[0]
-        render :partial=>"hydra/permissions/edit_person_permissions", :locals=>{:person_id=>actor_id} 
-      end
-    end
-    
-  end
-  deprecation_deprecate :update
-    
-end

data/app/controllers/user_sessions_controller.rb

@@ -1,13 +0,0 @@
-class UserSessionsController < ApplicationController
-  # toggle to set superuser_mode in session
-  # Only allows user who can be superusers to set this value in session
-  def superuser
-    if session[:superuser_mode]
-      session[:superuser_mode] = nil
-    elsif Deprecation.silence(Hydra::SuperuserAttributes) { current_user.can_be_superuser? }
-      session[:superuser_mode] = true
-    end
-    redirect_to :back
-  end
-
-end

data/app/helpers/application_helper.rb

@@ -1,3 +0,0 @@
-module ApplicationHelper
-  include Hydra::ApplicationHelperBehavior
-end

data/app/helpers/article_metadata_helper.rb

@@ -1,4 +0,0 @@
-module ArticleMetadataHelper
-  include Hydra::ArticleMetadataHelperBehavior
-end
-

data/app/helpers/blacklight_helper.rb

@@ -1,4 +0,0 @@
-module BlacklightHelper
-  include Hydra::BlacklightHelperBehavior
-end
-

data/app/helpers/downloads_helper.rb

@@ -1,4 +0,0 @@
-module DownloadsHelper
-  include Hydra::DownloadsHelperBehavior
-end
-

data/app/helpers/facets_helper.rb

@@ -1,4 +0,0 @@
-module FacetsHelper
-  include Hydra::FacetsHelperBehavior
-
-end

data/app/helpers/generic_content_objects_helper.rb

@@ -1,4 +0,0 @@
-module GenericContentObjectsHelper
-  include Hydra::GenericContentObjectsHelperBehavior
-end
-

data/app/helpers/hydra/application_helper_behavior.rb

@@ -1,8 +0,0 @@
-module Hydra
-  module ApplicationHelperBehavior
-    
-    def application_name
-      'A Hydra Head'
-    end
-  end
-end

data/app/helpers/hydra/article_metadata_helper_behavior.rb

@@ -1,95 +0,0 @@
-# This was CatalogHelper in the rails2 version of hydra-head
-require 'deprecation'
-module Hydra
-  module ArticleMetadataHelperBehavior
-    extend Deprecation
-    self.deprecation_horizon = 'hydra-head 5.x'
-      
-    def format_date date
-     date.strftime("%b. %e, %Y")
-    end
-    deprecation_deprecate :format_date
-    
-    def depositor_string depositor=nil
-      "#{depositor}" unless depositor.nil? 
-    end
-    deprecation_deprecate :depositor_string
-
-    def get_children pid
-      par = solr_facet_params(:is_part_of_s)
-      query="_query_:\"{!dismax qf=$qf_dismax pf=$pf_dismax}is_part_of_s:info\\:fedora/#{pid.gsub(":",'\:')}\"" 
-      # start query of with user supplied query term
-        #q << "_query_:\"{!dismax qf=$qf_dismax pf=$pf_dismax}#{user_query}\""
-      (response, document_list) = get_search_results( :q=>query )
-      par.inspect
-    end
-    deprecation_deprecate :get_children
-
-    def author_list(doc)
-      get_persons_from_roles(doc,['author','collaborator','creator','contributor']).map {|person| format_person_string(person[:first],person[:last],person[:institution])}
-    end
-    deprecation_deprecate :author_list
-
-    def researcher_list(doc)
-      get_persons_from_roles(doc,['research team head']).map {|person| format_person_string(person[:first],person[:last],person[:institution])}
-    end
-    deprecation_deprecate :researcher_list
-
-    def get_persons_from_roles(doc,roles,opts={})
-      i = 0
-      persons =[]
-      while i < 10
-        persons_roles = [] # reset the array
-        persons_roles = doc["person_#{i}_role_t"].map{|w|w.strip.downcase} unless doc["person_#{i}_role_t"].nil?
-        if persons_roles and (persons_roles & roles).length > 0
-          persons << {:first => doc["person_#{i}_first_name_t"], :last=> doc["person_#{i}_last_name_t"], :institution => doc["person_#{i}_institution_t"]}
-        end
-        i += 1
-      end
-      return persons
-    end
-    deprecation_deprecate :get_persons_from_roles
-
-    def format_person_string first_name, last_name, affiliation, opt={}
-      full_name = [first_name, last_name].join(" ").strip
-      affiliation = affiliation.nil? ? "" : "(#{affiliation})"
-      [full_name, affiliation].join(" ").concat(";")
-    end
-    deprecation_deprecate :format_person_string
-
-    def journal_info(doc)
-      title = doc.get(:journal_title_info_main_title_t)
-      pub_date = doc.get(:journal_issue_publication_date_t)
-      volume = doc.get(:journal_issue_volume_t)
-      issue = doc.get(:journal_issue_volume_t)
-      start_page = doc.get(:journal_issue_pages_start_t) 
-      end_page = doc.get(:journal_issue_end_page_t)
-      journal_info = "#{title}. #{pub_date}; #{volume} ( #{issue} ): #{start_page} - #{end_page}"
-      journal_info = "" if journal_info.match(/^\.\s+;\s+\(\s+\)\:\s+-\s*$/)
-      journal_info
-    end
-    deprecation_deprecate :journal_info
-
-    def short_abstract(doc,max=250)
-      abstract = doc.get(:abstract_t)
-      if abstract.blank?
-        return ""
-      elsif abstract.length < max
-        return abstract
-      else
-        return abstract[0..max].strip.concat("...")
-      end
-    end
-    deprecation_deprecate :short_abstract
-
-    def admin_info(doc)
-      info =<<-EOS
-        Deposited: #{format_date(DateTime.parse(doc.get(:system_create_dt)).to_time)} 
-        | By: #{depositor_string(doc.get(:depositor_t))} 
-        | Status: Created
-      EOS
-    end
-    deprecation_deprecate :admin_info
-
-  end
-end

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -1,128 +0,0 @@
-require 'deprecation'
-module Hydra
-  module BlacklightHelperBehavior
-    extend Deprecation
-    include Blacklight::BlacklightHelperBehavior
-    
-    self.deprecation_horizon = 'hydra-head 5.x'
-    
-    def get_data_with_linked_label(doc, label, field_string, opts={})
-      (opts[:default] and !doc[field_string]) ? field = opts[:default] : field = doc[field_string]
-      delim = opts[:delimiter] ? opts[:delimiter] : "<br/>"
-      if doc[field_string]
-        text = "<dt>#{label}</dt><dd>"
-        if field.respond_to?(:each)
-          text += field.map do |l| 
-            linked_label(l, field_string)
-          end.join(delim)
-        else
-          text += linked_label(field, field_string)
-        end
-        text += "</dd>"
-        text
-      end
-    end
-    deprecation_deprecate :get_data_with_linked_label
-    
-    def linked_label(field, field_string)
-      link_to(field, add_facet_params(field_string, field).merge!({"controller" => "catalog", :action=> "index"}))
-    end
-    deprecation_deprecate :linked_label
-
-    # currently only used by the render_document_partial helper method (below)
-    def document_partial_name(document)
-      display_type = document[blacklight_config.show.display_type]
-
-      return 'default' unless display_type 
-
-      display_type.first.gsub(/^[^\/]+\/[^:]+:/,"").underscore.pluralize
-    end
-
-    def document_partial_path_templates
-      ["%2$s/%1$s"] + super
-    end
-    
-    def render_complex_facet_value(facet_solr_field, item, options ={})    
-      link_to_unless(options[:suppress_link], format_item_value(item.value), add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select") + " (" + format_num(item.hits) + ")" 
-    end
-    deprecation_deprecate :render_complex_facet_value
-
-    def render_journal_facet_value(facet_solr_field, item, options ={})
-      val = item.value.strip.length > 12 ? item.value.strip[0..12].concat("...") : item.value.strip
-      link_to_unless(options[:suppress_link], val, add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select") + " (" + format_num(item.hits) + ")" 
-    end
-    deprecation_deprecate :render_journal_facet_value
-
-    def render_complex_facet_image(facet_solr_field, item, options = {})
-      computing_id = extract_computing_id(item.value)
-      if File.exists?("#{Rails.root}/public/images/faculty_images/#{computing_id}.jpg")
-        img = image_tag "/images/faculty_images/#{computing_id}.jpg", :width=> "100", :alt=>"#{item.value}"
-      else
-        img = image_tag "/plugin_assets/hydra-head/images/default_thumbnail.gif", :width=>"100", :alt=>"#{item.value}"
-      end
-      link_to_unless(options[:suppress_link], img, add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select facet_image") 
-    end
-    deprecation_deprecate :render_complex_facet_image
-
-    def render_journal_image(facet_solr_field, item, options = {})
-      if File.exists?("#{Rails.root}/public/images/journal_images/#{item.value.strip.downcase.gsub(/\s+/,'_')}.jpg")
-        img = image_tag "/images/journal_images/#{item.value.strip.downcase.gsub(/\s+/,'_')}.jpg", :width => "100"
-      else
-        img = image_tag "/plugin_assets/hydra-head/images/default_thumbnail.gif", :width=>"100", :alt=>"#{item.value}"
-      end
-
-      link_to_unless(options[:suppress_link], img, add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select") 
-    end
-    deprecation_deprecate :render_journal_image
-
-    def get_randomized_display_items items
-      clean_items = items.each.inject([]) do |array, item|
-        array << item unless item.value.strip.blank?
-        array
-      end
-
-      if clean_items.length < 6 
-        clean_items.sort_by {|item| item.value }
-      else 
-        rdi = clean_items.sort_by {rand}.slice(0..5)
-        return rdi.sort_by {|item| item.value.downcase}
-      end
-    end
-    deprecation_deprecate :get_randomized_display_items
-
-    def extract_computing_id val
-      cid = val.split(" ")[-1]
-      cid[1..cid.length-2]
-    end
-    deprecation_deprecate :extract_computing_id
-
-    def format_item_value val
-      begin
-        last, f_c = val.split(", ")
-        first = f_c.split(" (")[0]
-      rescue
-        return val.nil? ? "" : val
-      end
-      [last, "#{first[0..0]}."].join(", ")
-    end
-    deprecation_deprecate :format_item_value
-
-  #   COPIED from vendor/plugins/blacklight/app/helpers/application_helper.rb
-    # Used in catalog/facet action, facets.rb view, for a click
-    # on a facet value. Add on the facet params to existing
-    # search constraints. Remove any paginator-specific request
-    # params, or other request params that should be removed
-    # for a 'fresh' display. 
-    # Change the action to 'index' to send them back to
-    # catalog/index with their new facet choice. 
-    def add_facet_params_and_redirect(field, value)
-      new_params = super
-
-      # Delete :qt, if needed - added to resolve NPE errors
-      new_params.delete(:qt)
-
-      new_params
-    end
-
-  end
-end