hydra-head 4.0.3 → 4.1.0

data/app/helpers/hydra/release_process_helper_behavior.rb

@@ -1,4 +1,7 @@
+require 'deprecation'
 module Hydra::ReleaseProcessHelperBehavior
+  extend Deprecation
+  self.deprecation_horizon = 'hydra-head 5.x'
   
   def display_release_status_notice(document)
     readiness = document.test_release_readiness
@@ -14,6 +17,7 @@ module Hydra::ReleaseProcessHelperBehavior
       flash[:error] = flash[:error] | readiness[:failures]
     end
   end
+  deprecation_deprecate :display_release_status_notice
 
   def check_embargo_date_format
     if params.keys.include? [:embargo, :embargo_release_date]
@@ -28,5 +32,6 @@ module Hydra::ReleaseProcessHelperBehavior
       end
     end
   end  
+  #deprecation_deprecate :check_embargo_date_format
   
 end

data/app/models/generic_content.rb

@@ -1,5 +1,7 @@
 # GenericContent:  EXAMPLE Model that conforms to the Hydra genericContent and genericMetadata cModels 
+require 'deprecation'
 class GenericContent < ActiveFedora::Base
+  extend Deprecation
 
   # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
   #  FIXME:  should this have   "include Hydra::ModelMixins::CommonMetadata" instead?
@@ -18,6 +20,7 @@ class GenericContent < ActiveFedora::Base
   include Hydra::ModelMethods
   
   def initialize( attrs={} )
+    Deprecation.warn(GenericContent, "GenericContent is deprecated and will be removed in hydra-head 5.x")
     super
   end
 end

data/app/models/generic_image.rb

@@ -39,8 +39,10 @@
 #    gi.has_screen?
 #    gi.has_thumbnail?
 require 'hydra'
+require 'deprecation'
 
 class GenericImage < ActiveFedora::Base
+  extend Deprecation
 
   # Uses the GenericImage mixin to conform to the Hydra genericImage cModel (auto-includes on GenericContent behaviors)
   include Hydra::GenericImage
@@ -58,6 +60,7 @@ class GenericImage < ActiveFedora::Base
   has_metadata :name => "properties", :type => Hydra::Datastream::Properties
   
   def initialize( attrs={} )
+    Deprecation.warn(GenericImage, "GenericImage is deprecated and will be removed in hydra-head 5.x")
     super
   end
   

data/app/models/superuser.rb

@@ -1,12 +1,14 @@
 # @deprecated - we are moving away from this approach; this code will be removed no later than release 6.x 
 # To make a superuser record, look up the ID (not the login) of a previously created user,
 # and then insert that id into the superusers table
+require 'deprecation'
 class Superuser < ActiveRecord::Base
+  extend Deprecation
   belongs_to :user
     
   def initialize
-    ActiveSupport::Deprecation.warn("Superuser is deprecated and will be removed from HydraHead in release 5 or 6; we are moving away from this approach.")
+    Deprecation.warn(Superuser, "Superuser is deprecated and will be removed from HydraHead in release 5 or 6; we are moving away from this approach.")
     super
   end
 
-end
+end

data/app/models/user_attribute.rb

@@ -1,9 +1,12 @@
 # @deprecated - from the original implementation of UVA's Libra.  This type of behavior should be application-specific.  This will be removed no later than release 6.x
+require 'deprecation'
 class UserAttribute < ActiveRecord::Base
   belongs_to :user
+  extend Deprecation
 
+  self.deprecation_horizon = 'hydra-head 5.x'
   def initialize
-    ActiveSupport::Deprecation.warn("UserAttribute is deprecated and will be removed from HydraHead in release 5 or 6;  this behavior should be implemented at the app level.")
+    Deprecation.warn(UserAttribute, "UserAttribute is deprecated and will be removed from HydraHead in release 5 or 6;  this behavior should be implemented at the app level.")
     super
   end
 
@@ -12,7 +15,7 @@ class UserAttribute < ActiveRecord::Base
 # @param [sting] login the login of the user
 # @return the user attribute object or nil
  def self.find_by_login(login)
-    ActiveSupport::Deprecation.warn("UserAttribute.find_by_login is deprecated and will be removed from HydraHead in release 5 or 6;  this behavior should be implemented at the app level.")
+    Deprecation.warn(UserAttribute, "UserAttribute.find_by_login is deprecated and will be removed from HydraHead in release 5 or 6;  this behavior should be implemented at the app level.")
     user = User.find_by_login(login)
     if user
       UserAttribute.find_by_user_id(user.id)
@@ -29,4 +32,6 @@ class UserAttribute < ActiveRecord::Base
     [fn, ln].join(" ").strip
   end
 
+  deprecation_deprecate :full_name
+
 end

data/app/views/_add_assets_links.html.erb

@@ -2,13 +2,13 @@
   <a class="add-new-asset" href="#">Add a New Asset</a>
   <ul id="select-item-list">
     <li>
-      <%= link_to_create_asset 'Add a Basic MODS Asset', 'mods_asset' %>
+      <%= link_to 'Add a Basic MODS Asset', new_hydra_asset_path(:content_type => 'mods_asset'), :class => 'create_asset' %>
     </li>
     <li>
-      <%= link_to_create_asset 'Add an Image', 'generic_image' %>
+      <%= link_to 'Add an Image', new_hydra_asset_path(:content_type => 'generic_image'), :class => 'create_asset'  %>
     </li>
     <li>
-      <%= link_to_create_asset 'Add Generic Content', 'generic_content' %>
+      <%= link_to 'Add Generic Content', new_hydra_asset_path(:content_type => 'generic_content'), :class => 'create_asset'  %>
     </li>
   </ul>
-</div>      
+</div>      

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

@@ -6,10 +6,10 @@
 
   </td>
   <td>
-    <%= DateTime.parse(document.fetch(:system_create_dt,nil)).to_time %>
+    <%= l DateTime.parse(document.fetch(:system_create_dt,nil)).to_time %>
   </td>
   <td>
-    <%= (document.fetch(:medium_t,nil) || document_type(document)).gsub("Hydrangea","") %>
+    <%= document.document_type(blacklight_config.show.display_type) %>
   </td>
   <td>
     <%= get_file_asset_count(document)%>

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

@@ -35,6 +35,6 @@
 </div>
 <% if controller.action_name == "edit" %>
   <div class="delete-asset">
-    <%= button_to("Delete This Item", {:action => :destroy, :controller => :"hydra/assets", :id => @document_fedora.pid}, :confirm => 'Are you sure?', :method => :delete )%>
+    <%= button_to("Delete This Item", {:action => :destroy, :controller => :"hydra/assets", :id => @document_fedora.pid}, :data => { :confirm => 'Are you sure?' }, :method => :delete )%>
   </div>
 <% end %>

data/app/views/generic_contents/_index.html.erb

@@ -3,14 +3,14 @@
 		<%= link_to_document(document, :label => blacklight_config.show.heading.to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>		
   </td>
   <td>
-    <% creator = get_person_from_role(document, "Creator") %>
+    <% creator = document.get_person_from_role("Creator") %>
     <%= [creator[:last], creator[:first]].join(", ") unless creator.nil? %>
   </td>
   <td>
     <%= DateTime.parse(document.fetch(:system_create_dt, "")).to_time %>
   </td>
   <td>
-    <%= (document[:medium_t] || document_type(document)).gsub(/^Generic/,"") %>
+    <%= document.document_type(blacklight_config.show.display_type) %>
   </td>
   <td>
     <%= get_file_asset_count(document)%>

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

@@ -20,7 +20,7 @@
     // This hidden form really belongs elsewhere, but putting it inside of an 
     // accordion section un-hides it, so I stuck it here for now. -MZ
     %>
-    <form id="new_contributor" action="<%=url_for(:action=>"create", :controller=>"contributors", :asset_id=>params[:id]) %>" method="post">
+    <form id="new_contributor" action="<%=hydra_asset_contributors_path(:asset_id=>params[:id]) %>" method="post">
       <input class="content_type" type="hidden" name="content_type" value="generic_content" />
       <p><label for="contributor_type">Contributor Type</label>
       <select id="contributor_type" name="contributor_type">

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

@@ -6,14 +6,14 @@
 		
   </td>
   <td>
-    <% creator = get_person_from_role(document, "Creator") %>
+    <% creator = document.get_person_from_role("Creator") %>
     <%= [creator[:last], creator[:first]].join(", ") unless creator.nil? %>
   </td>
   <td>
     <%= DateTime.parse(document.fetch(:system_create_dt, "")).to_time %>
   </td>
   <td>
-    <%= (document[:medium_t] || document_type(document)).gsub(/^Generic/,"") %>
+    <%= document.document_type(blacklight_config.show.display_type) %>
   </td>
   <td>
     <%= get_file_asset_count(document)%>

data/app/views/hydra/file_assets/_file_assets_form.html.erb

@@ -1,7 +1,7 @@
 <%- if params.has_key?(:number_of_files) or !@file_assets.empty? -%>
   <%= render :partial => "hydra/file_assets/index", :locals => { :file_assets => @file_assets } %>
 <%- end -%>
-<%= form_tag(upload_url, :class => "step") do -%>
+<%= form_tag(hydra_asset_file_assets_path(:asset_id => params[:asset_id] || params[:id]), :class => "step") do -%>
   <%= label_tag "number_of_files", "Number of files add" %>
   <%= select_tag("number_of_files", options_for_select((0...11).to_a) ) -%>
   <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "num_files_wf_step") %>

data/app/views/hydra/file_assets/_index.html.erb

@@ -11,8 +11,8 @@
   <%- container_content_type_param = defined?(container_content_type) ? "?container_content_type=#{container_content_type}" : "" %>
   <fieldset id='uploader'>
     <legend>File Upload</legend>
-    <%= form_tag(upload_url,:method=>"post",:enctype=>"multipart/form-data", :class=>"uploader-form step") do -%>
-      <input type="hidden" name="container_id" value="<%=h container_id %>"/>
+    <%= form_tag(hydra_asset_file_assets_path(:asset_id => params[:asset_id] || params[:id]),:method=>"post",:enctype=>"multipart/form-data", :class=>"uploader-form step") do -%>
+      <%= hidden_field_tag("container_id", params[:asset_id] || params[:id]) %>
       <%= hidden_field_tag("container_content_type", container_content_type, :id => "file_upload_content_type") if defined?(container_content_type) %>
       <%- params[:number_of_files].to_i.times do -%>
         <%= render :partial=>"hydra/file_assets/new"%>

data/app/views/hydra/file_assets/_result.html.erb

@@ -5,7 +5,7 @@
   <td>
 	
    <% if can? :edit, @document %>
-    	<%= button_to("Delete", "/hydra/assets/#{result["id"]}/file_assets/#{result["id"]}?container_id=#{@document[:id]}", :confirm => "Are you sure you want to delete this file?", :method => :delete, :class => "delete-button") %>
+     <%= button_to("Delete", "/hydra/assets/#{result["id"]}/file_assets/#{result["id"]}?container_id=#{@document[:id]}", :data => { :confirm => "Are you sure you want to delete this file?" }, :method => :delete, :class => "delete-button") %>
    <% end %>
   </td>
 </tr>

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

@@ -12,10 +12,12 @@
 	</head>
   
   <body class="<%= render_body_class %>">
+    <div id="page">
 
 		<div id="hd">
+      <div id="user_util_links">
 			<%= render :partial => '/user_util_links' %>
-			<%= (params[:controller] == "catalog" and !params[:id]) ? "<span id='results_text'>Search Results</span>".html_safe : "" %>
+      </div>
 		</div>
 	    
     <div id="bd">
@@ -38,6 +40,7 @@
         </div>
       </div>
 		</div>
+  </div>
 		
   </body>
 

data/app/views/mods_assets/_index_list.html.erb

@@ -1,5 +1,5 @@
 <div id="title_div" style="float:left;width:300px;"><h2><%= counter + 1 %>. <%= link_to_document(document, :label => Blacklight.config[:show][:heading].to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %></h2></div>
-<div id="type_div" style="float:right;"><%= (document.get(:medium_t) || document_type(document)).gsub("Hydrangea","") %></div>
+<div id="type_div" style="float:right;"><%= document.document_type(blacklight_config.show.display_type) %></div>
 <div id="content_div" style="float:left;">
 	<dl id="index_list">
   <dt>Author(s):</dt>

data/app/views/mods_assets/_index_table.html.erb

@@ -1,7 +1,7 @@
 <tr class="document <%= cycle("even","odd") %>">
   <td class="document_title"><%= link_to_document(document, :label => :mods_0_title_info_0_main_title_t, :counter => (counter + 1 + @response.params[:start].to_i)) %></td>
-  <td class="document_author"><% author = get_person_from_role(document, "author") %><%= author.nil? ? "n/a" : [author[:last], author[:first]].join(", ") %></td>
+  <td class="document_author"><% author = document.get_person_from_role("author") %><%= author.nil? ? "n/a" : [author[:last], author[:first]].join(", ") %></td>
   <td class="document_work"><%= document.fetch(:journal_title_info_main_title_t, nil) %></td>
-  <td class="document_date"><%= format_date(DateTime.parse(document.fetch(:system_create_dt, "")).to_time) %></td>
+  <td class="document_date"><%= l(DateTime.parse(document.fetch(:system_create_dt, "")).to_date, :format => :hydra) %></td>
   <td class="document_files"><%= get_file_asset_count(document) %></td>
 </tr>

data/app/views/mods_assets/_show.html.erb

@@ -28,7 +28,7 @@
   			  <td><%= result[solr_name("extent", :text)] %></td>
   			  <td>
   			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) -%>
-  			    <%= format_date dt %>
+            <%= l dt, :format => :hydra %>
   			  </td>
   			</tr>
 			<% end %>		

data/app/views/mods_assets/_show_file_assets.html.erb

@@ -13,7 +13,7 @@
 			  <td><%= result[solr_name("extent", :text)] %></td>
 			  <td>
 			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) -%>
-			    <%= format_date dt %>
+          <%= l dt, :format => :hydra %>
 			  </td>
 			</tr>
 		<% end %>		

data/config/jetty.yml

@@ -1,5 +1,5 @@
 default:
-  jetty_port: 8983
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
   startup_wait: 30
   java_opts:
     - "-Xmx256m" 

data/config/locales/hydra.en.yml

@@ -0,0 +1,7 @@
+en:
+  date:
+    formats:
+      hydra: "%b. %e, %Y"
+  time:
+    formats:
+      hydra: "%b. %e, %Y"

data/config/solr.yml

@@ -2,7 +2,7 @@
 development:
   url: http://localhost:8983/solr/development
 test: &TEST
-  url: http://127.0.0.1:8983/solr/test
+  url: http://localhost:8983/solr/test
 cucumber:
   <<: *TEST
 production:

data/config/solr_mappings.yml

@@ -8,7 +8,7 @@ default: searchable
 searchable: 
   default: _t
   date: _dt
-  string: _t
+  string: _s
   text: _t
   symbol: _s
   integer: _i
@@ -19,4 +19,4 @@ searchable:
 displayable: _display
 facetable: _facet
 sortable: _sort
-unstemmed_searchable: _unstem_search
+unstemmed_searchable: _unstem_search

data/hydra-head.gemspec

@@ -13,19 +13,20 @@ Gem::Specification.new do |s|
   s.description = %q{Hydra-Head is a Rails Engine containing the core code for a Hydra application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer, and om}
 
   s.add_dependency "rails", '~>3.2.3' 
-  s.add_dependency "blacklight", '~>3.4.2'  
+  s.add_dependency "blacklight", '~>3.4'  
   s.add_dependency "devise"
   s.add_dependency "active-fedora", '~>4.1'
   s.add_dependency 'RedCloth', '=4.2.9'
   s.add_dependency 'block_helpers'
   s.add_dependency 'sanitize'
-  s.add_dependency 'cancan'
-  s.add_dependency 'deprecation'
+  s.add_dependency 'hydra-mods', ">= 0.0.5"
+  s.add_dependency 'deprecation', ">= 0.0.5"
   s.add_dependency 'jquery-rails'
+  s.add_dependency 'hydra-access-controls', ">= 0.0.2"
   
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'jettywrapper', ">=1.0.4"
+  s.add_development_dependency 'jettywrapper', ">=1.3.0"
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'cucumber-rails', '>=1.2.0'

data/lib/generators/hydra/head_generator.rb

@@ -112,17 +112,18 @@ EOF
     if File.exists?(file_path) 
       insert_into_file file_path, :after => 'include Blacklight::Catalog' do      
         "\n  # Extend Blacklight::Catalog with Hydra behaviors (primarily editing)." +
-        "\n  include Hydra::Catalog\n"  +
+        "\n  include Hydra::Controller::CatalogControllerBehavior\n"  +
         "\n  # These before_filters apply the hydra access controls" +
         "\n  before_filter :enforce_access_controls" +
         "\n  before_filter :enforce_viewing_context_for_show_requests, :only=>:show" +
         "\n  # This applies appropriate access controls to all solr queries" +  
         "\n  CatalogController.solr_search_params_logic << :add_access_controls_to_solr_params" +  
         "\n  # This filters out objects that you want to exclude from search results, like FileAssets" +  
-        "\n  CatalogController.solr_search_params_logic << :exclude_unwanted_models"   
+        "\n  CatalogController.solr_search_params_logic << :exclude_unwanted_models" 
+
       end
     else
-      puts "     \e[31mFailure\e[0m  Could not find #{model_name.underscore}.rb.  To add Hydra behaviors to your Blacklight::Catalog Controllers, you must include the Hydra::Controller module in the Controller class definition.  See the Hydra::Controller section in the Hydra API Docs for more info." 
+      puts "     \e[31mFailure\e[0m  Could not find #{model_name.underscore}.rb.  To add Hydra behaviors to your Blacklight::Catalog Controllers, you must include the Hydra::Controller::ControllerBehavior module in the Controller class definition.  See the Hydra::Controller::ControllerBehavior section in the Hydra API Docs for more info." 
     end    
   end
   
@@ -142,13 +143,13 @@ EOF
     if File.exists?(file_path) 
       insert_into_file file_path, :after => 'include Blacklight::Controller' do 
         "  \n# Adds Hydra behaviors into the application controller \n" +        
-        "  include Hydra::Controller\n" +
+        "  include Hydra::Controller::ControllerBehavior\n" +
         "  def layout_name\n" +
         "   'hydra-head'\n" +
         "  end\n"     
       end
     else
-      puts "     \e[31mFailure\e[0m  Could not find #{model_name.underscore}.rb.  To add Hydra behaviors to your Blacklight::Catalog Controllers, you must include the Hydra::Controller module in the Controller class definition.  See the Hydra::Controller section in the Hydra API Docs for more info." 
+      puts "     \e[31mFailure\e[0m  Could not find #{model_name.underscore}.rb.  To add Hydra behaviors to your Blacklight::Catalog Controllers, you must include the Hydra::Controller::ControllerBehavior module in the Controller class definition.  See the Hydra::Controller::ControllerBehavior section in the Hydra API Docs for more info." 
     end
   end
   

data/lib/generators/hydra/templates/config/fedora.yml

@@ -5,7 +5,7 @@ development:
 test: &TEST  
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:8983/fedora-test
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/fedora-test" %>
 production:
   user: fedoraAdmin
   password: fedoraAdmin

data/lib/generators/hydra/templates/config/solr.yml

@@ -3,7 +3,7 @@
 development:
   url: http://localhost:8983/solr/development
 test: &TEST
-  url: http://127.0.0.1:8983/solr/test
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
 cucumber:
   <<: *TEST
 production:

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "4.0.3"
+  VERSION = "4.1.0"
 end
 

data/lib/hydra.rb

@@ -1,13 +1,13 @@
 require "blacklight"
 require 'active-fedora'
 require 'cancan'
+require 'hydra-access-controls'
 
 # Hydra libraries
 module Hydra
-  extend Blacklight::GlobalConfigurable
   extend ActiveSupport::Autoload
-  autoload :AccessControlsEvaluation
-  autoload :AccessControlsEnforcement
+  autoload :GlobalConfigurable
+  extend GlobalConfigurable
   autoload :Assets
   autoload :Catalog
   autoload :Controller
@@ -15,27 +15,29 @@ module Hydra
   autoload :GenericContent
   autoload :GenericImage
   autoload :GenericUserAttributes
-  autoload :ModelMixins
-  autoload :ModsGenericContent
-  autoload :ModsImage
+  require 'hydra/model_mixins'
   autoload :RepositoryController
   autoload :SubmissionWorkflow
   autoload :SuperuserAttributes
   autoload :User
   autoload :UI
   autoload :Workflow
-end
 
+  autoload :FileAssetsHelper
+
+  # This error is raised when a user isn't allowed to access a given controller action.
+  # This usually happens within a call to AccessControlsEnforcement#enforce_access_controls but can be
+  # raised manually.
+  class Hydra::AccessDenied < CanCan::AccessDenied; end
+end
 
 
 require 'hydra/assets_controller_helper'
-require 'hydra/file_assets_helper'
-
 require 'hydra/rights_metadata'
-require 'hydra/common_mods_index_methods'
-require 'hydra/mods_article'
+require 'hydra/mods'
 require 'hydra/model_methods'
 require 'hydra/models/file_asset'
 require 'mediashelf/active_fedora_helper' #deprecated
 
+SolrDocument.use_extension Hydra::ModelMixins::SolrDocumentExtension