curation_concerns 0.3.0 → 0.4.0

data/app/views/curation_concerns/classify_concerns/new.html.erb

@@ -12,7 +12,7 @@
           <h3 class="title"><%= klass.human_readable_type %></h3>
           <p class="short-description"><%= klass.human_readable_short_description %></p>
           <%= link_to 'Add New',
-            main_app.new_polymorphic_path([:curation_concerns, klass]),
+            main_app.new_polymorphic_path(klass),
             class: "add-button btn btn-primary #{dom_class(klass, 'add_new')}"
           %>
         </li>

data/app/views/curation_concerns/file_sets/_actions.html.erb

@@ -1,11 +1,11 @@
 <% if can?(:edit, file_set.id) %>
-  <%= link_to( 'Edit', edit_polymorphic_path([main_app, :curation_concerns, file_set]),
+  <%= link_to( 'Edit', edit_polymorphic_path([main_app, file_set]),
     { class: 'btn btn-default', title: "Edit #{file_set}" }) %>
   <%= link_to( 'Rollback', main_app.versions_curation_concerns_file_set_path(file_set),
     { class: 'btn btn-default', title: "Rollback to previous version" }) %>
 <% end %>
 <% if can?(:destroy, file_set.id) %>
-  <%= link_to( 'Delete', polymorphic_path([main_app, :curation_concerns, file_set]),
+  <%= link_to( 'Delete', polymorphic_path([main_app, file_set]),
     class: 'btn btn-default', method: :delete, title: "Delete #{file_set}",
     data: {confirm: "Deleting #{file_set} from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation"}
   )%>

data/app/views/curation_concerns/file_sets/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for [main_app, :curation_concerns, curation_concern],
+<%= simple_form_for [main_app, curation_concern],
                     html: { multipart: true },
                     wrapper_mappings: { multifile: :horizontal_file_input } do |f| %>
   <div class="row">

data/app/views/curation_concerns/file_sets/_rights_modal.html.erb

@@ -0,0 +1,41 @@
+<div class="modal-div">
+<!-- Modal -->
+<div class="modal fade" id="rightsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+        <h2 id="rightsModallLabel"><%= t('sufia.product_name') %> License Descriptions</h2>
+      </div>
+      <div class="modal-body">
+        <p>Creative Commons licenses can take the following combinations, which is what a depositor sees on the page where metadata (descriptions) are entered. Via the drop-down menu, the depositor may select any of the following licenses (these are all described at "About the Licenses" on the Creative Commons site):
+        </p> <ul>
+        <li><b>Attribution 3.0: CC BY</b><br/>
+        With this license you allow others to "distribute, remix, tweak, and build" on your deposited content - including for commercial purposes - provided they attribute you as the original creator.</li>
+        <li><b>Attribution-Share-Alike 3.0: CC BY-SA</b> <br/>
+        With this license you allow others to "remix, tweak, and build" on your deposited content, including for commercial uses, provided they attribute you as the original creator AND incorporate the same level of licensing (i.e., CC BY-SA) for the newly resulting creation. "All new works based on yours will carry the same license, so any derivatives will also allow commercial use."</li>
+        <li><b>Attribution-NoDerivs 3.0: CC BY-ND </b><br/>
+        With this license you permit "redistribution, commercial and non-commercial," provided the content remains unaltered and intact (i.e., whole) and provided you are attributed as the original creator.</li>
+        <li><b>Attribution-Non-Commercial 3.0: CC BY-NC</b><br/>
+        With this license you allow others to "remix, tweak, and build" on your content in non-commercial ways. While they must credit you as the original creator and while the remixed, tweaked, or expanded upon content must remain non-commercial, they do not have to apply identical license terms on the new content.</li>
+        <li><b>Attribution-NonCommercial-NoDerivs 3.0 CC BY-NC-ND</b><br/>
+        With this license you share your work with others and allow them to download your work, provided they attribute you as the creator and refrain from changing the content in any way and from using it for commercial means. </li>
+        <li><b>Attribution-Non-Commercial-Share-Alike 3.0: CC BY-NC-SA</b><br/>
+        With this license you allow others to "remix, tweak, and build" on your content in non-commercial ways, provided they give you credit (as the original creator) and also apply the same license level to the newly resulting creations.</li>
+        <li><b>Attribution-Non-Commercial-Share-Alike-NoDerivs 3.0: CC BY-NC-SA-ND</b><br/>
+        With this license you share your work with others and allow them to download it, provided they attribute you as the creator; they must also refrain from changing the content in any way and from using it for commercial means. </li>
+        <li><b>Public Domain Mark 1.0 </b><br/>
+        When content is in the public domain, it has no known copyright owner. </li>
+        <li><b>CC0 1.0 Universal </b><br/>
+        With this license you are waiving your rights as copyright owner to the content you upload. This means your content may be distributed and reused without attribution, without restriction. CC0 is a license that one applies to one's own work; rarely does one apply it to another's work, unless one has the appropriate rights to do so.</li>
+        </ul>
+    </p>
+    <p> Please note: Another license option that is listed is <b>"All rights reserved."</b> With this license you - as the copyright holder - reserve all rights held under copyright law, such as for distribution and creation of derivative works. This means that no one can use your content in a work - such as a presentation or article - or create derivatives from it without your permission.</p>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-primary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+</div>

data/app/views/curation_concerns/file_sets/media_display/_default.html.erb

@@ -1,4 +1,7 @@
   <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the document" do %>
-    <%= image_tag "default.png", alt: "No preview available", class: "img-responsive" %>
+    <figure>
+      <%= image_tag "default.png", alt: "No preview available", class: "img-responsive" %>
+      <figcaption>Download the document</figcaption>
+    </figure>
   <% end %>
 

data/app/views/curation_concerns/file_sets/media_display/_image.html.erb

@@ -1,8 +1,9 @@
-   <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized image" do %>
-     <%= image_tag(main_app.download_path(file_set, file: 'thumbnail'),
-                   class: "img-responsive",
-                   alt: "Download the full-sized image of #{file_set.to_s}"
-                  ) %>
-     Download the full-sized image
-   <% end %>
-
+  <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized image" do %>
+    <figure>
+      <%= image_tag(main_app.download_path(file_set, file: 'thumbnail'),
+                    class: "img-responsive",
+                    alt: "Download the full-sized image of #{file_set.to_s}"
+                   ) %>
+      <figcaption>Download the full-sized image</figcaption>
+    </figure>
+  <% end %>

data/app/views/curation_concerns/file_sets/media_display/_office_document.html.erb

@@ -1,7 +1,9 @@
-   <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the document" do %>
-     <%= image_tag(main_app.download_path(file_set, file: 'thumbnail'),
-                   class: "img-responsive",
-                   alt: "Download the document \"#{file_set.to_s}\""
-                  ) %>
-     Download the document
-   <% end %>
+  <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the document" do %>
+    <figure>
+      <%= image_tag(main_app.download_path(file_set, file: 'thumbnail'),
+                    class: "img-responsive",
+                    alt: "Download the document \"#{file_set.to_s}\""
+                   ) %>
+      <figcaption>Download the document</figcaption>
+    </figure>
+  <% end %>

data/app/views/curation_concerns/file_sets/media_display/_pdf.html.erb

@@ -1,7 +1,9 @@
-  <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized PDF" do%>
-    <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
-                  class: "img-responsive",
-                  alt: "Download the full-sized PDF of #{file_set.to_s}" %>
-    Download the full-sized PDF
+  <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized PDF" do %>
+    <figure>
+      <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
+                    class: "img-responsive",
+                    alt: "Download the full-sized PDF of #{file_set.to_s}" %>
+      <figcaption>Download the full-sized PDF</figcaption>
+    </figure>
   <% end %>
 

data/app/views/curation_concerns/file_sets/show.html.erb

@@ -1,6 +1,6 @@
 <% provide :page_title, @presenter.page_title %>
 <% provide :page_header do %>
-  <h1>File Details</h1>
+  <h1>File Details <small><%= @presenter.title %></small></h1>
 <% end %>
 <%= media_display @presenter %>
 <%= render "attributes", curation_concern: @presenter %>
@@ -8,7 +8,7 @@
   <div class="form-actions">
     <%= link_to "Download this File", main_app.download_path(@presenter), class: 'btn btn-default' %>
     <% if can? :edit, @presenter.id %>
-      <%= link_to "Edit this File", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-default'  %>
+      <%= link_to "Edit this File", edit_polymorphic_path([main_app, @presenter]), class: 'btn btn-default'  %>
     <% end %>
 
     <%= link_to "Back to #{parent.human_readable_type}", parent_path(parent), class: 'btn btn-default' %>

data/app/views/curation_concerns/file_sets/upload/_alerts.html.erb

@@ -2,17 +2,17 @@
 <div class="alert alert-info hide" id="success">
   You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
   <p>
-  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn' %>
+  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, @presenter]), class: 'btn' %>
   </p>
 </div>
 
 <div class="alert hide" id="fail">
-  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', edit_polymorphic_path([main_app, :curation_concerns, @presenter]) %>
+  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', edit_polymorphic_path([main_app, @presenter]) %>
 </div>
 
 <div class="alert hide" id="partial_fail">
   One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
-  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn' %>
+  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, @presenter]), class: 'btn' %>
 </div>
 
 <div class="alert hide" id="errmsg"> </div>

data/app/views/curation_concerns/file_sets/upload/_form.html.erb

@@ -1,6 +1,6 @@
 <%= form_for(FileSet.new, url: main_app.curation_concerns_file_sets_path(parent_id: @presenter.id), html: { multipart: true, id: 'fileupload' }) do |f| %>
   <div class="well">
-    <%= render partial: 'curation_concerns/file_sets/upload/form_fields', presenter: @presenter, locals: { upload_set_id: ActiveFedora::Noid::Service.new.mint } %>
+    <%= render 'curation_concerns/file_sets/upload/form_fields', presenter: @presenter, upload_set_id: ActiveFedora::Noid::Service.new.mint %>
   </div>
 <% end %>
 

data/app/views/curation_concerns/file_sets/upload/_script_templates.html.erb

@@ -1,6 +1,6 @@
 <div class="alert alert-info hide" id="redirect-loc" type="text/x-jquery-tmpl">
   <%-# Script redirects here once the uploads are complete %>
-  <%= polymorphic_path([main_app, :curation_concerns, @presenter]) %>
+  <%= polymorphic_path([main_app, @presenter]) %>
 </div>
 
 <!-- The template to display files available for upload -->

data/app/views/curation_concerns/permissions/confirm.html.erb

@@ -16,6 +16,6 @@
   </div>
   <div class="form-actions panel-footer">
     <%= button_to "Yes please.", main_app.copy_curation_concerns_permission_path(curation_concern), class: 'btn btn-primary' %>
-    <%= link_to "No. I'll update it manually.", polymorphic_path([main_app, :curation_concerns, curation_concern]), class: 'btn' %>
+    <%= link_to "No. I'll update it manually.", polymorphic_path([main_app, curation_concern]), class: 'btn' %>
   </div>
 </div>

data/app/views/curation_concerns/single_use_links_viewer/show.html.erb

@@ -1,5 +1,5 @@
 <div >
-  <h1 class="lower"><%= @asset %></h1>
+  <h1 class="lower"><%= @presenter %></h1>
     <h2 class="non lower">Actions</h2>
     <p>
       <%= link_to "Download (can only be used once)", @download_link, target: '_blank', data: { 'no-turbolink' => ''} %>

data/app/views/embargoes/edit.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <h2>Current Embargo</h2>
-<%= simple_form_for [:curation_concerns, curation_concern] do |f| %>
+<%= simple_form_for [main_app, curation_concern] do |f| %>
   <fieldset id="set-access-controls">
     <section class="help-block">
       <p>
@@ -25,12 +25,12 @@
     <div class="col-md-12 form-actions">
       <% if curation_concern.embargo_release_date %>
         <%= f.submit "Update Embargo", class: 'btn btn-primary' %>
-        <%= link_to "Deactivate Embargo", embargo_path(curation_concern), :method => :delete, class: 'btn btn-danger' %>
+        <%= link_to "Deactivate Embargo", embargo_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
       <% else %>
         <%= f.submit "Apply Embargo", class: 'btn btn-primary' %>
       <% end %>
       <%= link_to 'Cancel and manage all embargoes', embargoes_path, class: 'btn btn-default' %>
-      <%= link_to "Return to editing this #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concerns, curation_concern]), class: 'btn btn-default' %>
+      <%= link_to "Return to editing this #{curation_concern.human_readable_type}", [:edit, curation_concern], class: 'btn btn-default' %>
     </div>
   </div>
 <% end %>
@@ -39,5 +39,5 @@
 <% if curation_concern.embargo_history.empty? %>
   This <%= curation_concern.human_readable_type %> has never had embargoes applied to it.
 <% else %>
-  <%= render partial:"embargo_history" %>
+  <%= render partial: "embargo_history" %>
 <% end %>

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

@@ -19,4 +19,4 @@
 
 <% end %>
 
-<%= render :template => 'layouts/boilerplate' %>
+<%= render template: 'layouts/boilerplate' %>

data/app/views/leases/edit.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <h2>Current Lease</h2>
-<%= simple_form_for [:curation_concerns, curation_concern] do |f| %>
+<%= simple_form_for curation_concern do |f| %>
   <fieldset id="set-access-controls">
     <section class="help-block">
       <p>
@@ -25,12 +25,12 @@
     <div class="col-md-12 form-actions">
       <% if curation_concern.lease_expiration_date %>
         <%= f.submit "Update Lease", class: 'btn btn-primary' %>
-        <%= link_to "Deactivate Lease", lease_path(curation_concern), :method => :delete, class: 'btn btn-danger' %>
+        <%= link_to "Deactivate Lease", lease_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
       <% else %>
         <%= f.submit "Apply Lease", class: 'btn btn-primary' %>
       <% end %>
       <%= link_to 'Cancel and manage all leases', leases_path, class: 'btn btn-default' %>
-      <%= link_to "Return to editing this #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concerns, curation_concern]), class: 'btn btn-default' %>
+      <%= link_to "Return to editing this #{curation_concern.human_readable_type}", [:edit, curation_concern], class: 'btn btn-default' %>
     </div>
   </div>
 <% end %>

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

@@ -1,14 +1,17 @@
           <strong class="menu-heading item-with-options">Add a Work</strong>
           <ul class="item-options quick-classify">
-            <% CurationConcerns::QuickClassificationQuery.each_for_context(current_user) do |concern| %>
+            <% classification = CurationConcerns::QuickClassificationQuery.new(current_user) %>
+            <% classification.each do |concern| %>
               <li><%= link_to(
                     "New #{concern.human_readable_type}",
-                    main_app.new_polymorphic_path([:curation_concerns, concern]),
+                    new_polymorphic_path([main_app, concern]),
                     class: "item-option contextual-quick-classify #{dom_class(concern, 'new').gsub('_', '-')}",
                     role: 'menuitem'
                   ) %>
               </li>
             <% end %>
-            <li><%= link_to 'More Options', curation_concerns.new_classify_concern_path, class: 'item-option link-to-full-list', role: 'menuitem' %></li>
+            <% unless classification.all? %>
+              <li><%= link_to 'More Options', curation_concerns.new_classify_concern_path, class: 'item-option link-to-full-list', role: 'menuitem' %></li>
+            <% end %>
           </ul>
 

data/app/views/upload_sets/_base_metadata.html.erb

@@ -0,0 +1,12 @@
+      <%#= f.input :resource_type, as: :select_with_help, collection: CurationConcerns.config.resource_types,
+          input_html: { class: 'form-control', multiple: true } %>
+
+      <%= f.input :tag, as: :multi_value_with_help %>
+
+      <%= f.input :creator, as: :multi_value_with_help %>
+
+      <%= f.input :rights, as: :select_with_modal_help, collection: RightsService.select_options,
+          input_html: { class: 'form-control', multiple: true } %>
+
+      <%= render "curation_concerns/file_sets/rights_modal" %>
+

data/app/views/upload_sets/_metadata.html.erb

@@ -4,11 +4,11 @@
     <div class="col-sm-8">
       <h3>Applies to individual files uploaded</h3>
       <%= content_tag :p, t('curation_concerns.upload_set.help.title'), class: "help-block" %>
-      <% @upload_set.file_sets.sort { |a,b| a.label.downcase <=> b.label.downcase }.each_with_index  do |gen_f, index| %>
+      <% f.object.works.each_with_index  do |work, index| %>
         <div class="form-group">
           <%= f.input_label :title, as: :multi_value_with_help, label: "Title #{index + 1}" %>
           <div id="additional_title_clone">
