hydra-head 4.0.0.rc5 → 4.0.0.rc6

data/app/controllers/downloads_controller.rb

@@ -7,7 +7,8 @@ class DownloadsController < ApplicationController
     # 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
-      fedora_object = ActiveFedora::Base.load_instance(params[:asset_id])
+      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

data/app/controllers/hydra/permissions_controller.rb

@@ -3,9 +3,7 @@ class Hydra::PermissionsController < ApplicationController
   include Hydra::SubmissionWorkflow
   
   def index
-    af_base=ActiveFedora::Base.load_instance(params[:asset_id])
-    the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
-    @document_fedora = af_base.adapt_to(the_model)
+    @document_fedora=ActiveFedora::Base.find(params[:asset_id], :cast=>true)
     
     respond_to do |format|
       format.html 
@@ -21,9 +19,7 @@ class Hydra::PermissionsController < ApplicationController
   end
   
   def edit
-    af_base=ActiveFedora::Base.load_instance(params[:asset_id])
-    the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
-    @document_fedora = af_base.adapt_to(the_model)
+    @document_fedora=ActiveFedora::Base.find(params[:asset_id], :cast=>true)
     
     respond_to do |format|
       format.html 

data/app/models/ability.rb

@@ -1,101 +1,4 @@
 class Ability
   include CanCan::Ability
-  include Hydra::AccessControlsEnforcement
-
-  attr_reader :user, :user_groups
-
-  def initialize(user, session=nil)
-    user ||= User.new # guest user (not logged in)
-    @user = user
-    @user_groups = RoleMapper.roles(@user.email)
-    # everyone is automatically a member of the group 'public'
-    @user_groups.push 'public' unless @user_groups.include?('public')
-    # logged-in users are automatically members of the group "registered"
-    @user_groups.push 'registered' unless (@user.email == '' || @user == "public" || @user_groups.include?('registered') )
-    
-    logger.debug("Usergroups is " + @user_groups.inspect)
-    
-    if @user.is_being_superuser?(session)
-      can :manage, :all
-    else
-      hydra_default_permissions
-    end
-  end
-
-  def hydra_default_permissions
-    can :edit, String do |pid|
-      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(pid)
-      test_edit
-    end 
-
-    can :edit, ActiveFedora::Base do |obj|
-      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(obj.pid)
-      test_edit
-    end
-
-    can :edit, SolrDocument do |obj|
-      test_edit
-    end       
-
-    can :read, String do |pid|
-      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(pid)
-      test_read
-    end
-
-    can :read, ActiveFedora::Base do |obj|
-      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(obj.pid)
-      test_read
-    end 
-    
-    can :read, SolrDocument do |obj|
-      test_read
-    end 
-  end
-  
-  private
-  def test_edit
-    logger.debug("CANCAN Checking edit permissions for user: #{@user}")
-    group_intersection = @user_groups & edit_groups
-    result = !group_intersection.empty? || edit_persons.include?(@user.email)
-    logger.debug("CANCAN decision: #{result}")
-    result
-  end   
-  
-  def test_read
-    logger.debug("CANCAN Checking edit permissions for user: #{@user}")
-    group_intersection = @user_groups & read_groups
-    result = !group_intersection.empty? || read_persons.include?(@user.email)
-    logger.debug("CANCAN decision: #{result}")
-    result
-  end 
-  
-  def edit_groups
-    edit_group_field = Hydra.config[:permissions][:edit][:group]
-    eg = ((@permissions_solr_document == nil || @permissions_solr_document.fetch(edit_group_field,nil) == nil) ? [] : @permissions_solr_document.fetch(edit_group_field,nil))
-    logger.debug("edit_groups: #{eg.inspect}")
-    return eg
-  end
-
-  # edit implies read, so read_groups is the union of edit and read groups
-  def read_groups
-    read_group_field = Hydra.config[:permissions][:read][:group]
-    rg = edit_groups | ((@permissions_solr_document == nil || @permissions_solr_document.fetch(read_group_field,nil) == nil) ? [] : @permissions_solr_document.fetch(read_group_field,nil))
-    logger.debug("read_groups: #{rg.inspect}")
-    return rg
-  end
-
-  def edit_persons
-    edit_person_field = Hydra.config[:permissions][:edit][:individual]
-    ep = ((@permissions_solr_document == nil || @permissions_solr_document.fetch(edit_person_field,nil) == nil) ? [] : @permissions_solr_document.fetch(edit_person_field,nil))
-    logger.debug("edit_persons: #{ep.inspect}")
-    return ep
-  end
-
-  # edit implies read, so read_persons is the union of edit and read persons
-  def read_persons
-    read_individual_field = Hydra.config[:permissions][:read][:individual]
-    rp = edit_persons | ((@permissions_solr_document == nil || @permissions_solr_document.fetch(read_individual_field,nil) == nil) ? [] : @permissions_solr_document.fetch(read_individual_field,nil))
-    logger.debug("read_persons: #{rp.inspect}")
-    return rp
-  end
+  include Hydra::Ability
 end

