hydra-head 3.3.0 → 4.0.0.rc2

data/app/views/layouts/application.html.erb

@@ -26,7 +26,7 @@
   <div id="doc4" class="yui-t2">
 
   	<div id="hd">
-  		<%= render :partial => '/user_util_links.html' %>
+  		<%= render :partial => '/user_util_links' %>
   		<%= (params[:controller] == "catalog" and !params[:id]) ? "<span id='results_text'>Search Results</span>".html_safe : "" %>
   	</div>
   

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

@@ -26,7 +26,7 @@
 	  <div id="doc4" class="yui-t2">
 		
 		<div id="hd">
-			<%= render :partial => '/user_util_links.html' %>
+			<%= render :partial => '/user_util_links' %>
 			<%= (params[:controller] == "catalog" and !params[:id]) ? "<span id='results_text'>Search Results</span>".html_safe : "" %>
 		</div>
 	    

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

@@ -1,4 +1,4 @@
-<%= form_tag(url_for(:controller=>"assets", :action=>"update", :id=>params[:id]), :class => "step") do -%>
+<%= form_tag(url_for(:controller=>"hydra/assets", :action=>"update", :id=>params[:id]), :class => "step") do -%>
   <%= hidden_field_tag("_method","put", :id=>"assets_method") %>
   <p id="abstract_field" class="fedora-text-area">
     <%= fedora_field_label("descMetadata", [:abstract], "Abstract") %>
@@ -41,4 +41,4 @@
   <%= hidden_field_tag(:content_type,"mods_asset", :id => "additional_content_type") %>
   <%= submit_tag(submit_name, :name=>"continue", :class=>"save-submit") %>
   <%= submit_tag("Save and Finish", :name=>"finish", :class=>"save-submit") unless params[:new_asset] %>
-<%- end -%>
+<%- end -%>

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

@@ -1,4 +1,4 @@
-<%= form_tag(asset_update_contributors_path(:asset_id=>params[:id]), :method => "GET", :class => "step") do -%>
+<%= form_tag(hydra_asset_update_contributors_path(:asset_id=>params[:id]), :method => "GET", :class => "step") do -%>
   <fieldset id="contributors_fields">
 		<legend>Authors</legend>
 	  <p class="legend-caption">An individual or organizational author of work.</p>	

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

@@ -5,7 +5,7 @@
 <%- license_values = @ds_rights_metadata.term_values(:copyright, :license) %>
 <%- journal_title_values = @ds_desc_metadata.term_values(:journal,:title_info,:main_title) %>
 
-<form id="document_metadata" action="<%= url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset")%>" method="post" data-resourceType="mods_asset" accept-charset="utf-8">
+<form id="document_metadata" action="<%= url_for(:action=>"update", :controller=>"hydra/assets", :content_type=>"mods_asset")%>" method="post" data-resourceType="mods_asset" accept-charset="utf-8">
   <input name="_method" type="hidden" value="put" />
   <input class="content_type" type="hidden" name="content_type" value="mods_asset" />
 

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

@@ -39,7 +39,7 @@
     <hr size="1" />
     <!-- <p class="progressItem progressItemChecked bold">Released</p> -->
     <!-- <div class="progressInfoBox"><%#= formatTimestamp(@ds_properties.submit_date_values.first) %></div> -->
-      <%= form_tag url_for( :action=>"update", :controller=>"assets", :content_type=>"mods_asset"), "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8"  do %>
+      <%= form_tag url_for( :action=>"update", :controller=>"hydra/assets", :content_type=>"mods_asset"), "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8"  do %>
             <input name="_method" type="hidden" value="put" />
       	<div>  
             <p class="progressItem progressItemChecked bold">
@@ -58,7 +58,7 @@
 <% else %>
   <li class="progressBoxSubmit noIndent" id="submitToRegistrarDiv">
     <hr size="1" />
-      <%= form_tag url_for( :action=>"update", :controller=>"assets", :content_type=>"mods_asset"), "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8"  do %>
+      <%= form_tag url_for( :action=>"update", :controller=>"hydra/assets", :content_type=>"mods_asset"), "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8"  do %>
         <input name="_method" type="hidden" value="put" />
       	<div>  
         			<%= fedora_field_label("properties", [:release_to], "Release to") %>

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

@@ -1,4 +1,4 @@
-<%= form_tag(url_for(:controller=>"assets", :action=>"update", :id=>params[:id]), :class => "step") do -%>
+<%= form_tag(url_for(:controller=>"hydra/assets", :action=>"update", :id=>params[:id]), :class => "step") do -%>
   <%= hidden_field_tag("_method","put") %>
   <p id="title_field" class="fedora-text-field">
     <%= fedora_field_label("descMetadata", [:title_info,:main_title], "Title<span class=\"required-note\">Required</span>".html_safe) %>

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

@@ -13,7 +13,7 @@
     <%= render :partial => 'mods_assets/show_description' %>
   </div>
   <%# copied to show_file_assets %>
-	<% unless @document_fedora.file_objects(:response_format=>:solr).hits.empty? %>
+	<% unless @document_fedora.file_objects(:response_format=>:solr).empty? %>
     <h2 class="section-title">Files</h2>
     <div class="uploads" id="uploads_<%= format_pid(params[:id]) %>">	
       <table id="file_assets" class="multipleEdit">
@@ -24,7 +24,7 @@
 		    </tr>
 			<% @document_fedora.file_objects(:response_format=>:solr).each do |result| %>
   			<tr class="file_asset" >
-  			  <td><%= link_to result[solr_name("title", :text)], file_asset_path(result["id"]) %></td>
+  			  <td><%= link_to result[solr_name("title", :text)], hydra_file_asset_path(result["id"]) %></td>
   			  <td><%= result[solr_name("extent", :text)] %></td>
   			  <td>
   			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) -%>

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

@@ -1,6 +1,7 @@
 <%# copied div below to show_contributor partial %>
 <div id="contributors_list">
 <ol> 
+
 	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:person) %>
 	<%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:organization) %>
 	<%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:conference) %>

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

@@ -1,4 +1,4 @@
-<% unless @document_fedora.file_objects(:response_format=>:solr).hits.empty? %>
+<% unless @document_fedora.file_objects(:response_format=>:solr).empty? %>
   <h2 class="section-title">Files</h2>
   <div class="uploads" id="uploads_<%= format_pid(params[:id]) %>">	
     <table id="file_assets" class="multipleEdit">
@@ -9,7 +9,7 @@
 	    </tr>
 		<% @document_fedora.file_objects(:response_format=>:solr).each do |result| %>
 			<tr class="file_asset" >
-			  <td><%= link_to result[solr_name("title", :text)], file_asset_path(result["id"]) %></td>
+			  <td><%= link_to result[solr_name("title", :text)], hydra_file_asset_path(result["id"]) %></td>
 			  <td><%= result[solr_name("extent", :text)] %></td>
 			  <td>
 			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) -%>
@@ -19,4 +19,4 @@
 		<% end %>		
 	  </table>
 	</div>
-<% end %>
+<% end %>

data/app/views/shared/_delete_asset_confirmation.html.erb

@@ -1,6 +1,6 @@
 <div id="delete_dialog_container" style="display:none;">
 	<div id="delete_dialog">
-    <%= form_tag(url_for(:action => "destroy", :controller => "assets", :id => pid, :method => "delete")) %>
+    <%= form_tag(url_for(:action => "destroy", :controller => "hydra/assets", :id => pid, :method => "delete")) %>
       <div>
         <span>Permanently delete <%= title %> and its assets from the repository?</span><br/>
         <div id="deletable_assets"></div>

data/config/fedora.yml

@@ -1,8 +1,14 @@
 development:
-  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora
 test: &TEST  
-  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora
 production:
-  url: http://fedoraAdmin:fedoraAdmin@your.production.server:8080/fedora
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://your.production.server:8080/fedora
 cucumber:
   <<: *TEST

data/hydra-head.gemspec

@@ -12,56 +12,26 @@ Gem::Specification.new do |s|
   s.summary     = %q{Hydra-Head Rails Engine (requires Rails3) }
   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.0.10'
-  s.add_dependency "blacklight", '~>3.1.2'  
+  s.add_dependency "rails", '~> 3.2.1'
+  s.add_dependency "blacklight", '~>3.2.2'  
   s.add_dependency "devise"