-            <%= f.text_field :title, name: "title[#{gen_f.id}][]", value: gen_f.label, class: 'form-control', required: true %>
+            <%= f.text_field :title, name: "title[#{work.id}][]", value: work.title, class: 'form-control', required: true %>
           </div>
         </div>
       <% end %>
@@ -27,17 +27,7 @@
     <div class="row">
       <div class="col-sm-6">
       <h3>Applies to all files just uploaded</h3>
-      <%= f.input :resource_type, as: :select_with_help, collection: Sufia.config.resource_types,
-          input_html: { class: 'form-control', multiple: true } %>
-
-      <%= f.input :tag, as: :multi_value_with_help %>
-
-      <%= f.input :creator, as: :multi_value_with_help %>
-
-      <%= f.input :rights, as: :select_with_modal_help, collection: RightsService.select_options,
-          input_html: { class: 'form-control', multiple: true } %>
-
-      <%= render "file_sets/rights_modal" %>
+      <%= render 'base_metadata', f: f %>
 
       <button id="show_addl_descriptions" class="btn btn-default" aria-label="reveal additional metadata description fields">Show Additional Fields</button>
       <!-- hidden on initial load -->

data/app/views/upload_sets/edit.html.erb

@@ -10,7 +10,7 @@
   <%= link_to "<i class='glyphicon glyphicon-dashboard'></i> #{t('curation_concerns.bread_crumb.works_list')}".html_safe, main_app.curation_concerns_generic_works_path %>
   once this step is finished. <span class="required"><abbr title="required">*</abbr></span> indicates required fields.
 </p>
-<%= simple_form_for [main_app, @upload_set, @form], html: { multipart: true }, builder: Sufia::FormBuilder do |f| %>
+<%= simple_form_for [main_app, @form], html: { multipart: true }, builder: CurationConcerns::FormBuilder do |f| %>
 
   <%= render 'metadata', f: f %>
 

data/config/locales/curation_concerns.en.yml

@@ -55,6 +55,52 @@ en:
         default: "Unable to process your request.  See errors for more info."
       internal_error:
         default: "The server encountered an error."
+    schema_org:
+      resource_type:
+        Article: "http://schema.org/Article"
+        Audio: "http://schema.org/AudioObject"
+        Book: "http://schema.org/Book"
+        Conference Proceeding: "http://schema.org/ScholarlyArticle"
+        Dataset: "http://schema.org/Dataset"
+        Dissertation: "http://schema.org/ScholarlyArticle"
+        Image: "http://schema.org/ImageObject"
+        Map or Cartographic Material: "http://schema.org/Map"
+        Masters Thesis: "http://schema.org/ScholarlyArticle"
+        Part of Book: "http://schema.org/Book"
+        Research Paper: "http://schema.org/ScholarlyArticle"
+        Software or Program Code: "http://schema.org/Code"
+        Video: "http://schema.org/VideoObject"
+      based_near:
+        type: "http://schema.org/Place"
+        property: contentLocation
+        value: name
+      contributor:
+        type: "http://schema.org/Person"
+        property: contributor
+        # used as the itemprop value for itemscoped attributes
+        value: name
+      creator:
+        type: "http://schema.org/Person"
+        property: creator
+        value: name
+      date_created:
+        property: dateCreated
+      description:
+        property: description
+      language:
+        property: inLanguage
+      publisher:
+        type: "http://schema.org/Organization"
+        property: publisher
+        value: name
+      subject:
+        type: "http://schema.org/Thing"
+        property: about
+        value: name
+      tag:
+        property: keywords
+      title:
+        property: name
   blacklight:
     search:
       fields:

data/curation_concerns.gemspec

@@ -14,18 +14,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "APACHE2"
 
-  spec.files         = `git ls-files | grep -v ^curation_concerns-models`.split($\)
+  spec.files         = `git ls-files | grep -v ^curation_concerns-models | grep -v ^spec/fixtures`.split($\)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'hydra-head', '~> 9.0'
-  spec.add_dependency "breadcrumbs_on_rails", "~> 2.3.0"
+  spec.add_dependency "breadcrumbs_on_rails", "~> 2.3"
   spec.add_dependency "jquery-ui-rails"