data/app/models/hydra/ability.rb

@@ -0,0 +1,128 @@
+module Hydra::Ability
+  include Hydra::AccessControlsEnforcement
+
+  attr_reader :user, :user_groups
+
+  def initialize(user, session=nil)
+    user ||= User.new # guest user (not logged in)
+    @user = user
+    @user_groups = RoleMapper.roles(user_key)
+    # # everyone is automatically a member of the group 'public'
+    # @user_groups.push 'public' unless @user_groups.include?('public')
+    # # logged-in users are automatically members of the group "registered"
+    # @user_groups.push 'registered' unless (@user.email == '' || @user == "public" || @user_groups.include?('registered') )
+    
+    logger.debug("Usergroups is " + @user_groups.inspect)
+    
+    if @user.is_being_superuser?(session)
+      can :manage, :all
+    else
+      hydra_default_permissions(user, session)
+    end
+  end
+
+  def hydra_default_permissions(user, session)
+    edit_permissions(user, session)
+    read_permissions(user, session)
+    custom_permissions(user, session)
+  end
+
+  def edit_permissions(user, session)
+    can :edit, String do |pid|
+      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(pid)
+      test_edit
+    end 
+
+    can :edit, ActiveFedora::Base do |obj|
+      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(obj.pid)
+      test_edit
+    end
+ 
+    can :edit, SolrDocument do |obj|
+      @permissions_solr_document = obj
+      test_edit
+    end       
+
+    can :edit, SolrDocument do |obj|
+      test_edit
+    end       
+  end
+
+  def read_permissions(user, session)
+    can :read, String do |pid|
+      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(pid)
+      test_read
+    end
+
+    can :read, ActiveFedora::Base do |obj|
+      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(obj.pid)
+      test_read
+    end 
+    
+    can :read, SolrDocument do |obj|
+      @permissions_solr_document = obj
+      test_read
+    end 
+  end
+
+
+  ## Override custom permissions in your own app to add more permissions beyond what is defined by default.
+  def custom_permissions(user, session)
+  end
+  
+  protected
+  def test_edit
+    logger.debug("CANCAN Checking edit permissions for user: #{@user}")
+    group_intersection = @user_groups & edit_groups
+    result = !group_intersection.empty? || edit_persons.include?(@user.email)
+    logger.debug("CANCAN decision: #{result}")
+    result
+  end   
+  
+  def test_read
+    logger.debug("CANCAN Checking edit permissions for user: #{@user}")
+    group_intersection = @user_groups & read_groups
+    result = !group_intersection.empty? || read_persons.include?(@user.email)
+    logger.debug("CANCAN decision: #{result}")
+    result
+  end 
+  
+  def edit_groups
+    edit_group_field = Hydra.config[:permissions][:edit][:group]
+    eg = ((@permissions_solr_document == nil || @permissions_solr_document.fetch(edit_group_field,nil) == nil) ? [] : @permissions_solr_document.fetch(edit_group_field,nil))
+    logger.debug("edit_groups: #{eg.inspect}")
+    return eg
+  end
+
+  # edit implies read, so read_groups is the union of edit and read groups
+  def read_groups
+    read_group_field = Hydra.config[:permissions][:read][:group]
+    rg = edit_groups | ((@permissions_solr_document == nil || @permissions_solr_document.fetch(read_group_field,nil) == nil) ? [] : @permissions_solr_document.fetch(read_group_field,nil))
+    logger.debug("read_groups: #{rg.inspect}")
+    return rg
+  end
+
+  def edit_persons
+    edit_person_field = Hydra.config[:permissions][:edit][:individual]
+    ep = ((@permissions_solr_document == nil || @permissions_solr_document.fetch(edit_person_field,nil) == nil) ? [] : @permissions_solr_document.fetch(edit_person_field,nil))
+    logger.debug("edit_persons: #{ep.inspect}")
+    return ep
+  end
+
+  # edit implies read, so read_persons is the union of edit and read persons
+  def read_persons
+    read_individual_field = Hydra.config[:permissions][:read][:individual]
+    rp = edit_persons | ((@permissions_solr_document == nil || @permissions_solr_document.fetch(read_individual_field,nil) == nil) ? [] : @permissions_solr_document.fetch(read_individual_field,nil))
+    logger.debug("read_persons: #{rp.inspect}")
+    return rp
+  end
+
+  
+  # get the currently configured user identifier.  Can be overridden to return whatever (ie. login, email, etc)
+  # defaults to using whatever you have set as the Devise authentication_key
+  def user_key
+    @user.send(Devise.authentication_keys.first)
+  end
+
+
+end

