fbaa_api 0.9.2 → 0.9.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6445cdc905b368eb8b01995add5d33ffb30420f9
4
- data.tar.gz: be097fd0cc5de7c6b2066959a6e192f960a0826a
3
+ metadata.gz: b11b9ee45295f3bbc0522c3097e3a3f9176702a8
4
+ data.tar.gz: b423bcbd21bfd2a337a598f7735984b12277a8c0
5
5
  SHA512:
6
- metadata.gz: f40daf8536f8b11ca3c104d35d6dfe234eb9ad20aeee871d40d4bdec828fa974af41fe986a198621d2514cf21d38f88892cd2c1bd3cef36cc8fb659aa423c8d2
7
- data.tar.gz: f9724ad453a5d05553d7c875a4dbe5acfbec3a32bf1de2e57a94d3fc6491b10d7c3b1dd683b42e351160bff10d1e518089c18e15f1c1a8d2f75391db4c70275f
6
+ metadata.gz: 3b08268be7d441789af2af56753733d5eab9a92f7bd697c4de6938c691f8bb69bd1df1646e9eeb38c7356d3ce9885bd524d343d94421f39ce984530e60b12789
7
+ data.tar.gz: ef216fd049f1f1625605fdc5f70995a8a9f97c4ff4883ba70b76c3d002aba16551816032c684d7155f26aed91278cd8d0bb63ae7b40e20826b98ba8c52f41dae
@@ -38,25 +38,28 @@ module FbaaApi
38
38
  def request(method, path, params = {})
39
39
  url = "#{fbaa_url}/#{path}"
40
40
  config.logger.info("Fbaa::Client - #request url = #{url}")
41
- req = RestClient::Request.new(
41
+
42
+ opts = {
42
43
  url: url,
43
- headers: { params: params }.merge(headers),
44
+ headers: headers(method, params),
44
45
  method: method
45
- )
46
- response = signed_request(req).execute
46
+ }
47
+ opts.merge!(payload: params.to_json) if method != :get
48
+
49
+ req = RestClient::Request.new(opts)
50
+ signed_req = signed_request(req)
51
+ response = signed_req.execute
47
52
 
48
53
  config.logger.info("Fbaa::Client - response code #{response.code}")
49
54
  config.logger.info("Fbaa::Client - body #{response.body}")
50
55
 
51
56
  { status: response.code, body: JSON.parse(response.body) }
52
- rescue JSON::ParserError => e
53
- log_exception(e)
54
- { status: 500, body: { 'error_messages' => "JSON::ParseError #{response.body}" } }
55
57
  rescue => e
56
58
  log_exception(e)
57
59
  if e.respond_to?(:response)
58
60
  response = e.response
59
- { status: response.code, body: JSON.parse(response.body) }
61
+ body = response.body.empty? ? {}.to_json : response.body
62
+ { status: response.code, body: JSON.parse(body) }
60
63
  else
61
64
  raise e
62
65
  end
@@ -70,8 +73,10 @@ module FbaaApi
70
73
  @fbaa_url ||= "#{config.base_url}/api/#{config.api_version}"
71
74
  end
72
75
 
73
- def headers
74
- { 'Content-Type' => "application/json" }
76
+ def headers(method, params)
77
+ _params = { 'Content-Type' => "application/json" }
78
+ _params.merge!(params: params) if method == :get
79
+ _params
75
80
  end
76
81
 
77
82
  def config
@@ -1,3 +1,3 @@
1
1
  module FbaaApi
2
- VERSION = "0.9.2"
2
+ VERSION = "0.9.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fbaa_api
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.2
4
+ version: 0.9.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jarrod Spillers
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-01-12 00:00:00.000000000 Z
11
+ date: 2016-01-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler