fog 0.1.8 → 0.1.9

data/lib/fog/aws/elb.rb

@@ -1,39 +1,31 @@
 module Fog
   module AWS
     module ELB
+      extend Fog::Service
 
-      def self.new(options={})
+      requires :aws_access_key_id, :aws_secret_access_key
 
-        unless @required
-          require 'fog/aws/parsers/elb/create_load_balancer'
-          require 'fog/aws/parsers/elb/delete_load_balancer'
-          require 'fog/aws/parsers/elb/deregister_instances_from_load_balancer'
-          require 'fog/aws/parsers/elb/describe_instance_health'
-          require 'fog/aws/parsers/elb/describe_load_balancers'
-          require 'fog/aws/parsers/elb/disable_availability_zones_for_load_balancer'
-          require 'fog/aws/parsers/elb/enable_availability_zones_for_load_balancer'
-          require 'fog/aws/parsers/elb/register_instances_with_load_balancer'
-          require 'fog/aws/requests/elb/create_load_balancer'
-          require 'fog/aws/requests/elb/delete_load_balancer'
-          require 'fog/aws/requests/elb/deregister_instances_from_load_balancer'
-          require 'fog/aws/requests/elb/describe_instance_health'
-          require 'fog/aws/requests/elb/describe_load_balancers'
-          require 'fog/aws/requests/elb/disable_availability_zones_for_load_balancer'
-          require 'fog/aws/requests/elb/enable_availability_zones_for_load_balancer'
-          require 'fog/aws/requests/elb/register_instances_with_load_balancer'
-          @required = true
-        end
+      request_path 'fog/aws/requests/elb'
+      request 'create_load_balancer'
+      request 'delete_load_balancer'
+      request 'deregister_instances_from_load_balancer'
+      request 'describe_instance_health'
+      request 'describe_load_balancers'
+      request 'disable_availability_zones_for_load_balancer'
+      request 'enable_availability_zones_for_load_balancer'
+      request 'register_instances_with_load_balancer'
 
-        unless options[:aws_access_key_id]
-          raise ArgumentError.new('aws_access_key_id is required to access elb')
-        end
-        unless options[:aws_secret_access_key]
-          raise ArgumentError.new('aws_secret_access_key is required to access elb')
+      class Mock
+        include Collections
+
+        def initialize(options={})
+          Fog::Mock.not_implemented
         end
-        Fog::AWS::ELB::Real.new(options)
+
       end
 
       class Real
+        include Collections
 
         # Initialize connection to ELB
         #
@@ -56,7 +48,7 @@ module Fog
         def initialize(options={})
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
-          @hmac = HMAC::SHA256.new(@aws_secret_access_key)
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @host = options[:host] || case options[:region]
           when 'ap-southeast-1'
             'elasticloadbalancing.ap-southeast-1.amazonaws.com'

data/lib/fog/aws/models/ec2/addresses.rb

@@ -5,15 +5,7 @@ module Fog
   module AWS
     module EC2
 
-      class Mock
-        def addresses(attributes = {})
-          Fog::AWS::EC2::Addresses.new({
-            :connection => self
-          }.merge!(attributes))
-        end
-      end
-
-      class Real
+      module Collections
         def addresses(attributes = {})
           Fog::AWS::EC2::Addresses.new({
             :connection => self

data/lib/fog/aws/models/ec2/flavors.rb

@@ -5,13 +5,7 @@ module Fog
   module AWS
     module EC2
 
-      class Mock
-        def flavors
-          Fog::AWS::EC2::Flavors.new(:connection => self)
-        end
-      end
-
-      class Real
+      module Collections
         def flavors
           Fog::AWS::EC2::Flavors.new(:connection => self)
         end

data/lib/fog/aws/models/ec2/images.rb

@@ -5,13 +5,7 @@ module Fog
   module AWS
     module EC2
 
-      class Mock
-        def images
-          Fog::AWS::EC2::Images.new(:connection => self)
-        end
-      end
-
-      class Real
+      module Collections
         def images
           Fog::AWS::EC2::Images.new(:connection => self)
         end

data/lib/fog/aws/models/ec2/key_pairs.rb

@@ -5,13 +5,7 @@ module Fog
   module AWS
     module EC2
 
-      class Mock
-        def key_pairs
-          Fog::AWS::EC2::KeyPairs.new(:connection => self)
-        end
-      end
-
-      class Real
+      module Collections
         def key_pairs
           Fog::AWS::EC2::KeyPairs.new(:connection => self)
         end

data/lib/fog/aws/models/ec2/security_groups.rb

@@ -5,13 +5,7 @@ module Fog
   module AWS
     module EC2
 
-      class Mock
-        def security_groups
-          Fog::AWS::EC2::SecurityGroups.new(:connection => self)
-        end
-      end
-
-      class Real
+      module Collections
         def security_groups
           Fog::AWS::EC2::SecurityGroups.new(:connection => self)
         end

data/lib/fog/aws/models/ec2/servers.rb

@@ -5,13 +5,7 @@ module Fog
   module AWS
     module EC2
 
-      class Mock
-        def servers
-          Fog::AWS::EC2::Servers.new(:connection => self)
-        end
-      end
-
-      class Real
+      module Collections
         def servers
           Fog::AWS::EC2::Servers.new(:connection => self)
         end

data/lib/fog/aws/models/ec2/snapshots.rb

@@ -5,15 +5,7 @@ module Fog
   module AWS
     module EC2
 
-      class Mock
-        def snapshots(attributes = {})
-          Fog::AWS::EC2::Snapshots.new({
-            :connection => self
-          }.merge!(attributes))
-        end
-      end
-
-      class Real
+      module Collections
         def snapshots(attributes = {})
           Fog::AWS::EC2::Snapshots.new({
             :connection => self

data/lib/fog/aws/models/ec2/volumes.rb

@@ -5,15 +5,7 @@ module Fog
   module AWS
     module EC2
 
-      class Mock
-        def volumes(attributes = {})
-          Fog::AWS::EC2::Volumes.new({
-            :connection => self
-          }.merge!(attributes))
-        end
-      end
-
-      class Real
+      module Collections
         def volumes(attributes = {})
           Fog::AWS::EC2::Volumes.new({
             :connection => self

data/lib/fog/aws/models/s3/directories.rb

@@ -5,13 +5,7 @@ module Fog
   module AWS
     module S3
 
-      class Real
-        def directories
-          Fog::AWS::S3::Directories.new(:connection => self)
-        end
-      end
-
-      class Mock
+      module Collections
         def directories
           Fog::AWS::S3::Directories.new(:connection => self)
         end

data/lib/fog/aws/models/s3/file.rb

@@ -66,6 +66,11 @@ module Fog
           true
         end
 
+        def url(expires)
+          requires :key
+          collection.get_url(key, expires)
+        end
+
         private
 
         def directory=(new_directory)

data/lib/fog/aws/requests/ec2/allocate_address.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/allocate_address'
+
         # Acquire an elastic IP address.
         #
         # ==== Returns

data/lib/fog/aws/requests/ec2/attach_volume.rb

@@ -3,6 +3,8 @@ module Fog
     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

data/lib/fog/aws/requests/ec2/create_key_pair.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/create_key_pair'
+
         # Create a new key pair
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/create_snapshot.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/create_snapshot'
+
         # Create a snapshot of an EBS volume and store it in S3
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/create_volume.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/create_volume'
+
         # Create an EBS volume
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/describe_addresses.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_addresses'
+
         # Describe all or specified IP addresses.
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/describe_availability_zones.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_availability_zones'
+
         # Describe all or specified availability zones
         #
         # ==== Params

data/lib/fog/aws/requests/ec2/describe_images.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_images'
+
         # Describe all or specified images.
         #
         # ==== Params

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_instances'
+
         # Describe all or specified instances
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/describe_key_pairs.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_key_pairs'
+
         # Describe all or specified key pairs
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/describe_regions.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_regions'
+
         # Describe all or specified regions
         #
         # ==== Params

data/lib/fog/aws/requests/ec2/describe_reserved_instances.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_reserved_instances'
+
         # Describe all or specified reserved instances
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/describe_security_groups.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_security_groups'
+
         # Describe all or specified security groups
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/describe_snapshots.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_snapshots'
+
         # Describe all or specified snapshots
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/describe_volumes.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/describe_volumes'
+
         # Describe all or specified volumes.
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/detach_volume.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/detach_volume'
+
         # Detach an Amazon EBS volume from a running instance
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/get_console_output.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/get_console_output'
+
         # Retrieve console output for specified instance
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/run_instances.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/run_instances'
+
         # Launch specified instances
         #
         # ==== Parameters

data/lib/fog/aws/requests/ec2/terminate_instances.rb

@@ -3,6 +3,8 @@ module Fog
     module EC2
       class Real
 
+        require 'fog/aws/parsers/ec2/terminate_instances'
+
         # Terminate specified instances
         #
         # ==== Parameters

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -3,6 +3,8 @@ module Fog
     module ELB
       class Real
 
+        require 'fog/aws/parsers/elb/create_load_balancer'
+
         # Create a new Elastic Load Balancer
         #
         # ==== Parameters

data/lib/fog/aws/requests/elb/delete_load_balancer.rb

@@ -3,6 +3,8 @@ module Fog
     module ELB
       class Real
 
+        require 'fog/aws/parsers/elb/delete_load_balancer'
+
         # Delete an existing Elastic Load Balancer
         #
         # Note that this API call, as defined by Amazon, is idempotent.

data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb

@@ -3,6 +3,8 @@ module Fog
     module ELB
       class Real
 
+        require 'fog/aws/parsers/elb/deregister_instances_from_load_balancer'
+
         # Deregister an instance from an existing ELB
         #
         # ==== Parameters

data/lib/fog/aws/requests/elb/describe_instance_health.rb

@@ -3,6 +3,8 @@ module Fog
     module ELB
       class Real
 
+        require 'fog/aws/parsers/elb/describe_instance_health'
+
         # Get health status for one or more instances on an existing ELB
         #
         # ==== Parameters