-  s.add_dependency 'sqlite3-ruby', '~>1.2.5'  #Locked here because centos 5.2 (Hudson) won't support a modern version
-  s.add_dependency "active-fedora", '>=3.3.0'
-  s.add_dependency 'builder', '2.1.2'
-  s.add_dependency 'columnize'
-  s.add_dependency 'crack'
-  s.add_dependency 'curb', '0.7.15' ##Locked here because centos 5.2 (Hudson) doesn't support curl 7.16
-  s.add_dependency 'database_cleaner'
-  s.add_dependency 'diff-lcs'
-  s.add_dependency 'facets', '2.8.4'
-  s.add_dependency 'haml'
-  s.add_dependency 'httparty'
-  s.add_dependency 'json_pure', '>1.4.3'
-  s.add_dependency 'launchy'
-  s.add_dependency 'linecache'
-  s.add_dependency 'mime-types'
-  s.add_dependency 'mediashelf-loggable', "=0.4.7" # Solrizer defines this dependency but its' gemspec needs to be updated.  Until then we'll require 0.4.7.
-  s.add_dependency 'multipart-post'
-  s.add_dependency 'nokogiri' # Default to using the version required by Blacklight
-  s.add_dependency 'om', '>=1.2.3'
-  s.add_dependency 'rack'
-  s.add_dependency 'rack-test'
-  s.add_dependency 'rake'
-  s.add_dependency 'RedCloth', '=4.2.3'
-  s.add_dependency 'solr-ruby' 
-  s.add_dependency 'mediashelf-loggable', '>=0.4.7' ##This can be removed once this dependency is declared in solrizer
-  s.add_dependency 'solrizer', '>=1.1.0'
-  s.add_dependency 'solrizer-fedora', '>=1.2.2'
-  s.add_dependency 'term-ansicolor'
-  s.add_dependency 'trollop'
-  s.add_dependency 'will_paginate'
-  s.add_dependency 'xml-simple'
+  s.add_dependency "active-fedora", '~>4.0.0.rc13'
+  s.add_dependency 'RedCloth', '=4.2.9'
+  s.add_dependency 'solrizer-fedora', '>=1.2.5'
   s.add_dependency 'block_helpers'
   s.add_dependency 'sanitize'
+  s.add_dependency 'om', '=1.5.3'
+
   
+  s.add_development_dependency 'sqlite3-ruby'
+
   s.add_development_dependency 'yard'
   s.add_development_dependency 'jettywrapper', ">=1.0.4"
-  s.add_development_dependency 'ruby-debug'
-  s.add_development_dependency 'ruby-debug-base'
-#  s.add_development_dependency 'rspec', '>= 2.0.0'  
-  s.add_development_dependency 'rspec-rails', '>= 2.7.0'
-#  s.add_development_dependency 'rest-client'
+  #s.add_development_dependency 'rspec-rails', '>= 2.8.0'
+  s.add_development_dependency 'rspec-rails', '~> 2.6.0'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'cucumber', '>=0.8.5'
-  s.add_development_dependency 'cucumber-rails', '>=1.0.0'
-  s.add_development_dependency 'gherkin'
+  s.add_development_dependency 'cucumber-rails', '>=1.2.0'
   s.add_development_dependency 'factory_girl'
-  s.add_development_dependency "rake"
 
 
   s.files         = `git ls-files`.split("\n")

data/lib/application_controller.rb

@@ -8,18 +8,17 @@ module HydraHead
       before_filter :method_for_before_filtering
     end
 
-    module InstanceMethods
-      def method_for_before_filtering
-        #puts "Filtering before" 
-      end
+    def method_for_before_filtering
+      #puts "Filtering before" 
+    end
 
-      def method_not_a_filter
-        puts "not used as a filter"
-      end
+    def method_not_a_filter
+      puts "not used as a filter"
     end
   end
 end
 
+#TODO this seems bad
 ::ActionController::Base.send :include, HydraHead::Controller
 
 

data/lib/generators/hydra/head_generator.rb

@@ -26,29 +26,29 @@ class HeadGenerator < Rails::Generators::Base
          
   # Copy all files in templates/config directory to host config
   def create_configuration_files
+    #CatalogController
+    copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+
     # Initializers
-   copy_file "config/initializers/hydra_config.rb", "config/initializers/hydra_config.rb"
-   copy_file "config/initializers/blacklight_config.rb", "config/initializers/blacklight_config.rb"
-   copy_file "config/initializers/action_dispatch_http_upload_monkey_patch.rb", "config/initializers/action_dispatch_http_upload_monkey_patch.rb"
+    copy_file "config/initializers/hydra_config.rb", "config/initializers/hydra_config.rb"
+    copy_file "config/initializers/action_dispatch_http_upload_monkey_patch.rb", "config/initializers/action_dispatch_http_upload_monkey_patch.rb"
 
-   # Role Mappings
-   copy_file "config/role_map_cucumber.yml", "config/role_map_cucumber.yml"
-   copy_file "config/role_map_development.yml", "config/role_map_development.yml"
-   copy_file "config/role_map_production.yml", "config/role_map_production.yml"
-   copy_file "config/role_map_test.yml", "config/role_map_test.yml"
+    # Role Mappings
+    copy_file "config/role_map_cucumber.yml", "config/role_map_cucumber.yml"
+    copy_file "config/role_map_development.yml", "config/role_map_development.yml"
+    copy_file "config/role_map_production.yml", "config/role_map_production.yml"
+    copy_file "config/role_map_test.yml", "config/role_map_test.yml"
    
