RubyGems - sufia-models - Versions diffs - 6.3.0 → 6.4.0 - Mend

sufia-models 6.3.0 → 6.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

checksums.yaml +4 -4
data/app/actors/sufia/generic_file/actor.rb +25 -2
data/app/jobs/batch_update_job.rb +78 -41
data/app/models/concerns/sufia/generic_file/metadata.rb +18 -18
data/app/models/concerns/sufia/generic_file/querying.rb +8 -0
data/app/models/geo_names_resource.rb +1 -1
data/app/services/sufia/generic_file_csv_service.rb +41 -0
data/app/services/sufia/generic_file_indexing_service.rb +11 -0
data/app/services/sufia/lock_manager.rb +43 -0
data/lib/generators/sufia/models/citation_config_generator.rb +22 -0
data/lib/generators/sufia/models/geonames_username_config_generator.rb +20 -0
data/lib/generators/sufia/models/install_generator.rb +6 -0
data/lib/generators/sufia/models/lock_manager_config_generator.rb +28 -0
data/lib/generators/sufia/models/minimagick_config_generator.rb +18 -0
data/lib/generators/sufia/models/templates/config/mini_magick.rb +5 -0
data/lib/generators/sufia/models/templates/config/sufia.rb +22 -0
data/lib/generators/sufia/models/upload_to_collection_config_generator.rb +22 -0
data/lib/sufia/models/engine.rb +6 -0
data/lib/sufia/models/version.rb +1 -1
data/sufia-models.gemspec +3 -2
metadata +28 -12

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8aaf1e2e42b84b0e4a1331a69fa75380c39b5d8
-  data.tar.gz: aa45e5332b4d18964bd006da94f500081a848b46
+  metadata.gz: 8330c2299c06f65449dfb7ce36e3d011667d4c2f
+  data.tar.gz: cd37e02c1d1d2be11c039430332a5bf103b2f6ff
 SHA512:
-  metadata.gz: 78bd0e47f109f0c8eecfc861458d6ba77726f77ca72f1eb42f2e8969a0fc7409c1f7739b2c1f3c649eb847e658788b45c6cfd0a2c1817ef5c640f3e6e9546ce1
-  data.tar.gz: 991b122862009f831320945391d228c1068259b27d1102e44176ed5dea353cb9d366a93b8776f978da8cd0b688c31734247ea1c97267f07fbe03d0c8692d0ae4
+  metadata.gz: 5021bfd98929e7fcbbc1619274308ca853343fc38f974623d809242aa8c6b45d2cfd7897f9cba4df5eb986fc51e060c742c3a0f94a0c63afaa8034dc94bb285e
+  data.tar.gz: 8cbbefc5ff16a747880dea64437c343b7420bc103d50db813e632f6288d51d4d8098a2876c9cffacaa6f8c930b4812817b9ba91f4c0ee76016836e2055d04206

data/app/actors/sufia/generic_file/actor.rb CHANGED Viewed

@@ -27,15 +27,27 @@ module Sufia::GenericFile
       yield(generic_file) if block_given?
     end
-    def create_content(file, file_name, path, mime_type)
+    def create_content(file, file_name, path, mime_type, collection_id = nil)
       generic_file.add_file(file, path: path, original_name: file_name, mime_type: mime_type)
       generic_file.label ||= file_name
       generic_file.title = [generic_file.label] if generic_file.title.blank?
-      save_characterize_and_record_committer do
+      saved = save_characterize_and_record_committer do
         if Sufia.config.respond_to?(:after_create_content)
           Sufia.config.after_create_content.call(generic_file, user)
         end
       end
+      add_file_to_collection(collection_id) if saved
+      saved
+    end
+    def add_file_to_collection(collection_id)
+      return if collection_id.nil? || collection_id == "-1"
+      collection = Collection.find(collection_id)
+      return unless user.can? :edit, collection
+      acquire_lock_for(collection_id) do
+        collection.add_members [generic_file.id]
+        collection.save
+      end
     end
     def revert_content(revision_id)
@@ -130,5 +142,16 @@ module Sufia::GenericFile
         featured_work = FeaturedWork.find_by_generic_file_id(generic_file.id)
         featured_work.destroy unless featured_work.nil?
       end
