curate 0.6.1 → 0.6.3

data/app/views/curate/collections/_form_to_add_member.html.erb

@@ -1,24 +1,26 @@
+<% fieldset_class  ||= '' %>
+<% select_label_id ||= '' %>
+
 <%= form_tag add_member_collections_path, method: :put do %>
   <fieldset class="required <%= fieldset_class %>">
-    <% if collectible %>
-      <%= hidden_field_tag :collectible_id, collectible.pid %>
-    <% end %>
+    <%= hidden_field_tag :collectible_id, collectible.pid %>
 
     <div class="control-group collection_id">
       <div class="controls">
-        <% options = '<option selected="true" disabled="disabled">Make a Selection</option>'.html_safe %>
-        <%- if (collection = (@collection_options || [] ).reject {|n| n == collectible}).any? -%>
+        <% options = "" %>
+        <% collections = available_collections(collectible) %>
+        <% if collections.any? -%>
           <% options << '<optgroup label="Your Collections">'.html_safe %>
-          <% options << options_from_collection_for_select(collection, "pid", "title") %>
+          <% options << options_from_collection_for_select(collections, "pid", "title") %>
           <% options << '</optgroup>'.html_safe %>
-        <%- end -%>
+        <% end %>
         <% options << options_from_collection_for_select(available_profiles, "pid", "title") %>
-        <%- if current_users_profile_sections.any? -%>
+        <% if current_users_profile_sections.any? %>
           <% options << '<optgroup label="Profile Sections">'.html_safe %>
           <% options << options_from_collection_for_select(current_users_profile_sections, "pid", "title") %>
           <% options << '</optgroup>'.html_safe %>
-        <%- end -%>
-        <%= select_tag :profile_collection_id, options, include_blank: true, class: 'input-xlarge' %>
+        <% end %>
+        <%= select_tag :profile_collection_id, options, prompt: 'Make a Selection', class: 'input-xlarge', :'aria-labelledby' => select_label_id %>
       </div>
     </div>
 

data/app/views/curate/collections/add_member_form.html.erb

@@ -1,4 +1,6 @@
 <% content_for :page_header do %>
-  <h1>Add <%= @collectible %> to:</h1>
+  <h1 id="add-to-title">Add <%= @collectible %> to:</h1>
+<% end %>
+<% if can? :collect, @collectible %>
+  <%= render partial: 'form_to_add_member', locals: { collectible: @collectible, select_label_id: 'add-to-title', button_class: 'btn btn-primary' } %>
 <% end %>
-<%= render partial: 'form_to_add_member', locals: { collectible: @collectible, fieldset_class: '' } %>

data/app/views/curation_concern/base/_collections.html.erb

@@ -19,13 +19,3 @@
   </tbody>
 </table>
 <% end %>
-
-<%- if current_user %>
-  <%- if has_any_collections? %>
-    <%= render 'add_to_collection_gui', collectible: curation_concern %>
-  <%- else %>
-    <div class="span12 main-header">
-      <p><em>You have no collections in which to add this <%= curation_concern.human_readable_type %>.</em></p>
-    </div>
-  <%- end -%>
-<%- end -%>

data/app/views/curation_concern/base/_related_files.html.erb

@@ -48,7 +48,7 @@
             <%- end -%>
           <%- end -%>
           <%- if can?(:read, generic_file) -%>
-            <%= render 'curation_concern/generic_files/media_display', generic_file: generic_file %>
+            <%= link_to 'Download', download_path(generic_file.noid),{class: 'btn', title: "Download #{generic_file.to_s.inspect}", :target => "_blank"}%>
           <%- end -%>
         </td>
       </tr>

data/app/views/curation_concern/base/_representative_media.html.erb

@@ -0,0 +1,8 @@
+<% if work.representative.present? && (gf = GenericFile.load_instance_from_solr(work.representative)) %>
+  <%= render partial: 'curation_concern/generic_files/media_display', locals: {generic_file: gf, dom_class_name: 'representative_image'} %>
+<% elsif work.representative.present? %>
+  <%= image_tag download_path(work.representative, {:datastream_id => 'thumbnail'}), class: 'representative_image' %>
+<% else %>
+  <%= image_tag 'curate/nope.png', class: "canonical-image" %>
+<% end %>
+

