sufia 7.1.0 → 7.2.0

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -4,9 +4,8 @@ class CatalogController < ApplicationController
   include Sufia::Catalog
   include BlacklightAdvancedSearch::Controller
 
-  # These before_filters apply the hydra access controls
-  before_filter :enforce_show_permissions, only: :show
-  skip_before_filter :default_html_head
+  # This filter applies the hydra access controls
+  before_action :enforce_show_permissions, only: :show
 
   def self.uploaded_field
     solr_name('system_create', :stored_sortable, type: :date)
@@ -73,13 +72,15 @@ class CatalogController < ApplicationController
     config.add_index_field solr_name("publisher", :stored_searchable), label: "Publisher", itemprop: 'publisher', link_to_search: solr_name("publisher", :facetable)
     config.add_index_field solr_name("based_near", :stored_searchable), label: "Location", itemprop: 'contentLocation', link_to_search: solr_name("based_near", :facetable)
     config.add_index_field solr_name("language", :stored_searchable), label: "Language", itemprop: 'inLanguage', link_to_search: solr_name("language", :facetable)
-    config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), label: "Date Uploaded", itemprop: 'datePublished'
-    config.add_index_field solr_name("date_modified", :stored_sortable, type: :date), label: "Date Modified", itemprop: 'dateModified'
+    config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), label: "Date Uploaded", itemprop: 'datePublished', helper_method: :human_readable_date
+    config.add_index_field solr_name("date_modified", :stored_sortable, type: :date), label: "Date Modified", itemprop: 'dateModified', helper_method: :human_readable_date
     config.add_index_field solr_name("date_created", :stored_searchable), label: "Date Created", itemprop: 'dateCreated'
-    config.add_index_field solr_name("rights", :stored_searchable), label: "Rights", helper_method: :rights_statement_links
+    config.add_index_field solr_name("rights", :stored_searchable), label: "Rights", helper_method: :license_links
     config.add_index_field solr_name("resource_type", :stored_searchable), label: "Resource Type", link_to_search: solr_name("resource_type", :facetable)
     config.add_index_field solr_name("file_format", :stored_searchable), label: "File Format", link_to_search: solr_name("file_format", :facetable)
     config.add_index_field solr_name("identifier", :stored_searchable), label: "Identifier", helper_method: :index_field_link, field_name: 'identifier'
+    config.add_index_field solr_name("embargo_release_date", :stored_sortable, type: :date), label: "Embargo release date", helper_method: :human_readable_date
+    config.add_index_field solr_name("lease_expiration_date", :stored_sortable, type: :date), label: "Lease expiration date", helper_method: :human_readable_date
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display

data/lib/generators/sufia/templates/config/sufia.rb

@@ -88,11 +88,18 @@ Sufia.config do |config|
 
   # The user who runs audit jobs. Update this if you aren't using emails
   # config.audit_user_key = 'audituser@example.com'
+  #
+  # The banner image. Should be 5000px wide by 1000px tall.
+  # config.banner_image = 'https://cloud.githubusercontent.com/assets/92044/18370978/88ecac20-75f6-11e6-8399-6536640ef695.jpg'
 
   # Temporary path to hold uploads before they are ingested into FCrepo.
   # This must be a lambda that returns a Pathname
   #  config.upload_path = ->() { Rails.root + 'tmp' + 'uploads' }
 
+  # Location on local file system where derivatives will be stored.
+  # If you use a multi-server architecture, this MUST be a shared volume.
+  # config.derivatives_path = File.join(Rails.root, 'tmp', 'derivatives')
+
   # If browse-everything has been configured, load the configs.  Otherwise, set to nil.
   begin
     if defined? BrowseEverything

data/lib/generators/sufia/work_generator.rb

@@ -45,8 +45,8 @@ module Sufia
       file_path = "app/controllers/curation_concerns/#{plural_file_name}_controller.rb"
       if File.exist?(file_path)
         inject_into_file file_path, after: /include CurationConcerns::CurationConcernController/ do
-          "\n  # Adds Sufia behaviors to the controller.\n" \
-            "  include Sufia::WorksControllerBehavior\n"
+          "\n    # Adds Sufia behaviors to the controller.\n" \
+            "    include Sufia::WorksControllerBehavior\n"
         end
       else
         puts "     \e[31mFailure\e[0m  Sufia requires a #{controller_class_name} object. This generator assumes that the model is defined in the file #{file_path}, which does not exist."

data/lib/sufia.rb

@@ -2,7 +2,6 @@ require 'select2-rails'
 require 'nest'
 require 'redis-namespace'
 require 'mailboxer'
-require 'acts_as_follower'
 require 'carrierwave'
 require 'rails_autolink'
 require 'font-awesome-rails'

data/lib/sufia/arkivo/metadata_munger.rb

@@ -35,8 +35,7 @@ module Sufia
         end
 
         # Then, parse creators and contributors out
-        creator_names = munged_creators.select { |c| Sufia::Arkivo::CREATOR_TYPES.include? c['creatorType'] }.map { |c| c['name'] }
-        contributor_names = munged_creators.select { |c| Sufia::Arkivo::CONTRIBUTOR_TYPES.include? c['creatorType'] }.map { |c| c['name'] }
+        creator_names, contributor_names = split_creators_and_contributors(munged_creators)
         munged['creator'] = creator_names unless creator_names.blank?
         munged['contributor'] = contributor_names unless contributor_names.blank?
 
@@ -44,6 +43,18 @@ module Sufia
         munged.delete('creators') if munged['creators']
         munged
       end
+
+      private
+
+        def split_creators_and_contributors(list_of_creators)
+          creators = []
+          contributors = []
+          list_of_creators.each do |creator|
+            creators << creator['name'] if Sufia::Arkivo::CREATOR_TYPES.include? creator['creatorType']
+            contributors << creator['name'] if Sufia::Arkivo::CONTRIBUTOR_TYPES.include? creator['creatorType']
+          end
+          [creators, contributors]
+        end
     end
   end
 end

data/lib/sufia/configuration.rb

@@ -7,6 +7,11 @@ module Sufia
     delegate(*(CurationConcerns.config.methods - Object.methods),
              to: :curation_concerns_config)
 
+    attr_writer :banner_image
+    def banner_image
+      @banner_image ||= "https://cloud.githubusercontent.com/assets/92044/18370978/88ecac20-75f6-11e6-8399-6536640ef695.jpg"
+    end
+
     attr_writer :persistent_hostpath
     def persistent_hostpath
       @persistent_hostpath ||= "http://localhost/files/"

data/lib/sufia/controlled_vocabulary/importer/downloader.rb

@@ -0,0 +1,17 @@
+require 'ruby-progressbar'
+
+module Sufia
+  module ControlledVocabulary
+    module Importer
+      class Downloader
+        def self.fetch(url, output)
+          open(url) do |io|
+            IO.copy_stream(io, output)
+          end
+        rescue OpenURI::HTTPError => e
+          raise "Unable to download from #{url}\n#{e.message}: #{e.io.read}"
+        end
+      end
+    end
+  end
+end

data/lib/sufia/controlled_vocabulary/importer/language.rb

@@ -0,0 +1,62 @@
+require_relative 'downloader'
+require 'rdf/rdfxml'
+module Sufia
+  module ControlledVocabulary
+    module Importer
+      class Language
+        URL = 'http://www.lexvo.org/resources/lexvo_2013-02-09.rdf.gz'.freeze
+
+        def initialize
+          stdout_logger = Logger.new(STDOUT)
+          stdout_logger.level = Logger::INFO
+          stdout_logger.formatter = proc do |_severity, _datetime, _progname, msg|
+            "#{msg}\n"
+          end
+          Rails.logger.extend(ActiveSupport::Logger.broadcast(stdout_logger))
+        end
+
+        def import
+          download
+          extract
+          logger.info "Importing #{rdf_path}"
+          Qa::Services::RDFAuthorityParser.import_rdf(
+            'languages',
+            [rdf_path],
+            format: 'rdfxml',
+            predicate: RDF::Vocab::SKOS.prefLabel
+          )
+          logger.info "Import complete"
+        end
+
+        delegate :logger, to: Rails
+
+        def rdf_path
+          @rdf_path ||= download_path.sub(/\.gz$/, '')
+        end
+
+        def extract
+          return if File.exist?(rdf_path)
+          logger.info "Extracting #{download_path}"
+          system("gunzip #{download_path}")
+          raise "Unable to extract #{download_path}" unless $CHILD_STATUS.success?
+        end
+
+        def download
+          return if File.exist?(rdf_path) || File.exist?(download_path)
+          logger.info "Downloading #{URL}"
+          Downloader.fetch(URL, download_path)
+        end
+
+        def download_path
+          File.join(download_dir, File.basename(URL))
+        end
+
+        def download_dir
+          @download_dir ||= File.join(Rails.root, 'tmp')
+          FileUtils.mkdir_p @download_dir
+          @download_dir
+        end
+      end
+    end
+  end
+end