+      def acquire_lock_for(lock_key, &block)
+        lock_manager.lock(lock_key, &block)
+      end
+      def lock_manager
+        @lock_manager ||= Sufia::LockManager.new(
+          Sufia.config.lock_time_to_live,
+          Sufia.config.lock_retry_count,
+          Sufia.config.lock_retry_delay)
+      end
   end
 end

data/app/jobs/batch_update_job.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# Resque job that updates files uploaded via the BatchController
 class BatchUpdateJob
   include Hydra::PermissionsQuery
   include Sufia::Messages
@@ -6,67 +7,103 @@ class BatchUpdateJob
     :batch_update
   end
-  attr_accessor :login, :title, :file_attributes, :batch_id, :visibility, :saved, :denied
+  attr_reader :login, :batch_id, :title, :file_attributes, :visibility
+  attr_writer :saved, :denied
+  # Called from BatchController
+  # @param [String] login of the current user
+  # @param [String] batch_id for the Batch object containing the files
+  # @param [Hash] title contains the filename of each file
+  # @param [Hash] file_attributes applied to every file in the batch
+  # @param [String] visibility
   def initialize(login, batch_id, title, file_attributes, visibility)
-    self.login = login
-    self.title = title || {}
-    self.file_attributes = file_attributes
-    self.visibility = visibility
-    self.batch_id = batch_id
-    self.saved = []
-    self.denied = []
+    @login = login
+    @batch_id = batch_id
+    @title = title || {}
+    @file_attributes = file_attributes
+    @visibility = visibility
   end
   def run
-    batch = Batch.find_or_create(batch_id)
-    user = User.find_by_user_key(login)
-    batch.generic_files.each do |gf|
-      update_file(gf, user)
-    end
+    batch.generic_files.each { |gf| update_file(gf) }
     batch.update(status: ["Complete"])
-    if denied.empty?
-      send_user_success_message(user, batch) unless saved.empty?
-    else
-      send_user_failure_message(user, batch)
-    end
+    send_user_message
   end
-  def update_file(gf, user)
-    unless user.can? :edit, gf
-      ActiveFedora::Base.logger.error "User #{user.user_key} DENIED access to #{gf.id}!"
-      denied << gf
-      return
-    end
+  # Updates the metadata for one file in the batch. Override this method if you wish to perform
+  # additional operations to these files.
+  # @param [GenericFile] gf
+  def apply_metadata(gf)
     gf.title = title[gf.id] if title[gf.id]
     gf.attributes = file_attributes
     gf.visibility = visibility
+  end
-    save_tries = 0
-    begin
-      gf.save!
-    rescue RSolr::Error::Http => error
-      save_tries += 1
-      ActiveFedora::Base.logger.warn "BatchUpdateJob caught RSOLR error on #{gf.id}: #{error.inspect}"
-      # fail for good if the tries is greater than 3
-      raise error if save_tries >= 3
-      sleep 0.01
-      retry
-    end #
+  # Queues jobs to run on each file. By default, this includes ContentUpdateEventJob, but
+  # can be augmented with additional custom jobs
+  # @param [GenericFile] gf
+  def queue_additional_jobs(gf)
     Sufia.queue.push(ContentUpdateEventJob.new(gf.id, login))
-    saved << gf
   end
-  def send_user_success_message(user, batch)
+  def send_user_success_message
     message = saved.count > 1 ? multiple_success(batch.id, saved) : single_success(batch.id, saved.first)
     User.batchuser.send_message(user, message, success_subject, false)
   end
-  def send_user_failure_message(user, batch)
+  def send_user_failure_message
     message = denied.count > 1 ? multiple_failure(batch.id, denied) : single_failure(batch.id, denied.first)
     User.batchuser.send_message(user, message, failure_subject, false)
   end
