hydra-core 5.0.0.pre9 → 5.0.0.pre10

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "5.0.0.pre9"
+  VERSION = "5.0.0.pre10"
 end
 

data/spec/controllers/catalog_controller_spec.rb

@@ -54,10 +54,8 @@ describe CatalogController do
     
     describe "access controls" do
       before(:all) do
-        @public_only_results = Blacklight.solr.find Hash[:fq=>"access_t:public"]
-        # @public_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"public"}]
-        # @private_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"private"}]
-        @private_only_results = Blacklight.solr.find Hash[:fq=>"access_t:private"]
+        fq = "read_access_group_t:public OR edit_access_group_t:public OR discover_access_group_t:public"
+        @public_only_results = Blacklight.solr.find Hash[:fq=>fq]
       end
 
       it "should only return public documents if role does not have permissions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre9
+  version: 5.0.0.pre10
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.0.rc2
+        version: 5.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.0.rc2
+        version: 5.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre9
+        version: 5.0.0.pre10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre9
+        version: 5.0.0.pre10
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -317,23 +317,6 @@ files:
 - app/helpers/hydra/facets_helper_behavior.rb
 - app/models/hydra/datastream/properties.rb
 - app/models/mods_asset.rb
-- app/views/_flash_msg.html.erb
-- app/views/catalog/_citation.html.erb
-- app/views/catalog/_delete_partials/_default.html.erb
-- app/views/catalog/_edit_partials/_default.html.erb
-- app/views/catalog/_edit_partials/_default_details.html.erb
-- app/views/catalog/_home.html.erb
-- app/views/catalog/_home_text.html.erb
-- app/views/catalog/_index_partials/_default.html.erb
-- app/views/catalog/_index_partials/_default_details.html.erb
-- app/views/catalog/_show_partials/_default.html.erb
-- app/views/catalog/_show_partials/_default_details.html.erb
-- app/views/catalog/_show_partials/_facets.html.erb
-- app/views/catalog/_sms_form.html.erb
-- app/views/catalog/_uva_tabs.html.erb
-- app/views/catalog/about.html.erb
-- app/views/catalog/show.html.erb
-- app/views/layouts/hydra-head.html.erb
 - config/jetty.yml
 - config/locales/hydra.en.yml
 - hydra-core.gemspec

data/app/views/_flash_msg.html.erb

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

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

@@ -1,11 +0,0 @@
-<h1><%= document_show_html_title %></h1>
-
-<% if @document.respond_to?(:export_as_mla_citation_txt) %>
-  <h4>MLA</h4>
-  <%= @document.send(:export_as_mla_citation_txt) %><br/><br/>
-<% end %>
-
-<% if @document.respond_to?(:export_as_apa_citation_txt) %>
-  <h4>APA</h4>
-  <%= @document.send(:export_as_apa_citation_txt) %>
-<% end %>

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

@@ -1,22 +0,0 @@
-<%# default partial to delete display solr document fields in catalog show view -%>
-
-<div class="document_viewer" id="cover_container">
-	<div id="delete_dialog">
-		<div id="delete_dialog_container">
-			
-				
-				<div>
-	        <span>Permanently delete <%= @document['id'] %> and its assets from the repository?</span><br/>
-	        <div id="deletable_assets"></div>
-	      </div>
-				
-					<div>
-					<%= button_to("Delete", hydra_asset_path(@document['id']), :confirm => 'Are you sure?', :method => :delete )%>
-					 <%= button_to("Withdraw", withdraw_path(:id => @document['id']) ) %>
-					 <%= button_to("Cancel", :action=>:edit, :controller => :catalog, :id => @document['id'] ) %>
-					
-	      </div>
-	      		 
-		 </div>
-	</div>
-</div>

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

