curation_concerns 0.1.0 → 0.2.0

data/app/views/upload_sets/_edit.js.erb

@@ -0,0 +1,15 @@
+if (navigator.userAgent.match("MSIE"))
+  $("#new_file_set").validate();
+
+$('#permissions_display').show();
+
+confirmation_needed = true;
+window.onbeforeunload = confirmExit;
+
+function confirmExit(){
+  if(confirmation_needed){
+    // if you return a string it will be displayed in between "don't navigate away"
+    // and "click Ok to navigate away or cancel to stay put" in the confirm dialog
+    return "Your metadata has not been saved.";
+  }
+}

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

@@ -0,0 +1,50 @@
+<h2>Individual Titles  </h2>
+<div id="" class="well">
+  <div class="row">
+    <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| %>
+        <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 %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+
+    <div class="col-sm-4">
+      <!-- put metadata about file being edited here -->
+    </div>
+  </div>
+</div>
+
+<%= hidden_field_tag(:extra_description_count, "1") %>
+<div id="descriptions_display">
+  <h2>Bulk Descriptions</h2>
+  <div class="well">
+    <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" %>
+
+      <button id="show_addl_descriptions" class="btn btn-default" aria-label="reveal additional metadata description fields">Show Additional Fields</button>
+      <!-- hidden on initial load -->
+
+      <%= render 'more_metadata', f: f %>
+
+      </div> <!-- /col-sm-8 -->
+    </div> <!-- /row -->
+  </div><!-- /well -->
+</div> <!-- /row -->

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