+  private
+    def update_file(gf, you = nil)
+      you ||= user
+      unless you.can? :edit, gf
+        ActiveFedora::Base.logger.error "User #{you.user_key} DENIED access to #{gf.id}!"
+        denied << gf
+        return
+      end
+      apply_metadata(gf)
+      save_tries = 0
+      begin
+        gf.save!
+      rescue RSolr::Error::Http => error
+        save_tries += 1
+        ActiveFedora::Base.logger.warn "BatchUpdateJob caught RSOLR error on #{gf.id}: #{error.inspect}"
+        # fail for good if the tries is greater than 3
+        raise error if save_tries >= 3
+        sleep 0.01
+        retry
+      end
+      queue_additional_jobs(gf)
+      saved << gf
+    end
+    def send_user_message
+      if denied.empty?
+        send_user_success_message unless saved.empty?
+      else
+        send_user_failure_message
+      end
+    end
+    def batch
+      @batch ||= Batch.find_or_create(batch_id)
+    end
+    def user
+      @user ||= User.find_by_user_key(login)
+    end
+    def saved
+      @saved ||= []
+    end
+    def denied
+      @denied ||= []
+    end
 end

data/app/models/concerns/sufia/generic_file/metadata.rb CHANGED Viewed

@@ -18,33 +18,33 @@ module Sufia
           index.as :symbol
         end
-        property :part_of, predicate: ::RDF::DC.isPartOf
-        property :resource_type, predicate: ::RDF::DC.type do |index|
+        property :part_of, predicate: RDF::Vocab::DC.isPartOf
+        property :resource_type, predicate: RDF::Vocab::DC.type do |index|
           index.as :stored_searchable, :facetable
         end
-        property :title, predicate: ::RDF::DC.title do |index|
+        property :title, predicate: RDF::Vocab::DC.title do |index|
           index.as :stored_searchable, :facetable
         end
-        property :creator, predicate: ::RDF::DC.creator do |index|
+        property :creator, predicate: RDF::Vocab::DC.creator do |index|
           index.as :stored_searchable, :facetable
         end
-        property :contributor, predicate: ::RDF::DC.contributor do |index|
+        property :contributor, predicate: RDF::Vocab::DC.contributor do |index|
           index.as :stored_searchable, :facetable
         end
-        property :description, predicate: ::RDF::DC.description do |index|
+        property :description, predicate: RDF::Vocab::DC.description do |index|
           index.type :text
           index.as :stored_searchable
         end
-        property :tag, predicate: ::RDF::DC.relation do |index|
+        property :tag, predicate: RDF::Vocab::DC.relation do |index|
           index.as :stored_searchable, :facetable
         end
-        property :rights, predicate: ::RDF::DC.rights do |index|
+        property :rights, predicate: RDF::Vocab::DC.rights do |index|
           index.as :stored_searchable
         end
-        property :publisher, predicate: ::RDF::DC.publisher do |index|
+        property :publisher, predicate: RDF::Vocab::DC.publisher do |index|
           index.as :stored_searchable, :facetable
         end
-        property :date_created, predicate: ::RDF::DC.created do |index|
+        property :date_created, predicate: RDF::Vocab::DC.created do |index|
           index.as :stored_searchable
         end
@@ -53,34 +53,34 @@ module Sufia
         # fedora's system created date will reflect the date when the record
         # was created in fedora4, but the date_uploaded will preserve the
         # original creation date from the old repository.
-        property :date_uploaded, predicate: ::RDF::DC.dateSubmitted, multiple: false do |index|
+        property :date_uploaded, predicate: RDF::Vocab::DC.dateSubmitted, multiple: false do |index|
           index.type :date
           index.as :stored_sortable
         end
-        property :date_modified, predicate: ::RDF::DC.modified, multiple: false do |index|
+        property :date_modified, predicate: RDF::Vocab::DC.modified, multiple: false do |index|
           index.type :date
           index.as :stored_sortable
         end
-        property :subject, predicate: ::RDF::DC.subject do |index|
+        property :subject, predicate: RDF::Vocab::DC.subject do |index|
           index.as :stored_searchable, :facetable
         end
-        property :language, predicate: ::RDF::DC.language do |index|
+        property :language, predicate: RDF::Vocab::DC.language do |index|
           index.as :stored_searchable, :facetable
         end
-        property :identifier, predicate: ::RDF::DC.identifier do |index|
+        property :identifier, predicate: RDF::Vocab::DC.identifier do |index|
           index.as :stored_searchable
         end
