consolidate parser loading

fog · Apr 13, 2010 · f5673d3 · f5673d3
1 parent 3b55ee9
commit f5673d3
Show file tree

Hide file tree

Showing 62 changed files with 42 additions and 116 deletions.
diff --git a/lib/fog/aws/ec2.rb b/lib/fog/aws/ec2.rb
@@ -21,6 +21,26 @@ def self.new(options={})
           require 'fog/aws/models/ec2/snapshots'
           require 'fog/aws/models/ec2/volume'
           require 'fog/aws/models/ec2/volumes'
+          require 'fog/aws/parsers/ec2/allocate_address'
+          require 'fog/aws/parsers/ec2/attach_volume'
+          require 'fog/aws/parsers/ec2/basic'
+          require 'fog/aws/parsers/ec2/create_key_pair'
+          require 'fog/aws/parsers/ec2/create_snapshot'
+          require 'fog/aws/parsers/ec2/create_volume'
+          require 'fog/aws/parsers/ec2/describe_addresses'
+          require 'fog/aws/parsers/ec2/describe_availability_zones'
+          require 'fog/aws/parsers/ec2/describe_images'
+          require 'fog/aws/parsers/ec2/describe_instances'
+          require 'fog/aws/parsers/ec2/describe_key_pairs'
+          require 'fog/aws/parsers/ec2/describe_regions'
+          require 'fog/aws/parsers/ec2/describe_reserved_instances'
+          require 'fog/aws/parsers/ec2/describe_security_groups'
+          require 'fog/aws/parsers/ec2/describe_snapshots'
+          require 'fog/aws/parsers/ec2/describe_volumes'
+          require 'fog/aws/parsers/ec2/detach_volume'
+          require 'fog/aws/parsers/ec2/get_console_output'
+          require 'fog/aws/parsers/ec2/run_instances'
+          require 'fog/aws/parsers/ec2/terminate_instances'
           require 'fog/aws/requests/ec2/allocate_address'
           require 'fog/aws/requests/ec2/associate_address'
           require 'fog/aws/requests/ec2/attach_volume'

diff --git a/lib/fog/aws/requests/ec2/allocate_address.rb b/lib/fog/aws/requests/ec2/allocate_address.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/allocate_address'
-
         # Acquire an elastic IP address.
         #
         # ==== Returns

diff --git a/lib/fog/aws/requests/ec2/associate_address.rb b/lib/fog/aws/requests/ec2/associate_address.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Associate an elastic IP address with an instance
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/attach_volume.rb b/lib/fog/aws/requests/ec2/attach_volume.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/attach_volume'
-
         # Attach an Amazon EBS volume with a running instance, exposing as specified device
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb b/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Add permissions to a security group
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/create_key_pair.rb b/lib/fog/aws/requests/ec2/create_key_pair.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/create_key_pair'
-
         # Create a new key pair
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/create_security_group.rb b/lib/fog/aws/requests/ec2/create_security_group.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Create a new security group
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/create_snapshot.rb b/lib/fog/aws/requests/ec2/create_snapshot.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/create_snapshot'
-
         # Create a snapshot of an EBS volume and store it in S3
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/create_volume.rb b/lib/fog/aws/requests/ec2/create_volume.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/create_volume'
-
         # Create an EBS volume
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/delete_key_pair.rb b/lib/fog/aws/requests/ec2/delete_key_pair.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Delete a key pair that you own
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/delete_security_group.rb b/lib/fog/aws/requests/ec2/delete_security_group.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Delete a security group that you own
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/delete_snapshot.rb b/lib/fog/aws/requests/ec2/delete_snapshot.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Delete a snapshot of an EBS volume that you own
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/delete_volume.rb b/lib/fog/aws/requests/ec2/delete_volume.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Delete an EBS volume
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/describe_addresses.rb b/lib/fog/aws/requests/ec2/describe_addresses.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_addresses'
-
         # Describe all or specified IP addresses.
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/describe_availability_zones.rb b/lib/fog/aws/requests/ec2/describe_availability_zones.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_availability_zones'
-
         # Describe all or specified availability zones
         #
         # ==== Params

diff --git a/lib/fog/aws/requests/ec2/describe_images.rb b/lib/fog/aws/requests/ec2/describe_images.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_images'
-
         # Describe all or specified images.
         #
         # ==== Params

diff --git a/lib/fog/aws/requests/ec2/describe_instances.rb b/lib/fog/aws/requests/ec2/describe_instances.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_instances'
-
         # Describe all or specified instances
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/describe_key_pairs.rb b/lib/fog/aws/requests/ec2/describe_key_pairs.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_key_pairs'
-
         # Describe all or specified key pairs
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/describe_regions.rb b/lib/fog/aws/requests/ec2/describe_regions.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_regions'
-
         # Describe all or specified regions
         #
         # ==== Params

