[storage|aws] move aws storage back with other aws stuff (namespacing should probably be recorrected as well)

lib/fog/aws/aws.rb

@@ -18,7 +18,7 @@ module Fog
     service(:simpledb,        'aws/simpledb')
     service(:sns,             'aws/sns')
     service(:sqs,             'aws/sqs')
-    service(:storage,         'storage/aws')
+    service(:storage,         'aws/storage')
 
     def self.indexed_param(key, values)
       params = {}

lib/fog/aws/models/storage/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/storage/models/aws/directory'
+require 'fog/aws/models/storage/directory'
 
 module Fog
   module Storage

lib/fog/aws/models/storage/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/storage/models/aws/files'
+require 'fog/aws/models/storage/files'
 
 module Fog
   module Storage

lib/fog/aws/models/storage/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/storage/models/aws/file'
+require 'fog/aws/models/storage/file'
 
 module Fog
   module Storage

lib/fog/aws/requests/storage/complete_multipart_upload.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/complete_multipart_upload'
+        require 'fog/aws/parsers/storage/complete_multipart_upload'
 
         # Complete a multipart upload
         #

lib/fog/aws/requests/storage/copy_object.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/copy_object'
+        require 'fog/aws/parsers/storage/copy_object'
 
         # Copy an object from one S3 bucket to another
         #

lib/fog/aws/requests/storage/get_bucket.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/get_bucket'
+        require 'fog/aws/parsers/storage/get_bucket'
 
         # List information about objects in an S3 bucket
         #

lib/fog/aws/requests/storage/get_bucket_acl.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/access_control_list'
+        require 'fog/aws/parsers/storage/access_control_list'
 
         # Get access control list for an S3 bucket
         #

lib/fog/aws/requests/storage/get_bucket_location.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/get_bucket_location'
+        require 'fog/aws/parsers/storage/get_bucket_location'
 
         # Get location constraint for an S3 bucket
         #

lib/fog/aws/requests/storage/get_bucket_logging.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/get_bucket_logging'
+        require 'fog/aws/parsers/storage/get_bucket_logging'
 
         # Get logging status for an S3 bucket
         #

lib/fog/aws/requests/storage/get_bucket_object_versions.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/get_bucket_object_versions'
+        require 'fog/aws/parsers/storage/get_bucket_object_versions'
 
         # List information about object versions in an S3 bucket
         #

lib/fog/aws/requests/storage/get_bucket_versioning.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/get_bucket_versioning'
+        require 'fog/aws/parsers/storage/get_bucket_versioning'
 
         # Get versioning status for an S3 bucket
         #

lib/fog/aws/requests/storage/get_bucket_website.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/get_bucket_website'
+        require 'fog/aws/parsers/storage/get_bucket_website'
 
         # Get website configuration for an S3 bucket
         #

lib/fog/aws/requests/storage/get_object_acl.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/access_control_list'
+        require 'fog/aws/parsers/storage/access_control_list'
 
         # Get access control list for an S3 object
         #

lib/fog/aws/requests/storage/get_request_payment.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/get_request_payment'
+        require 'fog/aws/parsers/storage/get_request_payment'
 
         # Get configured payer for an S3 bucket
         #

lib/fog/aws/requests/storage/get_service.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/get_service'
+        require 'fog/aws/parsers/storage/get_service'
 
         # List information about S3 buckets for authorized user
         #

lib/fog/aws/requests/storage/initiate_multipart_upload.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/initiate_multipart_upload'
+        require 'fog/aws/parsers/storage/initiate_multipart_upload'
 
         # Initiate a multipart upload to an S3 bucket
         #

lib/fog/aws/requests/storage/list_multipart_uploads.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/list_multipart_uploads'
+        require 'fog/aws/parsers/storage/list_multipart_uploads'
 
         # List multipart uploads for a bucket
         #

lib/fog/aws/requests/storage/list_parts.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/storage/parsers/aws/list_parts'
+        require 'fog/aws/parsers/storage/list_parts'
 
         # List parts for a multipart upload
         #

lib/fog/aws/storage.rb

@@ -5,13 +5,13 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
 
-      model_path 'fog/storage/models/aws'
+      model_path 'fog/aws/models/storage'
       collection  :directories
       model       :directory
       collection  :files
       model       :file
 
-      request_path 'fog/storage/requests/aws'
+      request_path 'fog/aws/requests/storage'
       request :abort_multipart_upload
       request :complete_multipart_upload
       request :copy_object

lib/fog/storage.rb

@@ -9,7 +9,7 @@ module Fog
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider).to_s.downcase.to_sym
       when :aws
-        require 'fog/storage/aws'
+        require 'fog/aws/storage'
         Fog::Storage::AWS.new(attributes)
       when :google
         require 'fog/storage/google'