data/app/views/_flash_msg.html.erb

@@ -1,5 +1,5 @@
 <% [:notice, :error, :alert].each do |type| %>
   <% if flash[type] %>
-    <div class="ui-state-<%= type == :error ? 'error' : 'highlight' %> ui-corner-all <%= type.to_s %>"><%= flash[type] %></div>
+    <div class="ui-state-<%= type == :error ? 'error' : 'highlight' %> ui-corner-all msg <%= type.to_s %>"><%= flash[type] %></div>
   <% end %>
 <% end %>

data/app/views/catalog/_home.html.erb

@@ -1,6 +1,6 @@
-<%#= render :partial=>'search_form' %>
+<%= render :partial=>'search_form' %>
 <%= render :partial=>'home_text' %>
 
 <% sidebar_items << capture do %>
   <%= render :partial=>'facets' %>
-<% end %>
+<% end %>

data/app/views/catalog/_home_text.html.erb

@@ -1,10 +1,4 @@
 <div id="results" class="home-text">
-	
-	<%= render :partial=>'search_form' %>
-	
-	<div class="home_text">
-		<h1>Welcome to Hydra</h1>
-		<p>Edit or override this page (vendor/plugins/hydra-head/views/catalog/_home_text.html.erb)</p>
-	</div>
-
+  <h1>Welcome to Hydra</h1>
+  <p>Edit or override this page (views/catalog/_home_text.html.erb)</p>
 </div>

data/app/views/catalog/_show_partials/_default.html.erb

@@ -18,8 +18,4 @@
 <div class="<%= params[:action]%>_details">
   <%= render :partial => "#{params[:controller]}/_#{params[:action]}_partials/default_details", :locals => {:document => document}%>
 </div>
-<% sidebar_items << capture do %>
-  <%#= render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
-<% end %>
-
 <%= async_load_tag(hydra_asset_downloads_path(params[:id]), 'downloads') %>

data/app/views/generic_images/_edit.html.erb

@@ -33,8 +33,6 @@
   </div>
 </div>
 <% sidebar_items << capture do %>
