Skip to content

Commit fc9d44d

Browse files
kennyegun24kennyegun24
committed
Fix linter errors
1 parent 66a6c98 commit fc9d44d

39 files changed

+224
-117
lines changed

‎.github/workflows/linters.yml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Linters
2+
3+
on: pull_request
4+
5+
env:
6+
FORCE_COLOR: 1
7+
8+
jobs:
9+
rubocop:
10+
name: Rubocop
11+
runs-on: ubuntu-22.04
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: actions/setup-ruby@v1
15+
with:
16+
ruby-version: 3.1.x
17+
- name: Setup Rubocop
18+
run: |
19+
gem install --no-document rubocop -v '>= 1.0, < 2.0' # https://docs.rubocop.org/en/stable/installation/
20+
[ -f .rubocop.yml ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/ror/.rubocop.yml
21+
- name: Rubocop Report
22+
run: rubocop --color
23+
stylelint:
24+
name: Stylelint
25+
runs-on: ubuntu-22.04
26+
steps:
27+
- uses: actions/checkout@v2
28+
- uses: actions/setup-node@v1
29+
with:
30+
node-version: "12.x"
31+
- name: Setup Stylelint
32+
run: |
33+
npm install --save-dev [email protected] [email protected] [email protected] [email protected]
34+
[ -f .stylelintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/ror/.stylelintrc.json
35+
- name: Stylelint Report
36+
run: npx stylelint "**/*.{css,scss}"
37+
nodechecker:
38+
name: node_modules checker
39+
runs-on: ubuntu-22.04
40+
steps:
41+
- uses: actions/checkout@v2
42+
- name: Check node_modules existence
43+
run: |
44+
if [ -d "node_modules/" ]; then echo -e "\e[1;31mThe node_modules/ folder was pushed to the repo. Please remove it from the GitHub repository and try again."; echo -e "\e[1;32mYou can set up a .gitignore file with this folder included on it to prevent this from happening in the future." && exit 1; fi

‎.rubocop.yml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
AllCops:
2+
NewCops: enable
3+
Exclude:
4+
- "db/**/*"
5+
- "bin/*"
6+
- "config/**/*"
7+
- "Guardfile"
8+
- "Rakefile"
9+
- "node_modules/**/*"
10+
11+
DisplayCopNames: true
12+
13+
Layout/LineLength:
14+
Max: 150
15+
Metrics/MethodLength:
16+
Include:
17+
- "app/controllers/*"
18+
- "app/models/*"
19+
Max: 20
20+
Metrics/AbcSize:
21+
Include:
22+
- "app/controllers/*"
23+
- "app/models/*"
24+
Max: 50
25+
Metrics/ClassLength:
26+
Max: 150
27+
Metrics/BlockLength:
28+
IgnoredMethods: ['describe']
29+
Max: 30
30+
31+
Style/Documentation:
32+
Enabled: false
33+
Style/ClassAndModuleChildren:
34+
Enabled: false
35+
Style/EachForSimpleLoop:
36+
Enabled: false
37+
Style/AndOr:
38+
Enabled: false
39+
Style/DefWithParentheses:
40+
Enabled: false
41+
Style/FrozenStringLiteralComment:
42+
EnforcedStyle: never
43+
44+
Layout/HashAlignment:
45+
EnforcedColonStyle: key
46+
Layout/ExtraSpacing:
47+
AllowForAlignment: false
48+
Layout/MultilineMethodCallIndentation:
49+
Enabled: true
50+
EnforcedStyle: indented
51+
Lint/RaiseException:
52+
Enabled: false
53+
Lint/StructNewOverride:
54+
Enabled: false
55+
Style/HashEachMethods:
56+
Enabled: false
57+
Style/HashTransformKeys:
58+
Enabled: false
59+
Style/HashTransformValues:
60+
Enabled: false

‎.stylelintrc.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"extends": ["stylelint-config-standard"],
3+
"plugins": ["stylelint-scss", "stylelint-csstree-validator"],
4+
"rules": {
5+
"at-rule-no-unknown": [
6+
true,
7+
{
8+
"ignoreAtRules": [
9+
"tailwind",
10+
"apply",
11+
"variants",
12+
"responsive",
13+
"screen"
14+
]
15+
}
16+
],
17+
"scss/at-rule-no-unknown": [
18+
true,
19+
{
20+
"ignoreAtRules": [
21+
"tailwind",
22+
"apply",
23+
"variants",
24+
"responsive",
25+
"screen"
26+
]
27+
}
28+
],
29+
"csstree/validator": true
30+
},
31+
"ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css"]
32+
}

