fog 0.0.56 → 0.0.57

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

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class S3
+module Fog
+  module AWS
+    module S3
+      class Real
 
         # Create an S3 bucket
         #
@@ -17,11 +16,11 @@ unless Fog.mocking?
         def put_bucket(bucket_name, options = {})
           if options['LocationConstraint']
             data =
-  <<-DATA
-    <CreateBucketConfiguration>
-      <LocationConstraint>#{options['LocationConstraint']}</LocationConstraint>
-    </CreateBucketConfiguration>
-  DATA
+<<-DATA
+  <CreateBucketConfiguration>
+    <LocationConstraint>#{options['LocationConstraint']}</LocationConstraint>
+  </CreateBucketConfiguration>
+DATA
           else
             data = nil
           end
@@ -36,14 +35,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def put_bucket(bucket_name, options = {})
           response = Excon::Response.new
@@ -60,8 +53,8 @@ else
           else
             bucket['LocationConstraint'] = ''
           end
-          unless Fog::AWS::S3.data[:buckets][bucket_name]
-            Fog::AWS::S3.data[:buckets][bucket_name] = bucket
+          unless @data[:buckets][bucket_name]
+            @data[:buckets][bucket_name] = bucket
           end
           response
         end
@@ -69,5 +62,4 @@ else
       end
     end
   end
-
-end
+end

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

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class S3
+module Fog
+  module AWS
+    module S3
+      class Real
 
         # Create an object in an S3 bucket
         #
@@ -25,7 +24,7 @@ unless Fog.mocking?
         #   * headers<~Hash>:
         #     * 'ETag'<~String> - etag of new object
         def put_object(bucket_name, object_name, data, options = {})
-          data = parse_data(data)
+          data = Fog::AWS::S3.parse_data(data)
           headers = data[:headers].merge!(options)
           request({
             :body       => data[:body],
@@ -39,19 +38,13 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def put_object(bucket_name, object_name, data, options = {})
-          data = parse_data(data)
+          data = Fog::AWS::S3.parse_data(data)
           response = Excon::Response.new
-          if (bucket = Fog::AWS::S3.data[:buckets][bucket_name])
+          if (bucket = @data[:buckets][bucket_name])
             response.status = 200
             bucket[:objects][object_name] = {
               :body           => data[:body],
@@ -72,5 +65,4 @@ else
       end
     end
   end
-
 end

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

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class S3
+module Fog
+  module AWS
+    module S3
+      class Real
 
         # Change who pays for requests to an S3 bucket
         #
@@ -27,18 +26,12 @@ DATA
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class S3
+      class Mock
 
         def put_request_payment(bucket_name, payer)
           response = Excon::Response.new
-          if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
+          if bucket = @data[:buckets][bucket_name]
             response.status = 200
             bucket['Payer'] = payer
           else
@@ -51,6 +44,4 @@ else
       end
     end
   end
-
-
-end
+end

data/lib/fog/aws/requests/simpledb/batch_put_attributes.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class SimpleDB
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
         # Put items attributes into a SimpleDB domain
         #
@@ -23,33 +22,28 @@ unless Fog.mocking?
         #     * 'RequestId'
         def batch_put_attributes(domain_name, items, replace_attributes = Hash.new([]))
           request({
-            'Action' => 'BatchPutAttributes',
-            'DomainName' => domain_name
-          }.merge!(encode_batch_attributes(items, replace_attributes)), Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string))
+            'Action'      => 'BatchPutAttributes',
+            'DomainName'  => domain_name,
+            :parser       => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string)
+          }.merge!(encode_batch_attributes(items, replace_attributes)))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDB
+      class Mock
 
         def batch_put_attributes(domain_name, items, replace_attributes = Hash.new([]))
           response = Excon::Response.new
-          if Fog::AWS::SimpleDB.data[:domains][domain_name]
+          if @data[:domains][domain_name]
             for item_name, attributes in items do
               for key, value in attributes do
-                Fog::AWS::SimpleDB.data[:domains][domain_name][item_name] ||= {}
+                @data[:domains][domain_name][item_name] ||= {}
                 if replace_attributes[item_name] && replace_attributes[item_name].include?(key)
