cobot_client 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31d7c3f30c6c94506857a0a005f65976a494818a
-  data.tar.gz: 5625e0d5d2a99c7b747de56399ab92c6e23d2cba
+  metadata.gz: 5ef6565b60d68b573425d7e0cc139b6a050aedeb
+  data.tar.gz: 3e08fc83c9d58b3e08efc4b3b943fa4d6f20acec
 SHA512:
-  metadata.gz: 0d713d3b32b0b7fbc8edae0f8b314793056bae5cae9dd19e3dda82d1513e9b2ae717dda8bc83581557c37fde63d68e2e362c03189afbeedc89454287a3ad3120
-  data.tar.gz: 75138f1446fd3fb6f732f0838145897d021e3129179cfc785bb78e8462413261e2da5fd4c00d9b376796301b99fdf9c75042c1a27015d35bb094f37d04fa254b
+  metadata.gz: 311d59891c2b4cd2b30c828d5e4c264cfbd22e97f235f23d4cda3c4646f48507d849b158e0234857c071b30b7b49a4215121c1031500e0e45cb0ef6d5f82b489
+  data.tar.gz: 99efdb44a13c364905e7953bf496233f6986544649556505ae07dd330b9b15cd72304a0df36af7471ea695e1c387bf3fd85b9a5a4955bd680f9897323a314dc8

data/lib/cobot_client/api_client.rb

@@ -29,8 +29,11 @@ module CobotClient
       delete subdomain, "/bookings/#{id}"
     end
 
-    def put(subdomain, path, params)
-      JSON.parse RestClient.put(cobot_url(subdomain, "/api#{path}"), params, headers).body,
+    def put(subdomain, path, body)
+      JSON.parse RestClient.put(
+          cobot_url(subdomain, "/api#{path}"),
+          body.to_json,
+          headers.merge(content_type_header)).body,
         symbolize_names: true
     end
 
@@ -38,18 +41,27 @@ module CobotClient
       RestClient.delete(cobot_url(subdomain, "/api#{path}"), headers)
     end
 
-    def post(subdomain, path, params)
-      JSON.parse RestClient.post(cobot_url(subdomain, "/api#{path}"), params, headers).body,
+    def post(subdomain, path, body)
+      JSON.parse RestClient.post(
+          cobot_url(subdomain, "/api#{path}"),
+          body.to_json,
+          headers.merge(content_type_header)).body,
         symbolize_names: true
     end
 
     def get(subdomain, path, params = {})
       JSON.parse(
-        RestClient.get(cobot_url(subdomain, "/api#{path}", params: params), headers).body,
+        RestClient.get(
+          cobot_url(subdomain, "/api#{path}", params: params),
+          headers).body,
         symbolize_names: true
       )
     end
 
+    def content_type_header
+      {'Content-Type' => 'application/json'}
+    end
+
     def headers
       {
         'Authorization' => "Bearer #{@access_token}",

data/lib/cobot_client/version.rb

@@ -1,3 +1,3 @@
 module CobotClient
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/cobot_client/api_client_spec.rb

@@ -4,6 +4,10 @@ describe CobotClient::ApiClient do
   let(:api_client) { CobotClient::ApiClient.new('token-123') }
   let(:default_response) { double(:default_response, body: '{}') }
 
+  before(:each) do
+    CobotClient::ApiClient.user_agent = 'test agent'
+  end
+
   context 'listing resources' do
     it 'calls rest client' do
       RestClient.should_receive(:get).with('https://co-up.cobot.me/api/resources',
@@ -23,8 +27,9 @@ describe CobotClient::ApiClient do
 
   context 'creating a booking' do
     it 'calls rest client' do
-      RestClient.should_receive(:post).with('https://co-up.cobot.me/api/resources/res-1/bookings',
-        {title: 'meeting'},
+      RestClient.should_receive(:post).with(
+        'https://co-up.cobot.me/api/resources/res-1/bookings',
+        {title: 'meeting'}.to_json,
         hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.create_booking 'co-up', 'res-1', title: 'meeting'
@@ -42,7 +47,7 @@ describe CobotClient::ApiClient do
   context 'updating a booking' do
     it 'calls rest client' do
       RestClient.should_receive(:put).with('https://co-up.cobot.me/api/bookings/booking-1',
-        {title: 'meeting'},
+        {title: 'meeting'}.to_json,
         hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.update_booking 'co-up', 'booking-1', title: 'meeting'
@@ -66,21 +71,50 @@ describe CobotClient::ApiClient do
     end
   end
 
-  context '#get' do
+  context '#put' do
     it 'calls rest client' do
-      RestClient.should_receive(:get).with('https://co-up.cobot.me/api/invoices?from=2013-10-6&to=2013-10-12',
-        hash_including('Authorization' => 'Bearer token-123')) { default_response }
+      RestClient.should_receive(:put).with(
+        'https://co-up.cobot.me/api/invoices',
+        {id: '1'}.to_json,
+        'Content-Type' => 'application/json',
+          'User-Agent' => 'test agent',
+          'Authorization' => 'Bearer token-123') { default_response }
+
+      api_client.put 'co-up', '/invoices', {id: '1'}
+    end
 
-      api_client.get 'co-up', '/invoices', {from: '2013-10-6', to: '2013-10-12'}
+    it 'returns the response json' do
+      RestClient.stub(:put) { double(:response, body: [{number: 1}].to_json) }
+
+      expect(api_client.put('co-up', '/invoices', {})).to eql([{number: 1}])
+    end
+  end
+
+  context '#post' do
+    it 'calls rest client' do
+      RestClient.should_receive(:post).with(
+        'https://co-up.cobot.me/api/invoices',
+        {id: '1'}.to_json,
+        'Content-Type' => 'application/json',
+          'User-Agent' => 'test agent',
+          'Authorization' => 'Bearer token-123') { default_response }
+
+      api_client.post 'co-up', '/invoices', {id: '1'}
     end
 
-    it 'sends a user agent header' do
-      CobotClient::ApiClient.user_agent = 'test agent'
+    it 'returns the response json' do
+      RestClient.stub(:post) { double(:response, body: [{number: 1}].to_json) }
+
+      expect(api_client.post('co-up', '/invoices', {})).to eql([{number: 1}])
+    end
+  end
 
-      RestClient.should_receive(:get).with(anything,
-        hash_including('User-Agent' => 'test agent')) { default_response }
+  context '#get' do
+    it 'calls rest client' do
+      RestClient.should_receive(:get).with('https://co-up.cobot.me/api/invoices?from=2013-10-6&to=2013-10-12',
+        'User-Agent' => 'test agent', 'Authorization' => 'Bearer token-123') { default_response }
 
-      api_client.get 'co-up', '/invoices'
+      api_client.get 'co-up', '/invoices', {from: '2013-10-6', to: '2013-10-12'}
     end
 
     it 'returns the response json' do
@@ -89,4 +123,14 @@ describe CobotClient::ApiClient do
       expect(api_client.get('co-up', '/invoices')).to eql([{number: 1}])
     end
   end
+
+  context '#delete' do
+    it 'calls rest client' do
+      RestClient.should_receive(:delete).with(
+        'https://co-up.cobot.me/api/invoices/1',
+        'User-Agent' => 'test agent', 'Authorization' => 'Bearer token-123') { default_response }
+
+      api_client.delete 'co-up', '/invoices/1'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobot_client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus