[dns] consolidate

lib/fog/aws.rb

@@ -10,7 +10,7 @@ module Fog
 
     service(:cdn,       'aws/cdn')
     service(:compute,   'aws/compute')
-    service(:dns,       'aws/dns')
+    service(:dns,       'dns/aws')
     service(:ec2,       'aws/ec2')
     service(:elb,       'aws/elb')
     service(:iam,       'aws/iam')

lib/fog/core.rb

@@ -20,7 +20,6 @@ require 'fog/core/compute'
 require 'fog/core/connection'
 require 'fog/core/credentials'
 require 'fog/core/deprecation'
-require 'fog/core/dns'
 require 'fog/core/errors'
 require 'fog/core/hmac'
 require 'fog/core/model'

lib/fog/dns.rb

@@ -1,3 +1,8 @@
+require 'fog/aws'
+require 'fog/linode'
+require 'fog/slicehost'
+require 'fog/zerigo'
+
 module Fog
   class DNS
 

lib/fog/dns/aws.rb

@@ -5,13 +5,13 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent
 
-      model_path 'fog/aws/models/dns'
+      model_path 'fog/dns/models/aws'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/aws/requests/dns'
+      request_path 'fog/dns/requests/aws'
       request :create_hosted_zone
       request :get_hosted_zone
       request :delete_hosted_zone

lib/fog/dns/linode.rb

@@ -5,13 +5,13 @@ module Fog
       requires :linode_api_key
       recognizes :port, :scheme, :persistent
 
-      model_path 'fog/linode/models/dns'
+      model_path 'fog/dns/models/linode'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/linode/requests/dns'
+      request_path 'fog/dns/models/linode'
       request :domain_create
       request :domain_delete
       request :domain_list

lib/fog/dns/requests/aws/change_resource_record_sets.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/change_resource_record_sets'
+        require 'fog/dns/parsers/aws/change_resource_record_sets'
 
         # Use this action to create or change your authoritative DNS information for a zone
         #

lib/fog/dns/requests/aws/create_hosted_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/create_hosted_zone'
+        require 'fog/dns/parsers/aws/create_hosted_zone'
 
         # Creates a new hosted zone
         #

lib/fog/dns/requests/aws/delete_hosted_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/delete_hosted_zone'
+        require 'fog/dns/parsers/aws/delete_hosted_zone'
 
         # Delete a hosted zone
         #

lib/fog/dns/requests/aws/get_change.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/get_change'
+        require 'fog/dns/parsers/aws/get_change'
 
         # returns the current state of a change request
         #

lib/fog/dns/requests/aws/get_hosted_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/get_hosted_zone'
+        require 'fog/dns/parsers/aws/get_hosted_zone'
 
         # retrieve information about a hosted zone
         #

lib/fog/dns/requests/aws/list_hosted_zones.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/list_hosted_zones'
+        require 'fog/dns/parsers/aws/list_hosted_zones'
 
         # Describe all or specified instances
         #

lib/fog/dns/requests/aws/list_resource_record_sets.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/list_resource_record_sets'
+        require 'fog/dns/parsers/aws/list_resource_record_sets'
 
         # list your resource record sets
         #

lib/fog/dns/requests/slicehost/create_record.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/create_record'
+        require 'fog/dns/parsers/slicehost/create_record'
 
         # Create a new record in a DNS zone - or update an existing one
         # ==== Parameters

lib/fog/dns/requests/slicehost/create_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/create_zone'
+        require 'fog/dns/parsers/slicehost/create_zone'
 
         # Create a new zone for Slicehost's DNS servers to serve/host
         # ==== Parameters

lib/fog/dns/requests/slicehost/get_record.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/get_record'
+        require 'fog/dns/parsers/slicehost/get_record'
 
         # Get an individual DNS record from the specified zone 
         #

lib/fog/dns/requests/slicehost/get_records.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/get_records'
+        require 'fog/dns/parsers/slicehost/get_records'
 
         # Get all the DNS records across all the DNS zones for this account 
         #

lib/fog/dns/requests/slicehost/get_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/get_zone'
+        require 'fog/dns/parsers/slicehost/get_zone'
 
         # Get details of a DNS zone
         #

