fog 0.0.56 → 0.0.57

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

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
       class Image < Fog::Model
 

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

@@ -1,9 +1,20 @@
+require 'fog/collection'
+require 'fog/aws/models/ec2/image'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      def images
-        Fog::AWS::EC2::Images.new(:connection => self)
+      class Mock
+        def images
+          Fog::AWS::EC2::Images.new(:connection => self)
+        end
+      end
+
+      class Real
+        def images
+          Fog::AWS::EC2::Images.new(:connection => self)
+        end
       end
 
       class Images < Fog::Collection

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

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
       class KeyPair < Fog::Model
 

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

@@ -1,9 +1,20 @@
+require 'fog/collection'
+require 'fog/aws/models/ec2/key_pair'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      def key_pairs
-        Fog::AWS::EC2::KeyPairs.new(:connection => self)
+      class Mock
+        def key_pairs
+          Fog::AWS::EC2::KeyPairs.new(:connection => self)
+        end
+      end
+
+      class Real
+        def key_pairs
+          Fog::AWS::EC2::KeyPairs.new(:connection => self)
+        end
       end
 
       class KeyPairs < Fog::Collection

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

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
       class SecurityGroup < Fog::Model
 

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

@@ -1,9 +1,20 @@
+require 'fog/collection'
+require 'fog/aws/models/ec2/security_group'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      def security_groups
-        Fog::AWS::EC2::SecurityGroups.new(:connection => self)
+      class Mock
+        def security_groups
+          Fog::AWS::EC2::SecurityGroups.new(:connection => self)
+        end
+      end
+
+      class Real
+        def security_groups
+          Fog::AWS::EC2::SecurityGroups.new(:connection => self)
+        end
       end
 
       class SecurityGroups < Fog::Collection

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

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
       class Server < Fog::Model
 

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

@@ -1,9 +1,20 @@
+require 'fog/collection'
+require 'fog/aws/models/ec2/server'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      def servers
-        Fog::AWS::EC2::Servers.new(:connection => self)
+      class Mock
+        def servers
+          Fog::AWS::EC2::Servers.new(:connection => self)
+        end
+      end
+
+      class Real
+        def servers
+          Fog::AWS::EC2::Servers.new(:connection => self)
+        end
       end
 
       class Servers < Fog::Collection

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

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
       class Snapshot < Fog::Model
 

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

@@ -1,11 +1,24 @@
+require 'fog/collection'
+require 'fog/aws/models/ec2/snapshot'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      def snapshots(attributes = {})
-        Fog::AWS::EC2::Snapshots.new({
-          :connection => self
-        }.merge!(attributes))
+      class Mock
+        def snapshots(attributes = {})
+          Fog::AWS::EC2::Snapshots.new({
+            :connection => self
+          }.merge!(attributes))
+        end
+      end
+
+      class Real
+        def snapshots(attributes = {})
+          Fog::AWS::EC2::Snapshots.new({
+            :connection => self
+          }.merge!(attributes))
+        end
       end
 
       class Snapshots < Fog::Collection

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

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
       class Volume < Fog::Model
 

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

@@ -1,11 +1,24 @@
+require 'fog/collection'
+require 'fog/aws/models/ec2/volume'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      def volumes(attributes = {})
-        Fog::AWS::EC2::Volumes.new({
-          :connection => self
-        }.merge!(attributes))
+      class Mock
+        def volumes(attributes = {})
+          Fog::AWS::EC2::Volumes.new({
+            :connection => self
+          }.merge!(attributes))
+        end
+      end
+
+      class Real
+        def volumes(attributes = {})
+          Fog::AWS::EC2::Volumes.new({
+            :connection => self
+          }.merge!(attributes))
+        end
       end
 
       class Volumes < Fog::Collection

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

@@ -1,9 +1,20 @@
+require 'fog/collection'
+require 'fog/aws/models/s3/directory'
+
 module Fog
   module AWS
-    class S3
+    module S3
 
-      def directories
-        Fog::AWS::S3::Directories.new(:connection => self)
+      class Real
+        def directories
+          Fog::AWS::S3::Directories.new(:connection => self)
+        end
+      end
+
+      class Mock
+        def directories
+          Fog::AWS::S3::Directories.new(:connection => self)
+        end
       end
 
       class Directories < Fog::Collection

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

@@ -1,6 +1,9 @@
+require 'fog/model'
+require 'fog/aws/models/s3/files'
+
 module Fog
   module AWS
-    class S3
+    module S3
 
       class Directory < Fog::Model
 

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

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class S3
+    module S3
 
       class File < Fog::Model
 

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

@@ -1,6 +1,9 @@
+require 'fog/collection'
+require 'fog/aws/models/s3/file'
+
 module Fog
   module AWS
-    class S3
+    module S3
 
       class Files < Fog::Collection
 

data/lib/fog/aws/parsers/simpledb/domain_metadata.rb

@@ -1,3 +1,5 @@
+require 'fog/aws/parsers/simpledb/basic'
+
 module Fog
   module Parsers
     module AWS

data/lib/fog/aws/parsers/simpledb/get_attributes.rb

@@ -1,3 +1,5 @@
+require 'fog/aws/parsers/simpledb/basic'
+
 module Fog
   module Parsers
     module AWS

data/lib/fog/aws/parsers/simpledb/list_domains.rb

@@ -1,3 +1,5 @@
+require 'fog/aws/parsers/simpledb/basic'
+
 module Fog
   module Parsers
     module AWS

data/lib/fog/aws/parsers/simpledb/select.rb

@@ -1,3 +1,5 @@
+require 'fog/aws/parsers/simpledb/basic'
+
 module Fog
   module Parsers
     module AWS

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

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/allocate_address'
 
         # Acquire an elastic IP address.
         #
@@ -12,20 +13,15 @@ unless Fog.mocking?
         #     * 'publicIp'<~String> - The acquired address
         #     * 'requestId'<~String> - Id of the request
         def allocate_address
-          request({
-            'Action' => 'AllocateAddress'
-          }, Fog::Parsers::AWS::EC2::AllocateAddress.new)
+          request(
+            'Action'  => 'AllocateAddress',
+            :parser   => Fog::Parsers::AWS::EC2::AllocateAddress.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def allocate_address
           response = Excon::Response.new
@@ -35,7 +31,7 @@ else
             'instanceId' => '',
             'publicIp'   => public_ip
           }
-          Fog::AWS::EC2.data[:addresses][public_ip] = data
+          @data[:addresses][public_ip] = data
           response.body = {
             'publicIp'  => public_ip,
             'requestId' => Fog::AWS::Mock.request_id
@@ -46,5 +42,4 @@ else
       end
     end
   end
-
 end

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

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/basic'
 
         # Associate an elastic IP address with an instance
         #
@@ -16,28 +17,23 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
         def associate_address(instance_id, public_ip)
-          request({
-            'Action' => 'AssociateAddress',
-            'InstanceId' => instance_id,
-            'PublicIp' => public_ip
-          }, Fog::Parsers::AWS::EC2::Basic.new)
+          request(
+            'Action'      => 'AssociateAddress',
+            'InstanceId'  => instance_id,
+            'PublicIp'    => public_ip,
+            :parser       => Fog::Parsers::AWS::EC2::Basic.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def associate_address(instance_id, public_ip)
           response = Excon::Response.new
           response.status = 200
-          instance = Fog::AWS::EC2.data[:instances][instance_id]
-          address = Fog::AWS::EC2.data[:addresses][public_ip]
+          instance = @data[:instances][instance_id]
+          address = @data[:addresses][public_ip]
           if instance && address
             address['instanceId'] = instance_id
             response.status = 200
@@ -55,5 +51,4 @@ else
       end
     end
   end
-
 end

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

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/attach_volume'
 
         # Attach an Amazon EBS volume with a running instance, exposing as specified device
         #
@@ -21,30 +22,25 @@ unless Fog.mocking?
         #     * 'status'<~String> - Status of volume
         #     * 'volumeId'<~String> - Reference to volume
         def attach_volume(instance_id, volume_id, device)
-          request({
-            'Action' => 'AttachVolume',
-            'VolumeId' => volume_id,
-            'InstanceId' => instance_id,
-            'Device' => device
-          }, Fog::Parsers::AWS::EC2::AttachVolume.new)
+          request(
+            'Action'      => 'AttachVolume',
+            'VolumeId'    => volume_id,
+            'InstanceId'  => instance_id,
+            'Device'      => device,
+            :parser       => Fog::Parsers::AWS::EC2::AttachVolume.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def attach_volume(instance_id, volume_id, device)
           response = Excon::Response.new
           if instance_id && volume_id && device
             response.status = 200
-            instance = Fog::AWS::EC2.data[:instances][instance_id]
-            volume = Fog::AWS::EC2.data[:volumes][volume_id]
+            instance = @data[:instances][instance_id]
+            volume = @data[:volumes][volume_id]
             if instance && volume
               data = {
                 'attachTime'  => Time.now,
@@ -81,5 +77,4 @@ else
       end
     end
   end
-
-end
+end