Conform to Linter and Styleguide

hitobito · Feb 4, 2025 · 384c42d · 384c42d
1 parent 60bb460
commit 384c42d
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 58 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,6 +1,5 @@
 inherit_from:
   - ../hitobito/.rubocop.yml
-  - .rubocop_todo.yml
 
 AllCops:
   Exclude:

diff --git a/app/models/group/root.rb b/app/models/group/root.rb
@@ -5,7 +5,6 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 # TODO: rename class to specific name and change all references
 class Group::Root < ::Group
   self.layer = true

diff --git a/app/models/swb/group.rb b/app/models/swb/group.rb
@@ -5,7 +5,6 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 module Swb::Group
   extend ActiveSupport::Concern
 
@@ -16,5 +15,4 @@ module Swb::Group
 
     root_types Group::Root
   end
-
 end
diff --git a/app_root.rb b/app_root.rb
@@ -5,6 +5,5 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 # define the root directory of the main application
 ENV["APP_ROOT"] ||= File.expand_path("../hitobito", __dir__)
diff --git a/hitobito_swb.gemspec b/hitobito_swb.gemspec
@@ -1,20 +1,19 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 
 # Maintain your wagon's version:
-require 'hitobito_swb/version'
+require "hitobito_swb/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  # rubocop:disable SingleSpaceBeforeFirstArg
-  s.name        = 'hitobito_swb'
-  s.version     = HitobitoSwb::VERSION
-  s.authors     = ['Matthias Viehweger']
-  s.email       = ['[email protected]']
-  s.homepage    = 'https://swiss-badminton.ch'
-  s.summary     = 'hitobito for Swiss Badminton'
-  s.description = 'hitobito for Swiss Badminton'
+  # rubocop:disable Style/SingleSpaceBeforeFirstArg
+  s.name = "hitobito_swb"
+  s.version = HitobitoSwb::VERSION
+  s.authors = ["Matthias Viehweger"]
+  s.email = ["[email protected]"]
+  s.homepage = "https://swiss-badminton.ch"
+  s.summary = "hitobito for Swiss Badminton"
+  s.description = "hitobito for Swiss Badminton"
 
-  s.files = Dir['{app,config,db,lib}/**/*'] + ['Rakefile']
-  s.test_files = Dir['spec/**/*']
-  # rubocop:enable SingleSpaceBeforeFirstArg
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile"]
+  # rubocop:enable Style/SingleSpaceBeforeFirstArg
 end
diff --git a/lib/hitobito_swb.rb b/lib/hitobito_swb.rb
@@ -5,10 +5,9 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
-require 'wagons'
+require "wagons"
 # require 'your_wagon_dependencies'
-require 'hitobito_swb/wagon'
+require "hitobito_swb/wagon"
 
 module HitobitoSwb
 end
diff --git a/lib/hitobito_swb/version.rb b/lib/hitobito_swb/version.rb
@@ -5,7 +5,6 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 module HitobitoSwb
-  VERSION = '0.0.1'
+  VERSION = "0.0.1"
 end
diff --git a/lib/hitobito_swb/wagon.rb b/lib/hitobito_swb/wagon.rb
@@ -5,13 +5,12 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 module HitobitoSwb
   class Wagon < Rails::Engine
     include Wagons::Wagon
 
     # Set the required application version.
-    app_requirement '>= 0'
+    app_requirement ">= 0"
 
     # Add a load path for this specific wagon
     config.autoload_paths += %W[
@@ -25,12 +24,12 @@ class Wagon < Rails::Engine
       Group.include Swb::Group
     end
 
-    initializer 'swb.add_settings' do |_app|
-      Settings.add_source!(File.join(paths['config'].existent, 'settings.yml'))
+    initializer "swb.add_settings" do |_app|
+      Settings.add_source!(File.join(paths["config"].existent, "settings.yml"))
       Settings.reload!
     end
 
-    initializer 'swb.add_inflections' do |_app|
+    initializer "swb.add_inflections" do |_app|
       ActiveSupport::Inflector.inflections do |inflect|
         # inflect.irregular 'census', 'censuses'
       end
@@ -39,9 +38,8 @@ class Wagon < Rails::Engine
     private
 
     def seed_fixtures
-      fixtures = root.join('db', 'seeds')
-      ENV['NO_ENV'] ? [fixtures] : [fixtures, File.join(fixtures, Rails.env)]
+      fixtures = root.join("db", "seeds")
+      ENV["NO_ENV"] ? [fixtures] : [fixtures, File.join(fixtures, Rails.env)] # rubocop:disable Rails/EnvironmentVariableAccess
     end
-
   end
 end
diff --git a/lib/tasks/license.rake b/lib/tasks/license.rake
@@ -5,13 +5,12 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 namespace :app do
   namespace :license do
     task :config do # rubocop:disable Rails/RakeEnvironment
-      @licenser = Licenser.new('hitobito_swb',
-                               'Swiss Badminton',
-                               'https://github.com/hitobito/hitobito_swb')
+      @licenser = Licenser.new("hitobito_swb",
+        "Swiss Badminton",
+        "https://github.com/hitobito/hitobito_swb")
     end
   end
 end
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
@@ -5,7 +5,6 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 if Rake::Task.task_defined?("spec:features")
   # we DO have feature specs in this wagon.
   Rake::Task["spec:features"].actions.clear

diff --git a/spec/features/event_external_application_spec.rb b/spec/features/event_external_application_spec.rb
@@ -5,7 +5,6 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 require "spec_helper"
 
 describe :event_external_application do

diff --git a/spec/features/event_participation_spec.rb b/spec/features/event_participation_spec.rb
@@ -5,7 +5,6 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 require "spec_helper"
 
 describe :event_participation do

diff --git a/spec/features/self_registration_spec.rb b/spec/features/self_registration_spec.rb
@@ -5,7 +5,6 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 require "spec_helper"
 
 describe :self_registration do

diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
@@ -5,7 +5,6 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 require "spec_helper"
 
 describe Group do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -5,16 +5,15 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
+load File.expand_path("../../app_root.rb", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 
-load File.expand_path('../../app_root.rb', __FILE__)
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require File.join(ENV['APP_ROOT'], 'spec', 'spec_helper.rb')
+require File.join(ENV["APP_ROOT"], "spec", "spec_helper.rb")
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[HitobitoSwb::Wagon.root.join('spec/support/**/*.rb')].sort.each { |f| require f }
+Dir[HitobitoSwb::Wagon.root.join("spec/support/**/*.rb")].sort.each { |f| require f }
 
 RSpec.configure do |config|
-  config.fixture_path = File.expand_path('../fixtures', __FILE__)
+  config.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
diff --git a/spec/support/fabrication.rb b/spec/support/fabrication.rb
@@ -5,9 +5,8 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 Fabrication.configure do |config|
-  config.fabricator_path = ['spec/fabricators',
-                            '../hitobito_swb/spec/fabricators']
+  config.fabricator_path = ["spec/fabricators",
+    "../hitobito_swb/spec/fabricators"]
   config.path_prefix = Rails.root
 end
diff --git a/test/hitobito_swb_test.rb b/test/hitobito_swb_test.rb
@@ -5,8 +5,7 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
-require 'test_helper'
+require "test_helper"
 
 class HitobitoSwbTest < ActiveSupport::TestCase
   test "truth" do

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -5,14 +5,12 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_swb.
 
-
 # Configure Rails Environment
-load File.expand_path('../../app_root.rb', __FILE__)
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require File.expand_path('test/test_helper.rb', ENV['APP_ROOT'])
+load File.expand_path("../../app_root.rb", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 
+require File.expand_path("test/test_helper.rb", ENV["APP_ROOT"])
 
-class ActiveSupport::TestCase  
-  self.reset_fixture_path File.expand_path("../fixtures", __FILE__)
+class ActiveSupport::TestCase
+  reset_fixture_path File.expand_path("../fixtures", __FILE__)
 end