Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions lib/beyond_api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,16 @@ def self.setup
end

class Configuration
attr_accessor :client_id, :client_secret, :open_timeout, :timeout, :remove_response_links,
:remove_response_key_underscores, :object_struct_responses, :raise_error_requests,
:log_headers, :log_bodies, :log_level, :all_pagination_size, :retry_options
attr_accessor :client_id, :client_secret,
:open_timeout, :timeout,
:log_headers, :log_bodies, :log_level,
:all_pagination_size, :retry_options

def initialize
@client_id = nil
@client_secret = nil
@open_timeout = 2
@timeout = 5
@remove_response_links = false
@remove_response_key_underscores = false
@object_struct_responses = false
@raise_error_requests = false

@log_level = :info
@log_headers = false
Expand All @@ -59,12 +56,12 @@ def initialize
@all_pagination_size = 200

@retry_options = {
max: 5,
max: 3,
interval: 0.05,
interval_randomness: 0.5,
backoff_factor: 2,
retry_statuses: [409],
# exceptions: [Faraday::TimeoutError, Faraday::ConnectionFailed]
exceptions: [Faraday::TimeoutError, Faraday::ConnectionFailed]
}
end
end
Expand Down
33 changes: 20 additions & 13 deletions lib/beyond_api/response.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,35 @@ def handle

private

def sanitize_key(key)
key.chars.first == "_" ? key[1..-1] : key
end

def sanitize_response(hash)
return {} if hash.blank?

{}.tap do |h|
{}.tap do |response_hash|
hash.each do |key, value|
next if key == "_links" && BeyondApi.configuration.remove_response_links
key = remove_initial_underscore(key)
key = symbolize_key(key)

key = sanitize_key(key) if BeyondApi.configuration.remove_response_key_underscores
h[key.underscore.to_sym] = transform(value)
response_hash[key] = sanitize_value(value)
end
end
end

def transform(thing)
case thing
when Hash then sanitize_response(thing)
when Array then thing.map { |v| transform(v) }
else; thing
def remove_initial_underscore(key)
key.chars.first == "_" ? key[1..-1] : key
end

def symbolize_key(key)
key.underscore.to_sym
end

def sanitize_value(value)
case value
when Hash
sanitize_response(value)
when Array
value.map { |v| sanitize_value(v) }
else
value
end
end

Expand Down
21 changes: 0 additions & 21 deletions lib/generators/templates/beyond_api_initializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,6 @@
#
# config.log_bodies = false

# ==> Response configuration
# Configure if :_links should be removed from response. Default is false and
# :_links are gonna be part of the response.
# config.remove_response_links = false

# Configure if first character underescores should be removed on response hash
# keys. For example, if set to true, :_id will become :id. Default is false.
# config.remove_response_key_underscores = false

# Configure if responses should be transformed to ObjectStructs. If set to
# true, it gives you the posibility to access response data on a doted way.
# With OpenStructs => response.embeded.products.first.id
# Without OpenStructs => response["embeded"]["products"].first["id"]
# config.object_struct_responses = false

# Configure if the gem should raise on error requests. Setting it to true is
# useful for working with exceptions. Setting it to false will return a
# BeyondApi::Error object with detailed information of the error.
# Default is false.
# config.raise_error_requests = false

# ==> Retry configuration
# Configure the retry options for requests. Default is:
# config.retry_options = {
Expand Down