From b0ca359e6c3352b52a5ac508576eae7fcddbd3be Mon Sep 17 00:00:00 2001
From: dblock <dblock@dblock.org>
Date: Sun, 26 Apr 2020 16:44:13 -0400
Subject: [PATCH] More require_relative vs. require.

---
 lib/slack-ruby-bot-server/api.rb                       |  8 ++++----
 lib/slack-ruby-bot-server/api/endpoints.rb             |  6 +++---
 lib/slack-ruby-bot-server/api/helpers.rb               |  8 ++++----
 lib/slack-ruby-bot-server/api/presenters.rb            | 10 +++++-----
 .../config/database_adapters/activerecord.rb           |  2 +-
 .../config/database_adapters/mongoid.rb                |  3 ++-
 slack-ruby-bot-server.gemspec                          |  2 +-
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lib/slack-ruby-bot-server/api.rb b/lib/slack-ruby-bot-server/api.rb
index cfd713a..025ce65 100644
--- a/lib/slack-ruby-bot-server/api.rb
+++ b/lib/slack-ruby-bot-server/api.rb
@@ -3,7 +3,7 @@
 require 'grape-roar'
 
 require_relative 'ext/grape/sort_extension'
-require 'slack-ruby-bot-server/api/helpers'
-require 'slack-ruby-bot-server/api/presenters'
-require 'slack-ruby-bot-server/api/endpoints'
-require 'slack-ruby-bot-server/api/middleware'
+require_relative 'api/helpers'
+require_relative 'api/presenters'
+require_relative 'api/endpoints'
+require_relative 'api/middleware'
diff --git a/lib/slack-ruby-bot-server/api/endpoints.rb b/lib/slack-ruby-bot-server/api/endpoints.rb
index 5ebfa6d..08dd9ca 100644
--- a/lib/slack-ruby-bot-server/api/endpoints.rb
+++ b/lib/slack-ruby-bot-server/api/endpoints.rb
@@ -1,3 +1,3 @@
-require 'slack-ruby-bot-server/api/endpoints/teams_endpoint'
-require 'slack-ruby-bot-server/api/endpoints/status_endpoint'
-require 'slack-ruby-bot-server/api/endpoints/root_endpoint'
+require_relative 'endpoints/teams_endpoint'
+require_relative 'endpoints/status_endpoint'
+require_relative 'endpoints/root_endpoint'
diff --git a/lib/slack-ruby-bot-server/api/helpers.rb b/lib/slack-ruby-bot-server/api/helpers.rb
index 87e49bb..374b9bb 100644
--- a/lib/slack-ruby-bot-server/api/helpers.rb
+++ b/lib/slack-ruby-bot-server/api/helpers.rb
@@ -1,4 +1,4 @@
-require 'slack-ruby-bot-server/api/helpers/cursor_helpers'
-require 'slack-ruby-bot-server/api/helpers/pagination_parameters'
-require 'slack-ruby-bot-server/api/helpers/sort_helpers'
-require 'slack-ruby-bot-server/api/helpers/error_helpers'
+require_relative 'helpers/cursor_helpers'
+require_relative 'helpers/pagination_parameters'
+require_relative 'helpers/sort_helpers'
+require_relative 'helpers/error_helpers'
diff --git a/lib/slack-ruby-bot-server/api/presenters.rb b/lib/slack-ruby-bot-server/api/presenters.rb
index 272800a..0dfb77d 100644
--- a/lib/slack-ruby-bot-server/api/presenters.rb
+++ b/lib/slack-ruby-bot-server/api/presenters.rb
@@ -2,8 +2,8 @@
 require 'roar/json'
 require 'roar/json/hal'
 
-require 'slack-ruby-bot-server/api/presenters/paginated_presenter'
-require 'slack-ruby-bot-server/api/presenters/status_presenter'
-require 'slack-ruby-bot-server/api/presenters/team_presenter'
-require 'slack-ruby-bot-server/api/presenters/teams_presenter'
-require 'slack-ruby-bot-server/api/presenters/root_presenter'
+require_relative 'presenters/paginated_presenter'
+require_relative 'presenters/status_presenter'
+require_relative 'presenters/team_presenter'
+require_relative 'presenters/teams_presenter'
+require_relative 'presenters/root_presenter'
diff --git a/lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb b/lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb
index 3af4335..944b117 100644
--- a/lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb
+++ b/lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb
@@ -1,4 +1,4 @@
-require 'slack-ruby-bot-server/models/team/activerecord.rb'
+require_relative '../../models/team/activerecord.rb'
 
 module SlackRubyBotServer
   module DatabaseAdapter
diff --git a/lib/slack-ruby-bot-server/config/database_adapters/mongoid.rb b/lib/slack-ruby-bot-server/config/database_adapters/mongoid.rb
index 4cb15ca..4a4762d 100644
--- a/lib/slack-ruby-bot-server/config/database_adapters/mongoid.rb
+++ b/lib/slack-ruby-bot-server/config/database_adapters/mongoid.rb
@@ -1,4 +1,5 @@
-require 'slack-ruby-bot-server/models/team/mongoid.rb'
+require_relative '../../models/team/mongoid.rb'
+
 require 'kaminari/grape'
 require 'mongoid-scroll'
 
diff --git a/slack-ruby-bot-server.gemspec b/slack-ruby-bot-server.gemspec
index 80a9355..c4a1ba9 100644
--- a/slack-ruby-bot-server.gemspec
+++ b/slack-ruby-bot-server.gemspec
@@ -1,6 +1,6 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'slack-ruby-bot-server/version'
+require_relative 'lib/slack-ruby-bot-server/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'slack-ruby-bot-server'