fog-aws 3.3.0 → 3.4.0

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

@@ -12,7 +12,7 @@ module Fog
         #   * body [Hash]:
         #     * LocationConstraint [String] - Location constraint of the bucket
         #
-        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlocation.html
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
 
         def get_bucket_location(bucket_name)
           request({
@@ -22,8 +22,7 @@ module Fog
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::AWS::Storage::GetBucketLocation.new,
-            :query    => {'location' => nil},
-            :path_style => true
+            :query    => {'location' => nil}
           })
         end
       end

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

@@ -15,13 +15,13 @@ module Fog
         #       * DisplayName [String] - Display name of bucket owner
         #       * ID [String] - Id of bucket owner
         #
-        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTServiceGET.html
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/RESTServiceGET.html
         #
         def get_service
           request({
             :expects  => 200,
             :headers  => {},
-            :host     => @host,
+            :host     => 's3.amazonaws.com',
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::AWS::Storage::GetService.new

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

@@ -18,8 +18,10 @@ module Fog
         # @option options x-amz-acl [String] Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
         # @option options x-amz-storage-class [String] Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
         # @option options x-amz-meta-#{name} Headers to be returned with object, note total size of request without body must be less than 8 KB. Each name, value pair must conform to US-ASCII.
-        # @option options encryption [String] Sets HTTP header for server-side encryption. Set to 'AES256' for SSE-S3 and SSE-C. Set to 'aws:kms' for SSE-KMS
-        # @option options encryption_key [String] Encryption customer key for SSE-C
+        # @option options x-amz-server-side-encryption [String] Sets HTTP header for server-side encryption. Set to 'AES256' for SSE-S3 and SSE-C. Set to 'aws:kms' for SSE-KMS
+        # @option options x-amz-server-side​-encryption​-customer-algorithm [String] Algorithm to use to when encrypting the object for SSE-C.
+        # @option options x-amz-server-side​-encryption​-customer-key [String] Encryption customer key for SSE-C
+        # @option options x-amz-server-side​-encryption​-customer-key-MD5 [String] MD5 digest of the encryption key for SSE-C
         # @option options x-amz-server-side-encryption-aws-kms-key-id [String] KMS key ID of the encryption key for SSE-KMS
         # @option options x-amz-server-side-encryption-context [String] Encryption context for SSE-KMS
         #
@@ -27,7 +29,7 @@ module Fog
         #   * headers [Hash]:
         #     * ETag [String] etag of new object
         #
-        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html
 
         def self.conforming_to_us_ascii!(keys, hash)
           keys.each do |k|

data/lib/fog/aws/storage.rb

@@ -6,6 +6,7 @@ module Fog
       COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
 
       DEFAULT_REGION = 'us-east-1'
+      ACCELERATION_HOST = 's3-accelerate.amazonaws.com'
 
       DEFAULT_SCHEME = 'https'
       DEFAULT_SCHEME_PORT = {
@@ -42,7 +43,7 @@ module Fog
       ]
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style, :instrumentor, :instrumentor_name, :aws_signature_version
+      recognizes :endpoint, :region, :host, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style, :acceleration, :instrumentor, :instrumentor_name, :aws_signature_version, :virtual_host, :cname
 
       secrets    :aws_secret_access_key, :hmac
 
@@ -288,7 +289,11 @@ module Fog
                 end
               end
 
-              if path_style
+              # uses the bucket name as host if `virtual_host: true`, you can also
+              # manually specify the cname if required.
+              if params[:virtual_host]
+                host = params.fetch(:cname, bucket_name)
+              elsif path_style
                 path = bucket_to_path bucket_name, path
               else
                 host = [bucket_name, host].join('.')
@@ -499,6 +504,7 @@ module Fog
           @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.storage'
           @connection_options     = options[:connection_options] || {}
           @persistent = options.fetch(:persistent, false)
+          @acceleration = options.fetch(:acceleration, false)
           @signature_version = options.fetch(:aws_signature_version, 4)
           validate_signature_version!
           @path_style = options[:path_style]  || false
@@ -516,6 +522,7 @@ module Fog
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
           end
 
+          @host = ACCELERATION_HOST if @acceleration
           setup_credentials(options)
         end
 

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.3.0"
+    VERSION = "3.4.0"
   end
 end

data/tests/credentials_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Shindo.tests('AWS | credentials', ['aws']) do
   old_mock_value = Excon.defaults[:mock]
   fog_was_mocked = Fog.mocking?
@@ -5,8 +7,8 @@ Shindo.tests('AWS | credentials', ['aws']) do
   Fog.unmock!
   begin
     Excon.defaults[:mock] = true
-    Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 200, :body => 'arole'})
-    Excon.stub({:method => :get, :path => "/latest/meta-data/placement/availability-zone/"}, {:status => 200, :body => 'us-west-1a'})
+    Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/' }, { status: 200, body: 'arole' })
+    Excon.stub({ method: :get, path: '/latest/meta-data/placement/availability-zone/' }, { status: 200, body: 'us-west-1a' })
 
     expires_at = Time.at(Time.now.to_i + 500)
     credentials = {
@@ -16,69 +18,68 @@ Shindo.tests('AWS | credentials', ['aws']) do
       'Expiration' => expires_at.xmlschema
     }
 
-    Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/arole"}, {:status => 200, :body => Fog::JSON.encode(credentials)})
+    Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/arole' }, { status: 200, body: Fog::JSON.encode(credentials) })
 
-    tests("#fetch_credentials") do
-      returns({:aws_access_key_id => 'dummykey',
-                :aws_secret_access_key => 'dummysecret',
-                :aws_session_token => 'dummytoken',
-                :region => "us-west-1",
-                :aws_credentials_expire_at => expires_at}) { Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true) }
+    tests('#fetch_credentials') do
+      returns(aws_access_key_id: 'dummykey',
+              aws_secret_access_key: 'dummysecret',
+              aws_session_token: 'dummytoken',
+              region: 'us-west-1',
+              aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
     end
 
-    ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = '/v1/credentials?id=task_id'
-    Excon.stub({:method => :get, :path => '/v1/credentials?id=task_id'}, {:status => 200, :body => Fog::JSON.encode(credentials)})
+    ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = '/v1/credentials?id=task_id'
+    Excon.stub({ method: :get, path: '/v1/credentials?id=task_id' }, { status: 200, body: Fog::JSON.encode(credentials) })
 
-    tests("#fetch_credentials") do
-      returns({:aws_access_key_id => 'dummykey',
-                :aws_secret_access_key => 'dummysecret',
-                :aws_session_token => 'dummytoken',
-                :region => "us-west-1",
-                :aws_credentials_expire_at => expires_at}) { Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true) }
+    tests('#fetch_credentials') do
+      returns(aws_access_key_id: 'dummykey',
+              aws_secret_access_key: 'dummysecret',
+              aws_session_token: 'dummytoken',
+              region: 'us-west-1',
+              aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
     end
 
-    ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = nil
+    ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = nil
 
-    compute = Fog::AWS::Compute.new(:use_iam_profile => true)
+    compute = Fog::AWS::Compute.new(use_iam_profile: true)
 
-    tests("#refresh_credentials_if_expired") do
-      returns(nil){compute.refresh_credentials_if_expired}
+    tests('#refresh_credentials_if_expired') do
+      returns(nil) { compute.refresh_credentials_if_expired }
     end
 
     credentials['AccessKeyId'] = 'newkey'
     credentials['SecretAccessKey'] = 'newsecret'
     credentials['Expiration'] = (expires_at + 10).xmlschema
 
-    Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/arole"}, {:status => 200, :body => Fog::JSON.encode(credentials)})
+    Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/arole' }, { status: 200, body: Fog::JSON.encode(credentials) })
 
     Fog::Time.now = expires_at + 1
-    tests("#refresh_credentials_if_expired") do
-      returns(true){compute.refresh_credentials_if_expired}
-      returns("newkey"){ compute.instance_variable_get(:@aws_access_key_id)}
+    tests('#refresh_credentials_if_expired') do
+      returns(true) { compute.refresh_credentials_if_expired }
+      returns('newkey') { compute.instance_variable_get(:@aws_access_key_id) }
     end
     Fog::Time.now = Time.now
 
     default_credentials = Fog::AWS::Compute.fetch_credentials({})
-    tests("#fetch_credentials when the url 404s") do
-      Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 404, :body => 'not bound'})
-      Excon.stub({:method => :get, :path => "/latest/meta-data/placement/availability-zone/"}, {:status => 400, :body => 'not found'})
-      returns(default_credentials) {Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true)}
+    tests('#fetch_credentials when the url 404s') do
+      Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/' }, { status: 404, body: 'not bound' })
+      Excon.stub({ method: :get, path: '/latest/meta-data/placement/availability-zone/' }, { status: 400, body: 'not found' })
+      returns(default_credentials) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
     end
 
     mocked_credentials = {
-      :aws_access_key_id => "access-key-id",
-      :aws_secret_access_key => "secret-access-key",
-      :aws_session_token => "session-token",
-      :aws_credentials_expire_at => Time.at(Time.now.to_i + 500).xmlschema
+      aws_access_key_id: 'access-key-id',
+      aws_secret_access_key: 'secret-access-key',
+      aws_session_token: 'session-token',
+      aws_credentials_expire_at: Time.at(Time.now.to_i + 500).xmlschema
     }
-    tests("#fetch_credentials when mocking") do
+    tests('#fetch_credentials when mocking') do
       Fog.mock!
       Fog::AWS::Compute::Mock.data[:iam_role_based_creds] = mocked_credentials
-      returns(mocked_credentials) {Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true)}
+      returns(mocked_credentials) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
     end
-
   ensure
-    ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = nil
+    ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = nil
     Excon.stubs.clear
     Excon.defaults[:mock] = old_mock_value
     Fog.mock! if fog_was_mocked

data/tests/helper.rb

@@ -1,7 +1,7 @@
 begin
   require 'simplecov'
   SimpleCov.start
-  SimpleCov.command_name "Shindo"
+  SimpleCov.command_name 'Shindo'
 rescue LoadError => e
   $stderr.puts "not recording test coverage: #{e.inspect}"
 end
@@ -10,7 +10,7 @@ require File.expand_path('../../lib/fog/aws', __FILE__)
 
 Bundler.require(:test)
 
-Excon.defaults.merge!(:debug_request => true, :debug_response => true)
+Excon.defaults.merge!(debug_request: true, debug_response: true)
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper'))
 

data/tests/helpers/collection_helper.rb

@@ -1,6 +1,5 @@
 def collection_tests(collection, params = {}, mocks_implemented = true)
   tests('success') do
-
     tests("#new(#{params.inspect})").succeeds do
       pending if Fog.mocking? && !mocks_implemented
       collection.new(params)
@@ -34,7 +33,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       pending if Fog.mocking? && !mocks_implemented
 
       methods = [
-        'all?', 'any?', 'find',  'detect', 'collect', 'map',
+        'all?', 'any?', 'find', 'detect', 'collect', 'map',
         'find_index', 'flat_map', 'collect_concat', 'group_by',
         'none?', 'one?'
       ]
@@ -43,7 +42,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
         if collection.respond_to?(enum_method)
           tests("##{enum_method}").succeeds do
             block_called = false
-            collection.send(enum_method) {|x| block_called = true }
+            collection.send(enum_method) { block_called = true }
             block_called
           end
         end
@@ -55,7 +54,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
         if collection.respond_to?(enum_method)
           tests("##{enum_method}").succeeds do
             block_called = false
-            collection.send(enum_method) {|x| block_called = true; 0 }
+            collection.send(enum_method) { block_called = true; 0 }
             block_called
           end
         end

data/tests/helpers/compute/flavors_helper.rb

@@ -1,7 +1,6 @@
 def flavors_tests(connection, params = {}, mocks_implemented = true)
   tests('success') do
-
-    tests("#all").succeeds do
+    tests('#all').succeeds do
       pending if Fog.mocking? && !mocks_implemented
       connection.flavors.all
     end
@@ -14,11 +13,9 @@ def flavors_tests(connection, params = {}, mocks_implemented = true)
       pending if Fog.mocking? && !mocks_implemented
       connection.flavors.get(@identity)
     end
-
   end
 
   tests('failure') do
-
     if !Fog.mocking? || mocks_implemented
       invalid_flavor_identity = connection.flavors.first.identity.to_s.gsub(/\w/, '0')
     end
@@ -27,6 +24,5 @@ def flavors_tests(connection, params = {}, mocks_implemented = true)
       pending if Fog.mocking? && !mocks_implemented
       connection.flavors.get(invalid_flavor_identity)
     end
-
   end
 end

data/tests/helpers/compute/server_helper.rb

@@ -1,6 +1,5 @@
 def server_tests(connection, params = {}, mocks_implemented = true)
   model_tests(connection.servers, params, mocks_implemented) do
-
     tests('#reload').returns(true) do
       pending if Fog.mocking? && !mocks_implemented
       @instance.wait_for { ready? }
@@ -8,7 +7,7 @@ def server_tests(connection, params = {}, mocks_implemented = true)
       !identity.nil? && identity == @instance.reload.identity
     end
 
-    responds_to([:ready?, :state])
+    responds_to(%i[ready state])
     yield if block_given?
 
     tests('#reboot').succeeds do
@@ -20,6 +19,5 @@ def server_tests(connection, params = {}, mocks_implemented = true)
     if !Fog.mocking? || mocks_implemented
       @instance.wait_for { ready? }
     end
-
   end
 end

data/tests/helpers/compute/servers_helper.rb

@@ -1,10 +1,8 @@
 def servers_tests(connection, params = {}, mocks_implemented = true)
   collection_tests(connection.servers, params, mocks_implemented) do
-
     if !Fog.mocking? || mocks_implemented
       @instance.wait_for { ready? }
       yield if block_given?
     end
-
   end
 end

data/tests/helpers/dns_helper.rb

@@ -1,54 +1,55 @@
 def dns_providers
   {
-    :aws          => {
-      :mocked => false
+    aws: {
+      mocked:  false
     },
-    :bluebox      => {
-      :mocked => false,
-      :zone_attributes => {
-        :ttl => 60
+    bluebox: {
+      mocked:  false,
+      zone_attributes:  {
+        ttl: 60
       }
     },
-    :dnsimple     => {
-      :mocked => false
+    dnsimple: {
+      mocked: false
     },
-    :dnsmadeeasy  => {
-      :mocked => false
+    dnsmadeeasy: {
+      mocked: false
     },
-    :dynect       => {
-      :mocked => false,
-      :zone_attributes => {
-        :email => 'fog@example.com'
+    dynect: {
+      mocked: false,
+      zone_attributes: {
+        email: 'fog@example.com'
       }
     },
-    :linode       => {
-      :mocked => false,
-      :zone_attributes => {
-        :email => 'fog@example.com'
+    linode: {
+      mocked: false,
+      zone_attributes: {
+        email: 'fog@example.com'
       }
     },
-    :zerigo       => {
-      :mocked => false
+    zerigo: {
+      mocked: false
     },
-    :rackspace    => {
-      :mocked => false,
-      :zone_attributes => {
-        :email => 'fog@example.com'
+    rackspace: {
+      mocked: false,
+      zone_attributes: {
+        email: 'fog@example.com'
       }
     },
-    :rage4 => {
-      :mocked => false
+    rage4: {
+      mocked: false
     }
   }
 end
 
-def generate_unique_domain( with_trailing_dot = false)
-  #get time (with 1/100th of sec accuracy)
-  #want unique domain name and if provider is fast, this can be called more than once per second
-  time= (Time.now.to_f * 100).to_i
+def generate_unique_domain(with_trailing_dot = false)
+  # get time (with 1/100th of sec accuracy)
+  # want unique domain name and if provider is fast,
+  # this can be called more than once per second
+  time = (Time.now.to_f * 100).to_i
   domain = 'test-' + time.to_s + '.com'
   if with_trailing_dot
-    domain+= '.'
+    domain += '.'
   end
 
   domain

data/tests/helpers/formats_helper.rb

@@ -1,4 +1,6 @@
-require "fog/schema/data_validator"
+# frozen_string_literal: true
+
+require 'fog/schema/data_validator'
 
 # format related hackery
 # allows both true.is_a?(Fog::Boolean) and false.is_a?(Fog::Boolean)
@@ -15,62 +17,62 @@ module Fog
     module Array; end
   end
 end
-[FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)}
-[FalseClass, TrueClass, NilClass, Fog::Boolean].each {|klass| klass.send(:include, Fog::Nullable::Boolean)}
-[NilClass, String].each {|klass| klass.send(:include, Fog::Nullable::String)}
-[NilClass, Time].each {|klass| klass.send(:include, Fog::Nullable::Time)}
-[Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)}
-[Float, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Float)}
-[Hash, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Hash)}
-[Array, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Array)}
+[FalseClass, TrueClass].each { |klass| klass.send(:include, Fog::Boolean) }
+[FalseClass, TrueClass, NilClass, Fog::Boolean].each { |klass| klass.send(:include, Fog::Nullable::Boolean) }
+[NilClass, String].each { |klass| klass.send(:include, Fog::Nullable::String) }
+[NilClass, Time].each { |klass| klass.send(:include, Fog::Nullable::Time) }
+[Integer, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Integer) }
+[Float, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Float) }
+[Hash, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Hash) }
+[Array, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Array) }
 
 module Shindo
+  # Generates a Shindo test that compares a hash schema to the result
+  # of the passed in block returning true if they match.
+  #
+  # The schema that is passed in is a Hash or Array of hashes that
+  # have Classes in place of values. When checking the schema the
+  # value should match the Class.
+  #
+  # Strict mode will fail if the data has additional keys. Setting
+  # +strict+ to +false+ will allow additional keys to appear.
+  #
+  # @param [Hash] schema A Hash schema
+  # @param [Hash] options Options to change validation rules
+  # @option options [Boolean] :allow_extra_keys
+  #     If +true+ does not fail when keys are in the data that are
+  #     not specified in the schema. This allows new values to
+  #     appear in API output without breaking the check.
+  # @option options [Boolean] :allow_optional_rules
+  #     If +true+ does not fail if extra keys are in the schema
+  #     that do not match the data. Not recommended!
+  # @yield Data to check with schema
+  #
+  # @example Using in a test
+  #     Shindo.tests("comparing welcome data against schema") do
+  #       data = {:welcome => "Hello" }
+  #       data_matches_schema(:welcome => String) { data }
+  #     end
+  #
+  #     comparing welcome data against schema
+  #     + data matches schema
+  #
+  # @example Example schema
+  #     {
+  #       "id" => String,
+  #       "ram" => Integer,
+  #       "disks" => [
+  #         {
+  #           "size" => Float
+  #         }
+  #       ],
+  #       "dns_name" => Fog::Nullable::String,
+  #       "active" => Fog::Boolean,
+  #       "created" => DateTime
+  #     }
+  #
+  # @return [Boolean]
   class Tests
-    # Generates a Shindo test that compares a hash schema to the result
-    # of the passed in block returning true if they match.
-    #
-    # The schema that is passed in is a Hash or Array of hashes that
-    # have Classes in place of values. When checking the schema the
-    # value should match the Class.
-    #
-    # Strict mode will fail if the data has additional keys. Setting
-    # +strict+ to +false+ will allow additional keys to appear.
-    #
-    # @param [Hash] schema A Hash schema
-    # @param [Hash] options Options to change validation rules
-    # @option options [Boolean] :allow_extra_keys
-    #     If +true+ does not fail when keys are in the data that are
-    #     not specified in the schema. This allows new values to
-    #     appear in API output without breaking the check.
-    # @option options [Boolean] :allow_optional_rules
-    #     If +true+ does not fail if extra keys are in the schema
-    #     that do not match the data. Not recommended!
-    # @yield Data to check with schema
-    #
-    # @example Using in a test
-    #     Shindo.tests("comparing welcome data against schema") do
-    #       data = {:welcome => "Hello" }
-    #       data_matches_schema(:welcome => String) { data }
-    #     end
-    #
-    #     comparing welcome data against schema
-    #     + data matches schema
-    #
-    # @example Example schema
-    #     {
-    #       "id" => String,
-    #       "ram" => Integer,
-    #       "disks" => [
-    #         {
-    #           "size" => Float
-    #         }
-    #       ],
-    #       "dns_name" => Fog::Nullable::String,
-    #       "active" => Fog::Boolean,
-    #       "created" => DateTime
-    #     }
-    #
-    # @return [Boolean]
     def data_matches_schema(schema, options = {})
       test('data matches schema') do
         validator = Fog::Schema::DataValidator.new
@@ -84,9 +86,9 @@ module Shindo
     def formats(format, strict = true)
       test('has proper format') do
         if strict
-          options = {:allow_extra_keys => false, :allow_optional_rules => true}
+          options = { allow_extra_keys: false, allow_optional_rules: true }
         else
-          options = {:allow_extra_keys => true, :allow_optional_rules => true}
+          options = { allow_extra_keys: true, allow_optional_rules: true }
         end
         validator = Fog::Schema::DataValidator.new
         valid = validator.validate(yield, format, options)