fog 0.0.56 → 0.0.57

data/lib/fog/aws/requests/ec2/terminate_instances.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/terminate_instances'
 
         # Terminate specified instances
         #
@@ -24,32 +25,26 @@ unless Fog.mocking?
         def terminate_instances(instance_id)
           params = AWS.indexed_param('InstanceId', instance_id)
           request({
-            'Action' => 'TerminateInstances'
-          }.merge!(params), Fog::Parsers::AWS::EC2::TerminateInstances.new)
+            'Action' => 'TerminateInstances',
+            :parser  => Fog::Parsers::AWS::EC2::TerminateInstances.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def terminate_instances(instance_id)
           response = Excon::Response.new
           instance_id = [*instance_id]
-          if (Fog::AWS::EC2.data[:instances].keys & instance_id).length == instance_id.length
+          if (@data[:instances].keys & instance_id).length == instance_id.length
             for instance_id in instance_id
               response.body = {
                 'requestId'     => Fog::AWS::Mock.request_id,
                 'instancesSet'  => []
               }
-              instance = Fog::AWS::EC2.data[:instances][instance_id]
-              Fog::AWS::EC2.data[:deleted_at][instance_id] = Time.now
-              instance['status'] = 'deleting'
+              instance = @data[:instances][instance_id]
+              @data[:deleted_at][instance_id] = Time.now
               response.status = 200
               # TODO: the codes are mostly educated guessing, not certainty
               code = case instance['state']
@@ -64,11 +59,13 @@ else
               when 'rebooting'
                 128
               end
+              state = { 'name' => 'shutting-down', 'code' => 32}
               response.body['instancesSet'] << {
                 'instanceId'    => instance_id,
-                'previousState' => { 'name' => instance['state'], 'code' => code },
-                'shutdownState' => { 'name' => 'shutting-down', 'code' => 32}
+                'previousState' => instance['instanceState'],
+                'currentState'  => state
               }
+              instance['instanceState'] = state
             end
           else
             response.status = 400
@@ -80,5 +77,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/s3/copy_object.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module S3
+      class Real
 
-  module Fog
-    module AWS
-      class S3
+        require 'fog/aws/parsers/s3/copy_object'
 
         # Copy an object from one S3 bucket to another
         #
@@ -38,20 +39,14 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
           response = Excon::Response.new
-          source_bucket = Fog::AWS::S3.data[:buckets][source_bucket_name]
+          source_bucket = @data[:buckets][source_bucket_name]
           source_object = source_bucket && source_bucket[:objects][source_object_name]
-          target_bucket = Fog::AWS::S3.data[:buckets][target_bucket_name]
+          target_bucket = @data[:buckets][target_bucket_name]
 
           if source_object && target_bucket
             response.status = 200
@@ -75,5 +70,4 @@ else
       end
     end
   end
-
-end
+end

data/lib/fog/aws/requests/s3/delete_bucket.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class S3
+module Fog
+  module AWS
+    module S3
+      class Real
 
         # Delete an S3 bucket
         #
@@ -22,32 +21,26 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def delete_bucket(bucket_name)
           response = Excon::Response.new
-          if Fog::AWS::S3.data[:buckets][bucket_name].nil?
+          if @data[:buckets][bucket_name].nil?
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 204}, response))
-          elsif Fog::AWS::S3.data[:buckets][bucket_name] && !Fog::AWS::S3.data[:buckets][bucket_name][:objects].empty?
+          elsif @data[:buckets][bucket_name] && !@data[:buckets][bucket_name][:objects].empty?
             response.status = 409
             raise(Excon::Errors.status_error({:expects => 204}, response))
           else
-            Fog::AWS::S3.data[:buckets].delete(bucket_name)
+            @data[:buckets].delete(bucket_name)
             response.status = 204
           end
           response
         end
 
       end
+
     end
   end
-
 end

data/lib/fog/aws/requests/s3/delete_object.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class S3
+module Fog
+  module AWS
+    module S3
+      class Real
 
         # Delete an object from S3
         #
@@ -25,18 +24,12 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def delete_object(bucket_name, object_name)
           response = Excon::Response.new
-          if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
+          if bucket = @data[:buckets][bucket_name]
             response.status = 204
             bucket[:objects].delete(object_name)
           else