data/app/views/curation_concern/base/_thumbnail.html.erb

@@ -1,5 +1,7 @@
-<%- if thumbnail.representative.present? -%>
-  <%= image_tag download_path(thumbnail.representative, {:datastream_id => 'thumbnail'}), class: dom_class_name  %>
-<%- else -%>
-  <%= image_tag 'curate/nope.png', class: "canonical-image" %>
-<%- end -%>
+<% width = 36 if width.blank? %>
+<%  if thumbnail.image? || thumbnail.pdf? || thumbnail.video? %>
+  <% path = download_path(thumbnail, {datastream_id: 'thumbnail'}) %>
+<% else %>
+  <% path = "curate/default.png" %>
+<% end %>
+<%= link_to image_tag(path, width: width, class: 'thumbnail'), curation_concern_generic_file_path(thumbnail.noid), class: 'canonical-image' %>

data/app/views/curation_concern/base/show.html.erb

@@ -2,7 +2,7 @@
 <% content_for :page_header do %>
   <h1><%= curation_concern %> <span class="human_readable_type">(<%= curation_concern.human_readable_type %>)</span></h1>
 <% end %>
-<%= render partial: 'representative_image', locals: {work: curation_concern} %>
+<%= render partial: 'representative_media', locals: {work: curation_concern} %>
 
 <%= render 'attributes', curation_concern: curation_concern %>
 <%= render 'doi', curation_concern: curation_concern %>
@@ -12,12 +12,20 @@
 <%= render 'related_works', curation_concern: curation_concern, with_actions: true %>
 <%= render 'collections', curation_concern: curation_concern %>
 
-<% content_for :second_row do %>
-  <% if can?(:edit, curation_concern) %>
+<% collector = can?(:collect, curation_concern) %>
+<% editor    = can?(:edit,    curation_concern) %>
+<% if collector || editor %>
+  <% content_for :second_row do %>
     <div class="form-actions">
-      <%= link_to "Edit This #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concern, curation_concern]), class: 'btn btn-primary' %>
-      <%= link_to "Attach a File", new_curation_concern_generic_file_path(curation_concern), class: 'btn btn-primary' %>
-      <%= link_to "Add an External Link", new_curation_concern_linked_resource_path(curation_concern), class: 'btn btn-primary' %>
+      <% if editor %>
+        <%= link_to "Edit This #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concern, curation_concern]), class: 'btn btn-primary' %>
+        <%= link_to "Attach a File", new_curation_concern_generic_file_path(curation_concern), class: 'btn btn-primary' %>
+        <%= link_to "Add an External Link", new_curation_concern_linked_resource_path(curation_concern), class: 'btn btn-primary' %>
+      <% end %>
+      <% if collector %>
+        <%= render 'add_to_collection_gui', collectible: curation_concern, button_class: 'btn btn-primary' %>
+      <% end %>
     </div>
   <% end %>
 <% end %>
+

data/app/views/curation_concern/documents/_document.html.erb

@@ -2,7 +2,7 @@
 <% solr_doc = document.inner_object.solr_doc %>
 <li id="document_<%= document.noid %>" class="search-result">
 
-  <%= render :partial => 'catalog/_index_partials/identifier_and_action', locals: {document: document, counter: document_counter} %>
+  <%= render :partial => 'catalog/_index_partials/identifier_and_action', locals: {document: document, counter: document_counter, solr_doc: solr_doc} %>
 
   <div class="row-fluid">
 

data/app/views/curation_concern/generic_files/_media_display.html.erb

@@ -1 +1,11 @@
-<%= link_to 'Download', download_path(generic_file.noid),{class: 'btn', title: "Download #{generic_file.to_s.inspect}", :target => "_blank"}%>
+<%- if generic_file.image? -%>
+  <%= image_tag download_path(generic_file, datastream_id: 'thumbnail'), class: 'representative_image' %>
+<% elsif generic_file.audio? %>
+  <audio controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
+    <source src="<%= download_path(generic_file, datastream_id: 'ogg') %>" type="audio/ogg" />
+    <source src="<%= download_path(generic_file, datastream_id: 'mp3') %>" type="audio/mpeg" />
+    Your browser does not support the audio tag.
+  </audio>
+<%- else -%>
+  <%= image_tag 'curate/nope.png', class: "canonical-image" %>
+<%- end -%>

