Use zeitwerk to load gem files

Gemfile.lock

@@ -16,6 +16,7 @@ PATH
       faraday-detailed_logger (~> 2.1)
       ipaddress (~> 0.8, >= 0.8.3)
       openssl (>= 2.0.5)
+      zeitwerk (~> 2.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -110,7 +111,7 @@ GEM
     ruby2_keywords (0.0.5)
     thor (1.3.2)
     unicode-display_width (2.6.0)
-    zeitwerk (2.7.1)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-22
@@ -119,7 +120,6 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal!
-  bundler (~> 2.1)
   faraday (~> 1.10)
   faraday_middleware
   netbox-client-ruby!

gemfiles/faraday1.gemfile.lock

@@ -16,6 +16,7 @@ PATH
       faraday-detailed_logger (~> 2.1)
       ipaddress (~> 0.8, >= 0.8.3)
       openssl (>= 2.0.5)
+      zeitwerk (~> 2.6.0)
 
 GEM
   remote: https://rubygems.org/

gemfiles/faraday2.gemfile.lock

@@ -16,6 +16,7 @@ PATH
       faraday-detailed_logger (~> 2.1)
       ipaddress (~> 0.8, >= 0.8.3)
       openssl (>= 2.0.5)
+      zeitwerk (~> 2.6.0)
 
 GEM
   remote: https://rubygems.org/

lib/netbox_client_ruby.rb

@@ -1,6 +1,41 @@
 require 'dry-configurable'
-require 'netbox_client_ruby/error'
-require 'netbox_client_ruby/api'
+require 'ipaddress'
+require 'openssl'
+
+require 'faraday'
+require 'faraday/detailed_logger'
+
+if Faraday::VERSION < '2'
+  begin
+    require 'faraday_middleware'
+  rescue LoadError => e
+    message = <<~MSG
+      For the current version of Faraday (#{Faraday::VERSION}), "faraday_middleware"
+      is a required peer dependency of "netbox-client-ruby". Please install
+      "faraday_middleware" separately OR upgrade to Faraday 2, in which case,
+      "faraday_middleware" is not needed to work with "netbox-client-ruby".
+
+      #{e.message}
+    MSG
+    raise NetboxClientRuby::Error, message
+  end
+end
+
+require 'zeitwerk'
+
+# load zeitwerk
+Zeitwerk::Loader.for_gem.tap do |loader|
+  loader.ignore("#{__dir__}/netbox-client-ruby.rb")
+  loader.collapse("#{__dir__}/netbox_client_ruby/api")
+  loader.inflector.inflect('dcim' => 'DCIM')
+  loader.inflector.inflect('ipam' => 'IPAM')
+  loader.inflector.inflect('rsa_key_pair' => 'RSAKeyPair')
+  # loader.log!
+  loader.setup
+end
+
+# load gem errors
+require_relative 'netbox_client_ruby/error'
 
 module NetboxClientRuby
   extend Dry::Configurable
@@ -29,4 +64,32 @@ module NetboxClientRuby
     setting :logger
     setting :request_options, default: { open_timeout: 1, timeout: 5 }
   end
+
+  def self.circuits
+    NetboxClientRuby::Circuits
+  end
+
+  def self.dcim
+    NetboxClientRuby::DCIM
+  end
+
+  def self.extras
+    NetboxClientRuby::Extras
+  end
+
+  def self.ipam
+    NetboxClientRuby::IPAM
+  end
+
+  def self.secrets
+    NetboxClientRuby::Secrets
+  end
+
+  def self.tenancy
+    NetboxClientRuby::Tenancy
+  end
+
+  def self.virtualization
+    NetboxClientRuby::Virtualization
+  end
 end

lib/netbox_client_ruby/api/circuits.rb

@@ -1,13 +1,3 @@
-require 'netbox_client_ruby/api/circuits/circuit'
-require 'netbox_client_ruby/api/circuits/circuits'
-require 'netbox_client_ruby/api/circuits/circuit_termination'
-require 'netbox_client_ruby/api/circuits/circuit_terminations'
-require 'netbox_client_ruby/api/circuits/circuit_type'
-require 'netbox_client_ruby/api/circuits/circuit_types'
-require 'netbox_client_ruby/api/circuits/provider'
-require 'netbox_client_ruby/api/circuits/providers'
-require 'netbox_client_ruby/communication'
-
 module NetboxClientRuby
   module Circuits
     {

lib/netbox_client_ruby/api/circuits/circuit.rb

@@ -1,8 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/circuits/circuit_type'
-require 'netbox_client_ruby/api/circuits/provider'
-require 'netbox_client_ruby/api/tenancy/tenant'
-
 module NetboxClientRuby
   module Circuits
     class Circuit

lib/netbox_client_ruby/api/circuits/circuit_termination.rb

@@ -1,8 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/circuits/circuit'
-require 'netbox_client_ruby/api/dcim/site'
-require 'netbox_client_ruby/api/dcim/interface'
-
 module NetboxClientRuby
   module Circuits
     class CircuitTermination

lib/netbox_client_ruby/api/circuits/circuit_terminations.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/circuits/circuit_termination'
-
 module NetboxClientRuby
   module Circuits
     class CircuitTerminations

lib/netbox_client_ruby/api/circuits/circuit_type.rb

@@ -1,5 +1,3 @@
-require 'netbox_client_ruby/entity'
-
 module NetboxClientRuby
   module Circuits
     class CircuitType

lib/netbox_client_ruby/api/circuits/circuit_types.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/circuits/circuit_type'
-
 module NetboxClientRuby
   module Circuits
     class CircuitTypes

lib/netbox_client_ruby/api/circuits/circuits.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/circuits/circuit'
-
 module NetboxClientRuby
   module Circuits
     ##

lib/netbox_client_ruby/api/circuits/provider.rb

@@ -1,5 +1,3 @@
-require 'netbox_client_ruby/entity'
-
 module NetboxClientRuby
   module Circuits
     class Provider

lib/netbox_client_ruby/api/circuits/providers.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/circuits/provider'
-
 module NetboxClientRuby
   module Circuits
     class Providers

lib/netbox_client_ruby/api/dcim.rb

@@ -1,47 +1,3 @@
-require 'netbox_client_ruby/api/dcim/console_connection'
-require 'netbox_client_ruby/api/dcim/console_connections'
-require 'netbox_client_ruby/api/dcim/console_port'
-require 'netbox_client_ruby/api/dcim/console_ports'
-require 'netbox_client_ruby/api/dcim/console_server_port'
-require 'netbox_client_ruby/api/dcim/console_server_ports'
-require 'netbox_client_ruby/api/dcim/device'
-require 'netbox_client_ruby/api/dcim/devices'
-require 'netbox_client_ruby/api/dcim/device_role'
-require 'netbox_client_ruby/api/dcim/device_roles'
-require 'netbox_client_ruby/api/dcim/device_type'
-require 'netbox_client_ruby/api/dcim/device_types'
-require 'netbox_client_ruby/api/dcim/interface'
-require 'netbox_client_ruby/api/dcim/interface_connection'
-require 'netbox_client_ruby/api/dcim/interface_connections'
-require 'netbox_client_ruby/api/dcim/interfaces'
-require 'netbox_client_ruby/api/dcim/inventory_item'
-require 'netbox_client_ruby/api/dcim/inventory_items'
-require 'netbox_client_ruby/api/dcim/manufacturer'
-require 'netbox_client_ruby/api/dcim/manufacturers'
-require 'netbox_client_ruby/api/dcim/platform'
-require 'netbox_client_ruby/api/dcim/platforms'
-require 'netbox_client_ruby/api/dcim/power_connection'
-require 'netbox_client_ruby/api/dcim/power_connections'
-require 'netbox_client_ruby/api/dcim/power_outlet'
-require 'netbox_client_ruby/api/dcim/power_outlets'
-require 'netbox_client_ruby/api/dcim/power_port'
-require 'netbox_client_ruby/api/dcim/power_ports'
-require 'netbox_client_ruby/api/dcim/rack'
-require 'netbox_client_ruby/api/dcim/rack_group'
-require 'netbox_client_ruby/api/dcim/rack_groups'
-require 'netbox_client_ruby/api/dcim/rack_reservation'
-require 'netbox_client_ruby/api/dcim/rack_reservations'
-require 'netbox_client_ruby/api/dcim/rack_role'
-require 'netbox_client_ruby/api/dcim/rack_roles'
-require 'netbox_client_ruby/api/dcim/racks'
-require 'netbox_client_ruby/api/dcim/region'
-require 'netbox_client_ruby/api/dcim/regions'
-require 'netbox_client_ruby/api/dcim/site'
-require 'netbox_client_ruby/api/dcim/sites'
-require 'netbox_client_ruby/api/dcim/virtual_chassis'
-require 'netbox_client_ruby/api/dcim/virtual_chassis_list'
-require 'netbox_client_ruby/communication'
-
 module NetboxClientRuby
   module DCIM
     {

lib/netbox_client_ruby/api/dcim/console_connection.rb

@@ -1,7 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/dcim/device'
-require 'netbox_client_ruby/api/dcim/console_server_port'
-
 module NetboxClientRuby
   module DCIM
     class ConsoleConnection

lib/netbox_client_ruby/api/dcim/console_connections.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/dcim/console_connection'
-
 module NetboxClientRuby
   module DCIM
     class ConsoleConnections

lib/netbox_client_ruby/api/dcim/console_port.rb

@@ -1,7 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/dcim/device'
-require 'netbox_client_ruby/api/dcim/console_server_port'
-
 module NetboxClientRuby
   module DCIM
     class ConsolePort

lib/netbox_client_ruby/api/dcim/console_ports.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/dcim/console_port'
-
 module NetboxClientRuby
   module DCIM
     class ConsolePorts

lib/netbox_client_ruby/api/dcim/console_server_port.rb

@@ -1,7 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/dcim/device'
-require 'netbox_client_ruby/api/dcim/console_port'
-
 module NetboxClientRuby
   module DCIM
     class ConsoleServerPort

lib/netbox_client_ruby/api/dcim/console_server_ports.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/dcim/console_server_port'
-
 module NetboxClientRuby
   module DCIM
     class ConsoleServerPorts

lib/netbox_client_ruby/api/dcim/device.rb

@@ -1,13 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/dcim/device_type'
-require 'netbox_client_ruby/api/dcim/device_role'
-require 'netbox_client_ruby/api/tenancy/tenant'
-require 'netbox_client_ruby/api/dcim/platform'
-require 'netbox_client_ruby/api/dcim/site'
-require 'netbox_client_ruby/api/dcim/rack'
-require 'netbox_client_ruby/api/dcim/virtual_chassis'
-require 'netbox_client_ruby/api/ipam/ip_address'
-
 module NetboxClientRuby
   module DCIM
     class Device

lib/netbox_client_ruby/api/dcim/device_role.rb

@@ -1,5 +1,3 @@
-require 'netbox_client_ruby/entity'
-
 module NetboxClientRuby
   module DCIM
     class DeviceRole

lib/netbox_client_ruby/api/dcim/device_roles.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/dcim/device_type'
-
 module NetboxClientRuby
   module DCIM
     class DeviceRoles

lib/netbox_client_ruby/api/dcim/device_type.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/dcim/manufacturer'
-
 module NetboxClientRuby
   module DCIM
     class InterfaceOrdering

lib/netbox_client_ruby/api/dcim/device_types.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/dcim/device_type'
-
 module NetboxClientRuby
   module DCIM
     class DeviceTypes

lib/netbox_client_ruby/api/dcim/devices.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/dcim/device'
-
 module NetboxClientRuby
   module DCIM
     class Devices

lib/netbox_client_ruby/api/dcim/interface.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/dcim/device'
-
 module NetboxClientRuby
   module DCIM
     class Interface

lib/netbox_client_ruby/api/dcim/interface_connection.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/api/dcim/interface'
-
 module NetboxClientRuby
   module DCIM
     class InterfaceConnection

lib/netbox_client_ruby/api/dcim/interface_connections.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/dcim/interface_connection'
-
 module NetboxClientRuby
   module DCIM
     class InterfaceConnections

lib/netbox_client_ruby/api/dcim/interfaces.rb

@@ -1,6 +1,3 @@
-require 'netbox_client_ruby/entities'
-require 'netbox_client_ruby/api/dcim/interface'
-
 module NetboxClientRuby
   module DCIM
     class Interfaces