sufia-models 6.2.0 → 6.3.0

data/app/services/sufia/repository_audit_service.rb

@@ -2,7 +2,7 @@ module Sufia
   class RepositoryAuditService
     def self.audit_everything
       ::GenericFile.find_each do |gf|
-        gf.audit
+        Sufia::GenericFileAuditService.new(gf).audit
       end
     end
   end

data/config/locales/sufia.en.yml

@@ -4,3 +4,5 @@ en:
     product_twitter_handle: "@HydraSphere"
     institution_name:   "Institution Name"
     institution_name_full: "The Institution Name"
+    sort_label: "Sort the listing of items"
+

data/lib/generators/sufia/models/abstract_migration_generator.rb

@@ -11,7 +11,8 @@ class Sufia::Models::AbstractMigrationGenerator < Rails::Generators::Base
     if @prev_migration_nr
       @prev_migration_nr += 1
     else
-      if last_migration = Dir[File.join(path, '*.rb')].sort.last
+      last_migration = Dir[File.join(path, '*.rb')].sort.last
+      if last_migration
         @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
       else
         @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
@@ -22,9 +23,9 @@ class Sufia::Models::AbstractMigrationGenerator < Rails::Generators::Base
 
   protected
 
-  def better_migration_template(file)
-    migration_template "migrations/#{file}", "db/migrate/#{file}"
-  rescue Rails::Generators::Error => e
-    say_status("error", e.message, :red)
-  end
+    def better_migration_template(file)
+      migration_template "migrations/#{file}", "db/migrate/#{file}"
+    rescue Rails::Generators::Error => e
+      say_status("error", e.message, :red)
+    end
 end

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

@@ -2,7 +2,7 @@ require_relative 'abstract_migration_generator'
 
 class Sufia::Models::InstallGenerator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
