Skip to content

Commit

Permalink
Merge pull request #830 from alkesh26/aws_resources_module_fixes
Browse files Browse the repository at this point in the history
1. Typo fixes.
  • Loading branch information
trevorrowe committed May 29, 2015
2 parents b5ae1df + 8ffcff2 commit 5c78b47
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion aws-sdk-resources/lib/aws-sdk-resources/batch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Resources
# You can invoke batch operations against collections and they will
# invoke them on each batch.
#
# # delets all all objects in this bucket in batches of 1k
# # delete all objects in this bucket in batches of 1k
# objects = s3.bucket('aws-sdk').objects
# objects.delete
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def return_type
end

# The message portion of the @return tag for this operation. This must
# be overidden in sub-classes.
# be overridden in sub-classes.
def return_message
raise NotImplementedError
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def docstring

def return_message
if plural? && structure?
"an array of {Structure structures} with the following memers:\n" + data_members
"an array of {Structure structures} with the following members:\n" + data_members
elsif structure?
"a {Structure} with the following members:\n" + data_members
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def return_message

def return_base_message
if returns_data_members
"Calls {#{called_operation}}, returning its reponse."
"Calls {#{called_operation}}, returning its response."
end
end

Expand Down
4 changes: 2 additions & 2 deletions aws-sdk-resources/lib/aws-sdk-resources/resource.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def initialize(*args)
#
# ## Basic Usage
#
# Waiter will polls until it is succesful, it fails by
# Waiter will polls until it is successful, it fails by
# entering a terminal state, or until a maximum number of attempts
# are made.
#
Expand Down Expand Up @@ -87,7 +87,7 @@ def initialize(*args)
# maximum number of attempts have been made, and the waiter is not
# yet successful.
#
# @raise [Aws::Waiters::Errors::UnexpectedError] Raised when an error is encounted
# @raise [Aws::Waiters::Errors::UnexpectedError] Raised when an error is encountered
# while polling for a resource that is not expected.
#
# @raise [NotImplementedError] Raised when the resource does not
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module S3
#
# This client uses a process called "envelope encryption". Your private
# encryption keys and your data's plain-text are **never** sent to
# Amazon S3. **If you loose you encrption keys, you will not be able to
# Amazon S3. **If you loose you encryption keys, you will not be able to
# un-encrypt your data.**
#
# ## Envelope Encryption Overview
Expand Down Expand Up @@ -175,7 +175,7 @@ class Client
# @option options [Symbol] :envelope_location (:metadata) Where to
# store the envelope encryption keys. By default, the envelope is
# stored with the encrypted object. If you pass `:instruction_file`,
# then the envelope is stored in a seperate object in Amazon S3.
# then the envelope is stored in a separate object in Amazon S3.
#
# @option options [String] :instruction_file_suffix ('.instruction')
# When `:envelope_location` is `:instruction_file` then the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class DefaultKeyProvider
# @option options [required, OpenSSL::PKey::RSA, String] :encryption_key
# The master key to use for encrypting objects.
# @option options [String<JSON>] :materials_description ('{}')
# A description of the encyrption key.
# A description of the encryption key.
def initialize(options = {})
@encryption_materials = Materials.new(
key: options[:encryption_key],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Encryption
# * Responds to {#encryption_materials} with an {Materials} object.
#
# * Responds to {#key_for}, receiving a JSON document String,
# returning an ecryption key. The returned encryption key
# returning an encryption key. The returned encryption key
# must be one of:
#
# * `OpenSSL::PKey::RSA` - for asymmetric encryption
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ def initialize(options = {})
attr_reader :multipart_threshold

# @param [String,Pathname,File,Tempfile] source
# @option options [requried,String] :bucket
# @option options [requried,String] :key
# @option options [required,String] :bucket
# @option options [required,String] :key
# @return [void]
def upload(source, options = {})
if File.size(source) >= multipart_threshold
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ def initialize(options = {})
attr_reader :client

# @param [String,Pathname,File,Tempfile] source
# @option options [requried,String] :bucket
# @option options [requried,String] :key
# @option options [required,String] :bucket
# @option options [required,String] :key
# @return [void]
def upload(source, options = {})
if File.size(source) < MIN_PART_SIZE
Expand Down Expand Up @@ -120,7 +120,7 @@ def upload_in_threads(pending, completed)
thread.abort_on_exception = true
threads << thread
end
errors = threads.map(&:value).compact
threads.map(&:value).compact
end

def compute_default_part_size(source_size)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ module SQS
# * Configure a {#before_request} callback.
#
# ```
# poller.before_reqeust do |stats|
# poller.before_request do |stats|
# logger.info("requests: #{stats.request_count}")
# logger.info("messages: #{stats.received_message_count}")
# logger.info("last-timestamp: #{stats.last_message_received_at}")
Expand Down Expand Up @@ -223,7 +223,7 @@ def initialize(queue_url, options = {})
# Registers a callback that is invoked once before every polling
# attempt.
#
# poller.before_reqeust do |stats|
# poller.before_request do |stats|
# logger.info("requests: #{stats.request_count}")
# logger.info("messages: #{stats.received_message_count}")
# logger.info("last-timestamp: #{stats.last_message_received_at}")
Expand All @@ -239,7 +239,7 @@ def initialize(queue_url, options = {})
# then the poller will exit normally before making the next long
# poll request.
#
# poller.before_reqeust do |stats|
# poller.before_request do |stats|
# throw :stop_polling if stats.received_messages >= 100
# end
#
Expand Down

0 comments on commit 5c78b47

Please sign in to comment.