-        property :based_near, predicate: ::RDF::FOAF.based_near do |index|
+        property :based_near, predicate: RDF::Vocab::FOAF.based_near do |index|
           index.as :stored_searchable, :facetable
         end
         property :related_url, predicate: ::RDF::RDFS.seeAlso do |index|
           index.as :stored_searchable
         end
-        property :bibliographic_citation, predicate: ::RDF::DC.bibliographicCitation do |index|
+        property :bibliographic_citation, predicate: RDF::Vocab::DC.bibliographicCitation do |index|
           index.as :stored_searchable
         end
-        property :source, predicate: ::RDF::DC.source do |index|
+        property :source, predicate: RDF::Vocab::DC.source do |index|
           index.as :stored_searchable
         end

data/app/models/concerns/sufia/generic_file/querying.rb CHANGED Viewed

@@ -38,6 +38,14 @@ module Sufia
           where Solrizer.solr_name('read_access_group', :symbol) => access_level
         end
+        def where_digest_is(digest_string)
+          where Solrizer.solr_name('digest', :symbol) => urnify(digest_string)
+        end
+        def urnify(digest_string)
+          "urn:sha1:#{digest_string}"
+        end
         def date_format
           "%Y-%m-%dT%H:%M:%SZ"
         end

data/app/models/geo_names_resource.rb CHANGED Viewed

@@ -13,6 +13,6 @@ class GeoNamesResource < ActiveResource::Base
   end
   def self.find_location(location)
-    GeoNamesResource.find(:all, params: { q: location, username: "cam156", maxRows: 10 })
+    GeoNamesResource.find(:all, params: { q: location, username: Sufia.config.geonames_username, maxRows: 10 })
   end
 end

data/app/services/sufia/generic_file_csv_service.rb ADDED Viewed

@@ -0,0 +1,41 @@
+module Sufia
+  #
+  # Generates CSV from a Generic_File
+  #
+  # @attr_reader [GenericFile] generic_file file that will be examined to generate the CSVs
+  # @attr_reader [Array] terms list of terms that will be output in CSV form
+  # @attr_reader [String] multi_value_separator separator for terms that have more than one value
+  class GenericFileCSVService
+    attr_reader :generic_file, :terms, :multi_value_separator
+    # @param [GenericFile] generic_file file that will be examined to generate the CSVs
+    # @param [Array]       terms list of terms that will be output in CSV form
+    #                      defaults if nil to list below
+    # @param [String]      multi_value_separator separator for terms that have more than one value
+    #                      defaults to '|'
+    def initialize(file, terms = nil, multi_value_separator = '|')
+      @generic_file = file
+      @terms = terms
+      @terms ||= [:id, :title, :depositor, :creator, :visibility, :resource_type, :rights, :file_format]
+      @multi_value_separator = multi_value_separator
+    end
+    # provide csv version of the GenericFile
+    def csv
+      ::CSV.generate do |csv|
+        csv << terms.map do |term|
+          values = generic_file.send(term)
+          values = Array(values) # make sure we have an array
+          values.join(multi_value_separator)
+        end
+      end
+    end
+    # provide csv header line for a GenericFile
+    def csv_header
+      ::CSV.generate do |csv|
+        csv << terms
+      end
+    end
+  end
+end

data/app/services/sufia/generic_file_indexing_service.rb CHANGED Viewed

@@ -9,7 +9,18 @@ module Sufia
         solr_doc[Solrizer.solr_name('file_format', :facetable)] = object.file_format
         solr_doc['all_text_timv'] = object.full_text.content
         solr_doc[Solrizer.solr_name('file_size', STORED_INTEGER)] = object.content.size.to_i
+        # Index the Fedora-generated SHA1 digest to create a linkage
+        # between files on disk (in fcrepo.binary-store-path) and objects
+        # in the repository.
+        solr_doc[Solrizer.solr_name('digest', :symbol)] = digest_from_content
       end
     end
+    private
+      def digest_from_content
+        return unless object.content.has_content?
+        object.content.digest.first.to_s
+      end
   end
 end