@@ -1,57 +0,0 @@
-<%# default partial to display solr document fields in catalog show view -%>
-
-<%- stylesheet_links << "../plugin_assets/hydra-head/javascripts/date-picker/css/datepicker" %>
-<%- stylesheet_links << ["../plugin_assets/hydra-head/javascripts/select_to_ui_slider/css/ui.slider.extras.css"] %>
-<%- stylesheet_links << ["../plugin_assets/hydra-head/stylesheets/slider.css"] %>
-
-
-
-<% @fedora_object = ActiveFedora::Base.find(params[:id])
-   @datastreams = @fedora_object.datastreams
-%>
-
-<div class="document_viewer" id="cover_container">
-  <dl>
-    <dt>pid:</dt>
-        <dd><%= @fedora_object.pid %></dd>
-  </dl>
-  <dl>
-    <dt>label:</dt>
-        <dd><%= @fedora_object.label %></dd>
-    <dt>state:</dt>
-        <dd><%= @fedora_object.state %></dd>
-    <dt>owner id:</dt>
-        <dd><%= @fedora_object.inner_object.ownerId %></dd>
-  </dl>
-  <dl>
-    <dt>created:</dt>
-        <dd><%= @fedora_object.create_date %></dd>
-    <dt>last modified:</dt>
-        <dd><%= @fedora_object.modified_date %></dd>
-  </dl>
-  <dl>
-    <dt>datastreams:</dt>
-        <dd>
-          <ul>
-            <% @datastreams.keys.sort!.each do |dsid| %>
-                <li><a href="#<%=dsid%>" class="inline"><%=dsid%></a>
-                    <div style='display:none'>
-                      <div id='<%=dsid%>'>
-                        <h1><%=dsid%></h1>
-                        <dl>
-                            <%= ("<dt>label:</dt><dd>" + @datastreams[dsid].dsLabel + "</dd>").html_safe unless @datastreams[dsid].dsLabel.blank? %>
-                            <%= ("<dt>last modified:</dt><dd>" + @datastreams[dsid].lastModifiedDate + "</dd>").html_safe unless @datastreams[dsid].lastModifiedDate.blank? %>
-                            <%= ("<dt>mimetype:</dt><dd>" + @datastreams[dsid].mimeType + "</dd>").html_safe unless @datastreams[dsid].mimeType.blank? %>
-                            <%= ("<dt>control group:</dt><dd>" + @datastreams[dsid].controlGroup + "</dd>").html_safe unless @datastreams[dsid].controlGroup.blank? %>
-                        </dl>
-                      </div>
-                    </div></li>
-            <% end %>
-          </ul>
-        </dd>
-  </dl>
-
-  <%= render :partial => "hydra/permissions/index", :locals => {:document => document, :asset_id=>params[:id]}%>
-
-</div>
-

data/app/views/catalog/_edit_partials/_default_details.html.erb

@@ -1,13 +0,0 @@
-
-
-<%# this should imitate the stuff in catalog/_show_partials/_default_details -%>
-<%= form_tag hydra_update_url_for(:action=>"update", :controller=>"hydra/assets"), :id=>"document_metadata"  "accept-charset"=>"utf-8" do %>
-
-  <div id="multipleEdit">
-      <dl class="defList fl-theme-mist">
-      <%= editable_metadata_field(@document_fedora, "descMetadata", :title, :label => "Title:") %>
-      </dl>
-    </div>
-  </div>
-<% end %>
-<%# -- end of code replicating catalog/_show_partials/_default_details -%>

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

@@ -1,4 +0,0 @@
-<%= render :partial=>'search_form' %>
-<%= render :partial=>'home_text' %>
-
-<%= sidebar_items.join('').html_safe %>

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

@@ -1,4 +0,0 @@
-<div id="results" class="home-text">
-  <h1>Welcome to Hydra</h1>
-  <p>Edit or override this page (views/catalog/_home_text.html.erb)</p>
-</div>

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

@@ -1,20 +0,0 @@
-<tr class="document">
-  <td>
-    <%= link_to_document(document, :label => blacklight_config.show.heading.to_sym) %>
-  </td>
-  <td>
-
-  </td>
-  <td>
-    <%= l DateTime.parse(document.fetch(:system_create_dt,nil)).to_time %>
-  </td>
-  <td>
-    <%= document.document_type(blacklight_config.show.display_type) %>
-  </td>
-  <td>
-    <%= document.get_file_asset_count()%>
-  </td>
-  <td>
-    Created
-  </td>
-</tr>

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

