lib/link_shrink/request.rb in link_shrink-0.0.3 vs lib/link_shrink/request.rb in link_shrink-0.0.4
- old
+ new
@@ -9,15 +9,22 @@
end
module_function
def process_request(url, options, shrinker = LinkShrink::Config.api)
- process_response(request(url, shrinker).body, options, shrinker)
+ parse(request(url, shrinker).body, options, shrinker)
end
+ def parse(response, options, shrinker)
+ if shrinker.content_type.eql?('text/plain')
+ response
+ else
+ process_response(response, options, shrinker)
+ end
+ end
+
def process_response(response, options, shrinker, json = JSONParser)
- return response if shrinker.content_type.eql?('text/plain')
option = Options.new(options)
parsed_json = json.parse_json(response)
plain = parsed_json['id']
if option.json? && option.qr_code?
@@ -43,15 +50,15 @@
end
# Calls URL API
# @see LinkShrink::Shrinkers::Base#api_url
# @see LinkShrink::Shrinkers::Base#body_parameters
- def request(url, shrinker)
- shrinker.url = url
+ def request(new_url, shrinker)
+ shrinker.url = new_url
Typhoeus::Request.new(
shrinker.api_url,
method: shrinker.http_method,
- body: shrinker.body_parameters(url),
+ body: shrinker.body_parameters(shrinker.url),
headers: { 'Content-Type' => shrinker.content_type }
).run
end
end
end