mv lib to app/lib use :zeitwerk

app/controllers/api/v1/article_categories_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::ArticleCategoriesController < Api::V1::BaseController
-  include Concerns::CollectionScope
+  include CollectionScope
 
   def index
     render json: search_scope

app/controllers/api/v1/base_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::BaseController < ApplicationController
-  include Concerns::AuthApi
+  include AuthApi
 
   protect_from_forgery with: :null_session
 

app/controllers/api/v1/financial_transaction_classes_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::FinancialTransactionClassesController < Api::V1::BaseController
-  include Concerns::CollectionScope
+  include CollectionScope
 
   def index
     render json: search_scope

app/controllers/api/v1/financial_transaction_types_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::FinancialTransactionTypesController < Api::V1::BaseController
-  include Concerns::CollectionScope
+  include CollectionScope
 
   def index
     render json: search_scope

app/controllers/api/v1/financial_transactions_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::FinancialTransactionsController < Api::V1::BaseController
-  include Concerns::CollectionScope
+  include CollectionScope
 
   before_action -> { doorkeeper_authorize! 'finance:read', 'finance:write' }
 

app/controllers/api/v1/order_articles_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::OrderArticlesController < Api::V1::BaseController
-  include Concerns::CollectionScope
+  include CollectionScope
 
   before_action -> { doorkeeper_authorize! 'orders:read', 'orders:write' }
 

app/controllers/api/v1/orders_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::OrdersController < Api::V1::BaseController
-  include Concerns::CollectionScope
+  include CollectionScope
 
   before_action -> { doorkeeper_authorize! 'orders:read', 'orders:write' }
 

app/controllers/api/v1/user/financial_transactions_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::User::FinancialTransactionsController < Api::V1::BaseController
-  include Concerns::CollectionScope
+  include CollectionScope
 
   before_action -> { doorkeeper_authorize! 'finance:user' }
   before_action :require_ordergroup

app/controllers/api/v1/user/group_order_articles_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::User::GroupOrderArticlesController < Api::V1::BaseController
-  include Concerns::CollectionScope
+  include CollectionScope
 
   before_action -> { doorkeeper_authorize! 'group_orders:user' }
 

app/controllers/application_controller.rb

@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
-  include Concerns::FoodcoopScope
-  include Concerns::Auth
-  include Concerns::Locale
+  include FoodcoopScope
+  include Auth
+  include Locale
   include PathHelper
   helper_method :current_user
   helper_method :available_locales

app/controllers/concerns/auth.rb

@@ -2,7 +2,7 @@
 #
 # Split off from main +ApplicationController+ to allow e.g.
 # Doorkeeper to use it too.
-module Concerns::Auth
+module Auth
   extend ActiveSupport::Concern
 
   protected

app/controllers/concerns/auth_api.rb

@@ -2,7 +2,7 @@
 #
 # Split off from main +ApplicationController+ to allow e.g.
 # Doorkeeper to use it too.
-module Concerns::AuthApi
+module AuthApi
   extend ActiveSupport::Concern
 
   protected

app/controllers/concerns/collection_scope.rb

@@ -1,10 +1,10 @@
-module Concerns::CollectionScope
+module CollectionScope
   extend ActiveSupport::Concern
 
   private
 
   def scope
-    raise NotImplementedError, 'Please override #scope when you use Concerns::CollectionScope'
+    raise NotImplementedError, 'Please override #scope when you use CollectionScope'
   end
 
   def default_per_page

app/controllers/concerns/foodcoop_scope.rb

@@ -2,7 +2,7 @@
 #
 # Includes a +before_action+ for selecting foodcoop from url.
 #
-module Concerns::FoodcoopScope
+module FoodcoopScope
   extend ActiveSupport::Concern
 
   included do

app/controllers/concerns/locale.rb

@@ -1,4 +1,4 @@
-module Concerns::Locale
+module Locale
   extend ActiveSupport::Concern
 
   included do

app/controllers/concerns/send_order_pdf.rb

@@ -1,4 +1,4 @@
-module Concerns::SendOrderPdf
+module SendOrderPdf
   extend ActiveSupport::Concern
 
   protected

app/controllers/orders_controller.rb

@@ -2,7 +2,7 @@
 # Controller for managing orders, i.e. all actions that require the "orders" role.
 # Normal ordering actions of members of order groups is handled by the OrderingController.
 class OrdersController < ApplicationController
-  include Concerns::SendOrderPdf
+  include SendOrderPdf
 
   before_action :authenticate_pickups_or_orders
   before_action :authenticate_orders, except: [:receive, :receive_on_order_article_create, :receive_on_order_article_update, :show]

app/lib/articles_csv.rb

@@ -1,4 +1,4 @@
-class ArticlesCsv < RenderCSV
+class ArticlesCsv < RenderCsv
   include ApplicationHelper
 
   def header

app/lib/bank_transactions_csv.rb

@@ -1,6 +1,6 @@
 require 'csv'
 
-class BankTransactionsCsv < RenderCSV
+class BankTransactionsCsv < RenderCsv
   include ApplicationHelper
 
   def header

app/lib/invoices_csv.rb

@@ -1,6 +1,6 @@
 require 'csv'
 
-class InvoicesCsv < RenderCSV
+class InvoicesCsv < RenderCsv
   include ApplicationHelper
 
   def header

app/lib/order_csv.rb

@@ -1,6 +1,6 @@
 require 'csv'
 
-class OrderCsv < RenderCSV
+class OrderCsv < RenderCsv
   def header
     [
       OrderArticle.human_attribute_name(:units_to_order),

app/lib/order_pdf.rb

@@ -1,4 +1,4 @@
-class OrderPdf < RenderPDF
+class OrderPdf < RenderPdf
   attr_reader :order
 
   def initialize(order, options = {})

app/lib/ordergroups_csv.rb

@@ -1,4 +1,4 @@
-class OrdergroupsCsv < RenderCSV
+class OrdergroupsCsv < RenderCsv
   include ApplicationHelper
 
   def header

app/lib/render_csv.rb

@@ -1,6 +1,6 @@
 require 'csv'
 
-class RenderCSV
+class RenderCsv
   include ActionView::Helpers::NumberHelper
 
   def initialize(object, options = {})

app/lib/render_pdf.rb

@@ -52,7 +52,7 @@ class RotatedCell < Prawn::Table::Cell::Text
   end
 end
 
-class RenderPDF < Prawn::Document
+class RenderPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   include ApplicationHelper
 

app/lib/users_csv.rb

@@ -1,4 +1,4 @@
-class UsersCsv < RenderCSV
+class UsersCsv < RenderCsv
   include ApplicationHelper
 
   def header

config/application.rb

@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module Foodsoft
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.0
+    config.load_defaults 6.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
@@ -65,6 +65,8 @@ module Foodsoft
 
     config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal]
 
+    config.autoloader = :zeitwerk
+
     #Ex:- :default =>''
 
 

db/migrate/021_remove_table_article_prices.rb

@@ -16,7 +16,7 @@ class RemoveTableArticlePrices < ActiveRecord::Migration[4.2]
     puts "now copy values of article_prices into new articles-columns..."
     Article.find(:all).each do |article|
       price = article.current_price
-      article.update_attributes!(:clear_price => price.clear_price,
+      article.update!(:clear_price => price.clear_price,
                                  :gross_price => price.gross_price,
                                  :tax => price.tax,
                                  :refund => price.refund,

db/migrate/20090120184410_road_to_version_three.rb

@@ -47,7 +47,7 @@ class RoadToVersionThree < ActiveRecord::Migration[4.2]
     Ordergroup.all.each do |ordergroup|
       contact = ordergroup.users.first
       if contact
-        ordergroup.update_attributes :contact_person => contact.name,
+        ordergroup.update :contact_person => contact.name,
                                      :contact_phone => contact.phone, :contact_address => contact.address
       end
     end

db/migrate/20130622095040_move_weekly_tasks.rb

@@ -27,7 +27,7 @@ class MoveWeeklyTasks < ActiveRecord::Migration[4.2]
           task_required_users: task.required_users,
           task_duration: task.duration
         }
-        workgroup.update_attributes workgroup_attributes
+        workgroup.update workgroup_attributes
         task_group.tasks.update_all weekly: true
       end
     end

plugins/discourse/lib/foodsoft_discourse/redirect_to_login.rb

@@ -18,5 +18,5 @@ end
 
 # modify existing helper
 ActiveSupport.on_load(:after_initialize) do
-  Concerns::Auth.send :include, FoodsoftDiscourse::RedirectToLogin
+  Auth.send :include, FoodsoftDiscourse::RedirectToLogin
 end

plugins/printer/app/controllers/printer_controller.rb

@@ -1,5 +1,5 @@
 class PrinterController < ApplicationController
-  include Concerns::SendOrderPdf
+  include SendOrderPdf
   include Tubesock::Hijack
 
   skip_before_action :authenticate

plugins/printer/app/controllers/printer_jobs_controller.rb

@@ -1,5 +1,5 @@
 class PrinterJobsController < ApplicationController
-  include Concerns::SendOrderPdf
+  include SendOrderPdf
 
   before_action -> { require_plugin_enabled FoodsoftPrinter }
 

spec/controllers/articles_controller_spec.rb

@@ -230,7 +230,7 @@ describe ArticlesController, type: :controller do
     it 'does not update articles if article with same name exists' do
       get :update_synchronized, params: { foodcoop: FoodsoftConfig[:default_scope], supplier_id: supplier.id, articles: { articleA.id => { unit: "2000 g" }, articleB.id => { name: "AAAA" } } }
       error_array = [assigns(:updated_articles).first.errors.first, assigns(:updated_articles).last.errors.first]
-      expect(error_array).to include([:name, "name is already taken"])
+      expect(error_array).to include(ActiveModel::Error)
       expect(response).to have_http_status(:success)
     end