-  spec.add_dependency "simple_form", '~> 3.1.0'
+  spec.add_dependency "simple_form", '~> 3.1'
   spec.add_dependency 'curation_concerns-models', version
   spec.add_dependency 'hydra-editor', '~> 1.1'
   spec.add_dependency 'blacklight_advanced_search', ['>= 5.1.4', '< 6.0']
+  spec.add_dependency 'rails_autolink'
 
   spec.add_development_dependency "devise", "~> 3.0"
   spec.add_development_dependency "bundler", "~> 1.6"
@@ -40,5 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "poltergeist", ">= 1.5.0"
   spec.add_development_dependency "factory_girl"
   spec.add_development_dependency "database_cleaner", "< 1.1.0"
-
+  spec.add_development_dependency 'mida', '~> 0.3.4'
 end

data/lib/curation_concerns/engine.rb

@@ -7,6 +7,11 @@ require 'jquery-ui-rails'
 require 'qa'
 
 module CurationConcerns
+  # Ensures that routes to curation_concerns are prefixed with `curation_concerns_`
+  # def self.use_relative_model_naming?
+  #   false
+  # end
+
   class Engine < ::Rails::Engine
     isolate_namespace CurationConcerns
     require 'breadcrumbs_on_rails'

data/lib/curation_concerns/form_builder.rb

@@ -0,0 +1,16 @@
+module CurationConcerns
+  class FormBuilder < SimpleForm::FormBuilder
+    def input_label(attribute_name, options = {})
+      options = options.dup
+      options[:input_html] = options.except(:as, :boolean_style, :collection, :label_method, :value_method, *ATTRIBUTE_COMPONENTS)
+      options = @defaults.deep_dup.deep_merge(options) if @defaults
+
+      input      = find_input(attribute_name, options)
+      wrapper    = find_wrapper(input.input_type, options)
+      components = (wrapper.components.map(&:namespace) & ATTRIBUTE_COMPONENTS) + [:input]
+      components.map { |component| SimpleForm::Wrappers::Leaf.new(component) }
+
+      input.label.html_safe
+    end
+  end
+end

data/lib/curation_concerns/rails/routes.rb

@@ -2,14 +2,13 @@ module ActionDispatch::Routing
   class Mapper
     def curation_concerns_basic_routes
       resources :downloads, only: :show
-      # Batch edit routes
-      get 'upload_sets/:id/edit' => 'upload_sets#edit', as: :edit_upload_set
-      post 'upload_sets/:id' => 'upload_sets#update', as: :upload_set_file_sets
+      resources :upload_sets, only: [:edit, :update]
 
       namespace :curation_concerns, path: :concern do
         CurationConcerns.config.registered_curation_concern_types.map(&:tableize).each do |curation_concern_name|
           namespaced_resources curation_concern_name, except: [:index]
         end
+
         resources :permissions, only: [] do
           member do
             get :confirm
@@ -60,16 +59,19 @@ module ActionDispatch::Routing
 
     private
 
+      # routing namepace arguments, for using a path other than the default
+      ROUTE_OPTIONS = { 'curation_concerns' => { path: :concern } }
+
       # Namespaces routes appropriately
       # @example route_namespaced_target("curation_concerns/generic_work") is equivalent to
-      #   namespace "curation_concerns" do
+      #   namespace "curation_concerns", path: :concern do
       #     resources "generic_work", except: [:index]
       #   end
       def namespaced_resources(target, opts = {})
         if target.include?('/')
           the_namespace = target[0..target.index('/') - 1]
           new_target = target[target.index('/') + 1..-1]
-          namespace the_namespace do
+          namespace the_namespace, ROUTE_OPTIONS.fetch(the_namespace, nil) do
             namespaced_resources(new_target, opts)
           end
         else

data/lib/generators/curation_concerns/install_generator.rb

@@ -60,7 +60,7 @@ module CurationConcerns
         "  mount Hydra::Collections::Engine => '/'\n"\
         "  mount CurationConcerns::Engine, at: '/'\n"\
         "  resources :welcome, only: 'index'\n"\