data/app/services/sufia/lock_manager.rb ADDED Viewed

@@ -0,0 +1,43 @@
+require 'redlock'
+module Sufia
+  class LockManager
+    class UnableToAcquireLockError < StandardError; end
+    # TODO: This file is the same as curation_concerns/curation_concerns-models/app/services/curation_concerns/lock_manager.rb.
+    #       During the merge of Sufia to use Curation Concerns, this file may be replaced by the Curation Concerns version.
+    attr_reader :client
+    # @param [Fixnum] time_to_live How long to hold the lock in milliseconds
+    # @param [Fixnum] retry_count How many times to retry to acquire the lock before raising UnableToAcquireLockError
+    # @param [Fixnum] retry_delay Maximum wait time in milliseconds before retrying. Wait time is a random value between 0 and retry_delay.
+    def initialize(time_to_live, retry_count, retry_delay)
+      @ttl = time_to_live
+      @client = Redlock::Client.new([uri], retry_count: retry_count, retry_delay: retry_delay)
+    end
+    # Blocks until lock is acquired or timeout.
+    def lock(key)
+      client.lock(key, @ttl) do |locked|
+        if locked
+          yield
+        else
+          raise UnableToAcquireLockError
+        end
+      end
+    end
+    private
+      def uri
+        @uri ||= begin
+          opts = options
+          URI("#{opts[:scheme]}://#{opts[:host]}:#{opts[:port]}").to_s
+        end
+      end
+      def options
+        ::Resque.redis.redis.client.options
+      end
+  end
+end

data/lib/generators/sufia/models/citation_config_generator.rb ADDED Viewed

@@ -0,0 +1,22 @@
+require 'rails/generators'
+class Sufia::Models::CitationConfigGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc """
+This Generator makes the following changes to your application:
+  1. Updates existing sufia.rb initializer to include a citation configuration
+       """
+  def banner
+    say_status("info", "ADDING CITATIONS OPTION TO SUFIA CONFIG", :blue)
+  end
+  def inject_config_initializer
+    inject_into_file 'config/initializers/sufia.rb', before: "# Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)" do
+      "# Enables a link to the citations page for a generic_file.\n" +
+        "# Default is false\n" +
+        "# config.citations = false\n"
+    end
+  end
+end

data/lib/generators/sufia/models/geonames_username_config_generator.rb ADDED Viewed

@@ -0,0 +1,20 @@
+require 'rails/generators'
+class Sufia::Models::GeonamesUsernameConfigGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc """
+This Generator makes the following changes to your application:
+  1. Updates existing sufia.rb initializer to include a geonames_username configuration
+       """
+  def banner
+    say_status("info", "ADDING GEONAMES_USERNAME OPTION TO SUFIA CONFIG", :blue)
+  end
+  def inject_config_initializer
+    inject_into_file 'config/initializers/sufia.rb', before: "# Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)" do
+      "config.geonames_username = ''\n"
+    end
+  end
+end

data/lib/generators/sufia/models/install_generator.rb CHANGED Viewed

@@ -15,6 +15,7 @@ This generator makes the following changes to your application:
  8. Runs cached stats generator
  9. Runs ORCID field generator
 10. Runs user stats generator
