lib/reviewed/client.rb in reviewed-0.4.1 vs lib/reviewed/client.rb in reviewed-0.4.2
- old
+ new
@@ -1,8 +1,8 @@
module Reviewed
class Client
- attr_accessor :request_params
+ attr_accessor :request_params, :base_uri, :api_key
DEFAULT_BASE_URI = "http://localhost:3000/api/v1"
class << self
attr_accessor :api_key, :api_base_uri, :api_version
@@ -13,20 +13,20 @@
end
end
def initialize(opts={})
- @base_uri = opts[:base_uri] || base_uri
- @api_key = opts[:api_key]
+ @base_uri = opts[:base_uri] || config_base_uri
+ @api_key = opts[:api_key] || config_api_key
@request_params = opts[:request_params] || {}
end
- def base_uri
+ def config_base_uri
self.class.api_base_uri || DEFAULT_BASE_URI
end
- def api_key
+ def config_api_key
self.class.api_key || ENV['REVIEWED_API_KEY']
end
# Perform an HTTP GET request
def get(path, params={})
@@ -74,10 +74,10 @@
begin
res = self.connection.send(method.to_sym, path, params) do |request|
request.params.merge!(self.request_params)
request.headers['X-Reviewed-Authorization'] ||= self.api_key
end
- raise Reviewed::ApiError.new(msg: "API connection returned redirect or error: status=#{res.status}") if res.status > 204 and res.status != 404
+ raise Reviewed::ApiError.new(msg: "API connection returned redirect or error") if res.status > 204 and res.status != 404
res
rescue Faraday::Error::ClientError => e
message = <<-EOS.gsub(/^[ ]*/, '')
API Error. method: #{method} url: #{base_uri} path: #{path} params: #{params.to_s} api_key: #{self.api_key}
Original exception message: