hydra-head 4.0.3 → 4.1.0

data/.gitignore

@@ -44,6 +44,7 @@ log/*.log
 tmp/*.log
 tmp/pids/
 tmp/test_app/
+console
 
 *.sqlite3
 *.log

data/HISTORY.textile

@@ -1,8 +1,23 @@
 h3. 4.1.0
-* Upgrade to active fedora 4.1.0
+* Add AccessControlsEnforcement to AssetsController
+* Upgrade to active fedora ~>4.1
 * Upgrade to solrizer-fedora 2.1.0
-* Upgrade to blacklight 3.4.1 
+* Upgrade to blacklight ~> 3.4 
 * Improved access controls api
+* HYDRA-817 allow overriding of where we redirect_to, so that nested routes will work
+* Extracted hydra-mods and hydra-access-controls
+* Deprecation fest in preparation for 5.0
+* HYDRA-822 Move GlobalConfig into Hydra. It was removed from Blacklight.
+* HYDRA-831 apply_depositor_metadata should not overwrite existing user permissions
+* HYDRA-832 depositor should apply depositor metadata if the properties datastream exists
+* Fix up layout to better match blacklight.
+
+Note about deprecations:  We encourage the implementer to create their own controllers
+for CRUD operations and use standard Rails forms rather than using the AssetsController 
+and the AssetsControllerHelpers. In the 5.0 series these capabilites will be removed from
+HydraHead.  If you want to continue using these modules, you should copy the appropriate 
+files from this release into your local Hydra application. Further simplified examples 
+of this approach will be forthcoming. Until then, scholarsphere is a great exemplar.
 
 h3. 4.0.0
 * Upgrade to active fedora 4.0.0

data/app/assets/stylesheets/hydra/html_refactor.css

@@ -1,30 +1,11 @@
-/* This is the CSS that Jessie is creating to put some CSS tweaks necessary to get the app looking like Blacklight again
-   I fully expect this CSS to either be moved to a more appropriate name or removed all together */
 
-#documents table {
-	width:100%;
-}
-
-
-/* The hydra provided search button was miss-aligned w/ the form field */
-#search .submit {
-	margin-bottom:-12px;
-}
-
-/* Record view next/previous links */
-#previousNextDocument {
-	text-align:center;
-}
-#previousNextDocument .previous {
-	float:left;
-}
-
-/* JFG: to be sorted */
 
 /* =HEADER
 -------------------------------------------------------------- */
 
-#doc4 #hd {font-size: 12px; text-align: right;}
+#hd { overflow: visible; margin-bottom: 2em; }
+
+#hd #user_util_links { width: 75%; }
 
 #select-item-box {background: url('/assets/hydra/search-button.png') no-repeat scroll 95% 5px #f5f5f5; border: 1px solid #BBB; float: left; line-height: 20px; margin-top: -3px; padding: 2px 6px; position: relative; text-align: left; width: 170px; z-index: 300; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; }
 #select-item-box > a {border-bottom: none; vertical-align: text-bottom;}
@@ -38,14 +19,6 @@
 /* =SEARCH
 -------------------------------------------------------------- */
 
-#doc4 #bd { font-size: 13px;}
-#bd #search {background-color: #EEE; padding: 12px 20px; background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #DDD), color-stop(1, #EEE));
-background-image: -moz-linear-gradient(center bottom, #DDD 0%, #EEE 100%); }
-#bd .home-text #search { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;}
-#bd #search #q {margin: 0 15px 0 0; padding: 0.2em; width: 420px;}
-#bd #search .submit {background: #f3f3f3; border: 1px solid #AAA; font-size: 16px; margin: 0; padding: 4px 6px; width: 75px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; }
-#bd #search .submit:hover {background: #f7f7f7; cursor: pointer;}
-
 /* =RESULTS
 -------------------------------------------------------------- */
 

data/app/assets/stylesheets/hydra/styles.css

@@ -1,42 +1,9 @@
-html {
-  background-color: white;
-	overflow-y: scroll;
-}
-
-html, body {
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-body {
-	background: #fff;
-  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
-  font-size: 13px;
-  color: #121212;
-}
-
-#document h1 {
-    display: none;
-}
-
-body td, body ul, body p, body ol {
-	font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
-
-
-#hd ul {
-	margin: 5px;
-	padding: 5px;
-}
+/*
+ *= require 'hydra/html_refactor'
+ */
 
-#hd ul li {
-	list-style-type: none;
-	display: inline;
-	color: blue;
-	cursor: pointer;
-	margin-left: 10px;
+#page {
+  width: 1020px;
 }
 
 button.ui-button-icon-only {
@@ -99,17 +66,11 @@ button.ui-button-icon-only {
     font-style: normal;
 }
 
-a:link, a:visited, a:active, #uvalicense_read_all {
-    color: blue;
-    text-decoration: underline;
-    border: none;
-}
-
 .editable-text:hover, .textile-text .text:hover {
     color: #E7C584 !important;
 }
 
-a:hover, a:hover.addval, #uvalicense_read_all:hover {
+a:hover.addval, #uvalicense_read_all:hover {
     color: blue
 }
 
@@ -127,20 +88,10 @@ a.destructive:hover {
     width: 40px;
 }
 
-h2 {
-    font-weight: bold;
-    text-transform: uppercase;
-    margin-top: 30px;
-}
-
 th {
     font-weight: bold;
 }
 
-h3 {
-    margin-left: 20px;
-}
-
 dl dd {
     margin-left: 0;
 }
@@ -211,11 +162,6 @@ table#file_assets {
     color: #E7C584;
 }
 
-#hd {
-  overflow: visible; /* override blacklight */
-}
-
-
 #submitForRelease {
 	background: #DFEFFC;
 	color: #336;
