Skip to content

Commit 15c11df

Browse files
committed
Improve rubocop config.
1 parent 497c51e commit 15c11df

File tree

4 files changed

+55
-72
lines changed

4 files changed

+55
-72
lines changed

.rubocop.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ inherit_gem:
22
rubocop-rails-omakase: rubocop.yml
33

44
AllCops:
5-
# Exclude:
6-
# - test/db/*schema.rb
7-
# - vendor
5+
Exclude:
6+
- test/db/*schema.rb
7+
- vendor
88
SuggestExtensions: false
99

1010
Layout/LineLength:

test/app/controllers/home_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def send_guide_asset
2626
protected
2727

2828
def sanitize_path(path)
29-
return path&.gsub(/[^a-zA-Z0-9-_\/]+/, "")&.gsub(/^\/+/, "")&.gsub(/\/+$/, "")
29+
path&.gsub(/[^a-zA-Z0-9-_\/]+/, "")&.gsub(/^\/+/, "")&.gsub(/\/+$/, "")
3030
end
3131

3232
def render_content(path)

test/db/queue_schema.rb

Lines changed: 33 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,24 @@
1818
t.string "concurrency_key", null: false
1919
t.datetime "expires_at", precision: nil, null: false
2020
t.datetime "created_at", precision: nil, null: false
21-
t.index [ "concurrency_key", "priority", "job_id" ],
22-
name: "index_solid_queue_blocked_executions_for_release"
23-
t.index [ "expires_at", "concurrency_key" ],
24-
name: "index_solid_queue_blocked_executions_for_maintenance"
25-
t.index [ "job_id" ], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
21+
t.index ["concurrency_key", "priority", "job_id"], name: "index_solid_queue_blocked_executions_for_release"
22+
t.index ["expires_at", "concurrency_key"], name: "index_solid_queue_blocked_executions_for_maintenance"
23+
t.index ["job_id"], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
2624
end
2725

2826
create_table "solid_queue_claimed_executions", force: :cascade do |t|
2927
t.bigint "job_id", null: false
3028
t.bigint "process_id"
3129
t.datetime "created_at", precision: nil, null: false
32-
t.index [ "job_id" ], name: "index_solid_queue_claimed_executions_on_job_id", unique: true
33-
t.index [ "process_id", "job_id" ],
34-
name: "index_solid_queue_claimed_executions_on_process_id_and_job_id"
30+
t.index ["job_id"], name: "index_solid_queue_claimed_executions_on_job_id", unique: true
31+
t.index ["process_id", "job_id"], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id"
3532
end
3633

3734
create_table "solid_queue_failed_executions", force: :cascade do |t|
3835
t.bigint "job_id", null: false
3936
t.text "error"
4037
t.datetime "created_at", precision: nil, null: false
41-
t.index [ "job_id" ], name: "index_solid_queue_failed_executions_on_job_id", unique: true
38+
t.index ["job_id"], name: "index_solid_queue_failed_executions_on_job_id", unique: true
4239
end
4340

4441
create_table "solid_queue_jobs", force: :cascade do |t|
@@ -52,17 +49,17 @@
5249
t.string "concurrency_key"
5350
t.datetime "created_at", precision: nil, null: false
5451
t.datetime "updated_at", precision: nil, null: false
55-
t.index [ "active_job_id" ], name: "index_solid_queue_jobs_on_active_job_id"
56-
t.index [ "class_name" ], name: "index_solid_queue_jobs_on_class_name"
57-
t.index [ "finished_at" ], name: "index_solid_queue_jobs_on_finished_at"
58-
t.index [ "queue_name", "finished_at" ], name: "index_solid_queue_jobs_for_filtering"
59-
t.index [ "scheduled_at", "finished_at" ], name: "index_solid_queue_jobs_for_alerting"
52+
t.index ["active_job_id"], name: "index_solid_queue_jobs_on_active_job_id"
53+
t.index ["class_name"], name: "index_solid_queue_jobs_on_class_name"
54+
t.index ["finished_at"], name: "index_solid_queue_jobs_on_finished_at"
55+
t.index ["queue_name", "finished_at"], name: "index_solid_queue_jobs_for_filtering"
56+
t.index ["scheduled_at", "finished_at"], name: "index_solid_queue_jobs_for_alerting"
6057
end
6158

6259
create_table "solid_queue_pauses", force: :cascade do |t|
6360
t.string "queue_name", null: false
6461
t.datetime "created_at", precision: nil, null: false
65-
t.index [ "queue_name" ], name: "index_solid_queue_pauses_on_queue_name", unique: true
62+
t.index ["queue_name"], name: "index_solid_queue_pauses_on_queue_name", unique: true
6663
end
6764

6865
create_table "solid_queue_processes", force: :cascade do |t|
@@ -74,30 +71,28 @@
7471
t.text "metadata"
7572
t.datetime "created_at", precision: nil, null: false
7673
t.string "name", null: false
77-
t.index [ "last_heartbeat_at" ], name: "index_solid_queue_processes_on_last_heartbeat_at"
78-
t.index [ "name", "supervisor_id" ],
79-
name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true
80-
t.index [ "supervisor_id" ], name: "index_solid_queue_processes_on_supervisor_id"
74+
t.index ["last_heartbeat_at"], name: "index_solid_queue_processes_on_last_heartbeat_at"
75+
t.index ["name", "supervisor_id"], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true
76+
t.index ["supervisor_id"], name: "index_solid_queue_processes_on_supervisor_id"
8177
end
8278

8379
create_table "solid_queue_ready_executions", force: :cascade do |t|
8480
t.bigint "job_id", null: false
8581
t.string "queue_name", null: false
8682
t.integer "priority", default: 0, null: false
8783
t.datetime "created_at", precision: nil, null: false
88-
t.index [ "job_id" ], name: "index_solid_queue_ready_executions_on_job_id", unique: true
89-
t.index [ "priority", "job_id" ], name: "index_solid_queue_poll_all"
90-
t.index [ "queue_name", "priority", "job_id" ], name: "index_solid_queue_poll_by_queue"
84+
t.index ["job_id"], name: "index_solid_queue_ready_executions_on_job_id", unique: true
85+
t.index ["priority", "job_id"], name: "index_solid_queue_poll_all"
86+
t.index ["queue_name", "priority", "job_id"], name: "index_solid_queue_poll_by_queue"
9187
end
9288

9389
create_table "solid_queue_recurring_executions", force: :cascade do |t|
9490
t.bigint "job_id", null: false
9591
t.string "task_key", null: false
9692
t.datetime "run_at", precision: nil, null: false
9793
t.datetime "created_at", precision: nil, null: false
98-
t.index [ "job_id" ], name: "index_solid_queue_recurring_executions_on_job_id", unique: true
99-
t.index [ "task_key", "run_at" ],
100-
name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true
94+
t.index ["job_id"], name: "index_solid_queue_recurring_executions_on_job_id", unique: true
95+
t.index ["task_key", "run_at"], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true
10196
end
10297

10398
create_table "solid_queue_recurring_tasks", force: :cascade do |t|
@@ -112,8 +107,8 @@
112107
t.text "description"
113108
t.datetime "created_at", precision: nil, null: false
114109
t.datetime "updated_at", precision: nil, null: false
115-
t.index [ "key" ], name: "index_solid_queue_recurring_tasks_on_key", unique: true
116-
t.index [ "static" ], name: "index_solid_queue_recurring_tasks_on_static"
110+
t.index ["key"], name: "index_solid_queue_recurring_tasks_on_key", unique: true
111+
t.index ["static"], name: "index_solid_queue_recurring_tasks_on_static"
117112
end
118113

119114
create_table "solid_queue_scheduled_executions", force: :cascade do |t|
@@ -122,8 +117,8 @@
122117
t.integer "priority", default: 0, null: false
123118
t.datetime "scheduled_at", precision: nil, null: false
124119
t.datetime "created_at", precision: nil, null: false
125-
t.index [ "job_id" ], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true
126-
t.index [ "scheduled_at", "priority", "job_id" ], name: "index_solid_queue_dispatch_all"
120+
t.index ["job_id"], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true
121+
t.index ["scheduled_at", "priority", "job_id"], name: "index_solid_queue_dispatch_all"
127122
end
128123

129124
create_table "solid_queue_semaphores", force: :cascade do |t|
@@ -132,21 +127,15 @@
132127
t.datetime "expires_at", precision: nil, null: false
133128
t.datetime "created_at", precision: nil, null: false
134129
t.datetime "updated_at", precision: nil, null: false
135-
t.index [ "expires_at" ], name: "index_solid_queue_semaphores_on_expires_at"
136-
t.index [ "key", "value" ], name: "index_solid_queue_semaphores_on_key_and_value"
137-
t.index [ "key" ], name: "index_solid_queue_semaphores_on_key", unique: true
130+
t.index ["expires_at"], name: "index_solid_queue_semaphores_on_expires_at"
131+
t.index ["key", "value"], name: "index_solid_queue_semaphores_on_key_and_value"
132+
t.index ["key"], name: "index_solid_queue_semaphores_on_key", unique: true
138133
end
139134

140-
add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id",
141-
on_delete: :cascade
142-
add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id",
143-
on_delete: :cascade
144-
add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id",
145-
on_delete: :cascade
146-
add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id",
147-
on_delete: :cascade
148-
add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id",
149-
on_delete: :cascade
150-
add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id",
151-
on_delete: :cascade
135+
add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
136+
add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
137+
add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
138+
add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
139+
add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
140+
add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
152141
end

test/db/schema.rb

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
t.string "message_checksum", null: false
1818
t.datetime "created_at", null: false
1919
t.datetime "updated_at", null: false
20-
t.index [ "message_id", "message_checksum" ],
21-
name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
20+
t.index ["message_id", "message_checksum"], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
2221
end
2322

2423
create_table "action_text_rich_texts", force: :cascade do |t|
@@ -28,8 +27,7 @@
2827
t.bigint "record_id", null: false
2928
t.datetime "created_at", null: false
3029
t.datetime "updated_at", null: false
31-
t.index [ "record_type", "record_id", "name" ],
32-
name: "index_action_text_rich_texts_uniqueness", unique: true
30+
t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
3331
end
3432

3533
create_table "active_storage_attachments", force: :cascade do |t|
@@ -38,9 +36,8 @@
3836
t.bigint "record_id", null: false
3937
t.bigint "blob_id", null: false
4038
t.datetime "created_at", null: false
41-
t.index [ "blob_id" ], name: "index_active_storage_attachments_on_blob_id"
42-
t.index [ "record_type", "record_id", "name", "blob_id" ],
43-
name: "index_active_storage_attachments_uniqueness", unique: true
39+
t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
40+
t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
4441
end
4542

4643
create_table "active_storage_blobs", force: :cascade do |t|
@@ -52,35 +49,33 @@
5249
t.bigint "byte_size", null: false
5350
t.string "checksum"
5451
t.datetime "created_at", null: false
55-
t.index [ "key" ], name: "index_active_storage_blobs_on_key", unique: true
52+
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
5653
end
5754

5855
create_table "active_storage_variant_records", force: :cascade do |t|
5956
t.bigint "blob_id", null: false
6057
t.string "variation_digest", null: false
61-
t.index [ "blob_id", "variation_digest" ],
62-
name: "index_active_storage_variant_records_uniqueness", unique: true
58+
t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
6359
end
6460

6561
create_table "emails", force: :cascade do |t|
6662
t.string "email", default: "", null: false
6763
t.boolean "is_primary", default: false, null: false
6864
t.integer "user_id"
69-
t.index [ "email" ], name: "index_emails_on_email", unique: true
70-
t.index [ "user_id" ], name: "index_emails_on_user_id"
65+
t.index ["email"], name: "index_emails_on_email", unique: true
66+
t.index ["user_id"], name: "index_emails_on_user_id"
7167
end
7268

7369
create_table "genres", force: :cascade do |t|
7470
t.string "name", default: "", null: false
7571
t.string "description", default: "", null: false
76-
t.index [ "name" ], name: "index_genres_on_name", unique: true
72+
t.index ["name"], name: "index_genres_on_name", unique: true
7773
end
7874

7975
create_table "genres_movies", id: false, force: :cascade do |t|
8076
t.integer "movie_id", null: false
8177
t.integer "genre_id", null: false
82-
t.index [ "movie_id", "genre_id" ], name: "index_genres_movies_on_movie_id_and_genre_id",
83-
unique: true
78+
t.index ["movie_id", "genre_id"], name: "index_genres_movies_on_movie_id_and_genre_id", unique: true
8479
end
8580

8681
create_table "movies", force: :cascade do |t|
@@ -89,22 +84,21 @@
8984
t.integer "main_genre_id"
9085
t.datetime "created_at"
9186
t.datetime "updated_at"
92-
t.index [ "main_genre_id" ], name: "index_movies_on_main_genre_id"
93-
t.index [ "name" ], name: "index_movies_on_name", unique: true
87+
t.index ["main_genre_id"], name: "index_movies_on_main_genre_id"
88+
t.index ["name"], name: "index_movies_on_name", unique: true
9489
end
9590

9691
create_table "movies_users", id: false, force: :cascade do |t|
9792
t.integer "user_id", null: false
9893
t.integer "movie_id", null: false
99-
t.index [ "user_id", "movie_id" ], name: "index_movies_users_on_user_id_and_movie_id",
100-
unique: true
94+
t.index ["user_id", "movie_id"], name: "index_movies_users_on_user_id_and_movie_id", unique: true
10195
end
10296

10397
create_table "phone_numbers", force: :cascade do |t|
10498
t.string "number", default: "", null: false
10599
t.integer "user_id", null: false
106-
t.index [ "number" ], name: "index_phone_numbers_on_number", unique: true
107-
t.index [ "user_id" ], name: "index_phone_numbers_on_user_id", unique: true
100+
t.index ["number"], name: "index_phone_numbers_on_number", unique: true
101+
t.index ["user_id"], name: "index_phone_numbers_on_user_id", unique: true
108102
end
109103

110104
create_table "users", force: :cascade do |t|
@@ -122,9 +116,9 @@
122116
t.datetime "created_at"
123117
t.datetime "updated_at"
124118
t.integer "finance_email_id"
125-
t.index [ "finance_email_id" ], name: "index_users_on_finance_email_id", unique: true
126-
t.index [ "login" ], name: "index_users_on_login", unique: true
127-
t.index [ "manager_id" ], name: "index_users_on_manager_id"
119+
t.index ["finance_email_id"], name: "index_users_on_finance_email_id", unique: true
120+
t.index ["login"], name: "index_users_on_login", unique: true
121+
t.index ["manager_id"], name: "index_users_on_manager_id"
128122
end
129123

130124
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"

0 commit comments

Comments
 (0)