curate 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59395ca50b59f9b6078a239e94f897910cb07f8c
-  data.tar.gz: caaf8e67b45bc57f724c9b1c660f3a03299fc33f
+  metadata.gz: 9da5c8f5b08a3fd6e12448c7dd7c73a2412246a0
+  data.tar.gz: 165283f25fa8b99a984b41b895e29a8623bf8e6e
 SHA512:
-  metadata.gz: 1da77dd060d40a9307c28220655e6be818921a7371dcff140a907db975b1a3784e51bb52c7c137c761fe2e4c9c52afec7832d67287f101169f25a403db4c94ca
-  data.tar.gz: 04b2dc97393bfd0a1125be100c6eceb0bf64de81f02977b75239ec7b989a89237ee568ed1c00f6374fb65ead6c24a1caf5340c153095eb74ab0972ed2672f14b
+  metadata.gz: 5e2a7f0f07daa348c38ce009f121a97e1fe1d7a150c8620a77ca1c62ffe9d13b20ddf9c40fa7bf8e869279cb589cf12e1825c585c4b0534ea95bc8fd61942296
+  data.tar.gz: f177f00845ea7bc440c098e645d48dfd7ab374460de15732c353c236721a1128ce8c2f3bfae1d0d19f4761cf2287a0c8cce2a201a2e964d39f9cb9f90ce63f13

data/README.md