@@ -1,14 +0,0 @@
-<%# default partial to display solr document fields in catalog index view -%>
-<dl class="defList">
-  <%#= get_relevance_bar(document[:score],"Relevance:") %>
-  <dt>Date: </dt>
-  <dd><%= render_document_show_field_value(:document=>document, :field=>"date_t") %></dd>
-  <dt>Title: </dt>
-  <dd><%= render_document_show_field_value(:document=>document, :field=>"title_t") %></dd>
-  <dt>Document Type: </dt>
-  <dd><%= render_document_show_field_value(:document=>document, :field=>"medium_t") %></dd>
-  <dt>Location: </dt>
-  <dd><%= render_document_show_field_value(:document=>document, :field=>"location_t") %></dd>
-  <dt>Date: </dt>
-  <dd><%= render_document_show_field_value(:document=>document, :field=>"date_t") %></dd>
-</dl>

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

@@ -1,20 +0,0 @@
-<%# default partial to display solr document fields in catalog show view -%>
-
-
-<div class="document_viewer" id="cover_container">
-  <dl class="defList">
-    <dt>ID: </dt>
-    <dd><%= render_document_show_field_value(:document=>document, :field=>"id") %></dd>
-    <dt>Download:</dt>
-    <dd id="downloads">
-	  <ul>
-        <% %>
-      </ul>
-    </dd>
-    <dt>Copyright: </dt>
-    <dd><%= render_document_show_field_value(:document=>document, :field=>"rights_t") %></dd>
-  </dl>
-</div>
-<div class="<%= params[:action]%>_details">
-  <%= render :partial => "#{params[:controller]}/_#{params[:action]}_partials/default_details", :locals => {:document => document}%>
-</div>

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

@@ -1,15 +0,0 @@
-<%# default partial to display solr document fields in catalog show view -%>
-<div>
-  <dl class="defList">
-    <dt>Date: </dt>
-    <dd><%= render_document_show_field_value(:document=>document, :field=>"date_t") %></dd>
-    <dt>Title: </dt>
-    <dd><%= render_document_show_field_value(:document=>document, :field=>"title_t") %></dd>
-    <dt>Document Type: </dt>
-    <dd><%= render_document_show_field_value(:document=>document, :field=>"medium_t") %></dd>
-    <dt>Location: </dt>
-    <dd><%= render_document_show_field_value(:document=>document, :field=>"location_t") %></dd>
-    <dt>Date: </dt>
-    <dd><%= render_document_show_field_value(:document=>document, :field=>"date_t") %></dd>
-  </dl>
-</div>

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

@@ -1,52 +0,0 @@
-<% facets_display_heading ||=  "" %>
-<% # main container for facets/limits menu -%>
-<div id="facets">
-  <h2><%=h facets_display_heading %></h2>
-  <% facet_field_names.each do |solr_fname| %>
-    <div>
-      <% display_facet = @response.facets.detect {|f| f.name == solr_fname} -%>
-      <%#- raise solr_fname.inspect unless display_facet -%>
-      <% if display_facet && display_facet.items.length > 0 %>
-        <h3 class="facet_selected"><%= facet_field_labels[solr_fname] -%></h3>
-        <ul>
-	      <% item_counter = 0 %>
-          <% display_facet.items.each do |item| -%>
-            <% if item.hits > 0 %>
-              <% facet_count_for_value = facet_value_hits(@facet_lookup, solr_fname, item.value) %>
-              <% if facet_in_params? solr_fname, item.value %>
-                <li>
-                  <span class="selected"><%= h(item.value) %> (<%= format_num facet_count_for_value %>)</span>
-                  <% link_options = remove_facet_params(solr_fname, item.value, params).merge!Hash["controller" => "catalog", :action=> "index"] %>
-                  [<%= link_to 'remove', url_for(link_options), :class=>'remove' %>]
-                </li>
-                <% else %>
-				<%- if item_counter > Blacklight.config[:facet_more_num]-1 -%>
-                  <li class="more">
-				<%- else -%>
-				  <li>
-				<%- end -%>
-                  <% link_options = add_facet_params(solr_fname, item.value).merge!Hash["controller" => "catalog", :action=> "index"] %>
-                  <%= link_to h(item.value), url_for(link_options) %> (<%= format_num facet_count_for_value %>)
-                </li>
-              <% end -%>
-            <% end -%>
-			<% item_counter += 1 %>
-          <% end %>
-          <%= display_facet.items.length > Blacklight.config[:facet_more_num] ? "<li class='more_li'><a href='' class='more_link' title='more #{pluralize(2, facet_field_labels[solr_fname])[2..-1].downcase}'>more<span class='off_screen'> #{pluralize(2, facet_field_labels[solr_fname])[2..-1].downcase}</span></a></li>" : "" %>
-          <%= display_facet.items.length > Blacklight.config[:facet_more_num] ? "<li class='less_li' style='display:none;'><a href='' class='more_link' title='less #{pluralize(2, facet_field_labels[solr_fname])[2..-1].downcase}'>less<span class='off_screen'> #{pluralize(2, facet_field_labels[solr_fname])[2..-1].downcase}</span></a></li>" : "" %>
-        </ul>
-      <% end %>
-    </div>
-  <% end %>
-</div>
-<script type="text/javascript">
-  $(".more").toggle();
-  $('.more_link').each(function(){
-    $(this).click(function(){
-      $(this).parent().parent().children("li.more").toggle();
-      $(this).parent().parent().children("li.more_li").toggle();
-      $(this).parent().parent().children("li.less_li").toggle();
-      return false;
-    });
-  });
-</script>

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