-  argument     :model_name, type: :string , default: "user"
+  argument :model_name, type: :string, default: "user"
   desc """
 This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
@@ -46,7 +46,7 @@ This generator makes the following changes to your application:
   # Add behaviors to the user model
   def inject_sufia_user_behavior
     file_path = "app/models/#{model_name.underscore}.rb"
-    if File.exists?(file_path)
+    if File.exist?(file_path)
       inject_into_file file_path, after: /include Hydra\:\:User.*$/ do
         "# Connects this user object to Sufia behaviors. " +
           "\n include Sufia::User\n"
@@ -58,7 +58,7 @@ This generator makes the following changes to your application:
 
   def create_configuration_files
     append_file 'config/initializers/mime_types.rb',
-                     "\nMime::Type.register 'application/x-endnote-refer', :endnote", {verbose: false }
+                "\nMime::Type.register 'application/x-endnote-refer', :endnote", verbose: false
     copy_file 'config/sufia.rb', 'config/initializers/sufia.rb'
     copy_file 'config/redis.yml', 'config/redis.yml'
     copy_file 'config/resque-pool.yml', 'config/resque-pool.yml'

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

@@ -1,6 +1,6 @@
 module Sufia
   class ArkivoConstraint
-    def self.matches?(request)
+    def self.matches?(_request)
       # Add your own logic here to authorize trusted connections to
       # the API e.g., if your installation of Arkivo runs on a host
       # with the 10.0.0.3 IP address, you could use:

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

@@ -1 +1 @@
-ClamAV.instance.loaddb() if defined? ClamAV
+ClamAV.instance.loaddb if defined? ClamAV

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

@@ -4,24 +4,32 @@ if defined?(PhusionPassenger)
     if forked
       # Re-establish redis connection
       require 'redis'
-      config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+      config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
 
       # The important two lines
       $redis.client.disconnect if $redis
-      $redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true) rescue nil
+      $redis = begin
+                 Redis.new(host: config[:host], port: config[:port], thread_safe: true)
+               rescue
+                 nil
+               end
       Resque.redis = $redis
       Resque.redis.client.reconnect if Resque.redis
       Resque.redis.namespace = "#{Sufia.config.redis_namespace}:#{Rails.env}"
     end
   end
 else
-  config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-  $redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true) rescue nil
+  config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+  $redis = begin
+             Redis.new(host: config[:host], port: config[:port], thread_safe: true)
+           rescue
+             nil
+           end
 end
 
 # Code borrowed from Obie's Redis patterns talk at RailsConf'12
 Nest.class_eval do
-  def initialize(key, redis=$redis)
+  def initialize(key, redis = $redis)
     super(key.to_param)
     @redis = redis
   end

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

@@ -3,8 +3,8 @@ module Sufia
     def self.matches?(request)
       current_user = request.env['warden'].user
       return false if current_user.blank?
-      # TODO code a group here that makes sense
-      #current_user.groups.include? 'umg/up.dlt.scholarsphere-admin'
+      # TODO: code a group here that makes sense
+      # current_user.groups.include? 'umg/up.dlt.scholarsphere-admin'
     end
   end
 end

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

@@ -1,4 +1,4 @@
-config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
 Resque.redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true)
 
 Resque.inline = Rails.env.test?

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

@@ -42,7 +42,7 @@ Sufia.config do |config|
     "Research Paper" => "Research Paper",
     "Software or Program Code" => "Software or Program Code",
     "Video" => "Video",
-    "Other" => "Other",
+    "Other" => "Other"
   }
 
   config.resource_types_to_schema = {
@@ -65,11 +65,11 @@ Sufia.config do |config|
     "Research Paper" => "http://schema.org/ScholarlyArticle",
     "Software or Program Code" => "http://schema.org/Code",
     "Video" => "http://schema.org/VideoObject",
-    "Other" => "http://schema.org/CreativeWork",
+    "Other" => "http://schema.org/CreativeWork"
   }
 
   config.permission_levels = {
-    "Choose Access"=>"none",
+    "Choose Access" => "none",
     "View/Download" => "read",
     "Edit" => "edit"
   }
@@ -107,6 +107,13 @@ Sufia.config do |config|
   # Specify a different template for your repository's NOID IDs
   # config.noid_template = ".reeddeeddk"
 
+  # Store identifier minter's state in a file for later replayability
+  # config.minter_statefile = '/tmp/minter-state'
+
+  # Process for translating Fedora URIs to identifiers and vice versa
+  # config.translate_uri_to_id = ActiveFedora::Noid.config.translate_uri_to_id
+  # config.translate_id_to_uri = ActiveFedora::Noid.config.translate_id_to_uri
+
   # Specify the prefix for Redis keys:
   # config.redis_namespace = "sufia"
 
@@ -135,7 +142,6 @@ Sufia.config do |config|
   rescue Errno::ENOENT
     config.browse_everything = nil
   end
-
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb

@@ -9,7 +9,7 @@ class CreateChecksumAuditLogs < ActiveRecord::Migration
       t.string :actual_result
       t.timestamps
     end
-    add_index :checksum_audit_logs, [:pid, :dsid], name: 'by_pid_and_dsid', order: {created_at: "DESC" }
+    add_index :checksum_audit_logs, [:pid, :dsid], name: 'by_pid_and_dsid', order: { created_at: "DESC" }
   end
 
   def self.down

data/lib/generators/sufia/models/templates/migrations/create_file_download_stats.rb

@@ -3,7 +3,7 @@ class CreateFileDownloadStats < ActiveRecord::Migration
     create_table :file_download_stats do |t|
       t.datetime :date
       t.integer :downloads
-      t.string  :file_id
+      t.string :file_id
 
       t.timestamps
     end

data/lib/generators/sufia/models/templates/migrations/create_file_view_stats.rb

@@ -3,7 +3,7 @@ class CreateFileViewStats < ActiveRecord::Migration
     create_table :file_view_stats do |t|
       t.datetime :date
       t.integer :views
-      t.string  :file_id
+      t.string :file_id
 
       t.timestamps
     end

data/lib/generators/sufia/models/templates/migrations/create_local_authorities.rb

@@ -20,7 +20,7 @@ class CreateLocalAuthorities < ActiveRecord::Migration
       t.integer :local_authority_id, foreign_key: true
     end
 
-    create_table :subject_local_authority_entries, force: true  do |t|
+    create_table :subject_local_authority_entries, force: true do |t|
       t.string :label
       t.string :lowerLabel
       t.string :url

data/lib/generators/sufia/models/update_content_blocks_generator.rb

@@ -14,5 +14,4 @@ This generator creates a database migration to add an external_key column to the
   def copy_migrations
     better_migration_template 'add_external_key_to_content_blocks.rb'
   end
-
 end

data/lib/generators/sufia/models/upgrade600_generator.rb

@@ -18,4 +18,3 @@ This generator for upgrading sufia-models to 6.0 makes the following changes to
     end
   end
 end
-

data/lib/generators/sufia/models/user_stats_generator.rb

@@ -2,7 +2,7 @@ require_relative 'abstract_migration_generator'
 
 class Sufia::Models::UserStatsGenerator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
-  argument :model_name, type: :string , default: "user"
+  argument :model_name, type: :string, default: "user"
 
   desc """
 This generator adds usage stats methods to the user model in your application:
@@ -20,7 +20,7 @@ This generator adds usage stats methods to the user model in your application:
   def add_stats_mixin_to_user_model
     file_path = "app/models/#{model_name.underscore}.rb"
 
-    if File.exists?(file_path)
+    if File.exist?(file_path)
       inject_into_file file_path, after: /include Sufia\:\:User.*$/ do
         "\n  include Sufia::UserUsageStats"
       end

data/lib/sufia/messages.rb

@@ -15,52 +15,52 @@ module Sufia
       I18n.t("sufia.messages.failure.subject")
     end
 
-    def single_success id, file
-      content_tag :span, id: "ss-"+id do
+    def single_success(id, file)
+      content_tag :span, id: "ss-" + id do
         [link_to_file(file), I18n.t("sufia.messages.success.single")].join(" ").html_safe
       end
     end
 
-    def multiple_success id, files
-      content_tag :span, id: "ss-"+id do
+    def multiple_success(id, files)
+      content_tag :span, id: "ss-" + id do
         [success_link(files), I18n.t("sufia.messages.success.multiple.tag")].join(" ").html_safe
       end
     end
 
-    def single_failure id, file
-      content_tag :span, id: "ss-"+id do
+    def single_failure(id, file)
+      content_tag :span, id: "ss-" + id do
         [link_to_file(file), I18n.t("sufia.messages.failure.single")].join(" ").html_safe
       end
     end
 
-    def multiple_failure id, files
-      content_tag :span, id: "ss-"+id do
+    def multiple_failure(id, files)
+      content_tag :span, id: "ss-" + id do
         [failure_link(files), I18n.t("sufia.messages.failure.multiple.tag")].join(" ").html_safe
       end
     end
 
     # Double-quotes are replaced with single ones so this list can be included in a data block. Ex:
     #   <a href="#" data-content="<a href='#'>embedded link</a>" rel="popover">Click me</a>
-    def file_list files
-      files.map { |gf| link_to_file(gf) }.join(', ').gsub(/"/, "'")
+    def file_list(files)
+      files.map { |gf| link_to_file(gf) }.join(', ').tr("\"", "'")
     end
 
-    def link_to_file file
+    def link_to_file(file)
       link_to(file.to_s, Sufia::Engine.routes.url_helpers.generic_file_path(file))
     end
 
     private
 
-      def success_link files
+      def success_link(files)
         link_to I18n.t("sufia.messages.success.multiple.link"), "#",
-          rel: "popover",
-          data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.success.title") }
+                rel: "popover",
+                data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.success.title") }
       end
 
-      def failure_link files
+      def failure_link(files)
         link_to I18n.t("sufia.messages.failure.multiple.link"), "#",
-          rel: "popover",
-          data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.failure.title") }
+                rel: "popover",
+                data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.failure.title") }
       end
   end
 end

data/lib/sufia/models.rb

@@ -29,6 +29,6 @@ module Sufia
 
     yield @@config if block
 
-    return @@config
+    @@config
   end
 end

data/lib/sufia/models/active_fedora/redis.rb

@@ -12,7 +12,7 @@ module ActiveFedora
       nil
     end
 
-    def events(size=-1)
+    def events(size = -1)
       stream[:event].lrange(0, size).map do |event_id|
         {
           action: $redis.hget("events:#{event_id}", "action"),
@@ -38,6 +38,3 @@ module ActiveFedora
     end
   end
 end
-
-
-

data/lib/sufia/models/active_record/redis.rb

@@ -11,7 +11,7 @@ ActiveRecord::Base.class_eval do
     nil
   end
 
-  def events(size=-1)
+  def events(size = -1)
     stream[:event].lrange(0, size).map do |event_id|
       {
         action: $redis.hget("events:#{event_id}", "action"),
@@ -22,7 +22,7 @@ ActiveRecord::Base.class_eval do
     []
   end
 
-  def profile_events(size=-1)
+  def profile_events(size = -1)
     stream[:event][:profile].lrange(0, size).map do |event_id|
       {
         action: $redis.hget("events:#{event_id}", "action"),
@@ -53,4 +53,3 @@ ActiveRecord::Base.class_eval do
     nil
   end
 end
-

data/lib/sufia/models/engine.rb

@@ -5,11 +5,12 @@ module Sufia
 
       yield @@config if block
 
-      return @@config
+      @@config
     end
 
     class Engine < ::Rails::Engine
       require 'sufia/models/resque'
+      require 'active_fedora/noid'
 
       # Set some configuration defaults
       config.persistent_hostpath = "http://localhost/files/"
@@ -17,9 +18,6 @@ module Sufia
       config.ffmpeg_path = 'ffmpeg'
       config.fits_message_length = 5
       config.temp_file_base = nil
-      config.enable_noids = true
-      config.noid_template = '.reeddeeddk'
-      config.minter_statefile = '/tmp/minter-state'
       config.redis_namespace = "sufia"
       config.fits_path = "fits.sh"
       config.enable_contact_form_delivery = false
@@ -28,10 +26,17 @@ module Sufia
       config.analytics = false
       config.queue = Sufia::Resque::Queue
       config.max_notifications_for_dashboard = 5
-      config.activity_to_show_default_seconds_since_now = 24*60*60
+      config.activity_to_show_default_seconds_since_now = 24 * 60 * 60
       config.arkivo_api = false
       config.retry_unless_sleep = 0.0
 
+      # Noid identifiers
+      config.enable_noids = true
+      config.noid_template = '.reeddeeddk'
+      config.minter_statefile = '/tmp/minter-state'
+      config.translate_uri_to_id = ActiveFedora::Noid.config.translate_uri_to_id
+      config.translate_id_to_uri = ActiveFedora::Noid.config.translate_id_to_uri
+
       # Defaulting analytic start date to whenever the file was uploaded by leaving it blank
       config.analytic_start_date = nil
 
@@ -68,8 +73,8 @@ module Sufia
           Hydra::Derivatives.fits_path      = c.fits_path
           Hydra::Derivatives.enable_ffmpeg  = c.enable_ffmpeg
 
-          ActiveFedora::Base.translate_uri_to_id = ActiveFedora::Noid.config.translate_uri_to_id
-          ActiveFedora::Base.translate_id_to_uri = ActiveFedora::Noid.config.translate_id_to_uri
+          ActiveFedora::Base.translate_uri_to_id = c.translate_uri_to_id
+          ActiveFedora::Base.translate_id_to_uri = c.translate_id_to_uri
           ActiveFedora::Noid.config.template = c.noid_template
           ActiveFedora::Noid.config.statefile = c.minter_statefile
         end

data/lib/sufia/models/file_content/versions.rb

@@ -1,7 +1,6 @@
 module Sufia
   module FileContent
     module Versions
-
       def latest_version
         versions.last unless versions.empty?
       end

data/lib/sufia/models/resque.rb

@@ -18,9 +18,9 @@ module Sufia
           ActiveFedora::Base.logger.error "Redis is down!"
         rescue Redis::TimeoutError => error
           ActiveFedora::Base.logger.warn "Redis Timed out.  Trying again! #{job.inspect}"
-          push_tries+=1
+          push_tries += 1
           # fail for good if the tries is greater than 3
-          raise error if push_tries >=3
+          raise error if push_tries >= 3
           sleep 0.01
           retry
         end