@@ -7,25 +7,22 @@ It is released under the [Apache 2 License](./LICENSE)
   * [or install by hand](#or-install-by-hand)
 * [Developing and contributing for the Curate gem](#developing-and-contributing-for-the-curate-gem)
   * [Prerequisites](#prerequisites)
-  * [Clone the Curate repository](#clone-the-repo)
+  * [Clone the Curate repository](#clone-the-curate-repository)
   * [Jetty](#jetty)
   * [Running the specs](#running-the-specs)
     * [All of them](#all-of-them)
     * [Some of them](#some-of-them)
     * [With Zeus](#with-zeus)
   * [Contributing back](#contributing-back)
-    * [Coding Guidelines](#coding-guidelines)
-      * [Writing Your Code](#writing-your-code)
-      * [Ruby File Structure](#ruby-file-structure)
-    * [Source Control Guidelines](#source-control-guidelines)
 * [Working on Curate while working on my Application](#working-on-curate-while-working-on-my-application)
+* [Integration with CAS, LDAP, Shibboleth](#integration-with-cas-ldap-shibboleth)
 * [Standing up your Curate-based Rails application in Production](#standing-up-your-curate-based-rails-application-in-production)
 
 # Starting a New Curate Based Application
 
 When you generate your new Rails application, you can use Curate's application template:
 ```bash
-$ rails new my_curate_application -m https://raw.github.com/ndlib/curate/master/lib/generators/curate/application_template.rb
+$ rails new my_curate_application -m https://raw.github.com/projecthydra/curate/master/lib/generators/curate/application_template.rb
 ```
 
 ## Or Install By Hand
@@ -83,11 +80,11 @@ Inside the Curate directory (i.e. `./path/to/local`):
 
 1. Make sure jetty is running (`rake jetty:start`); It will take a bit to spin up jetty.
 1. Make sure you have a dummy app ‡
-  1. Run `rake regenerate` build the to get a clean app ./spec/dummy
+  1. Run `rake regenerate` to build a clean app in ./spec/dummy
 1. Then run `rake spec`; The tests will take quite a while ‡‡
 
 ‡ - A Rails engine requires a Rails application to run.
-The dummy app is an generated application inside Curate in the `./spec/internal` directory
+The dummy app is a generated application inside Curate in the `./spec/internal` directory
 ‡‡ - Slow tests are a big problem and we are working on speeding them up, but its complicated.
 
 ### Some of Them
@@ -96,7 +93,7 @@ In some cases you want to know the results of a single test. Here's how you do i
 
 1. Make sure jetty is running (`rake jetty:start`); It will take a bit to spin up jetty.
 1. Make sure you have a dummy app ‡
-  1. Run `rake regenerate` build the to get a clean app ./spec/dummy
+  1. Run `rake regenerate` to build a clean app in ./spec/dummy
 1. Then run `BUNDLE_GEMFILE=spec/internal/Gemfile bundle exec rspec path/to/spec.rb:LINE` ‡
 
 ‡ - With Curate being an Engine we need to point to the Dummy Application's Gemfile.
@@ -104,7 +101,7 @@ In full Rails applications you can normally run the following `rspec path/to/spe
 
 ### With Zeus
 
-> [Zeus](https://github.com/burke/zeus) preloads your Rails app so that your normal development tasks such as console, server, generate, and specs/tests take less than one second. ‡
+> [Zeus](https://github.com/burke/zeus) pre-loads your Rails app so that your normal development tasks such as console, server, generate, and specs/tests take less than one second. ‡
 
 1. In terminal window #1 run `zeus start`
 1. In terminal window #2, once Zeus is started: run `zeus rake spec` for all tests; or `zeus test path/to/spec.rb:LINE` for one
@@ -113,57 +110,13 @@ In full Rails applications you can normally run the following `rspec path/to/spe
 
 ## Contributing Back
 
-There is an existing [CONTRIBUTING.md](./CONTRIBUTING.md) document which is currently under review.
-
-### Coding Guidelines
-
-The [Ruby Style Guide][1] is an excellent resource for how to craft your Ruby code, in particular the [Naming section][2].
-
-**Can I break these guidelines?** Yes. But you may need to convince the person merging your changes.
-
-#### Writing Your Code
-
-We are going to do our best to follow [Sandi Metz' Rules for Developers][3]
-
-> Here are the rules:
->
-> * Classes can be no longer than one hundred lines of code.
-> * Methods can be no longer than five lines of code.
-> * Pass no more than four parameters into a method. Hash options are parameters.
-> * Controllers can instantiate only one object. Therefore, views can only know about one instance variable and views should only send messages to that object (@object.collaborator.value is not allowed).
-
-#### Ruby File Structure
-
-* Use soft-tabs with a two space indent.
-* Never leave trailing whitespace (unless it is meaningful in the language)
-* End each file with a blank newline.
-* Please do your best to keep lines to 80 characters or fewer.
-
-### Source Control Guidelines
-
-*This is a placeholder for things to come*
-
-[Processing JIRA issues with commit messages](https://confluence.atlassian.com/display/BITBUCKET/Processing+JIRA+issues+with+commit+messages)
-
-```
-First line is 50 characters or less
-
-Description of work done; wrap at 72 characters.
-
-HYDRASIR-123 #close Any comment to post to JIRA
-```
-
-Make sure your JIRA email matches your Git config email (`~/.gitconfig`)
-
-[1]:https://github.com/bbatsov/ruby-style-guide "Ruby Style Guide"
-[2]:https://github.com/bbatsov/ruby-style-guide#naming "Ruby Style Guide - Naming"
-[3]:http://robots.thoughtbot.com/post/50655960596/sandi-metz-rules-for-developers "Sandi Metz' Rules for Developers"
+If you are interested in helping us make Curate better, please take a look at our [Contributing resources and guidelines](./CONTRIBUTING.md).
 
 # Working on Curate while working on my Application
 
 Assuming you are wanting to work on your Curate-based application and make modifications to the Curate gem, follow these instructions.
 
-Replace the folliwing line in the Gemfile of your Curate-based application (see [Starting a New Curate Based Application](#starting-a-new-curate-based-application)):
+Replace the following line in the Gemfile of your Curate-based application (see [Starting a New Curate Based Application](#starting-a-new-curate-based-application)):
 
 ```ruby
 gem 'curate' ...
@@ -181,6 +134,16 @@ You can then do concurrent development on both your clone of the Curate gem and
 
 **NOTE: Any changes you make in the Curate gem will likely require you to restart your web-server.**
 
+# Integration with CAS, LDAP, Shibboleth
+
+For integration with CAS, refer: https://github.com/nbudin/devise_cas_authenticatable
+
+For integration with LDAP, refer: https://github.com/cschiewek/devise_ldap_authenticatable
+
+For integration with Shibboleth, refer: https://github.com/jgeorge300/devise_shibboleth_authenticatable
+
+For integration with multiple authentication systems (and for twitter, facebook, etc.), consider using OmniAuth: https://github.com/intridea/omniauth
+
 # Standing up your Curate-based Rails application in Production
 
 We are working on this and have more to come.

data/app/assets/javascripts/curate/link_users.js.coffee

@@ -82,7 +82,7 @@
       $targetElement.autocomplete
         source: (request, response) ->
           $targetElement.data('url')
-          $.getJSON $targetElement.data('url'), { q: request.term}, ( data, status, xhr ) ->
+          $.getJSON $targetElement.data('url'), { q: request.term + "*" }, ( data, status, xhr ) ->
             matches = []
             $.each data.response.docs, (idx, val) ->
               matches.push {label: val['desc_metadata__name_tesim'][0], value: val['id']}

data/app/controllers/catalog_controller.rb

@@ -33,7 +33,7 @@ class CatalogController < ApplicationController
   end
 
   def self.modified_field
-    solr_name('desc_metadata__date_modified', :stored_sortable, type: :date)
+    solr_name('desc_metadata__date_modified', :stored_sortable , type: :date)
   end
 
 
@@ -83,8 +83,8 @@ class CatalogController < ApplicationController
     config.add_index_field solr_name("desc_metadata__publisher", :stored_searchable, type: :string), label: "Publisher"
     config.add_index_field solr_name("desc_metadata__based_near", :stored_searchable, type: :string), label: "Location"
     config.add_index_field solr_name("desc_metadata__language", :stored_searchable, type: :string), label: "Language"
-    config.add_index_field solr_name("desc_metadata__date_uploaded", :stored_searchable, type: :string), label: "Date Uploaded"
-    config.add_index_field solr_name("desc_metadata__date_modified", :stored_searchable, type: :string), label: "Date Modified"
+    config.add_index_field solr_name("desc_metadata__date_uploaded", :stored_sortable, type: :string), label: "Date Uploaded"
+    config.add_index_field solr_name("desc_metadata__date_modified", :stored_sortable, type: :string), label: "Date Modified"
     config.add_index_field solr_name("desc_metadata__date_created", :stored_searchable, type: :string), label: "Date Created"
     config.add_index_field solr_name("desc_metadata__rights", :stored_searchable, type: :string), label: "Rights"
     config.add_index_field solr_name("human_readable_type", :stored_searchable, type: :string), label: "Resource Type"

data/app/controllers/curation_concern/generic_works_controller.rb

@@ -82,10 +82,10 @@ class CurationConcern::GenericWorksController < CurationConcern::BaseController
   def destroy
     title = curation_concern.to_s
     curation_concern.destroy
-    after_destroy_response
+    after_destroy_response(title)
   end
 
-  def after_destroy_response
+  def after_destroy_response(title)
     flash[:notice] = "Deleted #{title}"
     respond_with { |wants|
       wants.html { redirect_to catalog_index_path }

data/app/helpers/blacklight_helper.rb

@@ -16,16 +16,4 @@ module BlacklightHelper
   def application_name
     t('sufia.product_name')
   end
-
-  # Loads the object and returns its name(for creator)/title(for collection)
-  def get_value_from_pid(field, value)
-    attr_value = ""
-    begin
-      attr_value = ActiveFedora::Base.load_instance_from_solr(value.split("/").last).name if field == "desc_metadata__creator_sim"
-      attr_value = ActiveFedora::Base.load_instance_from_solr(value).title if field == "collection_sim"
-    rescue => e
-      logger.warn("WARN: Helper method get_value_from_pid raised an error when loading #{value}.  Error was #{e}")
-    end
-    return attr_value.blank? ? value : attr_value
-  end
 end

data/app/helpers/curate_helper.rb

@@ -114,4 +114,10 @@ module CurateHelper
     return dom_label_class, link_title
   end
   private :extract_dom_label_class_and_link_title
+
+  def auto_link_without_protocols(url)
+    link = (url =~ /\A(?i)[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/) ? 'http://' + url : url
+    auto_link(link, :all)
+  end
+
 end

data/app/repository_datastreams/article_metadata_datastream.rb

@@ -44,11 +44,11 @@ class ArticleMetadataDatastream < ActiveFedora::NtriplesRDFDatastream
     end
     map.date_uploaded(to: "dateSubmitted", in: RDF::DC) do |index|
       index.type :date
-      index.as :stored_searchable, :sortable
+      index.as :stored_sortable
     end
     map.date_modified(to: "modified", in: RDF::DC) do |index|
       index.type :date
-      index.as :stored_searchable, :sortable
+      index.as :stored_sortable
     end
     map.recommended_citation({in: RDF::DC, to: 'bibliographicCitation'})
 

data/app/repository_datastreams/etd_metadata.rb

@@ -42,11 +42,11 @@ class EtdMetadata < ActiveFedora::NtriplesRDFDatastream
     end
     map.date_uploaded(to: "dateSubmitted", in: RDF::DC) do |index|
       index.type :date
-      index.as :stored_searchable, :sortable
+      index.as :stored_sortable
     end
     map.date_modified(to: "modified", in: RDF::DC) do |index|
       index.type :date
-      index.as :stored_searchable, :sortable
+      index.as :stored_sortable
     end
     map.language(in: RDF::DC) do |index|
       index.as :stored_searchable, :facetable

data/app/repository_datastreams/generic_work_rdf_datastream.rb

@@ -21,12 +21,12 @@ class GenericWorkRdfDatastream < ActiveFedora::NtriplesRDFDatastream
 
     map.date_uploaded(to: "dateSubmitted", in: RDF::DC) do |index|
       index.type :date
-      index.as :stored_searchable, :sortable
+      index.as :stored_sortable
     end
 
     map.date_modified(to: "modified", in: RDF::DC) do |index|
       index.type :date
-      index.as :stored_searchable, :sortable
+      index.as :stored_sortable
     end
 
     map.issued({in: RDF::DC}) do |index|

data/app/repository_datastreams/image_metadata.rb

@@ -39,11 +39,11 @@ class ImageMetadata < ActiveFedora::NtriplesRDFDatastream
     map.format(in: RDF::QualifiedDC, to: 'format#mimetype')
     map.date_uploaded(to: "dateSubmitted", in: RDF::DC) do |index|
       index.type :date
-      index.as :stored_searchable, :sortable
+      index.as :stored_sortable
     end
     map.date_modified(to: "modified", in: RDF::DC) do |index|
       index.type :date
-      index.as :stored_searchable, :sortable
+      index.as :stored_sortable
     end
     map.identifier(in: RDF::DC)
     map.doi(to: "identifier#doi", in: RDF::QualifiedDC)

data/app/repository_models/person.rb

@@ -104,6 +104,10 @@ class Person < ActiveFedora::Base
     self.thumbnail.content.present? ? generate_thumbnail_url : gravatar_link
   end
 
+  def can_be_member_of_collection?(collection)
+    false
+  end
+
   private
 
   def generate_derivatives

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

@@ -1,11 +1,11 @@
 <%# there has got to be a hipster ruby way to do this better %>
 <% if params[:f] %>
-  <% params[:f].each do |k,v| %>
-    <% v.each do |selected_facet| %>
-      <% link_options = remove_facet_params(k, selected_facet, params).merge!Hash["controller" => "catalog", :action=> "index"] %>
+  <% params[:f].each do |field,v| %>
+    <% v.each do |selected_value| %>
+      <% link_options = remove_facet_params(field, selected_value, params).merge!Hash["controller" => "catalog", :action=> "index"] %>
       <div class="alert alert-warning">
         <%= link_to 'X', url_for(link_options), {:class=>'close', :'data-dismiss' => "alert" } %>
-        <i class="icon-ok icon-large"></i> <strong><%= get_value_from_pid(k, selected_facet) %></strong>
+        <i class="icon-ok icon-large"></i> <strong><%= facet_display_value(field, selected_value) %></strong>
       </div>
     <% end %>
   <% end %>

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

@@ -22,11 +22,27 @@
           class: 'itemicon itemedit btn',
           title: "Edit #{document.human_readable_type}"
         )%>
+      <% unless document.is_a?(Collection) %>
+        <%= link_to(
+          raw('<i class="icon-trash icon-large"></i>'),
+            [:curation_concern, document],
+            class: 'itemicon itemtrash btn',
+            data: {
+              confirm: "Delete this #{document.human_readable_type}?"
+            },
+            method: :delete,
+            title: "Delete #{document.human_readable_type}"
+          )%>
       <% end %>
-      <% if can? :collect, document %>
-        <%= render 'add_to_collection_gui', collectible: document %>
+      <% end %>
+
+      <% unless document.respond_to?(:user) %>
+        <% if can? :collect, document %>
+          <%= render 'add_to_collection_gui', collectible: document %>
+        <% end %>
       <% end %>
     <% end %>
   </div>
 </div>
 
+

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

@@ -35,6 +35,6 @@
 </div>
 <% if controller.action_name == "edit" %>
   <div class="delete-asset">
-    <%= button_to("Delete This Item", {:action => :destroy, :controller => :assets, :id => @document_fedora.pid}, :confirm => 'Are you sure?', :method => :delete )%>
+    <%= button_to("Delete This Item", { action: :destroy, controller: :assets, id: @document_fedora.pid }, data: { confirm: 'Are you sure?' } , method: :delete )%>
   </div>
 <% end %>

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

@@ -45,6 +45,11 @@
 
   <div class="form-actions">
     <%= f.submit class: 'btn btn-primary' %>
+    <%- if @collection.persisted? -%>
+      <%= link_to 'Cancel', collection_path(@collection), class: 'btn btn-link' %>
+    <% else %>
+      <%= link_to 'Cancel', root_path, class: 'btn btn-link' %>
+    <% end %>
   </div>
 <% end %>
 </div>

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

@@ -2,3 +2,7 @@
   <h1><%= @collection %> <span class="human_readable_type">(<%= @collection.human_readable_type %>)</span></h1>
 <% end %>
 <%= render 'form' %>
+<h2>Collection Members</h2>
+<div id="documents" class="clear">
+  <%= list_items_in_collection(@collection) %>
+</div>

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

@@ -4,6 +4,20 @@
 <% end %>
 <% if can? :edit, @collection %>
   <% content_for :page_actions do %>
+
+  <%= button_to(
+    "Delete",
+    {
+      action: :destroy,
+      controller: :collections,
+      id: @collection.id
+    },
+    data: {confirm: 'Are you sure you want to delete this collection?'},
+    class: 'btn',
+    form_class: 'button-to pull-right',
+    method: :delete
+  )%>
+
     <%= link_to 'Edit', edit_collection_path(@collection), class: 'btn' %>
   <% end %>
 <% end %>

data/app/views/curate/people/show.html.erb

@@ -16,15 +16,15 @@
     </div>
 
     <dl class="<%= dom_class(@person) %>">
-    <%# This is where I tell Jeremy I'm sorry. %>
-    <% @person.terms_for_display.reject{|name| name == :name}.each do |attribute_name| %>
-      <% if @person.send(attribute_name).present? %>
-        <dt><%="#{derived_label_for( @person, attribute_name) }:" %></dt>
-        <% [@person.send(attribute_name)].flatten.compact.each do |value| %>
-        <dd><%= value %></dd>
+      <%# This is where I tell Jeremy I'm sorry. %>
+        <% @person.terms_for_display.reject{|name| name == :name}.each do |attribute_name| %>
+          <% if @person.send(attribute_name).present? %>
+            <dt><%="#{derived_label_for( @person, attribute_name) }:" %></dt>
+            <% [@person.send(attribute_name)].flatten.compact.each do |value| %>
+              <%= auto_link_without_protocols(value) %>
+            <% end %>
         <% end %>
       <% end %>
-    <% end %>
     </dl>
 
     <% if can? :edit, @person %>

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

@@ -19,6 +19,7 @@
     <div class="form-actions">
       <% if editor %>
         <%= link_to "Edit This #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concern, curation_concern]), class: 'btn btn-primary' %>
+        <%= link_to "Delete This #{curation_concern.human_readable_type}", [:curation_concern, curation_concern], class: 'btn btn-primary', data: { confirm: "Delete this #{curation_concern.human_readable_type}?" }, method: :delete %>
         <%= 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 %>

data/lib/curate.rb

@@ -10,6 +10,7 @@ require 'active_fedora/registered_attributes'
 require 'hydra/remote_identifier'
 require 'inline_reflection'
 require 'contributors_association'
+require 'rails_autolink'
 
 module Curate
   extend ActiveSupport::Autoload

data/lib/curate/version.rb

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

data/lib/generators/curate/application_template.rb

@@ -13,7 +13,7 @@ end
 with_git("Initial commit")
 
 with_git("Adding curate gem") do
-  gem 'curate', "~> 0.6.1"
+  gem 'curate', "~> 0.6.4"
 end
 
 HELPFUL_DEVELOPMENT_TOOLS =
@@ -40,6 +40,20 @@ if yes_with_banner?(HELPFUL_DEVELOPMENT_TOOLS)
 
 end
 
+USE_RUBY_RACER =
+  <<-QUESTION_TO_ASK
+Would you like to include the Ruby Racer gem? (Needed in some Linux environments)
+
+More information at http://github.com/cowboyd/therubyracer
+QUESTION_TO_ASK
+
+if yes_with_banner?(USE_RUBY_RACER)
+  with_git("Adding Ruby Racer gem") do
+    gem 'therubyracer', platforms: :ruby
+  end
+
+end
+
 with_git("Results of `bundle install`") do
   run 'bundle install'
 end
@@ -77,9 +91,24 @@ if yes_with_banner?(JETTY_QUESTION)
   end
 
   with_git("Downloading jettywrapper") do
-    if yes_with_banner?("Would you like to download jetty now?\n\nThis will take quite awhile based on download speeds.")
+    if yes_with_banner?("Would you like to download and unzip jetty now?\n\nThis will take quite awhile based on download speeds.")
       rake "jetty:download"
       rake "jetty:config"
+      rake "jetty:unzip"
+
+      if yes_with_banner?("Would you like to turn on soft deleting of works?\n\nThis will preserve deleted objects in the Fedora repository while preventing the works from being displayed in the application.")
+        get 'https://raw.github.com/projecthydra/curate/master/lib/generators/curate/soft_delete/active_fedora_soft_delete_monkey_patch.rb', 'config/initializers/active_fedora_soft_delete_monkey_patch.rb'
+        get 'https://raw.github.com/projecthydra/curate/master/lib/generators/curate/soft_delete/deny-d-objects-and-datastreams.xml', 'jetty/fedora/default/data/fedora-xacml-policies/repository-policies/deny-d-objects-and-datastreams.xml'
+        get 'https://raw.github.com/projecthydra/curate/master/lib/generators/curate/soft_delete/deny-purge.xml', 'jetty/fedora/default/data/fedora-xacml-policies/repository-policies/deny-purge.xml'
+        get 'https://raw.github.com/projecthydra/curate/master/lib/generators/curate/soft_delete/permit-describerepository.xml', 'jetty/fedora/default/data/fedora-xacml-policies/repository-policies/permit-describerepository.xml'
+      end
     end
   end
 end
+
+with_git("Installing RSpec files with curate support") do
+  if yes_with_banner?("Would you like to include support for RSpec testing?\n\nThis is needed if you want to use spec tests for your custom code.")
+    generate "rspec:install"
+    inject_into_file 'spec/spec_helper.rb', "\nrequire 'curate/spec_support'", :after => "require 'rspec/autorun'"
+  end
+end