-                  Fog::AWS::SimpleDB.data[:domains][domain_name][item_name][key.to_s] = []
+                  @data[:domains][domain_name][item_name][key.to_s] = []
                 else
-                  Fog::AWS::SimpleDB.data[:domains][domain_name][item_name][key.to_s] ||= []
+                  @data[:domains][domain_name][item_name][key.to_s] ||= []
                 end
-                Fog::AWS::SimpleDB.data[:domains][domain_name][item_name][key.to_s] << value.to_s
+                @data[:domains][domain_name][item_name][key.to_s] << value.to_s
               end
             end
             response.status = 200
@@ -67,5 +61,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/simpledb/create_domain.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class SimpleDB
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
         # Create a SimpleDB domain
         #
@@ -16,25 +15,20 @@ unless Fog.mocking?
         #     * 'BoxUsage'
         #     * 'RequestId'
         def create_domain(domain_name)
-          request({
-            'Action' => 'CreateDomain',
-            'DomainName' => domain_name
-          }, Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string))
+          request(
+            'Action'      => 'CreateDomain',
+            'DomainName'  => domain_name,
+            :parser       => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string)
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDB
+      class Mock
 
         def create_domain(domain_name)
           response = Excon::Response.new
-          Fog::AWS::SimpleDB.data[:domains][domain_name] = {}
+          @data[:domains][domain_name] = {}
           response.status = 200
           response.body = {
             'BoxUsage'  => Fog::AWS::Mock.box_usage,
@@ -46,5 +40,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/simpledb/delete_attributes.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class SimpleDB
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
         # List metadata for SimpleDB domain
         #
@@ -25,33 +24,28 @@ unless Fog.mocking?
         #     * 'RequestId'
         def delete_attributes(domain_name, item_name, attributes = nil)
           request({
-            'Action' => 'DeleteAttributes',
-            'DomainName' => domain_name,
-            'ItemName' => item_name
-          }.merge!(encode_attributes(attributes)), Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string))
+            'Action'      => 'DeleteAttributes',
+            'DomainName'  => domain_name,
+            'ItemName'    => item_name,
+            :parser       => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string)
+          }.merge!(encode_attributes(attributes)))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDB
+      class Mock
 
         def delete_attributes(domain_name, item_name, attributes = nil)
           response = Excon::Response.new
-          if Fog::AWS::SimpleDB.data[:domains][domain_name]
+          if @data[:domains][domain_name]
             if attributes
               for key, value in attributes
-                if Fog::AWS::SimpleDB.data[:domains][domain_name][key]
-                  Fog::AWS::SimpleDB.data[:domains][domain_name][key].delete('value')
+                if @data[:domains][domain_name][key]
+                  @data[:domains][domain_name][key].delete('value')
                 end
               end
             else
-              Fog::AWS::SimpleDB.data[:domains].delete(domain_name)
+              @data[:domains].delete(domain_name)
             end
             response.status = 200
             response.body = {
@@ -68,5 +62,4 @@ else
       end
     end
   end
-
-end
+end

data/lib/fog/aws/requests/simpledb/delete_domain.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class SimpleDB
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
         # Delete a SimpleDB domain
         #
@@ -16,25 +15,20 @@ unless Fog.mocking?
         #     * 'BoxUsage'
         #     * 'RequestId'
         def delete_domain(domain_name)
-          request({
-            'Action' => 'DeleteDomain',
-            'DomainName' => domain_name
-          }, Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string))
+          request(
+            'Action'      => 'DeleteDomain',
+            'DomainName'  => domain_name,
+            :parser       => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string)
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDB
+      class Mock
 
         def delete_domain(domain_name)
           response = Excon::Response.new