‎Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
source 'https://rubygems.org'
42
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
53

@@ -31,6 +29,8 @@ gem 'jbuilder'
3129

3230
gem 'devise'
3331

32+
gem 'rubocop'
33+
3434
# Use Redis adapter to run Action Cable in production
3535
# gem "redis", "~> 4.0"
3636

@@ -55,8 +55,8 @@ gem 'bootsnap', require: false
5555
group :development, :test do
5656
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
5757
gem 'debug', platforms: %i[mri mingw x64_mingw]
58-
gem 'rspec-rails'
5958
gem 'rails-controller-testing'
59+
gem 'rspec-rails'
6060
end
6161

6262
group :development do

‎Gemfile.lock

+21
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ GEM
6868
tzinfo (~> 2.0)
6969
addressable (2.8.1)
7070
public_suffix (>= 2.0.2, < 6.0)
71+
ast (2.4.2)
7172
bcrypt (3.1.18)
7273
bindex (0.8.1)
7374
bootsnap (1.16.0)
@@ -109,6 +110,7 @@ GEM
109110
jbuilder (2.11.5)
110111
actionview (>= 5.0.0)
111112
activesupport (>= 5.0.0)
113+
json (2.6.3)
112114
loofah (2.19.1)
113115
crass (~> 1.0.2)
114116
nokogiri (>= 1.5.9)
@@ -136,6 +138,9 @@ GEM
136138
nokogiri (1.14.2-x64-mingw-ucrt)
137139
racc (~> 1.4)
138140
orm_adapter (0.5.0)
141+
parallel (1.22.1)
142+
parser (3.2.1.0)
143+
ast (~> 2.4.1)
139144
pg (1.4.5-x64-mingw-ucrt)
140145
public_suffix (5.0.1)
141146
puma (5.6.5)
@@ -174,6 +179,7 @@ GEM
174179
rake (>= 12.2)
175180
thor (~> 1.0)
176181
zeitwerk (~> 2.5)
182+
rainbow (3.1.1)
177183
rake (13.0.6)
178184
regexp_parser (2.7.0)
179185
reline (0.3.2)
@@ -199,6 +205,19 @@ GEM
199205
rspec-mocks (~> 3.11)
200206
rspec-support (~> 3.11)
201207
rspec-support (3.12.0)
208+
rubocop (1.46.0)
209+
json (~> 2.3)
210+
parallel (~> 1.10)
211+
parser (>= 3.2.0.0)
212+
rainbow (>= 2.2.2, < 4.0)
213+
regexp_parser (>= 1.8, < 3.0)
214+
rexml (>= 3.2.5, < 4.0)
215+
rubocop-ast (>= 1.26.0, < 2.0)
216+
ruby-progressbar (~> 1.7)
217+
unicode-display_width (>= 2.4.0, < 3.0)
218+
rubocop-ast (1.26.0)
219+
parser (>= 3.2.1.0)
220+
ruby-progressbar (1.11.0)
202221
rubyzip (2.3.2)
203222
selenium-webdriver (4.8.1)
204223
rexml (~> 3.2, >= 3.2.5)
@@ -223,6 +242,7 @@ GEM
223242
concurrent-ruby (~> 1.0)
224243
tzinfo-data (1.2022.7)
225244
tzinfo (>= 1.0.0)
245+
unicode-display_width (2.4.2)
226246
warden (1.2.9)
227247
rack (>= 2.0.9)
228248
web-console (4.2.0)
@@ -257,6 +277,7 @@ DEPENDENCIES
257277
rails (~> 7.0.4, >= 7.0.4.2)
258278
rails-controller-testing
259279
rspec-rails
280+
rubocop
260281
selenium-webdriver
261282
sprockets-rails
262283
stimulus-rails

‎app/channels/application_cable/channel.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
module ApplicationCable
42
class Channel < ActionCable::Channel::Base
53
end

‎app/channels/application_cable/connection.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
module ApplicationCable
42
class Connection < ActionCable::Connection::Base
53
end

‎app/controllers/application_controller.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class ApplicationController < ActionController::Base
42
before_action :configure_permitted_parameters, if: :devise_controller?
53
before_action :authenticate_user!

‎app/controllers/foods_controller.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class FoodsController < ApplicationController
42
def index
53
@user = User.find(current_user.id)

‎app/controllers/public_recipes_controller.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class PublicRecipesController < ApplicationController
42
def index
53
@recipes = Recipe.where(public: true).order(created_at: :desc)

‎app/controllers/recipe_foods_controller.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class RecipeFoodsController < ApplicationController
42
def new
53
@recipe = Recipe.find(params[:recipe_id])

‎app/controllers/recipes_controller.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class RecipesController < ApplicationController
42
def index
53
@user = User.find(current_user.id)

‎app/controllers/shopping_lists_controller.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class ShoppingListsController < ApplicationController
42
def index
53
@recipe_foods = RecipeFood.includes(:food, :recipe)

‎app/helpers/application_helper.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
# frozen_string_literal: true
2-
31
module ApplicationHelper
42
end

‎app/jobs/application_job.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class ApplicationJob < ActiveJob::Base
42
# Automatically retry jobs that encountered a deadlock
53
# retry_on ActiveRecord::Deadlocked

‎app/mailers/application_mailer.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class ApplicationMailer < ActionMailer::Base
42
default from: '[email protected]'
53
layout 'mailer'

‎app/models/application_record.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class ApplicationRecord < ActiveRecord::Base
42
primary_abstract_class
53
end

‎app/models/food.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class Food < ApplicationRecord
42
belongs_to :user, class_name: 'User'
53
has_many :recipe_foods, foreign_key: 'food_id', class_name: 'RecipeFood'

‎app/models/recipe.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class Recipe < ApplicationRecord
42
belongs_to :user, class_name: 'User'
53
has_many :recipe_foods, foreign_key: 'recipe_id', class_name: 'RecipeFood'

‎app/models/recipe_food.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class RecipeFood < ApplicationRecord
42
belongs_to :food, class_name: 'Food'
53
belongs_to :recipe, class_name: 'Recipe'

‎app/models/user.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
class User < ApplicationRecord
42
# Include default devise modules. Others available are:
53
# :confirmable, :lockable, :timeoutable, :trackable and :omniauthable

‎config.ru

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
# This file is used by Rack-based servers to start the application.
42

53
require_relative 'config/environment'

‎spec/models/food_model_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RSpec.describe User, type: :model do
44
before :each do
55
@user = User.new(id: 1, name: 'Kenny')
6-
@food = Food.new(id: 1, user: @user, price: 1, quantity: 1, name: 'Random', measuerment_unit: 1 )
6+
@food = Food.new(id: 1, user: @user, price: 1, quantity: 1, name: 'Random', measuerment_unit: 1)
77
end
88

99
it 'name must not be blank' do

‎spec/models/recipe_food_model_spec.rb

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
require 'rails_helper'
22
RSpec.describe User, type: :model do
3-
before :each do
4-
@user = User.new(id: 1, name: 'Kenny')
5-
@food = Food.new(id: 1, user: @user, price: 1, quantity: 1, name: 'Random', measuerment_unit: 1 )
6-
@recipe = Recipe.new(id: 1, user: @user, cooking_time: '1hr:45mins', name: 'Rice and Beans', preparation_time: '2hrs', description: 'This is the best meal ever')
7-
@recipe_foods = RecipeFood.new(id: 1, food: @food, recipe: @recipe, quantity: 2)
8-
end
3+
before :each do
4+
@user = User.new(id: 1, name: 'Kenny')
5+
@food = Food.new(id: 1, user: @user, price: 1, quantity: 1, name: 'Random', measuerment_unit: 1)
6+
@recipe = Recipe.new(id: 1, user: @user, cooking_time: '1hr:45mins', name: 'Rice and Beans', preparation_time: '2hrs',
7+
description: 'This is the best meal ever')
8+
@recipe_foods = RecipeFood.new(id: 1, food: @food, recipe: @recipe, quantity: 2)
9+
end
910

10-
it '' do
11-
@recipe_foods.quantity = nil
12-
expect(@recipe_foods).to_not be_valid
13-
end
14-
end
11+
it '' do
12+
@recipe_foods.quantity = nil
13+
expect(@recipe_foods).to_not be_valid
14+
end
15+
end

0 commit comments

Comments
 (0)