From d50679f4eefde1aca1ab71ba3c0109739cfdff3f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 22 Jul 2017 09:47:24 -0500
Subject: [PATCH] Move models and jobs to the app setup

Follow engine conventions more closely
---
 {lib => app/jobs}/active_storage/purge_job.rb                   | 0
 {lib => app/models}/active_storage/attachment.rb                | 0
 {lib => app/models}/active_storage/blob.rb                      | 0
 {lib => app/models}/active_storage/filename.rb                  | 0
 {lib => app/models}/active_storage/service.rb                   | 2 +-
 {lib => app/models}/active_storage/service/configurator.rb      | 0
 {lib => app/models}/active_storage/service/disk_service.rb      | 0
 {lib => app/models}/active_storage/service/gcs_service.rb       | 0
 {lib => app/models}/active_storage/service/mirror_service.rb    | 0
 {lib => app/models}/active_storage/service/s3_service.rb        | 0
 {lib => app/models}/active_storage/variant.rb                   | 0
 {lib => app/models}/active_storage/variation.rb                 | 0
 .../models}/active_storage/verified_key_with_expiration.rb      | 0
 test/test_helper.rb                                             | 2 ++
 14 files changed, 3 insertions(+), 1 deletion(-)
 rename {lib => app/jobs}/active_storage/purge_job.rb (100%)
 rename {lib => app/models}/active_storage/attachment.rb (100%)
 rename {lib => app/models}/active_storage/blob.rb (100%)
 rename {lib => app/models}/active_storage/filename.rb (100%)
 rename {lib => app/models}/active_storage/service.rb (98%)
 rename {lib => app/models}/active_storage/service/configurator.rb (100%)
 rename {lib => app/models}/active_storage/service/disk_service.rb (100%)
 rename {lib => app/models}/active_storage/service/gcs_service.rb (100%)
 rename {lib => app/models}/active_storage/service/mirror_service.rb (100%)
 rename {lib => app/models}/active_storage/service/s3_service.rb (100%)
 rename {lib => app/models}/active_storage/variant.rb (100%)
 rename {lib => app/models}/active_storage/variation.rb (100%)
 rename {lib => app/models}/active_storage/verified_key_with_expiration.rb (100%)

diff --git a/lib/active_storage/purge_job.rb b/app/jobs/active_storage/purge_job.rb
similarity index 100%
rename from lib/active_storage/purge_job.rb
rename to app/jobs/active_storage/purge_job.rb
diff --git a/lib/active_storage/attachment.rb b/app/models/active_storage/attachment.rb
similarity index 100%
rename from lib/active_storage/attachment.rb
rename to app/models/active_storage/attachment.rb
diff --git a/lib/active_storage/blob.rb b/app/models/active_storage/blob.rb
similarity index 100%
rename from lib/active_storage/blob.rb
rename to app/models/active_storage/blob.rb
diff --git a/lib/active_storage/filename.rb b/app/models/active_storage/filename.rb
similarity index 100%
rename from lib/active_storage/filename.rb
rename to app/models/active_storage/filename.rb
diff --git a/lib/active_storage/service.rb b/app/models/active_storage/service.rb
similarity index 98%
rename from lib/active_storage/service.rb
rename to app/models/active_storage/service.rb
index cba9cd9c83..745b1a615f 100644
--- a/lib/active_storage/service.rb
+++ b/app/models/active_storage/service.rb
@@ -1,4 +1,4 @@
-require_relative "log_subscriber"
+require "active_storage/log_subscriber"
 
 # Abstract class serving as an interface for concrete services.
 #
diff --git a/lib/active_storage/service/configurator.rb b/app/models/active_storage/service/configurator.rb
similarity index 100%
rename from lib/active_storage/service/configurator.rb
rename to app/models/active_storage/service/configurator.rb
diff --git a/lib/active_storage/service/disk_service.rb b/app/models/active_storage/service/disk_service.rb
similarity index 100%
rename from lib/active_storage/service/disk_service.rb
rename to app/models/active_storage/service/disk_service.rb
diff --git a/lib/active_storage/service/gcs_service.rb b/app/models/active_storage/service/gcs_service.rb
similarity index 100%
rename from lib/active_storage/service/gcs_service.rb
rename to app/models/active_storage/service/gcs_service.rb
diff --git a/lib/active_storage/service/mirror_service.rb b/app/models/active_storage/service/mirror_service.rb
similarity index 100%
rename from lib/active_storage/service/mirror_service.rb
rename to app/models/active_storage/service/mirror_service.rb
diff --git a/lib/active_storage/service/s3_service.rb b/app/models/active_storage/service/s3_service.rb
similarity index 100%
rename from lib/active_storage/service/s3_service.rb
rename to app/models/active_storage/service/s3_service.rb
diff --git a/lib/active_storage/variant.rb b/app/models/active_storage/variant.rb
similarity index 100%
rename from lib/active_storage/variant.rb
rename to app/models/active_storage/variant.rb
diff --git a/lib/active_storage/variation.rb b/app/models/active_storage/variation.rb
similarity index 100%
rename from lib/active_storage/variation.rb
rename to app/models/active_storage/variation.rb
diff --git a/lib/active_storage/verified_key_with_expiration.rb b/app/models/active_storage/verified_key_with_expiration.rb
similarity index 100%
rename from lib/active_storage/verified_key_with_expiration.rb
rename to app/models/active_storage/verified_key_with_expiration.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 20b22049b3..5508061f6a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,4 +1,6 @@
 $LOAD_PATH << File.expand_path("../../app/controllers", __FILE__)
+$LOAD_PATH << File.expand_path("../../app/models", __FILE__)
+$LOAD_PATH << File.expand_path("../../app/jobs", __FILE__)
 
 require "bundler/setup"
 require "active_support"
-- 
GitLab