Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
# Omakase Ruby styling for Rails
inherit_gem: { rubocop-rails-omakase: rubocop.yml }

Style/TrailingCommaInArguments:
EnforcedStyleForMultiline: consistent_comma
Style/TrailingCommaInArrayLiteral:
EnforcedStyleForMultiline: consistent_comma
Style/TrailingCommaInHashLiteral:
EnforcedStyleForMultiline: consistent_comma
Style/StringLiterals:
Enabled: true
EnforcedStyle: double_quotes
Include:
- "app/**/*"
- "config/**/*"
- "lib/**/*"
- "spec/**/*"
- "Gemfile"
Style/StringLiteralsInInterpolation:
EnforcedStyle: double_quotes
Include:
- "app/**/*"
- "config/**/*"
- "lib/**/*"
- "spec/**/*"
- "Gemfile"
Bundler/OrderedGems:
Enabled: true

# Overwrite or add rules to create your own house style
#
# # Use `[a, [b, c]]` not `[ a, [ b, c ] ]`
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ gem "tailwindcss-rails"
gem "tzinfo-data", platforms: %i[ windows jruby ]

# Use the database-backed adapters for Rails.cache, Active Job, and Action Cable
gem "solid_cable"
gem "solid_cache"
gem "solid_queue"
gem "solid_cable"

# Reduces boot times through caching; required in config/boot.rb
gem "bootsnap", require: false
Expand Down
2 changes: 1 addition & 1 deletion app/services/admins_xml_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def parse
first_name: node.at_xpath("USER_FNAME")&.text&.strip,
last_name: node.at_xpath("USER_LNAME")&.text&.strip,
login_id: node.at_xpath("USER_ID")&.text&.strip&.downcase,
legacy_password_hash: node.at_xpath("PASSWORD")&.text&.strip
legacy_password_hash: node.at_xpath("PASSWORD")&.text&.strip,
}
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/services/content_importer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def import
files: { created: 0 },
authors: { created: 0 },
tags: { created: 0 },
errors: []
errors: [],
}

parsed_content.each do |provider_data|
Expand Down
4 changes: 2 additions & 2 deletions app/services/content_xml_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def parse_topics(provider_node)
issue: title_node.at_xpath("topic_issue")&.text&.strip,
files: parse_files(title_node),
authors: parse_authors(title_node),
tags: parse_tags(title_node)
tags: parse_tags(title_node),
}
end

Expand All @@ -57,7 +57,7 @@ def parse_files(title_node)
files << {
filename: filename,
file_size: file_node["file_size"]&.to_i,
file_type: determine_file_type(filename)
file_type: determine_file_type(filename),
}
end

Expand Down
8 changes: 4 additions & 4 deletions app/services/stats_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def overview
total_authors: Author.count,
total_tags: Tag.count,
total_favorites: Favorite.count,
total_local_files: LocalFile.count
total_local_files: LocalFile.count,
}
end

Expand All @@ -28,7 +28,7 @@ def activity_summary
searches: base_query.searches.count,
favorites: base_query.favorites.count,
unfavorites: base_query.unfavorites.count,
unique_users: base_query.distinct.count(:user_id)
unique_users: base_query.distinct.count(:user_id),
}
end

Expand Down Expand Up @@ -146,7 +146,7 @@ def group_by_day(relation, column)
# No string interpolation - each column has a literal SQL expression
DATE_SQL_EXPRESSIONS = {
"created_at" => Arel.sql("DATE(created_at)"),
"updated_at" => Arel.sql("DATE(updated_at)")
"updated_at" => Arel.sql("DATE(updated_at)"),
}.freeze

def date_sql_for_column(column)
Expand All @@ -162,7 +162,7 @@ module GroupByDayExtension
# Pre-defined SQL expressions for allowed columns (no interpolation)
DATE_SQL_EXPRESSIONS = {
"created_at" => Arel.sql("DATE(created_at)"),
"updated_at" => Arel.sql("DATE(updated_at)")
"updated_at" => Arel.sql("DATE(updated_at)"),
}.freeze

def group_by_day(column)
Expand Down
2 changes: 1 addition & 1 deletion app/services/users_xml_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def parse
last_name: node.at_xpath("USER_LNAME")&.text&.strip,
login_id: node.at_xpath("USER_ID")&.text&.strip&.downcase,
login_count: node.at_xpath("LOGIN_COUNTER")&.text&.to_i || 0,
favorites: parse_favorites(node.at_xpath("FAVOURITE")&.text)
favorites: parse_favorites(node.at_xpath("FAVOURITE")&.text),
}
end
end
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/filter_parameter_logging.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# Use this to limit dissemination of sensitive information.
# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
Rails.application.config.filter_parameters += [
:passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc
:passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc,
]
2 changes: 1 addition & 1 deletion spec/helpers/admin/base_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the Admin::BaseHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/admin/dashboard_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the Admin::DashboardHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/admin/sessions_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the Admin::SessionsHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/audio_player_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the AudioPlayerHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/errors_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the ErrorsHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/pdf_viewer_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the PdfViewerHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/registrations_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the RegistrationsHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/search_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the SearchHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/sessions_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the SessionsHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/topics_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

# Specs in this file have access to a helper object that includes
# the TopicsHelper. For example:
Expand Down
2 changes: 1 addition & 1 deletion spec/models/admin_activity_log_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe AdminActivityLog, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/admin_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe Admin, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/author_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe Author, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/content_provider_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe ContentProvider, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/local_file_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe LocalFile, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/tag_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe Tag, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/topic_author_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe TopicAuthor, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/topic_file_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe TopicFile, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/topic_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe Topic, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/topic_tag_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe TopicTag, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/user_activity_log_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe UserActivityLog, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/models/user_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe User, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
10 changes: 5 additions & 5 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# This file is copied to spec/ when you run 'rails generate rspec:install'
require 'spec_helper'
ENV['RAILS_ENV'] ||= 'test'
require_relative '../config/environment'
require "spec_helper"
ENV["RAILS_ENV"] ||= "test"
require_relative "../config/environment"
# Prevent database truncation if the environment is production
abort("The Rails environment is running in production mode!") if Rails.env.production?
# Uncomment the line below in case you have `--require rails_helper` in the `.rspec` file
# that will avoid rails generators crashing because migrations haven't been run yet
# return unless Rails.env.test?
require 'rspec/rails'
require "rspec/rails"
# Add additional requires below this line. Rails is not loaded until this point!

# Requires supporting ruby files with custom matchers and macros, etc, in
Expand Down Expand Up @@ -40,7 +40,7 @@

# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_paths = [
Rails.root.join('spec/fixtures')
Rails.root.join("spec/fixtures"),
]

# If you're not using ActiveRecord, or you'd prefer not to run each of your
Expand Down
2 changes: 1 addition & 1 deletion spec/requests/admin/base_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "Admin::Bases", type: :request do
describe "GET /index" do
Expand Down
2 changes: 1 addition & 1 deletion spec/views/admin/dashboard/index.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "dashboard/index.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/admin/sessions/create.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "sessions/create.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/admin/sessions/destroy.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "sessions/destroy.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/admin/sessions/new.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "sessions/new.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/audio_player/show.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "audio_player/show.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/errors/audio_not_found.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "errors/audio_not_found.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/errors/not_found.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "errors/not_found.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/errors/pdf_not_found.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "errors/pdf_not_found.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "errors/unsupported_browser.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/pdf_viewer/show.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "pdf_viewer/show.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/registrations/create.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "registrations/create.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/registrations/new.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "registrations/new.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/search/autocomplete.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "search/autocomplete.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/search/index.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "search/index.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/search/results.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "search/results.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/sessions/create.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "sessions/create.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
2 changes: 1 addition & 1 deletion spec/views/sessions/destroy.html.tailwindcss_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails_helper'
require "rails_helper"

RSpec.describe "sessions/destroy.html.tailwindcss", type: :view do
pending "add some examples to (or delete) #{__FILE__}"
Expand Down
Loading
Loading