-          if Fog::AWS::SimpleDB.data[:domains].delete(domain_name)
+          if @data[:domains].delete(domain_name)
             response.status = 200
             response.body = {
               'BoxUsage'  => Fog::AWS::Mock.box_usage,
@@ -47,5 +41,4 @@ else
       end
     end
   end
-
 end

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

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
-  module Fog
-    module AWS
-      class SimpleDB
+        require 'fog/aws/parsers/simpledb/domain_metadata'
 
         # List metadata for SimpleDB domain
         #
@@ -23,27 +24,22 @@ unless Fog.mocking?
         #     * 'RequestId'
         #     * 'Timestamp' - last update time for metadata.
         def domain_metadata(domain_name)
-          request({
-            'Action' => 'DomainMetadata',
-            'DomainName' => domain_name
-          }, Fog::Parsers::AWS::SimpleDB::DomainMetadata.new(@nil_string))
+          request(
+            'Action'      => 'DomainMetadata',
+            'DomainName'  => domain_name,
+            :parser       => Fog::Parsers::AWS::SimpleDB::DomainMetadata.new(@nil_string)
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDB
+      class Mock
 
         def domain_metadata(domain_name)
           response = Excon::Response.new
-          if domain = Fog::AWS::SimpleDB.data[:domains][domain_name]
+          if domain = @data[:domains][domain_name]
             response.status = 200
-            
+          
             attribute_names = []
             attribute_values = []
             for item in domain.values
@@ -54,7 +50,7 @@ else
                 end
               end
             end
-            
+          
             response.body = {
               'AttributeNameCount'        => attribute_names.length,
               'AttributeNamesSizeBytes'   => attribute_names.join('').length,
@@ -76,5 +72,4 @@ else
       end
     end
   end
-
 end

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

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
-  module Fog
-    module AWS
-      class SimpleDB
+        require 'fog/aws/parsers/simpledb/get_attributes'
 
         # List metadata for SimpleDB domain
         #
@@ -13,7 +14,7 @@ unless Fog.mocking?
         #   in xml.  Control characters and sequences not allowed in xml are not
         #   valid.  Can be up to 1024 bytes long.
         # * attributes<~Array> - Attributes to return from the item.  Defaults to
-        #   nil, which will return all attributes. Attribute names and values may use
+        #   {}, which will return all attributes. Attribute names and values may use
         #   any UTF-8 characters valid in xml. Control characters and sequences not 
         #   allowed in xml are not valid.  Each name and value can be up to 1024
         #   bytes long.
@@ -24,36 +25,32 @@ unless Fog.mocking?
         #     * 'Attributes' - list of attribute name/values for the item
         #     * 'BoxUsage'
         #     * 'RequestId'
-        def get_attributes(domain_name, item_name, attributes = nil)
+        def get_attributes(domain_name, item_name, attributes = {})
+          
           request({
-            'Action' => 'GetAttributes',
-            'DomainName' => domain_name,
-            'ItemName' => item_name,
-          }.merge!(encode_attribute_names(attributes)), Fog::Parsers::AWS::SimpleDB::GetAttributes.new(@nil_string))
+            'Action'      => 'GetAttributes',
+            'DomainName'  => domain_name,
+            'ItemName'    => item_name,
+            :parser       => Fog::Parsers::AWS::SimpleDB::GetAttributes.new(@nil_string)
+          }.merge!(encode_attribute_names(attributes)))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDB
+      class Mock
 
         def get_attributes(domain_name, item_name, attributes = nil)
           response = Excon::Response.new
-          if Fog::AWS::SimpleDB.data[:domains][domain_name]
+          if @data[:domains][domain_name]
             object = {}
             if attributes
               for attribute in attributes
-                if Fog::AWS::SimpleDB.data[:domains][domain_name][item_name] && Fog::AWS::SimpleDB.data[:domains][domain_name][item_name]
-                  object[attribute] = Fog::AWS::SimpleDB.data[:domains][domain_name][item_name][attribute]
+                if @data[:domains][domain_name][item_name] && @data[:domains][domain_name][item_name]
+                  object[attribute] = @data[:domains][domain_name][item_name][attribute]
                 end
               end
-            elsif Fog::AWS::SimpleDB.data[:domains][domain_name][item_name]
-              object = Fog::AWS::SimpleDB.data[:domains][domain_name][item_name]
+            elsif @data[:domains][domain_name][item_name]
+              object = @data[:domains][domain_name][item_name]
             end
             response.status = 200
             response.body = {
@@ -71,5 +68,4 @@ else
       end
     end
   end
-
 end