+11. Generates mini-magick config
        """
   def banner
     say_status("info", "GENERATING SUFIA MODELS", :blue)
@@ -109,4 +110,9 @@ This generator makes the following changes to your application:
   def clamav
     generate 'sufia:models:clamav'
   end
+  # Add mini-magick configuration
+  def minimagick_config
+    generate 'sufia:models:minimagick_config'
+  end
 end

data/lib/generators/sufia/models/lock_manager_config_generator.rb ADDED Viewed

@@ -0,0 +1,28 @@
+require 'rails/generators'
+class Sufia::Models::LockManagerConfigGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc """
+This Generator makes the following changes to your application:
+  1. Updates existing sufia.rb initializer to include lock manager configurations
+       """
+  def banner
+    say_status("info", "ADDING LOCK MANAGER OPTION TO SUFIA CONFIG", :blue)
+  end
+  def inject_config_initializer
+    inject_into_file 'config/initializers/sufia.rb', before: "# Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)" do
+      "\n  # How many times to retry to acquire the lock before raising UnableToAcquireLockError\n" +
+        "  # Default is 600ms\n" +
+        "  # config.lock_retry_count = 600 # Up to 2 minutes of trying at intervals up to 200ms\n" +
+        "\n  # How long to hold the lock in milliseconds\n" +
+        "  # Default is 60_000ms\n" +
+        "  # config.lock_time_to_live = 60_000 # milliseconds\n" +
+        "\n  # Maximum wait time in milliseconds before retrying. Wait time is a random value between 0 and retry_delay.\n" +
+        "  # Default is 200ms\n" +
+        "  # config.lock_retry_delay = 200 # milliseconds\n\n"
+    end
+  end
+end

data/lib/generators/sufia/models/minimagick_config_generator.rb ADDED Viewed

@@ -0,0 +1,18 @@
+require 'rails/generators'
+class Sufia::Models::MinimagickConfigGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc """
+This Generator makes the following changes to your application:
+  1. Creates new mini_magick.rb initializer configuring use of posix-spawn
+       """
+  def banner
+    say_status("info", "ADDING MINIMAGICK CONFIG", :blue)
+  end
+  def create_configuration_file
+    copy_file 'config/mini_magick.rb', 'config/initializers/mini_magick.rb'
+  end
+end

data/lib/generators/sufia/models/templates/config/mini_magick.rb ADDED Viewed

@@ -0,0 +1,5 @@
+require 'mini_magick'
+MiniMagick.configure do |config|
+  config.shell_api = "posix-spawn"
+end

data/lib/generators/sufia/models/templates/config/sufia.rb CHANGED Viewed

@@ -91,6 +91,26 @@ Sufia.config do |config|
   # Specify a date you wish to start collecting Google Analytic statistics for.
   # config.analytic_start_date = DateTime.new(2014,9,10)
+  # Enables a link to the citations page for a generic_file.
+  # Default is false
+  # config.citations = false
+  # Enables a select menu on the batch upload page to select a collection into which to add newly uploaded files.
+  # Default is false
+  # config.upload_to_collection = false
+  # How many times to retry to acquire the lock before raising UnableToAcquireLockError
+  # Default is 600ms
+  # config.lock_retry_count = 600 # Up to 2 minutes of trying at intervals up to 200ms
+  # How long to hold the lock in milliseconds
+  # Default is 60_000ms
+  # config.lock_time_to_live = 60_000 # milliseconds
+  # Maximum wait time in milliseconds before retrying. Wait time is a random value between 0 and retry_delay.
+  # Default is 200ms
+  # config.lock_retry_delay = 200 # milliseconds
   # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
   # config.temp_file_base = '/home/developer1'
@@ -132,6 +152,8 @@ Sufia.config do |config|
   # NOTE: if you have always sent analytics to GA for downloads and page views leave this commented out
   # config.analytic_start_date = DateTime.new(2014,9,10)
+  config.geonames_username = ''
   # If browse-everything has been configured, load the configs.  Otherwise, set to nil.
   begin
     if defined? BrowseEverything

data/lib/generators/sufia/models/upload_to_collection_config_generator.rb ADDED Viewed

@@ -0,0 +1,22 @@
+require 'rails/generators'
+class Sufia::Models::UploadToCollectionConfigGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc """
+This Generator makes the following changes to your application:
+  1. Updates existing sufia.rb initializer to include a update_to_collection configuration
+       """
+  def banner
+    say_status("info", "ADDING UPLOAD_TO_COLLECTION OPTION TO SUFIA CONFIG", :blue)
+  end
+  def inject_config_initializer
+    inject_into_file 'config/initializers/sufia.rb', before: "# Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)" do
+      "# Enables a select menu on the batch upload page to select a collection into which to add newly uploaded files.\n" +
+        "# Default is false\n" +
+        "# config.upload_to_collection = false\n"
+    end
+  end
+end

data/lib/sufia/models/engine.rb CHANGED Viewed

@@ -24,11 +24,17 @@ module Sufia
       config.browse_everything = nil
       config.enable_local_ingest = nil
       config.analytics = false
+      config.citations = false
+      config.upload_to_collection = false
+      config.lock_retry_count = 600 # Up to 2 minutes of trying at intervals up to 200ms
+      config.lock_time_to_live = 60_000 # milliseconds
+      config.lock_retry_delay = 200 # milliseconds
       config.queue = Sufia::Resque::Queue
       config.max_notifications_for_dashboard = 5
       config.activity_to_show_default_seconds_since_now = 24 * 60 * 60
       config.arkivo_api = false
       config.retry_unless_sleep = 0.0
+      config.geonames_username = ""
       # Noid identifiers
       config.enable_noids = true

data/lib/sufia/models/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.3.0"
+    VERSION = "6.4.0"
   end
 end

data/sufia-models.gemspec CHANGED Viewed

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activeresource', "~> 4.0" # No longer a dependency of rails 4.0
   spec.add_dependency "hydra-head", "~> 9.0"
-  spec.add_dependency "active-fedora", "~> 9.1", ">= 9.1.1"
-  spec.add_dependency "hydra-collections", [">= 5.0.2", "< 6.0"]
+  spec.add_dependency "active-fedora", "~> 9.4"
+  spec.add_dependency "hydra-collections", [">= 5.0.3", "< 6.0"]
   spec.add_dependency 'hydra-derivatives', '~> 1.0'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'
   spec.add_dependency 'nest', '~> 1.1'
@@ -49,4 +49,5 @@ Gem::Specification.new do |spec|
   else
     spec.add_dependency 'mini_magick'
   end
+  spec.add_dependency 'posix-spawn'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,27 +86,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 9.1.1
+        version: '9.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 9.1.1
+        version: '9.4'
 - !ruby/object:Gem::Dependency
   name: hydra-collections
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -116,7 +110,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -308,6 +302,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Models and services for sufia
 email:
 - [email protected]
@@ -383,16 +391,22 @@ files:
 - app/models/version_committer.rb
 - app/services/sufia/analytics.rb
 - app/services/sufia/generic_file_audit_service.rb
+- app/services/sufia/generic_file_csv_service.rb
 - app/services/sufia/generic_file_indexing_service.rb
+- app/services/sufia/lock_manager.rb
 - app/services/sufia/noid.rb
 - app/services/sufia/repository_audit_service.rb
 - config/locales/sufia.en.yml
 - lib/generators/sufia/models/abstract_migration_generator.rb
 - lib/generators/sufia/models/arkivo_api_generator.rb
 - lib/generators/sufia/models/cached_stats_generator.rb
+- lib/generators/sufia/models/citation_config_generator.rb
 - lib/generators/sufia/models/clamav_generator.rb
 - lib/generators/sufia/models/fulltext_generator.rb
+- lib/generators/sufia/models/geonames_username_config_generator.rb
 - lib/generators/sufia/models/install_generator.rb
+- lib/generators/sufia/models/lock_manager_config_generator.rb
+- lib/generators/sufia/models/minimagick_config_generator.rb
 - lib/generators/sufia/models/orcid_field_generator.rb
 - lib/generators/sufia/models/proxies_generator.rb
 - lib/generators/sufia/models/templates/app/models/collection.rb
@@ -401,6 +415,7 @@ files:
 - lib/generators/sufia/models/templates/config/arkivo_constraint.rb
 - lib/generators/sufia/models/templates/config/clamav.rb
 - lib/generators/sufia/models/templates/config/mime_types.rb
+- lib/generators/sufia/models/templates/config/mini_magick.rb
 - lib/generators/sufia/models/templates/config/redis.yml
 - lib/generators/sufia/models/templates/config/redis_config.rb
 - lib/generators/sufia/models/templates/config/resque-pool.yml
@@ -438,6 +453,7 @@ files:
 - lib/generators/sufia/models/update_content_blocks_generator.rb
 - lib/generators/sufia/models/upgrade400_generator.rb
 - lib/generators/sufia/models/upgrade600_generator.rb
+- lib/generators/sufia/models/upload_to_collection_config_generator.rb
 - lib/generators/sufia/models/usagestats_generator.rb
 - lib/generators/sufia/models/user_stats_generator.rb
 - lib/sufia/messages.rb