data/app/views/curation_concern/generic_files/show.html.erb

@@ -2,7 +2,7 @@
 <% content_for :page_header do %>
   <h1>File Details</h1>
 <% end %>
-<%= render partial: 'thumbnail', locals: {thumbnail: curation_concern, dom_class_name: 'representative_image'} %>
+<%= render partial: 'media_display', locals: {generic_file: curation_concern, dom_class_name: 'representative_image'} %>
 <%= render "attributes", curation_concern: curation_concern %>
 
   <div class="form-actions">

data/app/views/curation_concern/people/_person.html.erb

@@ -1,27 +1,9 @@
 <%# This is a search result view %>
 <% noid = person.noid %>
+<% solr_doc = person.inner_object.solr_doc %>
 <li id="document_<%= noid %>" class="search-result">
 
-  <div class="row-fluid">
-
-    <div class="span2 list-number">
-      <%= document_counter_with_offset( person_counter ) %>
-      <%= render :partial => 'catalog/_index_partials/type_display', locals: {document: person} %>
-    </div>
-
-    <div class="span6">
-      <% solr_doc = person.inner_object.solr_doc %>
-      <%# Minimize Fedora hits by using solr_doc rather than document %>
-      <%= link_to render_index_field_value(document: solr_doc, field: 'desc_metadata__name_tesim'), person, :id => "src_copy_link_#{noid}" %>
-    </div>
-
-    <div class="span4">
-      <% if current_user -%>
-        <%= render partial: 'add_to_collection_gui', locals: { document: person } %>
-      <% end -%>
-    </div>
-
-  </div>
+  <%= render :partial => 'catalog/_index_partials/identifier_and_action', locals: { document: person, counter: person_counter, title_link_target: person, title_link_text: person.name, edit_path: '' } %>
 
   <div class="row-fluid">
 

data/app/views/profiles/_profile.html.erb

@@ -1,34 +1,9 @@
 <%# This is a search result view %>
 <% noid = profile.noid %>
+<% solr_doc = profile.inner_object.solr_doc %>
 <li id="document_<%= noid %>" class="search-result">
 
-  <div class="row-fluid">
-
-    <div class="span2 list-number">
-      <%= document_counter_with_offset( profile_counter ) %>
-      <%= render :partial => 'catalog/_index_partials/type_display', locals: {document: profile} %>
-    </div>
-
-    <div class="span6">
-      <% solr_doc = profile.inner_object.solr_doc %>
-      <%# Minimize Fedora hits by using solr_doc rather than document %>
-      <%= link_to render_index_field_value(document: solr_doc, field: 'desc_metadata__title_tesim'), profile, :id => "src_copy_link_#{noid}" %>
-    </div>
-
-    <div class="span4">
-      <% if current_user %>
-        <%= render partial: 'add_to_collection_gui', locals: { document: profile } %>
-
-        <%= link_to(
-          raw('<i class="icon-pencil icon-large"></i>'),
-          edit_collection_path(profile),
-            :class=> 'itemicon itemedit btn pull-right',
-            :title => 'Edit Profile'
-          ) if can? :edit, profile %>
-      <% end -%>
-    </div>
-
-  </div>
+  <%= render :partial => 'catalog/_index_partials/identifier_and_action', locals: { document: profile, counter: profile_counter, title_link_target: profile, edit_path: edit_profile_path(profile), solr_doc: solr_doc } %>
 
   <div class="row-fluid">
 

data/lib/curate/spec_support.rb

@@ -3,8 +3,7 @@
 # Then we should expose those spec support files to that applications
 spec_directory = File.expand_path('../../../spec', __FILE__)
 require "rails/test_help"
-require 'rspec/rails'
-require 'rspec-html-matchers'
+require "rspec/rails"
 require 'factory_girl'
 require 'capybara/poltergeist'
 Dir["#{spec_directory}/factories/**/*.rb"].each { |f| require f }