diff --git a/lib/fog/aws/requests/ec2/describe_reserved_instances.rb b/lib/fog/aws/requests/ec2/describe_reserved_instances.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_reserved_instances'
-
         # Describe all or specified reserved instances
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/describe_security_groups.rb b/lib/fog/aws/requests/ec2/describe_security_groups.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_security_groups'
-
         # Describe all or specified security groups
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/describe_snapshots.rb b/lib/fog/aws/requests/ec2/describe_snapshots.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_snapshots'
-
         # Describe all or specified snapshots
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/describe_volumes.rb b/lib/fog/aws/requests/ec2/describe_volumes.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_volumes'
-
         # Describe all or specified volumes.
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/detach_volume.rb b/lib/fog/aws/requests/ec2/detach_volume.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/detach_volume'
-
         # Detach an Amazon EBS volume from a running instance
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/disassociate_address.rb b/lib/fog/aws/requests/ec2/disassociate_address.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Disassociate an elastic IP address from its instance (if any)
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/get_console_output.rb b/lib/fog/aws/requests/ec2/get_console_output.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/get_console_output'
-
         # Retrieve console output for specified instance
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/reboot_instances.rb b/lib/fog/aws/requests/ec2/reboot_instances.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Reboot specified instances
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/release_address.rb b/lib/fog/aws/requests/ec2/release_address.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Release an elastic IP address.
         #
         # ==== Returns

diff --git a/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb b/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Remove permissions from a security group
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/run_instances.rb b/lib/fog/aws/requests/ec2/run_instances.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/run_instances'
-
         # Launch specified instances
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/ec2/terminate_instances.rb b/lib/fog/aws/requests/ec2/terminate_instances.rb
@@ -3,8 +3,6 @@ module AWS
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/terminate_instances'
-
         # Terminate specified instances
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/s3/copy_object.rb b/lib/fog/aws/requests/s3/copy_object.rb
@@ -3,8 +3,6 @@ module AWS
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/copy_object'
-
         # Copy an object from one S3 bucket to another
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/s3/get_bucket.rb b/lib/fog/aws/requests/s3/get_bucket.rb
@@ -3,8 +3,6 @@ module AWS
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket'
-
         # List information about objects in an S3 bucket
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/s3/get_bucket_location.rb b/lib/fog/aws/requests/s3/get_bucket_location.rb
@@ -3,8 +3,6 @@ module AWS
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket_location'
-
         # Get location constraint for an S3 bucket
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/s3/get_request_payment.rb b/lib/fog/aws/requests/s3/get_request_payment.rb
@@ -3,8 +3,6 @@ module AWS
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/get_request_payment'
-
         # Get configured payer for an S3 bucket
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/s3/get_service.rb b/lib/fog/aws/requests/s3/get_service.rb
@@ -3,8 +3,6 @@ module AWS
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/get_service'
-
         # List information about S3 buckets for authorized user
         #
         # ==== Returns

diff --git a/lib/fog/aws/requests/simpledb/domain_metadata.rb b/lib/fog/aws/requests/simpledb/domain_metadata.rb
@@ -3,8 +3,6 @@ module AWS
     module SimpleDB
       class Real
 
-        require 'fog/aws/parsers/simpledb/domain_metadata'
-
         # List metadata for SimpleDB domain
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/simpledb/get_attributes.rb b/lib/fog/aws/requests/simpledb/get_attributes.rb
@@ -3,8 +3,6 @@ module AWS
     module SimpleDB
       class Real
 
-        require 'fog/aws/parsers/simpledb/get_attributes'
-
         # List metadata for SimpleDB domain
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/simpledb/list_domains.rb b/lib/fog/aws/requests/simpledb/list_domains.rb
@@ -3,8 +3,6 @@ module AWS
     module SimpleDB
       class Real
 
-        require 'fog/aws/parsers/simpledb/list_domains'
-
         # List SimpleDB domains
         #
         # ==== Parameters

diff --git a/lib/fog/aws/requests/simpledb/select.rb b/lib/fog/aws/requests/simpledb/select.rb
@@ -3,8 +3,6 @@ module AWS
     module SimpleDB
       class Real
 
-        require 'fog/aws/parsers/simpledb/select'
-
         # Select item data from SimpleDB
         #
         # ==== Parameters

diff --git a/lib/fog/aws/s3.rb b/lib/fog/aws/s3.rb
@@ -9,6 +9,11 @@ def self.new(options={})
           require 'fog/aws/models/s3/directory'
           require 'fog/aws/models/s3/files'
           require 'fog/aws/models/s3/file'
+          require 'fog/aws/parsers/s3/copy_object'
+          require 'fog/aws/parsers/s3/get_bucket'
+          require 'fog/aws/parsers/s3/get_bucket_location'
+          require 'fog/aws/parsers/s3/get_request_payment'
+          require 'fog/aws/parsers/s3/get_service'
           require 'fog/aws/requests/s3/copy_object'
           require 'fog/aws/requests/s3/delete_bucket'
           require 'fog/aws/requests/s3/delete_object'