@@ -0,0 +1,7 @@
+<div id="more_descriptions">
+  <button id="hide_addl_descriptions" class="btn btn-default" aria-label="hide additional metadata description fields">Hide Additional Fields</button>
+  <% (f.object.terms - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
+    <%# <%= f.input term, as: :multi_value_with_help, input_html: { required: false} %>
+    <%= render_edit_field_partial(term, f: f) %>
+  <% end %>
+</div> <!-- /more_descriptions -->

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

@@ -0,0 +1,26 @@
+<%= javascript_tag do %>
+  <%= render partial: "edit", formats: [:js] %>
+<% end %>
+
+<h1>Apply Metadata</h1>
+<p>
+  The information you provide for Title will be applied to the corresponding file only; however all other
+  information you provide will be applied <em>to the entire set of files that were uploaded together</em> you have just
+  deposited into <%= t('curation_concerns.product_name') %>. You may edit individual files from
+  <%= 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| %>
+
+  <%= render 'metadata', f: f %>
+
+  <%#= render 'file_sets/permission_form', f: f, upload_set: @upload_set %>
+
+  <div id="permissions_submit">
+    <%= button_tag type: 'submit', class: 'btn btn-primary btn-lg',
+        onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" do %>
+      <i class="glyphicon glyphicon-floppy-disk"></i> Save
+    <% end %>
+  </div>
+
+<% end %>

data/app/views/{catalog/_home_text.html.erb → welcome/index.html.erb}

@@ -1,3 +1,4 @@
+<br />
 <p>
   <%=t('curation_concerns.product_name') %> is a secure repository service enabling the
   <%=t('curation_concerns.institution.name') %> community to share its research and scholarly

data/config/initializers/simple_form.rb

@@ -20,6 +20,20 @@ SimpleForm.setup do |config|
     end
   end
 
+  config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
   # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
   # Check the Bootstrap docs (http://getbootstrap.com/css/)
   # to learn about the different styles for forms and inputs,

data/config/jetty.yml

@@ -0,0 +1,5 @@
+default:
+  startup_wait: 90
+  jetty_port: 8983
+  java_opts:
+    - "-Xmx1024m"

data/config/locales/curation_concerns.en.yml

@@ -7,6 +7,7 @@ en:
     division:
       name: "Your Division at Institution"
       homepage_url: "#"
+    document_language: "en"
     google_analytics_id: ""
     institution:
       name: "Your Institution"
@@ -17,10 +18,8 @@ en:
         q:
           label: "Search Repository"
           placeholder: "Type keywords in here"
-    work:
-      editor:
-        legend: "Content Editors"
-        caption: "Who should be able to make changes to this work?"
+    bread_crumb:
+      works_list: "the works browser"
     messages:
       success:
         single: "has been saved."
@@ -36,6 +35,26 @@ en:
           tag: "could not be updated. You do not have sufficient privileges to edit them."
         title:  "Files failed"
         subject: "Batch upload permission denied"
+    api:
+      accepted:
+        default: "Your request has been accepted for processing, but processing is not complete. See job for more info."
+      unauthorized:
+        default: "You must be logged in to do that!"
+      forbidden:
+        default: "You are not authorized to access this content."
+      success:
+        default: "Your request was processed successfully."
+      deleted:
+        default: "Deleted the Resource"
+      not_found:
+        default: "Could not find a resource that matches your request."
+      unprocessable_entity:
+        default: "The resource you attempted to modify cannot be modified according to your request."
+        empty_file: "The file you uploaded has no content."
+      bad_request:
+        default: "Unable to process your request.  See errors for more info."
+      internal_error:
+        default: "The server encountered an error."
   blacklight:
     search:
       fields:
@@ -86,6 +105,7 @@ en:
     hints:
       defaults:
         description: 'Please keep your description to 300 words or fewer.'
+        files:       'A PDF is preferred.'
     labels:
       defaults:
         lease_expiration_date:     'until'
@@ -94,3 +114,4 @@ en:
         visibility_after_embargo:  'then open it up to'
         visibility_during_lease:   'Is available for'
         visibility_after_lease:    'then restrict it to'
+        files:                     'Upload a file'

data/config/routes.rb

@@ -1,4 +1,9 @@
 CurationConcerns::Engine.routes.draw do
+  get 'single_use_link/show/:id' => 'single_use_links_viewer#show', as: :show_single_use_link
+  get 'single_use_link/download/:id' => 'single_use_links_viewer#download', as: :download_single_use_link
+  get 'single_use_link/generate_download/:id' => 'single_use_links#new_download', as: :generate_download_single_use_link
+  get 'single_use_link/generate_show/:id' => 'single_use_links#new_show', as: :generate_show_single_use_link
+
   # mount BrowseEverything::Engine => '/remote_files/browse'
   resources :classify_concerns, only: [:new, :create]
 end

data/curation_concerns.gemspec

@@ -14,19 +14,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "APACHE2"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files | grep -v ^curation_concerns-models`.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 "active_attr"
+  spec.add_dependency "jquery-ui-rails"
   spec.add_dependency "simple_form", '~> 3.1.0'
   spec.add_dependency 'curation_concerns-models', version
-  spec.add_dependency 'hydra-collections' # allow curation_concerns-models to specify the version
-  spec.add_dependency 'hydra-derivatives' # allow hydra-works to specify the version
-  spec.add_dependency 'hydra-editor'
+  spec.add_dependency 'hydra-editor', '~> 1.1'
   spec.add_dependency 'blacklight_advanced_search', ['>= 5.1.4', '< 6.0']
 
   spec.add_development_dependency "devise", "~> 3.0"
@@ -38,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency 'rspec-html-matchers'
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
-  spec.add_development_dependency "capybara"
+  spec.add_development_dependency "capybara", '~> 2.5'
   spec.add_development_dependency "poltergeist", ">= 1.5.0"
   spec.add_development_dependency "factory_girl"
   spec.add_development_dependency "database_cleaner", "< 1.1.0"

data/lib/curation_concerns/callbacks/registry.rb

@@ -0,0 +1,48 @@
+module CurationConcerns
+  module Callbacks
+    class Registry
+      attr_reader :callbacks
+
+      def initialize
+        @callbacks = {}
+      end
+
+      # Enables a callback by specifying one or more hooks.
+      def enable(hook, *more_hooks)
+        ([hook] + more_hooks).each { |h| @callbacks[h] ||= nil }
+      end
+
+      # Returns all enabled callback hooks.
+      def enabled
+        @callbacks.keys
+      end
+
+      # Returns true if the callback hook has been enabled.
+      def enabled?(hook)
+        @callbacks.key? hook
+      end
+
+      # Defines a callback for a given hook.
+      def set(hook, &block)
+        raise NoBlockGiven, "a block is required when setting a callback" unless block_given?
+        @callbacks[hook] = proc(&block)
+      end
+
+      # Returns true if a callback has been defined for a given hook.
+      def set?(hook)
+        enabled?(hook) && @callbacks[hook].respond_to?(:call)
+      end
+
+      # Runs the callback defined for a given hook, with the arguments provided
+      def run(hook, *args)
+        raise NotEnabled unless enabled?(hook)
+        return nil unless set?(hook)
+        @callbacks[hook].call(*args)
+      end
+    end
+
+    # Custom exceptions
+    class NotEnabled < StandardError; end
+    class NoBlockGiven < StandardError; end
+  end
+end

data/lib/curation_concerns/callbacks.rb

@@ -0,0 +1,26 @@
+require 'active_support/concern'
+require 'curation_concerns/callbacks/registry'
+
+module CurationConcerns
+  module Callbacks
+    extend ActiveSupport::Concern
+
+    included do
+      # Define class instance variable as endpoint to the
+      # Callback::Registry api.
+      @callback = Registry.new
+    end
+
+    module ClassMethods
+      # Reader for class instance variable containing callback definitions.
+      def callback
+        @callback
+      end
+    end
+
+    # Accessor to Callback::Registry api for instances.
+    def callback
+      self.class.callback
+    end
+  end
+end

data/lib/curation_concerns/controller_resource.rb

@@ -2,9 +2,9 @@ module CurationConcerns
   class ControllerResource < CanCan::ControllerResource
     protected
 
-    # Override resource_params to make this a nop. CurationConcerns uses actors to assign attributes
-    def resource_params
-      {}
-    end
+      # Override resource_params to make this a nop. CurationConcerns uses actors to assign attributes
+      def resource_params
+        {}
+      end
   end
 end

data/lib/curation_concerns/engine.rb

@@ -1,8 +1,10 @@
-#Load blacklight which will give curation_concerns views a higher preference than those in blacklight
+# Load blacklight which will give curation_concerns views a higher preference than those in blacklight
 require 'blacklight'
 require 'curation_concerns/models'
 require 'hydra-collections'
 require 'hydra-editor'
+require 'jquery-ui-rails'
+require 'qa'
 
 module CurationConcerns
   class Engine < ::Rails::Engine
@@ -10,7 +12,7 @@ module CurationConcerns
     require 'breadcrumbs_on_rails'
 
     config.autoload_paths += %W(
-     #{config.root}/lib
+      #{config.root}/lib
     )
 
     initializer 'curation_concerns.initialize' do

data/lib/curation_concerns/rails/routes.rb

@@ -1,10 +1,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
+
       namespace :curation_concerns, path: :concern do
-        CurationConcerns.configuration.registered_curation_concern_types.map(&:tableize).each do |curation_concern_name|
+        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
@@ -13,8 +16,8 @@ module ActionDispatch::Routing
             post :copy
           end
         end
-        resources :generic_files, only: [:new, :create], path: 'container/:parent_id/generic_files'
-        resources :generic_files, only: [:show, :edit, :update, :destroy] do
+        resources :file_sets, only: [:new, :create], path: 'container/:parent_id/file_sets'
+        resources :file_sets, only: [:show, :edit, :update, :destroy] do
           member do
             get :versions
             put :rollback
@@ -41,7 +44,7 @@ module ActionDispatch::Routing
       end
     end
 
-    # kmr added :show to make tests pass 
+    # kmr added :show to make tests pass
     def curation_concerns_embargo_management
       resources :embargoes, only: [:index, :edit, :destroy] do
         collection do
@@ -56,21 +59,22 @@ module ActionDispatch::Routing
     end
 
     private
-    # Namespaces routes appropriately
-    # @example route_namespaced_target("curation_concerns/generic_work") is equivalent to
-    #   namespace "curation_concerns" 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
-          namespaced_resources(new_target, opts)
+
+      # Namespaces routes appropriately
+      # @example route_namespaced_target("curation_concerns/generic_work") is equivalent to
+      #   namespace "curation_concerns" 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
+            namespaced_resources(new_target, opts)
+          end
+        else
+          resources target, opts
         end
-      else
-        resources target, opts
       end
-    end
   end
 end

data/lib/curation_concerns/single_use_error.rb

@@ -0,0 +1,3 @@
+module CurationConcerns
+  class SingleUseError < StandardError; end
+end

data/lib/curation_concerns/spec_support.rb

@@ -6,5 +6,3 @@ spec_directory = File.expand_path('../../../spec', __FILE__)
 # Dir["#{spec_directory}/factories/**/*.rb"].each { |f| require f }
 Dir["#{spec_directory}/support/curation_concerns/*.rb"].each { |f| require f }
 Dir["#{spec_directory}/support/shared/*.rb"].each { |f| require f }
-
-

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/curation_concerns.rb

@@ -1,8 +1,7 @@
-require "curation_concerns/version"
+require 'curation_concerns/version'
 require 'curation_concerns/engine'
 require 'curation_concerns/configuration'
 require 'blacklight_advanced_search'
 
 module CurationConcerns
-
 end

data/lib/generators/curation_concerns/install_generator.rb

@@ -2,45 +2,40 @@ require 'rails/generators'
 
 module CurationConcerns
   class Install < Rails::Generators::Base
-
     source_root File.expand_path('../templates', __FILE__)
 
-    argument :model_name, type: :string , default: "user"
-    desc """
+    argument :model_name, type: :string, default: 'user'
+    desc ''"
   This generator makes the following changes to your application:
    1. Runs installers for blacklight & hydra-head (which also install & configure devise)
    2. Runs curation_concerns:models:install
-   3. Injects CurationConcerns routes
-   4. Adds CurationConcerns abilities into the Ability class
-   5. Adds controller behavior to the application controller
+   3. Adds controller behavior to the application controller
+   4. Injects CurationConcerns routes
+   5. Adds CurationConcerns abilities into the Ability class
    6. Copies the catalog controller into the local app
    7. Adds CurationConcerns::SolrDocumentBehavior to app/models/solr_document.rb
-         """
+   8. Adds config/authorities/rights.yml to the application
+         "''
 
     def run_required_generators
-      say_status("warning", "[CurationConcerns] GENERATING BLACKLIGHT", :yellow)
-      generate "blacklight:install --devise"
-      say_status("warning", "[CurationConcerns] GENERATING HYDRA-HEAD", :yellow)
-      generate "hydra:head -f"
-      say_status("warning", "[CurationConcerns] GENERATING CURATION_CONCERNS MODELS", :yellow)
+      say_status('warning', '[CurationConcerns] GENERATING BLACKLIGHT', :yellow)
+      generate 'blacklight:install --devise'
+      say_status('warning', '[CurationConcerns] GENERATING HYDRA-HEAD', :yellow)
+      generate 'hydra:head -f'
+      say_status('warning', '[CurationConcerns] GENERATING CURATION_CONCERNS MODELS', :yellow)
       generate "curation_concerns:models:install#{options[:force] ? ' -f' : ''}"
     end
 
-    def remove_catalog_controller
-      say_status("warning", "Removing Blacklight's generated CatalogController...", :yellow)
-      remove_file('app/controllers/catalog_controller.rb')
-    end
-
     def inject_application_controller_behavior
-      inject_into_file 'app/controllers/application_controller.rb', :after => /Blacklight::Controller\s*\n/ do
-        "\n  # Adds CurationConcerns behaviors to the application controller.\n" +
+      inject_into_file 'app/controllers/application_controller.rb', after: /Hydra::Controller::ControllerBehavior\s*\n/ do
+        "\n  # Adds CurationConcerns behaviors to the application controller.\n" \
         "  include CurationConcerns::ApplicationControllerBehavior\n"
       end
     end
 
     def replace_blacklight_layout
       gsub_file 'app/controllers/application_controller.rb', /layout 'blacklight'/,
-        "include CurationConcerns::ThemedLayoutController\n  with_themed_layout '1_column'\n"
+                "include CurationConcerns::ThemedLayoutController\n  with_themed_layout '1_column'\n"
     end
 
     # def insert_builder
@@ -58,9 +53,14 @@ module CurationConcerns
     # END Blacklight stuff
 
     def inject_routes
-      inject_into_file 'config/routes.rb', :after => /devise_for :users\s*\n/ do
+      # Remove root route that was added by blacklight generator
+      gsub_file 'config/routes.rb', /root (:to =>|to:) "catalog#index"/, ''
+
+      inject_into_file 'config/routes.rb', after: /devise_for :users\s*\n/ do
         "  mount Hydra::Collections::Engine => '/'\n"\
         "  mount CurationConcerns::Engine, at: '/'\n"\
+        "  resources :welcome, only: 'index'\n"\
+        "  root to: 'welcome#index'\n"\
         "  curation_concerns_collections\n"\
         "  curation_concerns_basic_routes\n"\
         "  curation_concerns_embargo_management\n"\
@@ -68,18 +68,22 @@ module CurationConcerns
     end
 
     def inject_ability
-      inject_into_file 'app/models/ability.rb', :after => /Hydra::Ability\s*\n/ do
+      inject_into_file 'app/models/ability.rb', after: /Hydra::Ability\s*\n/ do
         "  include CurationConcerns::Ability\n"\
         "  self.ability_logic += [:everyone_can_create_curation_concerns]\n\n"
       end
     end
 
+    def catalog_controller
+      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+    end
+
     # Add behaviors to the SolrDocument model
     def inject_solr_document_behavior
-      file_path = "app/models/solr_document.rb"
-      if File.exists?(file_path)
+      file_path = 'app/models/solr_document.rb'
+      if File.exist?(file_path)
         inject_into_file file_path, after: /include Blacklight::Solr::Document.*$/ do
-          "\n  # Adds CurationConcerns behaviors to the SolrDocument.\n" +
+          "\n  # Adds CurationConcerns behaviors to the SolrDocument.\n" \
             "  include CurationConcerns::SolrDocumentBehavior\n"
         end
       else
@@ -88,16 +92,16 @@ module CurationConcerns
     end
 
     def assets
-      copy_file "curation_concerns.css.scss", "app/assets/stylesheets/curation_concerns.css.scss"
-      copy_file "curation_concerns.js", "app/assets/javascripts/curation_concerns.js"
+      copy_file 'curation_concerns.scss', 'app/assets/stylesheets/curation_concerns.scss'
+      copy_file 'curation_concerns.js', 'app/assets/javascripts/curation_concerns.js'
     end
 
     def add_helper
-      copy_file "curation_concerns_helper.rb", "app/helpers/curation_concerns_helper.rb"
+      copy_file 'curation_concerns_helper.rb', 'app/helpers/curation_concerns_helper.rb'
     end
 
-    def add_config_file
-      copy_file "curation_concerns_config.rb", "config/initializers/curation_concerns_config.rb"
+    def rights_config
+      copy_file "config/authorities/rights.yml", "config/authorities/rights.yml"
     end
   end
 end