| #{label} | \n)
attributes = microdata_object_attributes(field).merge(class: "attribute #{field}")
Array(values).each do |value|
@@ -57,7 +57,7 @@ def html_attributes(attributes)
buffer = ""
attributes.each do |k, v|
buffer << " #{k}"
- buffer << %(="#{v}") unless v.blank?
+ buffer << %(="#{v}") if v.present?
end
buffer
end
diff --git a/app/services/hyrax/admin_set_service.rb b/app/services/hyrax/admin_set_service.rb
index 1069456a57..8aadceda9a 100644
--- a/app/services/hyrax/admin_set_service.rb
+++ b/app/services/hyrax/admin_set_service.rb
@@ -1,4 +1,5 @@
# frozen_string_literal: true
+
module Hyrax
# Returns AdminSets that the current user has permission to use.
class AdminSetService
diff --git a/app/services/hyrax/analytics.rb b/app/services/hyrax/analytics.rb
index b9c532f369..16d2fe3166 100644
--- a/app/services/hyrax/analytics.rb
+++ b/app/services/hyrax/analytics.rb
@@ -27,7 +27,7 @@ def self.load_from_yaml
new yaml.fetch('analytics')
end
- REQUIRED_KEYS = %w(app_name app_version privkey_path privkey_secret client_email).freeze
+ REQUIRED_KEYS = %w[app_name app_version privkey_path privkey_secret client_email].freeze
def initialize(config)
@config = config
diff --git a/app/services/hyrax/collection_thumbnail_path_service.rb b/app/services/hyrax/collection_thumbnail_path_service.rb
index 121822d036..e74e85d8c1 100644
--- a/app/services/hyrax/collection_thumbnail_path_service.rb
+++ b/app/services/hyrax/collection_thumbnail_path_service.rb
@@ -1,4 +1,5 @@
# frozen_string_literal: true
+
module Hyrax
class CollectionThumbnailPathService < Hyrax::ThumbnailPathService
class << self
diff --git a/app/services/hyrax/statistics/depositors/summary.rb b/app/services/hyrax/statistics/depositors/summary.rb
index dc9bc7fa64..1a93c4b36c 100644
--- a/app/services/hyrax/statistics/depositors/summary.rb
+++ b/app/services/hyrax/statistics/depositors/summary.rb
@@ -47,7 +47,7 @@ def query
end
def date_query
- Hyrax::QueryService.new.build_date_query(start_dt, end_dt) unless start_dt.blank?
+ Hyrax::QueryService.new.build_date_query(start_dt, end_dt) if start_dt.present?
end
end
end
diff --git a/app/services/hyrax/user_stat_importer.rb b/app/services/hyrax/user_stat_importer.rb
index b14f49b3a5..3cc9d5a00c 100644
--- a/app/services/hyrax/user_stat_importer.rb
+++ b/app/services/hyrax/user_stat_importer.rb
@@ -50,10 +50,10 @@ def process_files(stats, user, start_date)
file_ids_for_user(user).each do |file_id|
file = ::FileSet.find(file_id)
view_stats = extract_stats_for(object: file, from: FileViewStat, start_date: start_date, user: user)
- stats = tally_results(view_stats, :views, stats) unless view_stats.blank?
+ stats = tally_results(view_stats, :views, stats) if view_stats.present?
delay
dl_stats = extract_stats_for(object: file, from: FileDownloadStat, start_date: start_date, user: user)
- stats = tally_results(dl_stats, :downloads, stats) unless dl_stats.blank?
+ stats = tally_results(dl_stats, :downloads, stats) if dl_stats.present?
delay
end
end
@@ -62,7 +62,7 @@ def process_works(stats, user, start_date)
work_ids_for_user(user).each do |work_id|
work = Hyrax::WorkRelation.new.find(work_id)
work_stats = extract_stats_for(object: work, from: WorkViewStat, start_date: start_date, user: user)
- stats = tally_results(work_stats, :work_views, stats) unless work_stats.blank?
+ stats = tally_results(work_stats, :work_views, stats) if work_stats.present?
delay
end
end
diff --git a/app/services/hyrax/workflow/permission_generator.rb b/app/services/hyrax/workflow/permission_generator.rb
index a46e8021f1..8da600051a 100644
--- a/app/services/hyrax/workflow/permission_generator.rb
+++ b/app/services/hyrax/workflow/permission_generator.rb
@@ -67,7 +67,7 @@ def create_action_and_permission_for_actions(workflow_role)
def create_action_and_permission_for(action_name, workflow_role)
workflow_action = Sipity::WorkflowAction.find_or_create_by!(workflow: workflow, name: action_name)
- return unless workflow_state.present?
+ return if workflow_state.blank?
state_action = Sipity::WorkflowStateAction.find_or_create_by!(
workflow_action: workflow_action, originating_workflow_state: workflow_state
)
diff --git a/app/services/hyrax/workflow/permission_query.rb b/app/services/hyrax/workflow/permission_query.rb
index 2a6b528931..66c4bbf6df 100644
--- a/app/services/hyrax/workflow/permission_query.rb
+++ b/app/services/hyrax/workflow/permission_query.rb
@@ -153,7 +153,7 @@ def authorized_for_processing?(user:, entity:, action:)
# @param user [User]
# @return [ActiveRecord::Relation]
def scope_processing_agents_for(user:)
- return Sipity::Agent.none unless user.present?
+ return Sipity::Agent.none if user.blank?
return Sipity::Agent.none unless user.persisted?
user_agent = PowerConverter.convert_to_sipity_agent(user)
group_agents = user.groups.map do |g|
diff --git a/app/services/hyrax/workflow/workflow_action_service.rb b/app/services/hyrax/workflow/workflow_action_service.rb
index 01411262e2..735c347161 100644
--- a/app/services/hyrax/workflow/workflow_action_service.rb
+++ b/app/services/hyrax/workflow/workflow_action_service.rb
@@ -25,12 +25,12 @@ def run
protected
def update_sipity_workflow_state
- return true unless action.resulting_workflow_state_id.present?
+ return true if action.resulting_workflow_state_id.blank?
subject.entity.update!(workflow_state_id: action.resulting_workflow_state_id)
end
def create_sipity_comment
- return true unless comment_text.present?
+ return true if comment_text.blank?
Sipity::Comment.create!(entity: subject.entity, agent: subject.agent, comment: comment_text)
end
diff --git a/app/uploaders/hyrax/avatar_uploader.rb b/app/uploaders/hyrax/avatar_uploader.rb
index e88b4a0a77..04902c37e1 100644
--- a/app/uploaders/hyrax/avatar_uploader.rb
+++ b/app/uploaders/hyrax/avatar_uploader.rb
@@ -11,6 +11,6 @@ class Hyrax::AvatarUploader < CarrierWave::Uploader::Base
end
def extension_whitelist
- %w(jpg jpeg png gif bmp tif tiff)
+ %w[jpg jpeg png gif bmp tif tiff]
end
end
diff --git a/app/views/hyrax/base/show.json.jbuilder b/app/views/hyrax/base/show.json.jbuilder
index 7ea107dbc0..267e1a1837 100644
--- a/app/views/hyrax/base/show.json.jbuilder
+++ b/app/views/hyrax/base/show.json.jbuilder
@@ -1,2 +1,2 @@
-json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.select {|f| ![:has_model].include? f}
+json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.reject { |f| [:has_model].include? f }
json.version @curation_concern.etag
diff --git a/config/routes.rb b/config/routes.rb
index e92a2d63ac..5aeb808521 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -207,7 +207,7 @@
get 'help' => 'pages#show', id: 'help_page'
# Static page routes
- %w(terms zotero mendeley agreement).each do |action|
+ %w[terms zotero mendeley agreement].each do |action|
get action, controller: 'static', action: action, as: action
end
end
diff --git a/hyrax.gemspec b/hyrax.gemspec
index 30652a4296..4d2206c1d9 100644
--- a/hyrax.gemspec
+++ b/hyrax.gemspec
@@ -1,4 +1,5 @@
# -*- encoding: utf-8 -*-
+
lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'hyrax/version'
@@ -7,7 +8,14 @@ Gem::Specification.new do |spec|
spec.authors = ["Justin Coyne", 'Michael J. Giarlo', "Carolyn Cole", "Matt Zumwalt", 'Jeremy Friesen', 'Trey Pendragon', 'Esmé Cowles']
spec.email = ["jcoyne85@stanford.edu", 'mjgiarlo@stanford.edu', 'cam156@psu.edu', 'matt@databindery.com', "jeremy.n.friesen@gmail.com", 'tpendragon@princeton.edu', 'escowles@ticklefish.org']
spec.description = 'Hyrax is a featureful Hydra front-end based on the latest and greatest Hydra software components.'
- spec.summary = "Hyrax is a front-end based on the robust Hydra framework, providing a user interface for common repository features. Hyrax offers the ability to create repository object types on demand, to deposit content via multiple workflows, and to describe content with flexible metadata. Numerous optional features may be turned on in the administrative dashboard or added through plugins."
+ spec.summary = <<-EOF
+ Hyrax is a front-end based on the robust Hydra framework, providing a user
+ interface for common repository features. Hyrax offers the ability to create
+ repository object types on demand, to deposit content via multiple workflows,
+ and to describe content with flexible metadata. Numerous optional features may
+ be turned on in the administrative dashboard or added through plugins.
+EOF
+
spec.homepage = "http://github.com/projecthydra-labs/hyrax"
spec.files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
@@ -77,7 +85,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "factory_girl_rails", '~> 4.4'
spec.add_development_dependency "equivalent-xml", '~> 0.5'
spec.add_development_dependency "jasmine", '~> 2.3'
- spec.add_development_dependency 'rubocop', '~> 0.47.0'
+ spec.add_development_dependency 'rubocop', '~> 0.48.1'
spec.add_development_dependency 'rubocop-rspec', '~> 1.10.0'
spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
spec.add_development_dependency 'rails-controller-testing', '~> 0'
diff --git a/lib/generators/hyrax/assets_generator.rb b/lib/generators/hyrax/assets_generator.rb
index 4c15fc2b1b..5cfb3b6d27 100644
--- a/lib/generators/hyrax/assets_generator.rb
+++ b/lib/generators/hyrax/assets_generator.rb
@@ -1,4 +1,5 @@
# -*- encoding : utf-8 -*-
+
require 'rails/generators'
class Hyrax::AssetsGenerator < Rails::Generators::Base
diff --git a/lib/generators/hyrax/clamav_generator.rb b/lib/generators/hyrax/clamav_generator.rb
index e296c5b451..261e8c4ee8 100644
--- a/lib/generators/hyrax/clamav_generator.rb
+++ b/lib/generators/hyrax/clamav_generator.rb
@@ -1,4 +1,5 @@
# -*- encoding : utf-8 -*-
+
require 'rails/generators'
class Hyrax::ClamavGenerator < Rails::Generators::Base
diff --git a/lib/generators/hyrax/config_generator.rb b/lib/generators/hyrax/config_generator.rb
index d160c3ea9a..a11ba1230d 100644
--- a/lib/generators/hyrax/config_generator.rb
+++ b/lib/generators/hyrax/config_generator.rb
@@ -1,4 +1,5 @@
# -*- encoding : utf-8 -*-
+
require 'rails/generators'
class Hyrax::ConfigGenerator < Rails::Generators::Base
diff --git a/lib/hyrax/collections/search_service.rb b/lib/hyrax/collections/search_service.rb
index 7f0ddea618..5e531c2522 100644
--- a/lib/hyrax/collections/search_service.rb
+++ b/lib/hyrax/collections/search_service.rb
@@ -31,7 +31,7 @@ def apply_gated_search(solr_parameters, _user_parameters)
user_access_filters << "#{solr_access_control_suffix(:group)}:public"
# Grant access based on user id & role
- unless @user_key.blank?
+ if @user_key.present?
# for roles
::User.group_service.roles(@user_key).each do |role|
user_access_filters << "#{solr_access_control_suffix(:group)}:#{escape_slashes(role)}"
diff --git a/lib/hyrax/engine.rb b/lib/hyrax/engine.rb
index 34c2711584..88ee636856 100644
--- a/lib/hyrax/engine.rb
+++ b/lib/hyrax/engine.rb
@@ -15,10 +15,10 @@ class Engine < ::Rails::Engine
require 'legato'
# Force these models to be added to Legato's registry in development mode
- config.eager_load_paths += %W(
+ config.eager_load_paths += %W[
#{config.root}/app/models/hyrax/download.rb
#{config.root}/app/models/hyrax/pageview.rb
- )
+ ]
config.action_dispatch.rescue_responses.merge!(
"ActiveFedora::ObjectNotFoundError" => :not_found, # We can remove this when we use ActiveFedora 11.2
@@ -85,7 +85,7 @@ class Engine < ::Rails::Engine
app.config.assets.paths << config.root.join('app', 'assets', 'images', 'site_images')
app.config.assets.precompile << /fontawesome-webfont\.(?:svg|ttf|woff)$/
- app.config.assets.precompile += %w(*.png *.jpg *.ico *.gif *.svg)
+ app.config.assets.precompile += %w[*.png *.jpg *.ico *.gif *.svg]
Sprockets::ES6.configuration = { 'modules' => 'amd', 'moduleIds' => true }
# When we upgrade to Sprockets 4, we can ditch sprockets-es6 and config AMD
diff --git a/spec/controllers/hyrax/accepts_batches_controller_spec.rb b/spec/controllers/hyrax/accepts_batches_controller_spec.rb
index 7b98315cd0..cc52ae65b4 100644
--- a/spec/controllers/hyrax/accepts_batches_controller_spec.rb
+++ b/spec/controllers/hyrax/accepts_batches_controller_spec.rb
@@ -7,8 +7,8 @@ class AcceptsBatchesController < ApplicationController
RSpec.describe AcceptsBatchesController, type: :controller do
describe 'batch' do
it 'accepts batch from parameters' do
- controller.params['batch_document_ids'] = %w(abc xyz)
- expect(controller.batch).to eq(%w(abc xyz))
+ controller.params['batch_document_ids'] = %w[abc xyz]
+ expect(controller.batch).to eq(%w[abc xyz])
end
describe ':all' do
let(:current_user) { double(user_key: 'vanessa') }
@@ -59,7 +59,7 @@ class AcceptsBatchesController < ApplicationController
end
it 'checks for empty' do
- controller.batch = %w(77826928 94120425)
+ controller.batch = %w[77826928 94120425]
expect(controller.check_for_empty_batch?).to eq(false)
controller.batch = []
expect(controller.check_for_empty_batch?).to eq(true)
diff --git a/spec/factories/file_sets.rb b/spec/factories/file_sets.rb
index f135bd50e7..50a8e5e153 100644
--- a/spec/factories/file_sets.rb
+++ b/spec/factories/file_sets.rb
@@ -29,7 +29,7 @@
initialize_with { new(id: id) }
read_groups ["public"]
resource_type ["Dissertation"]
- subject %w(lorem ipsum dolor sit amet)
+ subject %w[lorem ipsum dolor sit amet]
title ["fake_document.pdf"]
before(:create) do |fs|
fs.title = ["Fake PDF Title"]
@@ -40,7 +40,7 @@
id "fixturemp3"
end
initialize_with { new(id: id) }
- subject %w(consectetur adipisicing elit)
+ subject %w[consectetur adipisicing elit]
title ["Test Document MP3.mp3"]
read_groups ["public"]
end
@@ -52,7 +52,7 @@
resource_type ["Audio", "Dataset"]
read_groups ["public"]
title ["Fake Wav File.wav"]
- subject %w(sed do eiusmod tempor incididunt ut labore)
+ subject %w[sed do eiusmod tempor incididunt ut labore]
end
factory :file_with_work do
diff --git a/spec/features/browse_dashboard_works_spec.rb b/spec/features/browse_dashboard_works_spec.rb
index d82dd0a362..64f297319c 100644
--- a/spec/features/browse_dashboard_works_spec.rb
+++ b/spec/features/browse_dashboard_works_spec.rb
@@ -1,10 +1,10 @@
RSpec.describe "Browse Dashboard", type: :feature do
let(:user) { create(:user) }
let!(:dissertation) do
- create(:public_work, user: user, title: ["Fake PDF Title"], subject: %w(lorem ipsum dolor sit amet))
+ create(:public_work, user: user, title: ["Fake PDF Title"], subject: %w[lorem ipsum dolor sit amet])
end
let!(:mp3_work) do
- create(:public_work, user: user, title: ["Test Document MP3"], subject: %w(consectetur adipisicing elit))
+ create(:public_work, user: user, title: ["Test Document MP3"], subject: %w[consectetur adipisicing elit])
end
before do
@@ -16,7 +16,7 @@
agent_id: user.user_key)
sign_in user
- create(:public_work, user: user, title: ["Fake Wav Files"], subject: %w(sed do eiusmod tempor incididunt ut labore))
+ create(:public_work, user: user, title: ["Fake Wav Files"], subject: %w[sed do eiusmod tempor incididunt ut labore])
visit "/dashboard/my/works"
end
diff --git a/spec/helpers/hyrax_helper_spec.rb b/spec/helpers/hyrax_helper_spec.rb
index 6c0dc853c8..cda6d267b3 100644
--- a/spec/helpers/hyrax_helper_spec.rb
+++ b/spec/helpers/hyrax_helper_spec.rb
@@ -1,4 +1,5 @@
# coding: utf-8
+
def new_state
Blacklight::SearchState.new({}, CatalogController.blacklight_config)
end
diff --git a/spec/models/file_set_spec.rb b/spec/models/file_set_spec.rb
index 003afe8da5..e40d7c0e27 100644
--- a/spec/models/file_set_spec.rb
+++ b/spec/models/file_set_spec.rb
@@ -58,9 +58,9 @@
describe 'attributes' do
it 'has a set of permissions' do
- subject.read_groups = %w(group1 group2)
+ subject.read_groups = %w[group1 group2]
subject.edit_users = ['user1']
- subject.read_users = %w(user2 user3)
+ subject.read_users = %w[user2 user3]
expect(subject.permissions.map(&:to_hash)).to match_array [
{ type: 'group', access: 'read', name: 'group1' },
{ type: 'group', access: 'read', name: 'group2' },
@@ -172,7 +172,7 @@ class AltFile < ActiveFedora::Base
end
it 'supports multi-valued fields in solr' do
- subject.keyword = %w(keyword1 keyword2)
+ subject.keyword = %w[keyword1 keyword2]
expect { subject.save }.not_to raise_error
subject.delete
end
@@ -281,7 +281,7 @@ class AltFile < ActiveFedora::Base
subject.read_groups_string = 'umg/up.dlt.staff, group-3'
expect(subject.read_groups).to eq ['umg/up.dlt.staff', 'group-3']
expect(subject.edit_groups).to eq ['group-8']
- expect(subject.read_users).to eq %w(person1 person2)
+ expect(subject.read_users).to eq %w[person1 person2]
expect(subject.edit_users).to eq ['jcoyne']
end
@@ -290,7 +290,7 @@ class AltFile < ActiveFedora::Base
# 'group-7' is not eligible to be revoked
expect(subject.read_groups).to match_array ['group-2', 'group-3', 'group-7']
expect(subject.edit_groups).to eq ['group-8']
- expect(subject.read_users).to match_array %w(person1 person2)
+ expect(subject.read_users).to match_array %w[person1 person2]
expect(subject.edit_users).to eq ['jcoyne']
end
end
@@ -450,7 +450,7 @@ def paranoid_edit_permissions
describe '#to_s' do
it 'uses the provided titles' do
# The title property would return the terms in random order, so stub the behavior:
- subject.title = %w(Hello World)
+ subject.title = %w[Hello World]
expect(subject.to_s).to include 'Hello'
expect(subject.to_s).to include 'World'
end
diff --git a/spec/models/hyrax/permissions/readable_permissions_spec.rb b/spec/models/hyrax/permissions/readable_permissions_spec.rb
index 73aafc9252..3319dfd173 100644
--- a/spec/models/hyrax/permissions/readable_permissions_spec.rb
+++ b/spec/models/hyrax/permissions/readable_permissions_spec.rb
@@ -9,18 +9,18 @@ class SubjectClass
describe '#public?' do
it 'returns true for public items' do
- subject.read_groups = %w(public othergroup)
+ subject.read_groups = %w[public othergroup]
expect(subject).to be_public
end
it 'returns fale for non-public items' do
- subject.read_groups = %w(notpublic othergroup)
+ subject.read_groups = %w[notpublic othergroup]
expect(subject).not_to be_public
end
end
describe '#registered?' do
it 'returns true for registered items' do
- subject.read_groups = %w(registered othergroup)
+ subject.read_groups = %w[registered othergroup]
expect(subject).to be_registered
end
it 'returns fale for non-registered items' do
diff --git a/spec/models/hyrax/work_behavior_spec.rb b/spec/models/hyrax/work_behavior_spec.rb
index be5b9bf1f7..c667b885c6 100644
--- a/spec/models/hyrax/work_behavior_spec.rb
+++ b/spec/models/hyrax/work_behavior_spec.rb
@@ -24,7 +24,7 @@ class EssentialWork < ActiveFedora::Base
end
describe '#to_s' do
it 'uses the provided titles' do
- subject.title = %w(Hello World)
+ subject.title = %w[Hello World]
expect(subject.to_s).to include 'Hello'
expect(subject.to_s).to include 'World'
end
diff --git a/spec/support/controller_level_helpers.rb b/spec/support/controller_level_helpers.rb
index 4c746579c7..528bb1450d 100644
--- a/spec/support/controller_level_helpers.rb
+++ b/spec/support/controller_level_helpers.rb
@@ -1,4 +1,5 @@
# frozen_string_literal: true
+
module ControllerLevelHelpers
# This provides some common mock methods for view tests.
# These are normally provided by the controller.
diff --git a/spec/views/_flash_msg.html.erb_spec.rb b/spec/views/_flash_msg.html.erb_spec.rb
index 6940aa8941..64cfffe050 100644
--- a/spec/views/_flash_msg.html.erb_spec.rb
+++ b/spec/views/_flash_msg.html.erb_spec.rb
@@ -1,4 +1,5 @@
# coding: utf-8
+
RSpec.describe '/_flash_msg.html.erb', type: :view do
before do
allow(view).to receive(:flash).and_return(flash)
diff --git a/spec/views/hyrax/base/show.json.jbuilder_spec.rb b/spec/views/hyrax/base/show.json.jbuilder_spec.rb
index bad0febf9e..0a1c2b4a0a 100644
--- a/spec/views/hyrax/base/show.json.jbuilder_spec.rb
+++ b/spec/views/hyrax/base/show.json.jbuilder_spec.rb
@@ -13,7 +13,7 @@
json = JSON.parse(rendered)
expect(json['id']).to eq curation_concern.id
expect(json['title']).to match_array curation_concern.title
- expected_fields = curation_concern.class.fields.select { |f| ![:has_model, :create_date].include? f }
+ expected_fields = curation_concern.class.fields.reject { |f| [:has_model, :create_date].include? f }
expected_fields << :date_created
expected_fields.each do |field_symbol|
expect(json).to have_key(field_symbol.to_s)
diff --git a/tasks/hyrax-dev.rake b/tasks/hyrax_dev.rake
similarity index 92%
rename from tasks/hyrax-dev.rake
rename to tasks/hyrax_dev.rake
index 7818bd9abd..7b8b0e61cc 100644
--- a/tasks/hyrax-dev.rake
+++ b/tasks/hyrax_dev.rake
@@ -13,7 +13,7 @@ end
RSpec::Core::RakeTask.new(:spec)
desc 'Spin up test servers and run specs'
-task :spec_with_app_load do
+task :spec_with_app_load do
with_test_server do
Rake::Task['spec'].invoke
end
@@ -25,7 +25,7 @@ task :i18n_sorter do
locales = Dir.glob(File.expand_path('../../config/locales/**/*.yml', __FILE__))
locales.each do |locale_path|
sorted_contents = File.open(locale_path) { |f| I18nYamlSorter::Sorter.new(f).sort }
- File.open(locale_path, 'w') { |f| f << sorted_contents}
+ File.open(locale_path, 'w') { |f| f << sorted_contents }
abort("Bad I18n conversion!") unless Psych.load_file(locale_path).is_a?(Hash)
end
end
|
|---|