From 23948e232d75c66bebdfa8d26cbc5fa5107c2b00 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 9 Aug 2026 16:31:51 +0200 Subject: [PATCH] Switch to maintained fork of annotate and run it --- .annotaterb.yml | 58 ++++++++++++++++++++++++++++++++++ Gemfile | 2 +- Gemfile.lock | 8 ++--- app/models/barcode.rb | 10 +++++- app/models/order.rb | 12 ++++++- app/models/order_item.rb | 9 ++++-- app/models/product.rb | 16 +++++----- app/models/user.rb | 24 ++++++++++---- db/seeds.rb | 3 -- lib/tasks/annotate_rb.rake | 8 +++++ spec/factories/barcodes.rb | 10 +++++- spec/factories/order_items.rb | 9 ++++-- spec/factories/orders.rb | 12 ++++++- spec/factories/products.rb | 16 +++++----- spec/factories/users.rb | 24 ++++++++++---- spec/models/barcode_spec.rb | 10 +++++- spec/models/order_item_spec.rb | 9 ++++-- spec/models/order_spec.rb | 12 ++++++- spec/models/product_spec.rb | 16 +++++----- spec/models/user_spec.rb | 24 ++++++++++---- 20 files changed, 227 insertions(+), 65 deletions(-) create mode 100644 .annotaterb.yml create mode 100644 lib/tasks/annotate_rb.rake diff --git a/.annotaterb.yml b/.annotaterb.yml new file mode 100644 index 00000000..2811be74 --- /dev/null +++ b/.annotaterb.yml @@ -0,0 +1,58 @@ +--- +:position: before +:position_in_additional_file_patterns: before +:position_in_class: before +:position_in_factory: before +:position_in_fixture: before +:position_in_routes: before +:position_in_serializer: before +:position_in_test: before +:classified_sort: true +:exclude_controllers: true +:exclude_factories: false +:exclude_fixtures: false +:exclude_helpers: true +:exclude_scaffolds: true +:exclude_serializers: false +:exclude_sti_subclasses: false +:exclude_tests: false +:force: false +:format_markdown: false +:format_rdoc: false +:format_yard: false +:frozen: false +:ignore_model_sub_dir: false +:ignore_unknown_models: false +:include_version: false +:show_check_constraints: false +:show_complete_foreign_keys: false +:show_foreign_keys: true +:show_indexes: true +:simple_indexes: false +:sort: false +:timestamp: false +:trace: false +:with_comment: true +:with_column_comments: true +:with_table_comments: true +:active_admin: false +:command: +:debug: false +:hide_default_column_types: '' +:hide_limit_column_types: '' +:ignore_columns: +:ignore_routes: +:models: true +:routes: false +:skip_on_db_migrate: false +:target_action: :do_annotations +:wrapper: +:wrapper_close: +:wrapper_open: +:classes_default_to_s: [] +:additional_file_patterns: [] +:model_dir: +- app/models +:require: [] +:root_dir: +- '' diff --git a/Gemfile b/Gemfile index 338b7b46..4ae85edd 100644 --- a/Gemfile +++ b/Gemfile @@ -96,7 +96,7 @@ group :development do gem "sqlite3" # Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema. - gem "annotate" + gem "annotaterb" # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem "spring" diff --git a/Gemfile.lock b/Gemfile.lock index 8f5caa9c..a28d4ab6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,9 +77,9 @@ GEM uri (>= 0.13.1) addressable (2.8.9) public_suffix (>= 2.0.2, < 8.0) - annotate (2.6.5) - activerecord (>= 2.3.0) - rake (>= 0.8.7) + annotaterb (4.24.0) + activerecord (>= 6.0.0) + activesupport (>= 6.0.0) ast (2.4.3) base64 (0.3.0) bcrypt (3.1.22) @@ -469,7 +469,7 @@ PLATFORMS x86_64-linux-musl DEPENDENCIES - annotate + annotaterb bootsnap bulma-rails (~> 0.9) byebug diff --git a/app/models/barcode.rb b/app/models/barcode.rb index 7638411f..9d6c1739 100644 --- a/app/models/barcode.rb +++ b/app/models/barcode.rb @@ -5,10 +5,18 @@ # Table name: barcodes # # id :integer not null, primary key -# product_id :integer # code :string default(""), not null # created_at :datetime # updated_at :datetime +# product_id :integer not null +# +# Indexes +# +# index_barcodes_on_code (code) +# +# Foreign Keys +# +# product_id (product_id => products.id) # class Barcode < ApplicationRecord diff --git a/app/models/order.rb b/app/models/order.rb index 96b52414..13266320 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -5,11 +5,21 @@ # Table name: orders # # id :integer not null, primary key -# user_id :integer # price_cents :integer # created_at :datetime not null # updated_at :datetime not null # transaction_id :integer +# user_id :integer not null +# +# Indexes +# +# index_orders_on_created_at (created_at) +# index_orders_on_user_id (user_id) +# index_orders_on_user_id_and_created_at (user_id,created_at) +# +# Foreign Keys +# +# user_id (user_id => users.id) # class Order < ApplicationRecord include ApplicationHelper diff --git a/app/models/order_item.rb b/app/models/order_item.rb index 4dbe5e80..6c5951b5 100644 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -5,9 +5,14 @@ # Table name: order_items # # id :integer not null, primary key -# order_id :integer -# product_id :integer not null # count :integer default(0) +# order_id :integer not null +# product_id :integer not null +# +# Foreign Keys +# +# order_id (order_id => orders.id) +# product_id (product_id => products.id) # class OrderItem < ApplicationRecord diff --git a/app/models/product.rb b/app/models/product.rb index 19a647ee..67370195 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -5,18 +5,18 @@ # Table name: products # # id :integer not null, primary key -# name :string not null -# price_cents :integer default(0), not null -# created_at :datetime -# updated_at :datetime -# avatar_file_name :string # avatar_content_type :string -# avatar_file_size :integer +# avatar_file_name :string +# avatar_file_size :bigint # avatar_updated_at :datetime -# category :integer default("food") -# stock :integer default(0), not null # calories :integer +# category :integer default(0) # deleted :boolean default(FALSE) +# name :string not null +# price_cents :integer default(0), not null +# stock :integer default(0), not null +# created_at :datetime +# updated_at :datetime # class Product < ApplicationRecord diff --git a/app/models/user.rb b/app/models/user.rb index c2c3a382..78c9b01a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -5,19 +5,29 @@ # Table name: users # # id :integer not null, primary key -# created_at :datetime -# updated_at :datetime -# remember_created_at :datetime # admin :boolean default(FALSE) -# dagschotel_id :integer -# orders_count :integer default(0) +# frecency :integer default(0), not null # koelkast :boolean default(FALSE) # name :string +# orders_count :integer default(0) # private :boolean default(FALSE) -# frecency :integer default(0), not null # quickpay_hidden :boolean default(FALSE) +# remember_created_at :datetime # userkey :string -# zauth_id :string +# created_at :datetime +# updated_at :datetime +# dagschotel_id :integer +# zauth_id :text not null +# +# Indexes +# +# index_users_on_koelkast (koelkast) +# index_users_on_orders_count (orders_count) +# index_users_on_zauth_id (zauth_id) UNIQUE +# +# Foreign Keys +# +# dagschotel_id (dagschotel_id => products.id) # class User < ApplicationRecord diff --git a/db/seeds.rb b/db/seeds.rb index cf58ec8f..6ea8ded9 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -7,9 +7,6 @@ # Mayor.create(name: 'Emanuel', city: cities.first) if Rails.env.development? - require 'faker' - require 'tqdm' - puts "** Seeding database..." puts "** Creating 50 users..." diff --git a/lib/tasks/annotate_rb.rake b/lib/tasks/annotate_rb.rake new file mode 100644 index 00000000..2c54aa32 --- /dev/null +++ b/lib/tasks/annotate_rb.rake @@ -0,0 +1,8 @@ +# This rake task was added by annotate_rb gem. + +# Can set `ANNOTATERB_SKIP_ON_DB_TASKS` to be anything to skip this +if Rails.env.development? && ENV['ANNOTATERB_SKIP_ON_DB_TASKS'].nil? + require 'annotate_rb' + + AnnotateRb::Core.load_rake_tasks +end diff --git a/spec/factories/barcodes.rb b/spec/factories/barcodes.rb index 6f5b6de2..05410e68 100644 --- a/spec/factories/barcodes.rb +++ b/spec/factories/barcodes.rb @@ -5,10 +5,18 @@ # Table name: barcodes # # id :integer not null, primary key -# product_id :integer # code :string default(""), not null # created_at :datetime # updated_at :datetime +# product_id :integer not null +# +# Indexes +# +# index_barcodes_on_code (code) +# +# Foreign Keys +# +# product_id (product_id => products.id) # FactoryBot.define do diff --git a/spec/factories/order_items.rb b/spec/factories/order_items.rb index 40b49696..c888017e 100644 --- a/spec/factories/order_items.rb +++ b/spec/factories/order_items.rb @@ -5,9 +5,14 @@ # Table name: order_items # # id :integer not null, primary key -# order_id :integer -# product_id :integer not null # count :integer default(0) +# order_id :integer not null +# product_id :integer not null +# +# Foreign Keys +# +# order_id (order_id => orders.id) +# product_id (product_id => products.id) # FactoryBot.define do diff --git a/spec/factories/orders.rb b/spec/factories/orders.rb index 7e64d9c9..7613f7f4 100644 --- a/spec/factories/orders.rb +++ b/spec/factories/orders.rb @@ -5,11 +5,21 @@ # Table name: orders # # id :integer not null, primary key -# user_id :integer # price_cents :integer # created_at :datetime not null # updated_at :datetime not null # transaction_id :integer +# user_id :integer not null +# +# Indexes +# +# index_orders_on_created_at (created_at) +# index_orders_on_user_id (user_id) +# index_orders_on_user_id_and_created_at (user_id,created_at) +# +# Foreign Keys +# +# user_id (user_id => users.id) # require "faker" diff --git a/spec/factories/products.rb b/spec/factories/products.rb index 83804ee8..2fa46a3a 100644 --- a/spec/factories/products.rb +++ b/spec/factories/products.rb @@ -5,18 +5,18 @@ # Table name: products # # id :integer not null, primary key -# name :string not null -# price_cents :integer default(0), not null -# created_at :datetime -# updated_at :datetime -# avatar_file_name :string # avatar_content_type :string -# avatar_file_size :integer +# avatar_file_name :string +# avatar_file_size :bigint # avatar_updated_at :datetime -# category :integer default("food") -# stock :integer default(0), not null # calories :integer +# category :integer default(0) # deleted :boolean default(FALSE) +# name :string not null +# price_cents :integer default(0), not null +# stock :integer default(0), not null +# created_at :datetime +# updated_at :datetime # require "faker" diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 3233d408..86340c7a 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -5,19 +5,29 @@ # Table name: users # # id :integer not null, primary key -# created_at :datetime -# updated_at :datetime -# remember_created_at :datetime # admin :boolean default(FALSE) -# dagschotel_id :integer -# orders_count :integer default(0) +# frecency :integer default(0), not null # koelkast :boolean default(FALSE) # name :string +# orders_count :integer default(0) # private :boolean default(FALSE) -# frecency :integer default(0), not null # quickpay_hidden :boolean default(FALSE) +# remember_created_at :datetime # userkey :string -# zauth_id :string +# created_at :datetime +# updated_at :datetime +# dagschotel_id :integer +# zauth_id :text not null +# +# Indexes +# +# index_users_on_koelkast (koelkast) +# index_users_on_orders_count (orders_count) +# index_users_on_zauth_id (zauth_id) UNIQUE +# +# Foreign Keys +# +# dagschotel_id (dagschotel_id => products.id) # require "faker" diff --git a/spec/models/barcode_spec.rb b/spec/models/barcode_spec.rb index 0092cdb1..f7da038f 100644 --- a/spec/models/barcode_spec.rb +++ b/spec/models/barcode_spec.rb @@ -5,10 +5,18 @@ # Table name: barcodes # # id :integer not null, primary key -# product_id :integer # code :string default(""), not null # created_at :datetime # updated_at :datetime +# product_id :integer not null +# +# Indexes +# +# index_barcodes_on_code (code) +# +# Foreign Keys +# +# product_id (product_id => products.id) # describe Barcode do diff --git a/spec/models/order_item_spec.rb b/spec/models/order_item_spec.rb index 031fbde3..f4b3f840 100644 --- a/spec/models/order_item_spec.rb +++ b/spec/models/order_item_spec.rb @@ -5,9 +5,14 @@ # Table name: order_items # # id :integer not null, primary key -# order_id :integer -# product_id :integer not null # count :integer default(0) +# order_id :integer not null +# product_id :integer not null +# +# Foreign Keys +# +# order_id (order_id => orders.id) +# product_id (product_id => products.id) # describe OrderItem do diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb index a68523a7..82d1b4c2 100644 --- a/spec/models/order_spec.rb +++ b/spec/models/order_spec.rb @@ -5,11 +5,21 @@ # Table name: orders # # id :integer not null, primary key -# user_id :integer # price_cents :integer # created_at :datetime not null # updated_at :datetime not null # transaction_id :integer +# user_id :integer not null +# +# Indexes +# +# index_orders_on_created_at (created_at) +# index_orders_on_user_id (user_id) +# index_orders_on_user_id_and_created_at (user_id,created_at) +# +# Foreign Keys +# +# user_id (user_id => users.id) # describe Order do diff --git a/spec/models/product_spec.rb b/spec/models/product_spec.rb index e72447e7..95ee007a 100644 --- a/spec/models/product_spec.rb +++ b/spec/models/product_spec.rb @@ -5,18 +5,18 @@ # Table name: products # # id :integer not null, primary key -# name :string not null -# price_cents :integer default(0), not null -# created_at :datetime -# updated_at :datetime -# avatar_file_name :string # avatar_content_type :string -# avatar_file_size :integer +# avatar_file_name :string +# avatar_file_size :bigint # avatar_updated_at :datetime -# category :integer default("food") -# stock :integer default(0), not null # calories :integer +# category :integer default(0) # deleted :boolean default(FALSE) +# name :string not null +# price_cents :integer default(0), not null +# stock :integer default(0), not null +# created_at :datetime +# updated_at :datetime # describe Product do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 0be8bc62..924b04d8 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -5,19 +5,29 @@ # Table name: users # # id :integer not null, primary key -# created_at :datetime -# updated_at :datetime -# remember_created_at :datetime # admin :boolean default(FALSE) -# dagschotel_id :integer -# orders_count :integer default(0) +# frecency :integer default(0), not null # koelkast :boolean default(FALSE) # name :string +# orders_count :integer default(0) # private :boolean default(FALSE) -# frecency :integer default(0), not null # quickpay_hidden :boolean default(FALSE) +# remember_created_at :datetime # userkey :string -# zauth_id :string +# created_at :datetime +# updated_at :datetime +# dagschotel_id :integer +# zauth_id :text not null +# +# Indexes +# +# index_users_on_koelkast (koelkast) +# index_users_on_orders_count (orders_count) +# index_users_on_zauth_id (zauth_id) UNIQUE +# +# Foreign Keys +# +# dagschotel_id (dagschotel_id => products.id) # require "webmock/rspec"