lib/fog/dns/requests/slicehost/get_zones.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/get_zones'
+        require 'fog/dns/parsers/slicehost/get_zones'
 
         # Get list of all DNS zones hosted on Slicehost (for this account)
         #

lib/fog/dns/requests/zerigo/count_hosts.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/count_hosts'
+        require 'fog/dns/parsers/zerigo/count_hosts'
 
         # total number of hosts available for the specified zone. It is the same value as provided 
         # in the X-Query-Count header in the list_hosts API method

lib/fog/dns/requests/zerigo/count_zones.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/count_zones'
+        require 'fog/dns/parsers/zerigo/count_zones'
 
         # Total number of zones hosted Zerigo for this account. It is the same value as provided 
         # in the X-Query-Count header in the list_zones API method

lib/fog/dns/requests/zerigo/create_host.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/create_host'
+        require 'fog/dns/parsers/zerigo/create_host'
 
         # Create a new host in the specified zone
         #

lib/fog/dns/requests/zerigo/create_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/create_zone'
+        require 'fog/dns/parsers/zerigo/create_zone'
 
         # Create a new zone for Zerigo's DNS servers to serve/host
         # ==== Parameters

lib/fog/dns/requests/zerigo/find_hosts.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/find_hosts'
+        require 'fog/dns/parsers/zerigo/find_hosts'
 
         # Get list of all the host records that match the FQDN.  If desired, can limit
         # search to a specific zone

lib/fog/dns/requests/zerigo/get_host.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/get_host'
+        require 'fog/dns/parsers/zerigo/get_host'
 
         # get details about a given host record
         #

lib/fog/dns/requests/zerigo/get_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/get_zone'
+        require 'fog/dns/parsers/zerigo/get_zone'
 
         # Get details of a DNS zone. The response is similar to list_zones, with the 
         # addition of hosts-count and possibly hosts.

lib/fog/dns/requests/zerigo/get_zone_stats.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/get_zone_stats'
+        require 'fog/dns/parsers/zerigo/get_zone_stats'
 
         # returns current traffic statistics about this zone. Queries is measured from the 
         # beginning of the current period through the time of the API call.

lib/fog/dns/requests/zerigo/list_hosts.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/list_hosts'
+        require 'fog/dns/parsers/zerigo/list_hosts'
 
         # Get list of all DNS zones hosted on Slicehost (for this account)
         #

lib/fog/dns/requests/zerigo/list_zones.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/list_zones'
+        require 'fog/dns/parsers/zerigo/list_zones'
 
         # Get list of all DNS zones hosted on Slicehost (for this account)
         #

lib/fog/dns/slicehost.rb

@@ -5,13 +5,13 @@ module Fog
       requires :slicehost_password
       recognizes :host, :port, :scheme, :persistent
 
-      model_path 'fog/slicehost/models/dns'
+      model_path 'fog/dns/models/slicehost'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/slicehost/requests/dns'
+      request_path 'fog/dns/requests/slicehost'
       request :create_record
       request :create_zone
       request :delete_record

lib/fog/dns/zerigo.rb

@@ -5,13 +5,13 @@ module Fog
       requires :zerigo_email, :zerigo_token
       recognizes :timeout, :persistent
 
-      model_path 'fog/zerigo/models/dns'
+      model_path 'fog/dns/models/zerigo'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/zerigo/requests/dns'
+      request_path 'fog/dns/models/zerigo'
       request :count_hosts
       request :count_zones
       request :create_host

lib/fog/linode.rb

@@ -6,7 +6,7 @@ module Fog
     extend Fog::Provider
 
     service(:compute, 'linode/compute')
-    service(:dns,     'linode/dns')
+    service(:dns,     'dns/linode')
 
     def self.new(attributes = {})
       location = caller.first

lib/fog/slicehost.rb

@@ -9,7 +9,7 @@ module Fog
     extend Fog::Provider
 
     service(:compute, 'slicehost/compute')
-    service(:dns,     'slicehost/dns')
+    service(:dns,     'dns/slicehost')
 
     def self.new(attributes = {})
       location = caller.first

lib/fog/zerigo.rb

@@ -8,7 +8,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'zerigo/dns')
+    service(:dns, 'dns/zerigo')
 
   end
 end