data/lib/sufia/engine.rb

@@ -7,6 +7,8 @@ module Sufia
     require 'jquery-ui-rails'
     require 'flot-rails'
     require 'almond-rails'
+    require 'jquery-datatables-rails'
+    require 'flipflop'
 
     config.autoload_paths += %W(
       #{config.root}/app/controllers/concerns
@@ -25,6 +27,7 @@ module Sufia
       load File.expand_path('../../../tasks/reindex.rake', __FILE__)
       load File.expand_path('../../../tasks/stats_tasks.rake', __FILE__)
       load File.expand_path('../../../tasks/sufia_user.rake', __FILE__)
+      load File.expand_path('../../../tasks/controlled_vocabularies.rake', __FILE__)
     end
 
     initializer 'requires' do
@@ -32,6 +35,9 @@ module Sufia
     end
 
     initializer 'configure' do
+      # Set the path for the flipflop config:
+      Flipflop::Engine.config_file = Sufia::Engine.root + "config/features.rb"
+
       Sufia.config.tap do |c|
         Hydra::Derivatives.ffmpeg_path    = c.ffmpeg_path
         Hydra::Derivatives.temp_file_base = c.temp_file_base
@@ -58,6 +64,7 @@ module Sufia
 
       app.config.assets.precompile << /fontawesome-webfont\.(?:svg|ttf|woff)$/
       app.config.assets.precompile += %w(*.png *.jpg *.ico *.gif *.svg)
+      app.config.assets.precompile += %w(sufia/admin.css)
 
       Sprockets::ES6.configuration = { 'modules' => 'amd', 'moduleIds' => true }
       # When we upgrade to Sprockets 4, we can ditch sprockets-es6 and config AMD

data/lib/sufia/redis_event_store.rb

@@ -44,7 +44,7 @@ module Sufia
           timestamp: RedisEventStore.instance.hget("events:#{event_id}", "timestamp")
         }
       end
-    rescue Redis::CommandError
+    rescue Redis::CommandError, Redis::CannotConnectError
       RedisEventStore.logger.error("unable to fetch event: #{@key}")
       []
     end
@@ -52,7 +52,7 @@ module Sufia
     # Adds a value to the end of a list identified by key
     def push(value)
       RedisEventStore.instance.lpush(@key, value)
-    rescue Redis::CommandError
+    rescue Redis::CommandError, Redis::CannotConnectError
       RedisEventStore.logger.error("unable to push event: #{@key}")
       nil
     end

data/lib/sufia/resource_sync/resource_list_writer.rb

@@ -18,7 +18,7 @@ module Sufia
 
       private
 
-        def builder(capability_list_url: 'http://example.com/dataset1/capabilitylist.xml')
+        def builder
           Nokogiri::XML::Builder.new do |xml|
             xml.urlset('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9',
                        'xmlns:rs' => 'http://www.openarchives.org/rs/terms/') do

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = '7.1.0'.freeze
+  VERSION = '7.2.0'.freeze
 end

data/solr/config/solrconfig.xml

@@ -17,11 +17,11 @@
 -->
 
 <!--
- This is a stripped down config file used for a simple example...
- It is *not* a good example to work from.
+ This is a stripped down config file used for a simple example...  
+ It is *not* a good example to work from. 
 -->
 <config>
-
+  
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -29,15 +29,15 @@
        affect both how text is indexed and queried.
   -->
   <luceneMatchVersion>5.0.0</luceneMatchVersion>
-
+  
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
   <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
   <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
 
-  <directoryFactory name="DirectoryFactory"
+  <directoryFactory name="DirectoryFactory" 
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
-  </directoryFactory>
+  </directoryFactory> 
 
   <codecFactory class="solr.SchemaCodecFactory"/>
 
@@ -45,18 +45,33 @@
 
 
   <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
-
+  
   <requestDispatcher handleSelect="true" >
     <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" />
   </requestDispatcher>
-
+  
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
 
-  <!-- config for the admin interface -->
+  <!-- config for the admin interface --> 
   <admin>
     <defaultQuery>*:*</defaultQuery>
   </admin>
 
+  <updateHandler class="solr.DirectUpdateHandler2">
+    <updateLog>
+      <str name="dir">${solr.ulog.dir:}</str>
+    </updateLog>
+
+    <autoCommit>
+      <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
+      <openSearcher>false</openSearcher>
+    </autoCommit>
+
+    <autoSoftCommit>
+      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+    </autoSoftCommit>
+  </updateHandler>
+
   <!-- SearchHandler
 
        http://wiki.apache.org/solr/SearchHandler
