[cdn] consolidate

lib/fog.rb

@@ -8,6 +8,7 @@ module Fog
 
 end
 
+# FIXME: these should go away (force usage of Fog::[Compute, CDN, DNS, Storage]  etc)
 require 'fog/aws'
 require 'fog/bluebox'
 require 'fog/brightbox'
@@ -23,5 +24,6 @@ module Fog
 require 'fog/zerigo'
 
 require 'fog/compute'
+require 'fog/cdn'
 require 'fog/dns'
 require 'fog/storage'

lib/fog/aws.rb

@@ -8,7 +8,7 @@ module AWS
 
     extend Fog::Provider
 
-    service(:cdn,       'aws/cdn')
+    service(:cdn,       'cdn/aws')
     service(:compute,   'compute/aws')
     service(:dns,       'dns/aws')
     service(:ec2,       'aws/ec2')

lib/fog/cdn.rb

@@ -0,0 +1,19 @@
+module Fog
+  class CDN
+
+    def self.new(attributes)
+      attributes = attributes.dup # prevent delete from having side effects
+      case provider = attributes.delete(:provider)
+      when 'AWS'
+        require 'fog/aws'
+        Fog::AWS::CDN.new(attributes)
+      when 'Rackspace'
+        require 'fog/rackspace'
+        Fog::Rackspace::CDN.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} is not a recognized storage provider")
+      end
+    end
+
+  end
+end

lib/fog/aws/cdn.rb → lib/fog/cdn/aws.rb

@@ -5,9 +5,9 @@ class CDN < Fog::Service
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent
 
-      model_path 'fog/aws/models/cdn'
+      model_path 'fog/cdn/models/aws'
 
-      request_path 'fog/aws/requests/cdn'
+      request_path 'fog/cdn/requests/aws'
       request 'delete_distribution'
       request 'get_distribution'
       request 'get_distribution_list'

lib/fog/rackspace/cdn.rb → lib/fog/cdn/rackspace.rb

@@ -5,9 +5,9 @@ class CDN < Fog::Service
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :persistent
 
-      model_path 'fog/rackspace/models/cdn'
+      model_path 'fog/cdn/models/rackspace'
 
-      request_path 'fog/rackspace/requests/cdn'
+      request_path 'fog/cdn/requests/rackspace'
       request :get_containers
       request :head_container
       request :put_container

lib/fog/aws/requests/cdn/get_distribution.rb → lib/fog/cdn/requests/aws/get_distribution.rb

@@ -3,7 +3,7 @@ module AWS
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/distribution'
+        require 'fog/cdn/parsers/aws/distribution'
 
         # Get information about a distribution from CloudFront
         #

lib/fog/aws/requests/cdn/get_distribution_list.rb → lib/fog/cdn/requests/aws/get_distribution_list.rb

@@ -3,7 +3,7 @@ module AWS
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/get_distribution_list'
+        require 'fog/cdn/parsers/aws/get_distribution_list'
 
         # List information about distributions in CloudFront
         #

lib/fog/aws/requests/cdn/post_distribution.rb → lib/fog/cdn/requests/aws/post_distribution.rb

@@ -3,7 +3,7 @@ module AWS
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/distribution'
+        require 'fog/cdn/parsers/aws/distribution'
 
         # create a new distribution in CloudFront
         #

lib/fog/aws/requests/cdn/post_invalidation.rb → lib/fog/cdn/requests/aws/post_invalidation.rb

@@ -3,7 +3,7 @@ module AWS
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/post_invalidation'
+        require 'fog/cdn/parsers/aws/post_invalidation'
 
         # List information about distributions in CloudFront
         #

lib/fog/aws/requests/cdn/put_distribution_config.rb → lib/fog/cdn/requests/aws/put_distribution_config.rb

@@ -3,7 +3,7 @@ module AWS
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/distribution'
+        require 'fog/cdn/parsers/aws/distribution'
 
         # update a distribution in CloudFront
         #

lib/fog/rackspace.rb

@@ -2,10 +2,10 @@
 
 module Fog
   module Rackspace
-    
+
     extend Fog::Provider
 
-    service(:cdn,     'rackspace/cdn')
+    service(:cdn,     'cdn/rackspace')
     service(:compute, 'rackspace/compute')
     service(:files,   'rackspace/files')
     service(:servers, 'rackspace/servers')