-  <%#= render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
-  <%#= render :partial=>'facets' %>
   <%= delete_asset_link(params[:id], "GenericImage") %>
 <% end %>
 <%= async_load_tag(generic_content_object_path(params[:id], :layout=>"false", :method => ":get"), 'uploads') %>

data/app/views/layouts/hydra-head.html.erb

@@ -1,57 +1,44 @@
 <!DOCTYPE html>
-
-<!--[if lt IE 7 ]> <html class="ie6"> <![endif]--> 
-<!--[if IE 7 ]>    <html class="ie7"> <![endif]--> 
-<!--[if IE 8 ]>    <html class="ie8"> <![endif]--> 
-<!--[if IE 9 ]>    <html class="ie9"> <![endif]--> 
-<!--[if gt IE 9]>  <html> <![endif]-->
-<!--[if !IE]><!--> <html> <!--<![endif]-->
-
+<html>
   <head>
     <meta charset="utf-8" />
-
     <title><%= h(@page_title || application_name) %></title>
     <link href="<%= opensearch_catalog_url(:format => 'xml') %>" title="<%= application_name%>" type="application/opensearchdescription+xml" rel="search"/>
-    
-    <%= render_head_content %>
-
-		<!--[if IE]>
-    	<%= stylesheet_link_tag('hydra/ie-styles', {:media=>'all'}) %>
-    	<%= stylesheet_link_tag('progressBox-ie6.css', {:media=>'all'}) %>
-		<![endif]-->
+    <%= favicon_link_tag asset_path('favicon.ico') %>
+    <%= stylesheet_link_tag    "application" %>
+    <%= javascript_include_tag "application" %>
+    <%= csrf_meta_tags %>
+    <%= raw(render_head_content) %>
 	</head>
   
-    <body class="<%= render_body_class %>">
+  <body class="<%= render_body_class %>">
 
-	  <div id="doc4" class="yui-t2">
-		
 		<div id="hd">
 			<%= render :partial => '/user_util_links' %>
 			<%= (params[:controller] == "catalog" and !params[:id]) ? "<span id='results_text'>Search Results</span>".html_safe : "" %>
 		</div>
 	    
-	  <div id="bd">
-			<div id="yui-main">
-        <%= render :partial=>'/flash_msg' %>
-        <%= yield %>
+    <div id="bd">
+      <div id="main">
+        <div id="main_container">
+          <%= render :partial=>'/flash_msg' %>
+          <%= yield %>
+        </div>
       </div>
-      <div class="yui-b sidebar"><%= sidebar_items.join('').html_safe %></div>	
+      <div id="sidebar"><%= sidebar_items.join('').html_safe %></div>	
 	  </div>
 	    
 	    
-		<div id="footer">
-			<div id="container3">
-				<div class="contact_info"></div> 
-			    <div class="aux_links"> </div>
-				<div id="footer_notices">
-					<div id="bottom_text">
-						<div id="hydra_logo"><%= image_tag('hydra/powered_by_hydra.png', :width => 80, :height => 50, :alt => "Hydra logo") %></div>
-					</div>
-				</div>
-			</div>
+		<div id="ft">
+      <div class="contact_info"></div> 
+        <div class="aux_links"> </div>
+      <div id="footer_notices">
+        <div id="bottom_text">
+          <div id="hydra_logo"><%= image_tag('hydra/powered_by_hydra.png', :width => 80, :height => 50, :alt => "Hydra logo") %></div>
+        </div>
+      </div>
 		</div>
 		
-	  </div>
   </body>
 
 </html>

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "4.0.0.rc5"
+  VERSION = "4.0.0.rc6"
 end
 

data/lib/hydra/mods_article.rb

@@ -1,9 +1,7 @@
-require "uva/mods_index_methods"
 module Hydra
   
   class ModsArticle < ActiveFedora::NokogiriDatastream       
     include Hydra::Datastream::CommonModsIndexMethods