@@ -407,10 +353,6 @@ tr.document {
 	margin: 0;
 }
 
-#results {
-	border: 1px solid #C8C8C8;
-}
-
 .document_show #cover_container h1 {
 	margin-bottom: 0;
 	padding-bottom: 0;

data/app/controllers/downloads_controller.rb

@@ -1,5 +1,5 @@
 class DownloadsController < ApplicationController
-    include Hydra::RepositoryController
+    include Hydra::Controller::RepositoryControllerBehavior
     include Hydra::AssetsControllerHelper
     helper :downloads
     

data/app/controllers/hydra/assets_controller.rb

@@ -1,3 +1,12 @@
+require 'deprecation'
 class Hydra::AssetsController < ApplicationController
-    include Hydra::Assets
+  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,9 +1,18 @@
+require 'deprecation'
 class Hydra::ContributorsController < ApplicationController
-  include Hydra::RepositoryController
+  extend Deprecation
+
+  self.deprecation_horizon = 'hydra-head 5.x'
+  include Hydra::Controller::RepositoryControllerBehavior
   include Hydra::AssetsControllerHelper
   include Hydra::SubmissionWorkflow
 
   before_filter :load_document, :only => :update 
+
+  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
@@ -22,6 +31,7 @@ class Hydra::ContributorsController < ApplicationController
       format.inline { render :partial=>"contributors/new", :layout=>false }
     end
   end
+  deprecation_deprecate :new
   
   def create
     @document_fedora = load_document_from_id(params[:asset_id])
@@ -38,6 +48,7 @@ class Hydra::ContributorsController < ApplicationController
     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
@@ -55,6 +66,7 @@ class Hydra::ContributorsController < ApplicationController
       redirect_to next_step(params[:asset_id])
     end
   end
+  deprecation_deprecate :update
   
   def destroy
     af_model = retrieve_af_model(params[:content_type], :default=>ModsAsset)
@@ -67,6 +79,7 @@ class Hydra::ContributorsController < ApplicationController
       redirect_to edit_catalog_path(params[:asset_id], :wf_step => :contributor)
     end
   end
+  deprecation_deprecate :destroy
   
   protected 
   
@@ -87,6 +100,7 @@ class Hydra::ContributorsController < ApplicationController
     end
     return true
   end
+  deprecation_deprecate :mods_assets_update_validation
   
   private
   

data/app/controllers/hydra/file_assets_controller.rb

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

data/app/controllers/hydra/permissions_controller.rb

@@ -1,4 +1,13 @@
+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
   
@@ -10,6 +19,7 @@ class Hydra::PermissionsController < ApplicationController
       format.inline { render :partial=>"hydra/permissions/index", :format=>"html" }
     end
   end
+  deprecation_deprecate :index
   
   def new
     respond_to do |format|
@@ -17,6 +27,7 @@ class Hydra::PermissionsController < ApplicationController
       format.inline { render :partial=>"hydra/permissions/new" }
     end
   end
+  deprecation_deprecate :new
   
   def edit
     @document_fedora=ActiveFedora::Base.find(params[:asset_id], :cast=>true)
@@ -26,6 +37,7 @@ class Hydra::PermissionsController < ApplicationController
       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"}
@@ -55,6 +67,7 @@ class Hydra::PermissionsController < ApplicationController
     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"}}}
@@ -96,5 +109,6 @@ class Hydra::PermissionsController < ApplicationController
     end
     
   end
+  deprecation_deprecate :update
     
 end

data/app/helpers/hydra/article_metadata_helper_behavior.rb

@@ -1,15 +1,20 @@
 # 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(":",'\:')}\"" 
@@ -18,14 +23,17 @@ module Hydra
       (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
@@ -40,12 +48,14 @@ module Hydra
       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)
@@ -58,6 +68,7 @@ module Hydra
       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)
@@ -69,6 +80,7 @@ module Hydra
         return abstract[0..max].strip.concat("...")
       end
     end
+    deprecation_deprecate :short_abstract
 
     def admin_info(doc)
       info =<<-EOS
@@ -77,6 +89,7 @@ module Hydra
         | Status: Created
       EOS
     end
+    deprecation_deprecate :admin_info
 
   end
 end

data/app/helpers/hydra/downloads_helper_behavior.rb

@@ -1,5 +1,10 @@
+require 'deprecation'
+
 module Hydra
   module DownloadsHelperBehavior
+    extend Deprecation
+    
+    self.deprecation_horizon = 'hydra-head 5.x'
     
     def list_downloadables( datastreams, mime_types=["application/pdf"])
       result = "<ul>" 
@@ -13,6 +18,7 @@ module Hydra
       result << "</ul>"
       return result
     end
+    deprecation_deprecate :list_downloadables
     
   end
 end

data/app/helpers/hydra/facets_helper_behavior.rb

@@ -1,14 +1,21 @@
+# WILL BE REMOVED IN HYDRA-HEAD 5.x
+require 'deprecation'
 module Hydra
   module FacetsHelperBehavior
     include Blacklight::FacetsHelperBehavior
+    extend Deprecation
+    self.deprecation_horizon = 'hydra-head 5.x'
+
 
     # Removing the [remove] link and label class from the default selected facet display
+    # NOT DEPRECATED BECAUSE THIS IS AN OVERRIDE OF A BLACKLIGHT METHOD
     def render_selected_facet_value(facet_solr_field, item)
       content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected")
     end
 
     # Override to remove the label class (easier integration with bootstrap)
     # and handles arrays
+    # NOT DEPRECATED BECAUSE THIS IS AN OVERRIDE OF A BLACKLIGHT METHOD
     def render_facet_value(facet_solr_field, item, options ={})    
       if item.is_a? Array
         render_array_facet_value(facet_solr_field, item, options)