data/lib/curate/version.rb

@@ -1,3 +1,3 @@
 module Curate
-  VERSION = "0.6.1"
+  VERSION = "0.6.3"
 end

data/spec/features/catalog_search_spec.rb

@@ -65,25 +65,6 @@ describe "Search for a work" do
     end
   end
 
-  context "Facet - Cancel bar" do
-    let(:user) { FactoryGirl.create(:user) }
-    let!(:collection) { FactoryGirl.create(:public_collection, user: user, title: 'Collected Stuff') }
-    let!(:work1) { FactoryGirl.create(:generic_work, user: user, title: 'Work 1') }
-    let!(:work2) { FactoryGirl.create(:generic_work, user: user, title: 'Work 2') }
-    before do
-      login_as(user)
-      add_to_collection(work1)
-      add_to_collection(work2)
-    end
-    it "should display collection title and not PID" do
-      visit catalog_index_path
-      within "ul#facets" do
-        click_link "Collected Stuff"
-      end
-      page.should have_content("Collected Stuff X")
-    end
-  end
-
   protected
   def create_collection
     visit('/')
@@ -109,15 +90,4 @@ describe "Search for a work" do
     end
   end
 
-  def add_to_collection(work)
-    visit catalog_index_path
-    within "#document_#{work.noid}" do
-      click_on 'Add to Collection'
-    end
-    within "#main form" do
-      select('Collected Stuff')
-      click_on 'Add'
-    end
-  end
-
 end

data/spec/features/generic_file_spec.rb

@@ -74,7 +74,8 @@ describe 'Uploading Generic File' do
       curation_concern.save!
       login_as(user)
     end
-    it 'should change versions correctly' do
+
+    xit 'should change versions correctly', redundant: true do
       visit new_curation_concern_generic_file_path(curation_concern)
 
       within("form.new_generic_file") do

data/spec/features/generic_work_spec.rb

@@ -51,15 +51,6 @@ describe 'An existing generic work owned by the user' do
     click_link 'Add an External Link'
     page.should have_link('Cancel', href: catalog_index_path)
   end
-
-  context 'when the user has no collections yet,' do
-
-    it 'displays a message instead of the widget to add a work to a collection' do
-      login_as(user)
-      visit curation_concern_generic_work_path(work)
-      expect(page).to have_content('You have no collections')
-    end
-  end
 end
 
 describe 'Viewing a generic work that is private' do
@@ -88,4 +79,3 @@ describe 'When I click on the link to create a work: ' do
   end
 end
 
-

data/spec/features/thumbnail_display_spec.rb

@@ -10,6 +10,7 @@ describe 'display thumbnail' do
   context 'Display thumbnail for associated iamges' do
     before do
       generic_file2.datastreams['thumbnail'].content = image_file
+      generic_file2.mime_type = 'image/png'
       generic_file2.save!
       curation_concern.generic_files << generic_file2
       curation_concern.save!
@@ -25,8 +26,10 @@ describe 'display thumbnail' do
   context 'File Representative:' do
     before do
       generic_file1.datastreams['thumbnail'].content = image_file
+      generic_file1.mime_type = 'image/png'
       generic_file1.save!
       generic_file2.datastreams['thumbnail'].content = image_file
+      generic_file2.mime_type = 'image/png'
       generic_file2.save!
       curation_concern.generic_files << generic_file1
       curation_concern.generic_files << generic_file2
@@ -36,10 +39,10 @@ describe 'display thumbnail' do
     it 'should show thumbnail when a representative is selected for the work' do
       login_as(user)
       visit curation_concern_image_path(curation_concern)
-      page.should have_css("img[src$='#{generic_file1.pid}?datastream_id=thumbnail'][class$='representative_image']")
+      page.should have_css("img[src$='#{generic_file1.to_param}?datastream_id=thumbnail'][class$='representative_image']")
       page.should have_css("img[src$='#{generic_file1.to_param}?datastream_id=thumbnail'][class$='thumbnail']")
       page.should have_css("img[src$='#{generic_file2.to_param}?datastream_id=thumbnail'][class$='thumbnail']")