@@ -87,7 +102,6 @@
        -->
         <str name="qf">
           id
-          active_fedora_model_ssi
           title_tesim
           author_tesim
           subject_tesim
@@ -119,9 +133,6 @@
 
        <str name="facet">true</str>
        <str name="facet.mincount">1</str>
-       <str name="facet.limit">10</str>
-       <str name="facet.field">active_fedora_model_ssi</str>
-       <str name="facet.field">subject_sim</str>
 
        <str name="spellcheck">true</str>
        <str name="spellcheck.dictionary">default</str>
@@ -190,7 +201,7 @@
 <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.
+        suggestions.  
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -245,7 +256,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator
+    <!-- a spellchecker that use an alternate comparator 
 
          comparatorClass be one of:
           1. score (default)

data/spec/actors/sufia/create_with_files_actor_spec.rb

@@ -1,8 +1,10 @@
 describe Sufia::CreateWithFilesActor do
-  let(:create_actor) { double('create actor', create: true,
-                                              curation_concern: work,
-                                              update: true,
-                                              user: user) }
+  let(:create_actor) do
+    double('create actor', create: true,
+                           curation_concern: work,
+                           update: true,
+                           user: user)
+  end
   let(:actor) do
     CurationConcerns::Actors::ActorStack.new(work, user, [described_class])
   end

data/spec/actors/sufia/create_with_remote_files_actor_spec.rb

@@ -1,7 +1,9 @@
 describe Sufia::CreateWithRemoteFilesActor do
-  let(:create_actor) { double('create actor', create: true,
-                                              curation_concern: work,
-                                              user: user) }
+  let(:create_actor) do
+    double('create actor', create: true,
+                           curation_concern: work,
+                           user: user)
+  end
   let(:actor) do
     CurationConcerns::Actors::ActorStack.new(work, user, [described_class])
   end
@@ -11,12 +13,14 @@ describe Sufia::CreateWithRemoteFilesActor do
   let(:url2) { "https://dl.dropbox.com/fake/blah-blah.Getting%20Started.pdf" }
   let(:file) { "file:///local/file/here.txt" }
 
-  let(:remote_files) { [{ url: url1,
-                          expires: "2014-03-31T20:37:36.214Z",
-                          file_name: "filepicker-demo.txt.txt" },
-                        { url: url2,
-                          expires: "2014-03-31T20:37:36.731Z",
-                          file_name: "Getting+Started.pdf" }] }
+  let(:remote_files) do
+    [{ url: url1,
+       expires: "2014-03-31T20:37:36.214Z",
+       file_name: "filepicker-demo.txt.txt" },
+     { url: url2,
+       expires: "2014-03-31T20:37:36.731Z",
+       file_name: "Getting+Started.pdf" }]
+  end
   let(:attributes) { { remote_files: remote_files } }
 
   before do
@@ -25,12 +29,14 @@ describe Sufia::CreateWithRemoteFilesActor do
   end
 
   context "with source uris that are remote" do
-    let(:remote_files) { [{ url: url1,
-                            expires: "2014-03-31T20:37:36.214Z",
-                            file_name: "filepicker-demo.txt.txt" },
-                          { url: url2,
-                            expires: "2014-03-31T20:37:36.731Z",
-                            file_name: "Getting+Started.pdf" }] }
+    let(:remote_files) do
+      [{ url: url1,
+         expires: "2014-03-31T20:37:36.214Z",
+         file_name: "filepicker-demo.txt.txt" },
+       { url: url2,
+         expires: "2014-03-31T20:37:36.731Z",
+         file_name: "Getting+Started.pdf" }]
+    end
 
     it "attaches files" do
       expect(ImportUrlJob).to receive(:perform_later).with(FileSet, CurationConcerns::Operation).twice
@@ -39,9 +45,11 @@ describe Sufia::CreateWithRemoteFilesActor do
   end
 
   context "with source uris that are local files" do
-    let(:remote_files) { [{ url: file,
-                            expires: "2014-03-31T20:37:36.214Z",
-                            file_name: "here.txt" }] }
+    let(:remote_files) do
+      [{ url: file,
+         expires: "2014-03-31T20:37:36.214Z",
+         file_name: "here.txt" }]
+    end
 
     it "attaches files" do
       expect(IngestLocalFileJob).to receive(:perform_later).with(FileSet, "/local/file/here.txt", user)