@@ -1,21 +0,0 @@
-<% carriers = 
-{
-'Please select your carrier' => '',
-'AT&T' => 'att',
-'Verizon' => 'verizon',
-'T Mobile' => 'tmobile',
-'Sprint' => 'sprint',
-'Nextel' => 'nextel',
-'Virgin Mobile' => 'vmobile',
-'Alltel' => 'alltel',
-'Cricket' => 'cricket'
-}
-%>
-<h1>SMS This</h1>
-<%= form_tag url_for(:action => 'send_email_record', :style => 'sms'), :id => 'sms_form', :method => :post do %>
-  <%= label_tag(:to, "Phone Number:") %><br/>
-  <%= text_field_tag :sms_to %><br/>
-  <%= label_tag(:carrier, "Carrier:") %><br/>
-  <%= select_tag(:carrier, options_for_select(carriers, '')) %><br/>
-  <%= submit_tag "Send" %>
-<% end %>

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

@@ -1,10 +0,0 @@
-<ul>
- <li>
-  <% display_class = (!params[:home_context] || params[:home_context]=='authors') ? 'class="selected"' : '' %>
-   <a <%= display_class %> href="/catalog?home_context=authors">Authors</a>
- </li>
- <li>
-  <% display_class = params[:home_context]=='journals' ? 'class="selected"' : '' %>
-   <a <%= display_class %> href="/catalog?home_context=journals">Journals</a>
- </li>
-</ul>

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

@@ -1,40 +0,0 @@
-<%-
-  doc_title = (document_show_html_title.nil? || document_show_html_title.empty?) ? @document[:id] : document_show_html_title.first
-  @page_title = "#{doc_title} - #{application_name}" 
--%>
-<div id="showHead">
-  <div id="showUtils">
-    <span class="back_to_cat"><%= link_back_to_catalog :label=>'← Return to search results' %></span>
-    <%- if @previous_document || @next_document -%>
-      <div id="previousNextDocument">
-	    <span class="previous"><%= link_to_previous_document(@previous_document) %></span>
-    <%- end -%>
-    <%- if session[:search][:counter].to_i > 0 -%>
-      <span class="result-num">
-        <%= session[:search][:counter].to_i %> of <%= format_num(session[:search][:total]) %>
-      </span>
-    <%- end -%>
-    <%- if @previous_document || @next_document -%>
-	    <span class="next"><%= link_to_next_document(@next_document)%></span>	
-      </div>
-    <%- end -%>
-    <%- if can?(:edit, @document) && controller.action_name != "delete" -%>
-    	<span class="edit-browse">
-    		<%= edit_and_browse_links %>
-    	</span>
-    <%- end -%>
-  </div>
-</div>
-<div id="document" class="<%= controller.action_name == "edit" ? "document_edit" : "document_show" %> <%= "combined_document_view" if session[:scripts] %>">
-  <div id="<%= format_pid(@document[:id]) %>">
-    <%= "<h1>Add Your Work</h1>".html_safe if controller.action_name == "edit" %>
-    <div class="document">
-      <%= render_document_partial @document, params["action"] %>
-    </div>
-  </div>
-</div>
-<% if controller.action_name == "edit" %>
-  <div class="delete-asset">
-    <%= button_to("Delete This Item", {:action => :destroy, :controller => :"hydra/assets", :id => @document_fedora.pid}, :data => { :confirm => 'Are you sure?' }, :method => :delete )%>
-  </div>
-<% end %>