-      page.should_not have_css("img[src$='#{generic_file2.pid}?datastream_id=thumbnail'][class$='representative_image']")
+      page.should_not have_css("img[src$='#{generic_file2.to_param}?datastream_id=thumbnail'][class$='representative_image']")
     end
   end
 end

data/spec/helpers/curate_helper_spec.rb

@@ -1,6 +1,33 @@
 require 'spec_helper'
 
 describe ApplicationHelper do
+
+  context '#collection_title_from_pid' do
+    let(:value) { 'abc' }
+    let(:collection) { double(title: 'Title') }
+    it 'should load the value and return the title' do
+      Collection.should_receive(:load_instance_from_solr).with(value).and_return(collection)
+      expect(helper.collection_title_from_pid(value)).to eq(collection.title)
+    end
+    it 'should attempt to load the value, fail, and return the value' do
+      Collection.should_receive(:load_instance_from_solr).with(value).and_return(nil)
+      expect(helper.collection_title_from_pid(value)).to eq(value)
+    end
+  end
+
+  context '#creator_name_from_pid' do
+    let(:value) { 'abc' }
+    let(:collection) { double(name: 'Name') }
+    it 'should load the value and return the name' do
+      Person.should_receive(:load_instance_from_solr).with(value).and_return(collection)
+      expect(helper.creator_name_from_pid(value)).to eq(collection.name)
+    end
+    it 'should attempt to load the value, fail, and return the value' do
+      Person.should_receive(:load_instance_from_solr).with(value).and_return(nil)
+      expect(helper.creator_name_from_pid(value)).to eq(value)
+    end
+  end
+
   it 'has #default_page_title' do
     expect(helper.default_page_title).to(
       eq("#{controller_name.titleize} // #{I18n.t('sufia.product_name')}")

data/spec/internal/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: ../../../curate
   specs:
-    curate (0.6.0)
+    curate (0.6.1)
       active_attr
       active_fedora-registered_attributes (~> 0.2.0)
       bootstrap-datepicker-rails
@@ -81,7 +81,7 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    acts_as_follower (0.2.0)
+    acts_as_follower (0.2.1)
     addressable (2.3.5)
     arel (4.0.1)
     atomic (1.1.14)
@@ -216,10 +216,10 @@ GEM
       hydra-access-controls (= 6.4.1)
       hydra-core (= 6.4.1)
       rails (>= 3.2.6)
-    hydra-remote_identifier (0.6.1)
+    hydra-remote_identifier (0.6.2)
       activesupport (>= 3.2.13, < 5.0)
       rest-client (~> 1.6.7)
-    i18n (0.6.8)
+    i18n (0.6.9)
     ice_nine (0.10.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
@@ -318,7 +318,7 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     redis (3.0.6)
-    redis-namespace (1.3.2)
+    redis-namespace (1.4.1)
       redis (~> 3.0.4)
     resque (1.25.1)
       mono_logger (~> 1.0)
@@ -431,7 +431,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     trollop (1.16.2)
-    turbolinks (1.3.1)
+    turbolinks (2.0.0)
       coffee-rails
     tzinfo (0.3.38)
     uglifier (2.3.2)

data/spec/internal/config/initializers/devise.rb

@@ -4,7 +4,7 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  config.secret_key = 'd0c5b78901a2ff76f54024b900bc7a6243d42c7872c16a4ac32defaa2b888b170130ce4313a6fb7c0a772d6931011df622ec1967fbe0fcb3811bbfd18d3e0c4e'
+  config.secret_key = 'e1a71ebe9846b0adaa7f20e03dc5712b18f31fad02b361c617c236e783ea8874d37317b1d63ee251a39978b83d1023552715483df57292c80f22d9ddfdbd4c71'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
@@ -95,7 +95,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = '6b72cd98335ba66b9865e24950ba66e1e2b3a69f0482a0cb1910c69618a0e7a150cb6b3b7ef2025789364abc4b77febc0887d5aff6edd713f55743820c905baf'
+  # config.pepper = '063037e779f5ef314ccf15ef0b462128474a92348d7971311526a93313355088b2b36c444bc7c32021e6f9e2413c681cabc5b65fbab154366890b2b1df8eff35'
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without