@@ -49,5 +42,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/s3/get_bucket.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module S3
+      class Real
 
-  module Fog
-    module AWS
-      class S3
+        require 'fog/aws/parsers/s3/get_bucket'
 
         # List information about objects in an S3 bucket
         #
@@ -54,14 +55,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         # FIXME: implement delimiter
         def get_bucket(bucket_name, options = {})
@@ -69,16 +64,17 @@ else
             raise ArgumentError.new('bucket_name is required')
           end
           response = Excon::Response.new
-          if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
+          if bucket = @data[:buckets][bucket_name]
             response.status = 200
             response.body = {
               'Contents' => bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
                   (options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
                   (options['marker'] && object['Key'] <= options['marker'])
                 end.map do |object|
-                  data = object.reject {|key, value| !['ETag', 'Key', 'LastModified', 'Owner', 'Size', 'StorageClass'].include?(key)}
+                  data = object.reject {|key, value| !['ETag', 'Key', 'LastModified', 'Size', 'StorageClass'].include?(key)}
                   data.merge!({
                     'LastModified' => Time.parse(data['LastModified']),
+                    'Owner'        => bucket['Owner'],
                     'Size'         => data['Size'].to_i
                   })
                 data
@@ -103,5 +99,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/s3/get_bucket_location.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module S3
+      class Real
 
-  module Fog
-    module AWS
-      class S3
+        require 'fog/aws/parsers/s3/get_bucket_location'
 
         # Get location constraint for an S3 bucket
         #
@@ -26,18 +27,12 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def get_bucket_location(bucket_name)
           response = Excon::Response.new
-          if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
+          if bucket = @data[:buckets][bucket_name]
             response.status = 200
             response.body = {'LocationConstraint' => bucket['LocationConstraint'] }
           else
@@ -50,5 +45,4 @@ else
       end
     end
   end
-
-end
+end

data/lib/fog/aws/requests/s3/get_object.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class S3
+module Fog
+  module AWS
+    module S3
+      class Real
 
         # Get an object from S3
         #
@@ -56,19 +55,13 @@ unless Fog.mocking?
             :headers  => {},
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'GET',
-            :path     => object_name
+            :path     => CGI.escape(object_name)
           }, expires)
         end
 
       end
-    end
-  end
-
-else
 
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def get_object(bucket_name, object_name, options = {}, &block)
           unless bucket_name
@@ -78,7 +71,7 @@ else
             raise ArgumentError.new('object_name is required')
           end
           response = Excon::Response.new
-          if (bucket = Fog::AWS::S3.data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
+          if (bucket = @data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
             if options['If-Match'] && options['If-Match'] != object['ETag']
               response.status = 412
             elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['LastModified'])
@@ -121,5 +114,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/s3/get_request_payment.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module S3
+      class Real
 
-  module Fog
-    module AWS
-      class S3
+        require 'fog/aws/parsers/s3/get_request_payment'
 
         # Get configured payer for an S3 bucket
         #
@@ -26,18 +27,12 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def get_request_payment(bucket_name)
           response = Excon::Response.new
-          if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
+          if bucket = @data[:buckets][bucket_name]
             response.status = 200
             response.body = { 'Payer' => bucket['Payer'] }
           else
@@ -50,5 +45,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/s3/get_service.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module S3
+      class Real
 
-  module Fog
-    module AWS
-      class S3
+        require 'fog/aws/parsers/s3/get_service'
 
         # List information about S3 buckets for authorized user
         #
@@ -28,19 +29,13 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def get_service
           response = Excon::Response.new
           response.headers['Status'] = 200
-          buckets = Fog::AWS::S3.data[:buckets].values.map do |bucket|
+          buckets = @data[:buckets].values.map do |bucket|
             bucket.reject do |key, value|
               !['CreationDate', 'Name'].include?(key)
             end
@@ -55,5 +50,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/s3/head_object.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class S3
+module Fog
+  module AWS
+    module S3
+      class Real
 
         # Get headers for an object from S3
         #
@@ -39,14 +38,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def head_object(bucket_name, object_name, options = {})
           response = get_object(bucket_name, object_name, options)
@@ -57,5 +50,4 @@ else
       end
     end
   end
-
-end
+end