Use Autoload

davispuh · Apr 1, 2018 · 0d7636c · 0d7636c
1 parent 15f5fd3
commit 0d7636c
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 8 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1 +1,2 @@
-* Chris Luo <[email protected]>
+* Chris Luo <[email protected]>
+* Paulo Ribeiro <[email protected]>
diff --git a/lib/fog/powerdns/dns.rb → lib/fog/dns/powerdns.rb b/lib/fog/powerdns/dns.rb → lib/fog/dns/powerdns.rb
@@ -1,17 +1,15 @@
-require 'fog/powerdns'
-
 module Fog
   module DNS
     class PowerDNS < Fog::Service
       requires :pdns_api_key
       recognizes :host, :port, :persistent, :scheme, :timeout
 
-      model_path 'fog/powerdns/models/dns'
+      model_path 'fog/dns/powerdns/models'
       model       :zone
       collection  :zones
       # collection  :rrsets
 
-      request_path 'fog/powerdns/requests/dns'
+      request_path 'fog/dns/powerdns/requests'
       request :list_servers
       request :get_server
       request :list_server_configs

diff --git a/lib/fog/powerdns/models/dns/record.rb → lib/fog/dns/powerdns/models/record.rb b/lib/fog/powerdns/models/dns/record.rb → lib/fog/dns/powerdns/models/record.rb
diff --git a/lib/fog/powerdns/models/dns/records.rb → lib/fog/dns/powerdns/models/records.rb b/lib/fog/powerdns/models/dns/records.rb → lib/fog/dns/powerdns/models/records.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/rage4/models/dns/record'
+
 module Fog
   module DNS
     class PowerDNS

diff --git a/lib/fog/powerdns/models/dns/zone.rb → lib/fog/dns/powerdns/models/zone.rb b/lib/fog/powerdns/models/dns/zone.rb → lib/fog/dns/powerdns/models/zone.rb
@@ -1,5 +1,4 @@
 require 'fog/core/model'
-# require 'fog/powerdns/models/dns/rrsets'
 
 module Fog
   module DNS

diff --git a/lib/fog/powerdns/models/dns/zones.rb → lib/fog/dns/powerdns/models/zones.rb b/lib/fog/powerdns/models/dns/zones.rb → lib/fog/dns/powerdns/models/zones.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/powerdns/models/dns/zone'
+require 'fog/dns/powerdns/models/zone'
 
 module Fog
   module DNS

diff --git a/lib/fog/powerdns/requests/dns/create_zone.rb → lib/fog/dns/powerdns/requests/create_zone.rb b/lib/fog/powerdns/requests/dns/create_zone.rb → lib/fog/dns/powerdns/requests/create_zone.rb
diff --git a/lib/fog/powerdns/requests/dns/delete_zone.rb → lib/fog/dns/powerdns/requests/delete_zone.rb b/lib/fog/powerdns/requests/dns/delete_zone.rb → lib/fog/dns/powerdns/requests/delete_zone.rb
diff --git a/...og/powerdns/requests/dns/get_cryptokey.rb → ...og/dns/powerdns/requests/get_cryptokey.rb b/...og/powerdns/requests/dns/get_cryptokey.rb → ...og/dns/powerdns/requests/get_cryptokey.rb
diff --git a/lib/fog/powerdns/requests/dns/get_server.rb → lib/fog/dns/powerdns/requests/get_server.rb b/lib/fog/powerdns/requests/dns/get_server.rb → lib/fog/dns/powerdns/requests/get_server.rb
diff --git a/...owerdns/requests/dns/get_server_config.rb → ...ns/powerdns/requests/get_server_config.rb b/...owerdns/requests/dns/get_server_config.rb → ...ns/powerdns/requests/get_server_config.rb
diff --git a/...powerdns/requests/dns/get_server_stats.rb → ...dns/powerdns/requests/get_server_stats.rb b/...powerdns/requests/dns/get_server_stats.rb → ...dns/powerdns/requests/get_server_stats.rb
diff --git a/lib/fog/powerdns/requests/dns/get_zone.rb → lib/fog/dns/powerdns/requests/get_zone.rb b/lib/fog/powerdns/requests/dns/get_zone.rb → lib/fog/dns/powerdns/requests/get_zone.rb
diff --git a/.../powerdns/requests/dns/list_cryptokeys.rb → .../dns/powerdns/requests/list_cryptokeys.rb b/.../powerdns/requests/dns/list_cryptokeys.rb → .../dns/powerdns/requests/list_cryptokeys.rb
diff --git a/...erdns/requests/dns/list_server_configs.rb → .../powerdns/requests/list_server_configs.rb b/...erdns/requests/dns/list_server_configs.rb → .../powerdns/requests/list_server_configs.rb
diff --git a/...fog/powerdns/requests/dns/list_servers.rb → ...fog/dns/powerdns/requests/list_servers.rb b/...fog/powerdns/requests/dns/list_servers.rb → ...fog/dns/powerdns/requests/list_servers.rb
diff --git a/lib/fog/powerdns/requests/dns/list_zones.rb → lib/fog/dns/powerdns/requests/list_zones.rb b/lib/fog/powerdns/requests/dns/list_zones.rb → lib/fog/dns/powerdns/requests/list_zones.rb
diff --git a/lib/fog/powerdns/requests/dns/notify_zone.rb → lib/fog/dns/powerdns/requests/notify_zone.rb b/lib/fog/powerdns/requests/dns/notify_zone.rb → lib/fog/dns/powerdns/requests/notify_zone.rb
diff --git a/...og/powerdns/requests/dns/retrieve_zone.rb → ...og/dns/powerdns/requests/retrieve_zone.rb b/...og/powerdns/requests/dns/retrieve_zone.rb → ...og/dns/powerdns/requests/retrieve_zone.rb
diff --git a/lib/fog/powerdns/requests/dns/search_log.rb → lib/fog/dns/powerdns/requests/search_log.rb b/lib/fog/powerdns/requests/dns/search_log.rb → lib/fog/dns/powerdns/requests/search_log.rb
diff --git a/...og/powerdns/requests/dns/update_rrsets.rb → ...og/dns/powerdns/requests/update_rrsets.rb b/...og/powerdns/requests/dns/update_rrsets.rb → ...og/dns/powerdns/requests/update_rrsets.rb
diff --git a/...rdns/requests/dns/update_server_config.rb → ...powerdns/requests/update_server_config.rb b/...rdns/requests/dns/update_server_config.rb → ...powerdns/requests/update_server_config.rb
diff --git a/lib/fog/powerdns/requests/dns/update_zone.rb → lib/fog/dns/powerdns/requests/update_zone.rb b/lib/fog/powerdns/requests/dns/update_zone.rb → lib/fog/dns/powerdns/requests/update_zone.rb
diff --git a/lib/fog/powerdns.rb b/lib/fog/powerdns.rb
@@ -4,6 +4,10 @@
 require 'fog/json'
 
 module Fog
+  module DNS
+    autoload :PowerDNS, File.expand_path('../dns/powerdns')
+  end
+
   module PowerDNS
     extend Fog::Provider