-   # Solr Mappings
-   copy_file "config/solr_mappings.yml", "config/solr_mappings.yml"
+    # Solr Mappings
+    copy_file "config/solr_mappings.yml", "config/solr_mappings.yml"
 
-   # Fedora & Solr YAML files
-   copy_file "config/fedora.yml", "config/fedora.yml"
-   copy_file "config/solr.yml", "config/solr.yml"
+    # Fedora & Solr YAML files
+    copy_file "config/fedora.yml", "config/fedora.yml"
+    copy_file "config/solr.yml", "config/solr.yml"
    
-   # Fedora & Solr Config files
-   directory "fedora_conf"
-   directory "solr_conf"
-   # directory "../../../../fedora_conf", "fedora_conf"
-   # directory "../../../../solr_conf", "solr_conf"
+    # Fedora & Solr Config files
+    directory "fedora_conf"
+    directory "solr_conf"
   end
   
   # Register mimetypes required by hydra-head

data/lib/generators/hydra/templates/catalog_controller.rb

@@ -0,0 +1,162 @@
+# -*- encoding : utf-8 -*-
+require 'blacklight/catalog'
+
+class CatalogController < ApplicationController  
+
+  include Blacklight::Catalog
+
+  configure_blacklight do |config|
+    config.default_solr_params = { 
+      :qt => 'search',
+      :rows => 10 
+    }
+
+    # solr field configuration for search results/index views
+    config.index.show_link = 'title_t'
+    config.index.record_display_type = 'has_model_s'
+
+    # solr field configuration for document/show views
+    config.show.html_title = 'title_t'
+    config.show.heading = 'title_t'
+    config.show.display_type = 'has_model_s'
+
+    # solr fields that will be treated as facets by the blacklight application
+    #   The ordering of the field names is the order of the display
+    #
+    # Setting a limit will trigger Blacklight's 'more' facet values link.
+    # * If left unset, then all facet values returned by solr will be displayed.
+    # * If set to an integer, then "f.somefield.facet.limit" will be added to
+    # solr request, with actual solr request being +1 your configured limit --
+    # you configure the number of items you actually want _displayed_ in a page.    
+    # * If set to 'true', then no additional parameters will be sent to solr,
+    # but any 'sniffed' request limit parameters will be used for paging, with
+    # paging at requested limit -1. Can sniff from facet.limit or 
+    # f.specific_field.facet.limit solr request params. This 'true' config
+    # can be used if you set limits in :default_solr_params, or as defaults
+    # on the solr side in the request handler itself. Request handler defaults
+    # sniffing requires solr requests to be made with "echoParams=all", for
+    # app code to actually have it echo'd back to see it.  
+    #
+    # :show may be set to false if you don't want the facet to be drawn in the 
+    # facet bar
+    config.add_facet_field 'object_type_facet', :label => 'Format' 
+    config.add_facet_field 'pub_date', :label => 'Publication Year' 
+    config.add_facet_field 'subject_topic_facet', :label => 'Topic', :limit => 20 
+    config.add_facet_field 'language_facet', :label => 'Language', :limit => true 
+    config.add_facet_field 'lc_1letter_facet', :label => 'Call Number' 
+    config.add_facet_field 'subject_geo_facet', :label => 'Region' 
+    config.add_facet_field 'subject_era_facet', :label => 'Era'  
+
+    # Have BL send all facet field names to Solr, which has been the default
+    # previously. Simply remove these lines if you'd rather use Solr request
+    # handler defaults, or have no facets.
+    config.default_solr_params[:'facet.field'] = config.facet_fields.keys
+    #use this instead if you don't want to query facets marked :show=>false
+    #config.default_solr_params[:'facet.field'] = config.facet_fields.select{ |k, v| v[:show] != false}.keys
+
+
+    # solr fields to be displayed in the index (search results) view
+    #   The ordering of the field names is the order of the display 
+    config.add_index_field 'title_display', :label => 'Title:' 
+    config.add_index_field 'title_vern_display', :label => 'Title:' 
+    config.add_index_field 'author_display', :label => 'Author:' 
+    config.add_index_field 'author_vern_display', :label => 'Author:' 
+    config.add_index_field 'format', :label => 'Format:' 
+    config.add_index_field 'language_facet', :label => 'Language:'
+    config.add_index_field 'published_display', :label => 'Published:'
+    config.add_index_field 'published_vern_display', :label => 'Published:'
+    config.add_index_field 'lc_callnum_display', :label => 'Call number:'
+
+    # solr fields to be displayed in the show (single result) view
+    #   The ordering of the field names is the order of the display 
+    config.add_show_field 'title_display', :label => 'Title:' 
+    config.add_show_field 'title_vern_display', :label => 'Title:' 
+    config.add_show_field 'subtitle_display', :label => 'Subtitle:' 
+    config.add_show_field 'subtitle_vern_display', :label => 'Subtitle:' 
+    config.add_show_field 'author_display', :label => 'Author:' 
+    config.add_show_field 'author_vern_display', :label => 'Author:' 
+    config.add_show_field 'format', :label => 'Format:' 
+    config.add_show_field 'url_fulltext_display', :label => 'URL:'
+    config.add_show_field 'url_suppl_display', :label => 'More Information:'
+    config.add_show_field 'language_facet', :label => 'Language:'
+    config.add_show_field 'published_display', :label => 'Published:'
+    config.add_show_field 'published_vern_display', :label => 'Published:'
+    config.add_show_field 'lc_callnum_display', :label => 'Call number:'
+    config.add_show_field 'isbn_t', :label => 'ISBN:'
+
+    # "fielded" search configuration. Used by pulldown among other places.
+    # For supported keys in hash, see rdoc for Blacklight::SearchFields
+    #
+    # Search fields will inherit the :qt solr request handler from
+    # config[:default_solr_parameters], OR can specify a different one
+    # with a :qt key/value. Below examples inherit, except for subject
+    # that specifies the same :qt as default for our own internal
+    # testing purposes.
+    #
+    # The :key is what will be used to identify this BL search field internally,
+    # as well as in URLs -- so changing it after deployment may break bookmarked
+    # urls.  A display label will be automatically calculated from the :key,
+    # or can be specified manually to be different. 
+
+    # This one uses all the defaults set by the solr request handler. Which
+    # solr request handler? The one set in config[:default_solr_parameters][:qt],
+    # since we aren't specifying it otherwise. 
+    
+    config.add_search_field 'all_fields', :label => 'All Fields'
+    
+
+    # Now we see how to over-ride Solr request handler defaults, in this
+    # case for a BL "search field", which is really a dismax aggregate
+    # of Solr search fields. 
+    
+    config.add_search_field('title') do |field|
+      # solr_parameters hash are sent to Solr as ordinary url query params. 
+      field.solr_parameters = { :'spellcheck.dictionary' => 'title' }
+
+      # :solr_local_parameters will be sent using Solr LocalParams
+      # syntax, as eg {! qf=$title_qf }. This is neccesary to use
+      # Solr parameter de-referencing like $title_qf.
+      # See: http://wiki.apache.org/solr/LocalParams
+      field.solr_local_parameters = { 
+        :qf => '$title_qf',
+        :pf => '$title_pf'
+      }
+    end
+    
+    config.add_search_field('author') do |field|
+      field.solr_parameters = { :'spellcheck.dictionary' => 'author' }
+      field.solr_local_parameters = { 
+        :qf => '$author_qf',
+        :pf => '$author_pf'
+      }
+    end
+    
+    # Specifying a :qt only to show it's possible, and so our internal automated
+    # tests can test it. In this case it's the same as 
+    # config[:default_solr_parameters][:qt], so isn't actually neccesary. 
+    config.add_search_field('subject') do |field|
+      field.solr_parameters = { :'spellcheck.dictionary' => 'subject' }
+      field.qt = 'search'
+      field.solr_local_parameters = { 
+        :qf => '$subject_qf',
+        :pf => '$subject_pf'
+      }
+    end
+
+    # "sort results by" select (pulldown)
+    # label in pulldown is followed by the name of the SOLR field to sort by and
+    # whether the sort is ascending or descending (it must be asc or desc
+    # except in the relevancy case).
+    config.add_sort_field 'score desc, pub_date_sort desc, title_sort asc', :label => 'relevance'
+    config.add_sort_field 'pub_date_sort desc, title_sort asc', :label => 'year'
+    config.add_sort_field 'author_sort asc, title_sort asc', :label => 'author'
+    config.add_sort_field 'title_sort asc, pub_date_sort desc', :label => 'title'
+
+    # If there are more than this many search results, no spelling ("did you 
+    # mean") suggestion is offered.
+    config.spell_max = 5
+  end
+
+
+
+end