-    include Uva::ModsIndexMethods
 
     def initialize(digital_object, dsid, options={})
       ActiveSupport::Deprecation.warn("Hydra::ModsArticle has been deprecated. Use Hydra::Datastream::ModsArticle instead")
@@ -510,5 +508,27 @@ module Hydra
 
       solr_doc
     end
+
+    # extracts the last_name##full_name##computing_id to be used by home view
+    def extract_person_full_names_and_computing_ids
+      names = {}
+      self.find_by_terms(:person).each do |person|
+        name_parts = person.children.inject({}) do |hash,child|
+          hash[child.get_attribute(:type)] = child.text if ["family","given"].include? child.get_attribute(:type)
+          hash["computing_id"] = child.text if child.name == 'computing_id'
+          hash
+        end
+        if name_parts.length == 3 and person.search(:roleTerm).children.text.include?("Author")
+          if name_parts["family"].blank? && name_parts["given"].blank? && name_parts["computing_id"].blank?
+            value = "Unknown Author"
+          else
+            value = "#{name_parts["family"]}, #{name_parts["given"]} (#{name_parts["computing_id"]})"
+          end
+          ::Solrizer::Extractor.insert_solr_field_value(names, "person_full_name_cid_facet", value) if name_parts.length == 3        
+        end      
+      end
+      names
+    end
+
   end
 end

data/lib/railties/hydra-fixtures.rake

@@ -14,36 +14,29 @@ namespace :hydra do
   end
 
   namespace :fixtures do
-    FIXTURES = [
-        "hydrangea:fixture_mods_article1",
-        "hydrangea:fixture_mods_article3",
-        "hydrangea:fixture_file_asset1",
-        "hydrangea:fixture_mods_article2",
-        "hydrangea:fixture_uploaded_svg1",
-        "hydrangea:fixture_archivist_only_mods_article",
-        "hydrangea:fixture_mods_dataset1",
-        "libra-oa:1", "libra-oa:2", "libra-oa:7",
-        "hydrus:admin_class1",
-        "hydra:test_generic_content",
-        "hydra:test_generic_image",
-        "hydra:test_default_partials",
-        "hydra:test_no_model"
-    ]
-    desc "Load default Hydra fixtures"
     task :load do
-      ENV["dir"] = File.join("test_support", "fixtures")
-      FIXTURES.each do |fixture|
-        ENV["pid"] = fixture
-        Rake::Task["repo:load"].reenable
-        Rake::Task["repo:load"].invoke
+      ENV["dir"] ||= File.join("spec", "fixtures")
+      loader = ActiveFedora::FixtureLoader.new(ENV['dir'])
+      Dir.glob("#{ENV['dir']}/*.foxml.xml").each do |fixture_path|
+        pid = File.basename(fixture_path, ".foxml.xml").sub("_",":")
+        begin
+          foo = loader.reload(pid)
+          puts "Updated #{pid}"
+        rescue Errno::ECONNREFUSED => e
+          puts "Can't connect to Fedora! Are you sure jetty is running?"
+        rescue Exception => e
+          puts("Received a Fedora error while loading #{pid}\n#{e}")
+          logger.error("Received a Fedora error while loading #{pid}\n#{e}")
+        end
       end
     end
 
     desc "Remove default Hydra fixtures"
     task :delete do
-      ENV["dir"] = File.join("test_support", "fixtures")
-      FIXTURES.each do |fixture|
-        ENV["pid"] = fixture
+      ENV["dir"] ||= File.join("spec", "fixtures")
+      loader = ActiveFedora::FixtureLoader.new(ENV['dir'])
+      Dir.glob("#{ENV['dir']}/*.foxml.xml").each do |fixture_path|
+        ENV["pid"] = File.basename(fixture_path, ".foxml.xml").sub("_",":")
         Rake::Task["repo:delete"].reenable
         Rake::Task["repo:delete"].invoke
       end