onering-client 0.0.22 → 0.0.23

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/bin/onering +2 -2
  2. data/lib/onering/api.rb +2 -3
  3. metadata +7 -7
@@ -212,13 +212,13 @@ subcommand :call, "Call generic Onering API endpoints" do |call|
212
212
 
213
213
  call.usage = "onering call path/to/endpoint"
214
214
  call.opt :as_txt, '-t', '--as-text', "Return the results as text"
215
- call.opt :method, '-m', '--method', "The HTTP method to use for the call (default: GET)"
215
+ call.opt :method, '-m', '--method VERB', "The HTTP method to use for the call (default: GET)"
216
216
  call.opt :opts, '-o', '--option KEY:VALUE', Array, "A comma-separated list of key:value querystrings to pass with the request"
217
217
 
218
218
  call.exec do
219
219
  rv = api.request(call[:args].first.to_sym, {
220
220
  :method => (call[:method] || :get),
221
- :data => (STDIN.tty? ? nil : ::JSON.load(STDIN.read)),
221
+ :data => (STDIN.tty? ? {} : ::JSON.load(STDIN.read)),
222
222
  :fields => (Hash[call[:opts].collect{|i| i.split(':',2) }] rescue {})
223
223
  })
224
224
 
@@ -76,11 +76,10 @@ module Onering
76
76
 
77
77
  raise Errors::NotConnected unless @_http
78
78
 
79
- #STDERR.puts "DEBUG: Request #{options[:method].to_s.upcase} #{uri.normalize.to_s}"
80
-
81
79
  case options[:method]
82
80
  when :post
83
81
  request = Net::HTTP::Post.new(uri.request_uri)
82
+ request['Content-Type'] = 'application/json'
84
83
  request.body = options[:data].to_json if options[:data]
85
84
 
86
85
  when :delete
@@ -94,7 +93,7 @@ module Onering
94
93
  response = @_http.request(request)
95
94
 
96
95
  if response.code.to_i >= 400
97
- rv = JSON.load(response.body) unless response.body.empty?
96
+ rv = (JSON.load(response.body) rescue {}) unless response.body.empty?
98
97
 
99
98
  if rv['errors']
100
99
  msg = "#{rv['errors']['type']}: #{rv['errors']['message']}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: onering-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.22
4
+ version: 0.0.23
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2013-01-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: subcommander
16
- requirement: &16214160 !ruby/object:Gem::Requirement
16
+ requirement: &17831640 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *16214160
24
+ version_requirements: *17831640
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: deep_merge
27
- requirement: &16213640 !ruby/object:Gem::Requirement
27
+ requirement: &17831000 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *16213640
35
+ version_requirements: *17831000
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: addressable
38
- requirement: &16213020 !ruby/object:Gem::Requirement
38
+ requirement: &17830480 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *16213020
46
+ version_requirements: *17830480
47
47
  description: A Ruby wrapper for Onering
48
48
  email: ghetzel@outbrain.com
49
49
  executables: