From e39255644410f09d294970b6d67dbc90076b1355 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 29 Dec 2020 19:26:58 +0000
Subject: [PATCH] Revert "Switch to using the zeitwork autoloader"

This reverts commit 127880a73fa461400c53b29c98721e34660bca5e.
---
 app/validators/utf8_validator.rb   |  2 +-
 config/application.rb              |  3 +++
 config/initializers/inflections.rb | 17 +++++++++++------
 db/migrate/001_create_osm_db.rb    |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/validators/utf8_validator.rb b/app/validators/utf8_validator.rb
index dec6f4d96..0c6b3f594 100644
--- a/app/validators/utf8_validator.rb
+++ b/app/validators/utf8_validator.rb
@@ -2,7 +2,7 @@
 # validation method to be included like any other validations methods
 # in the models definitions. this one checks that the named attribute
 # is a valid UTF-8 format string.
-class UTF8Validator < ActiveModel::EachValidator
+class Utf8Validator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     record.errors.add(attribute, " is invalid UTF-8") unless UTF8.valid? value
   end
diff --git a/config/application.rb b/config/application.rb
index f5638e233..54390ba29 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,6 +31,9 @@ module OpenStreetMap
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W[#{config.root}/lib]
 
+    # Continue to use the classic autoloader for now
+    config.autoloader = :classic
+
     # Force requests from old versions of IE (<= IE8) to be UTF-8 encoded.
     # This has defaulted to false since rails 6.0
     config.action_view.default_enforce_utf8 = true
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 3a842d7d5..ac033bf9d 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -3,9 +3,14 @@
 # Add new inflection rules using the following format. Inflections
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
-ActiveSupport::Inflector.inflections(:en) do |inflect|
-  inflect.acronym "GPX"
-  inflect.acronym "ID"
-  inflect.acronym "OSM"
-  inflect.acronym "UTF8"
-end
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/db/migrate/001_create_osm_db.rb b/db/migrate/001_create_osm_db.rb
index bc6a10ed6..3772c5dc2 100644
--- a/db/migrate/001_create_osm_db.rb
+++ b/db/migrate/001_create_osm_db.rb
@@ -1,6 +1,6 @@
 require "migrate"
 
-class CreateOSMDb < ActiveRecord::Migration[4.2]
+class CreateOsmDb < ActiveRecord::Migration[4.2]
   def self.up
     create_table "current_nodes", :id => false do |t|
       t.column "id",        :bigint, :null => false
-- 
2.43.2