-        "  root to: 'welcome#index'\n"\
+        "  root 'welcome#index'\n"\
         "  curation_concerns_collections\n"\
         "  curation_concerns_basic_routes\n"\
         "  curation_concerns_embargo_management\n"\

data/lib/generators/curation_concerns/work/work_generator.rb

@@ -65,7 +65,7 @@ class CurationConcerns::WorkGenerator < Rails::Generators::NamedBase
   end
 
   def create_views
-    create_file "app/views/curation_concerns/#{plural_file_name}/_#{file_name}.html.erb" do
+    create_file "app/views/#{plural_file_name}/_#{file_name}.html.erb" do
       "<%# This is a search result view %>\n" \
       "<%= render 'catalog/document', document: #{file_name}, document_counter: #{file_name}_counter  %>\n"
     end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -8,6 +8,7 @@ describe CurationConcerns::FileSetActor do
   let(:file_set) { create(:file_set) }
   let(:actor) { described_class.new(file_set, user) }
   let(:uploaded_file) { fixture_file_upload('/world.png', 'image/png') }
+  let(:local_file) { File.open(File.join(fixture_path, 'world.png')) }
 
   describe 'creating metadata and content' do
     let(:upload_set_id) { nil }
@@ -23,22 +24,13 @@ describe CurationConcerns::FileSetActor do
       expect(CharacterizeJob).to receive(:perform_later)
       expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key)
       allow(actor).to receive(:acquire_lock_for).and_yield
-      actor.create_metadata(upload_set_id, work)
+      actor.create_metadata(work)
       actor.create_content(uploaded_file)
     end
 
-    context 'when an upload_set_id and work are not provided' do
-      let(:upload_set_id) { nil }
-      it "leaves the associations blank" do
-        expect(subject.upload_set).to be_nil
-        expect(subject.generic_works).to be_empty
-      end
-    end
-
-    context 'when a upload_set_id is provided' do
-      let(:upload_set_id) { ActiveFedora::Noid::Service.new.mint }
+    context 'when a work is not provided' do
       it "leaves the association blank" do
-        expect(subject.upload_set).to be_instance_of UploadSet
+        expect(subject.generic_works).to be_empty
       end
     end
 
@@ -67,7 +59,7 @@ describe CurationConcerns::FileSetActor do
 
     it 'copies visibility from the parent' do
       allow(actor).to receive(:acquire_lock_for).and_yield
-      actor.create_metadata(nil, work)
+      actor.create_metadata(work)
       saved_file = file_set.reload
       expect(saved_file.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
     end
@@ -80,6 +72,23 @@ describe CurationConcerns::FileSetActor do
       actor.create_content(uploaded_file)
     end
 
+    context 'using ::File' do
+      before do
+        allow(CharacterizeJob).to receive(:perform_later)
+        allow(IngestFileJob).to receive(:perform_later)
+        actor.create_content(local_file)
+      end
+
+      it 'sets the label and title' do
+        expect(file_set.label).to eq(File.basename(local_file))
+        expect(file_set.title).to eq([File.basename(local_file)])
+      end
+
+      it 'does not set the mime_type' do
+        expect(file_set.mime_type).to be_nil
+      end
+    end
+
     context 'when file_set.title is empty and file_set.label is not' do
       let(:file)       { 'world.png' }
       let(:long_name)  { 'an absurdly long title that goes on way to long and messes up the display of the page which should not need to be this big in order to show this impossibly long, long, long, oh so long string' }
@@ -125,20 +134,21 @@ describe CurationConcerns::FileSetActor do
       actor.destroy
       expect { file_set.reload }.to raise_error ActiveFedora::ObjectNotFoundError
     end
+
     context "representative of a work" do
       let!(:work) do
         work = create(:generic_work)
         # this is not part of a block on the create, since the work must be saved
         # before the representative can be assigned
-        work.members << file_set
+        work.ordered_members << file_set
         work.representative = file_set
         work.save
         work
       end
 
-      it "removes representative" do
+      it "removes representative and the proxy association" do
         expect(work.reload.representative_id).to eq(file_set.id)
-        actor.destroy
+        expect { actor.destroy }.to change { ActiveFedora::Aggregation::Proxy.count }.by(-1)
         expect(work.reload.representative_id).to be_nil
       end
     end