cobot_client 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01c5e183c0d951a2b1d0670e521e416ce12c5763
-  data.tar.gz: ec90ac312c8481a42cc17b8027db038a3d2f415e
+  metadata.gz: 7e15ca6aec9f2e4b87115f96ad199b4e9689badc
+  data.tar.gz: 3d47e5b284423f8984d299f887e55fc74322d945
 SHA512:
-  metadata.gz: 1968d198e816a0d3712fcfb1cf2790d273568a8b5565d21f8b4612dcd1a0e1c7c5677f94b500d5a3d605713a2826dd3a057ad8a72c9806a2def04224c4f7c653
-  data.tar.gz: 93d4f4a79520d93d1170263aeae5e98dfb9d53837a15133270f4cf9130d074fe9c234b901e1cc3fe612d4c43d2e117916b3383f871c9f924d5ddea72e001f2c9
+  metadata.gz: c4ff2fbfd692cce791d982c511a088c8c3226207564d1aa6e5608b10447cba41fb7e83e8bea20591e9ccded1603c9abfa774270e9b2abbbe2c759f5e17df8b1a
+  data.tar.gz: 88df0bde69c06d859a642d099de7cda4926712798fe2feeb2817d0a471c07416e931b596f51968f536d0f962253ac092194019d1b7dc0719fde575281187253b

data/cobot_client.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = CobotClient::VERSION
 
-  gem.add_dependency 'virtus', '~>1.0.0'
-  gem.add_dependency 'oauth2'
-  gem.add_dependency 'rest-client'
-  gem.add_dependency 'json'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rake'
+  gem.add_dependency 'virtus', '~>1.0'
+  gem.add_dependency 'oauth2', '~>1.0'
+  gem.add_dependency 'rest-client', '~>1.7'
+  gem.add_dependency 'json', '~>1.8'
+  gem.add_development_dependency 'rspec', '~>3.0'
+  gem.add_development_dependency 'rake', '~>10.0'
 end

data/lib/cobot_client/api_client.rb

@@ -32,11 +32,11 @@ module CobotClient
     # args: either a full URL or subdomain, path, plus a body as hash
     def put(*args)
       url, subdomain, path, body = parse_args *args
-      JSON.parse RestClient.put(
-          build_url(url || subdomain, path),
-          body.to_json,
-          headers.merge(content_type_header)).body,
-        symbolize_names: true
+      response = RestClient.put(
+        build_url(url || subdomain, path),
+        body.to_json,
+        headers.merge(content_type_header))
+      JSON.parse response.body, symbolize_names: true unless response.code == 204
     end
 
     # args: either a full URL or subdomain, path
@@ -48,11 +48,11 @@ module CobotClient
     # args: either a full URL or subdomain, path, plus a body as hash
     def post(*args)
       url, subdomain, path, body = parse_args *args
-      JSON.parse RestClient.post(
+      response = RestClient.post(
           build_url(url || subdomain, path),
           body.to_json,
-          headers.merge(content_type_header)).body,
-        symbolize_names: true
+          headers.merge(content_type_header))
+      JSON.parse response.body, symbolize_names: true unless response.code == 204
     end
 
     # args: either a full URL or subdomain, path, plus an optional params hash

data/lib/cobot_client/version.rb

@@ -1,3 +1,3 @@
 module CobotClient
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/cobot_client/api_client_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe CobotClient::ApiClient do
   let(:api_client) { CobotClient::ApiClient.new('token-123') }
-  let(:default_response) { double(:default_response, body: '{}') }
+  let(:default_response) { double(:default_response, code: 200, body: '{}') }
 
   before(:each) do
     CobotClient::ApiClient.user_agent = 'test agent'
@@ -10,14 +10,14 @@ describe CobotClient::ApiClient do
 
   context 'listing resources' do
     it 'calls rest client' do
-      RestClient.should_receive(:get).with('https://co-up.cobot.me/api/resources',
+      expect(RestClient).to receive(:get).with('https://co-up.cobot.me/api/resources',
         hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.get_resources 'co-up'
     end
 
     it 'returns the json' do
-      RestClient.stub(:get) { double(:response, body: [{id: 'resource-1'}].to_json) }
+      allow(RestClient).to receive(:get) { double(:response, body: [{id: 'resource-1'}].to_json) }
 
       resources = api_client.get_resources 'co-up'
 
@@ -27,7 +27,7 @@ describe CobotClient::ApiClient do
 
   context 'creating a booking' do
     it 'calls rest client' do
-      RestClient.should_receive(:post).with(
+      expect(RestClient).to 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 }
@@ -36,7 +36,8 @@ describe CobotClient::ApiClient do
     end
 
     it 'returns the json' do
-      RestClient.stub(:post) { double(:response, body: {title: 'meeting'}.to_json) }
+      allow(RestClient).to receive(:post) { double(:response,
+        code: 201, body: {title: 'meeting'}.to_json) }
 
       booking = api_client.create_booking 'co-up', 'res-1', title: 'meeting'
 
@@ -46,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',
+      expect(RestClient).to receive(:put).with('https://co-up.cobot.me/api/bookings/booking-1',
         {title: 'meeting'}.to_json,
         hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
@@ -54,7 +55,8 @@ describe CobotClient::ApiClient do
     end
 
     it 'returns the json' do
-      RestClient.stub(:put) { double(:response, body: {title: 'meeting'}.to_json) }
+      allow(RestClient).to receive(:put) { double(:response, code: 200,
+        body: {title: 'meeting'}.to_json) }
 
       booking = api_client.update_booking 'co-up', 'booking-1', title: 'meeting'
 
@@ -64,7 +66,7 @@ describe CobotClient::ApiClient do
 
   context 'deleting a booking' do
     it 'calls rest client' do
-      RestClient.should_receive(:delete).with('https://co-up.cobot.me/api/bookings/booking-1',
+      expect(RestClient).to receive(:delete).with('https://co-up.cobot.me/api/bookings/booking-1',
         hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.delete_booking 'co-up', 'booking-1'
@@ -73,7 +75,7 @@ describe CobotClient::ApiClient do
 
   context '#put' do
     it 'calls rest client' do
-      RestClient.should_receive(:put).with(
+      expect(RestClient).to receive(:put).with(
         'https://co-up.cobot.me/api/invoices',
         {id: '1'}.to_json,
         'Content-Type' => 'application/json',
@@ -84,7 +86,7 @@ describe CobotClient::ApiClient do
     end
 
     it 'accepts a url' do
-      RestClient.should_receive(:put).with(
+      expect(RestClient).to receive(:put).with(
         'https://co-up.cobot.me/api/invoices',
         {id: '1'}.to_json,
         'Content-Type' => 'application/json',
@@ -95,15 +97,21 @@ describe CobotClient::ApiClient do
     end
 
     it 'returns the response json' do
-      RestClient.stub(:put) { double(:response, body: [{number: 1}].to_json) }
+      allow(RestClient).to receive(:put) { double(:response, code: 200, body: [{number: 1}].to_json) }
 
       expect(api_client.put('co-up', '/invoices', {})).to eql([{number: 1}])
     end
+
+    it 'returns nil when the status code is 204' do
+      allow(RestClient).to receive(:put) { double(:response, body: '', code: 204) }
+
+      expect(api_client.put('co-up', '/invoices', {})).to be_nil
+    end
   end
 
   context '#post' do
     it 'calls rest client' do
-      RestClient.should_receive(:post).with(
+      expect(RestClient).to receive(:post).with(
         'https://co-up.cobot.me/api/invoices',
         {id: '1'}.to_json,
         'Content-Type' => 'application/json',
@@ -114,7 +122,7 @@ describe CobotClient::ApiClient do
     end
 
     it 'accepts a url' do
-      RestClient.should_receive(:post).with(
+      expect(RestClient).to receive(:post).with(
         'https://co-up.cobot.me/api/invoices',
         {id: '1'}.to_json,
         'Content-Type' => 'application/json',
@@ -125,29 +133,37 @@ describe CobotClient::ApiClient do
     end
 
     it 'returns the response json' do
-      RestClient.stub(:post) { double(:response, body: [{number: 1}].to_json) }
+      allow(RestClient).to receive(:post) { double(:response,
+        code: 201, body: [{number: 1}].to_json) }
 
       expect(api_client.post('co-up', '/invoices', {})).to eql([{number: 1}])
     end
+
+    it 'returns nil when the status code is 204' do
+      allow(RestClient).to receive(:post) { double(:response, code: 204,
+        body: '') }
+
+      expect(api_client.post('co-up', '/invoices', {})).to be_nil
+    end
   end
 
   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',
+      expect(RestClient).to 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', {from: '2013-10-6', to: '2013-10-12'}
     end
 
     it 'accepts a url' do
-      RestClient.should_receive(:get).with('https://co-up.cobot.me/api/invoices?from=2013-10-6&to=2013-10-12',
+      expect(RestClient).to 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 'https://co-up.cobot.me/api/invoices', {from: '2013-10-6', to: '2013-10-12'}
     end
 
     it 'returns the response json' do
-      RestClient.stub(:get) { double(:response, body: [{number: 1}].to_json) }
+      allow(RestClient).to receive(:get) { double(:response, body: [{number: 1}].to_json) }
 
       expect(api_client.get('co-up', '/invoices')).to eql([{number: 1}])
     end
@@ -155,7 +171,7 @@ describe CobotClient::ApiClient do
 
   context '#delete' do
     it 'calls rest client' do
-      RestClient.should_receive(:delete).with(
+      expect(RestClient).to receive(:delete).with(
         'https://co-up.cobot.me/api/invoices/1',
         'User-Agent' => 'test agent', 'Authorization' => 'Bearer token-123') { default_response }
 
@@ -163,7 +179,7 @@ describe CobotClient::ApiClient do
     end
 
     it 'accepts a url' do
-      RestClient.should_receive(:delete).with(
+      expect(RestClient).to receive(:delete).with(
         'https://co-up.cobot.me/api/invoices/1',
         'User-Agent' => 'test agent', 'Authorization' => 'Bearer token-123') { default_response }
 

data/spec/cobot_client/navigation_link_service_spec.rb

@@ -6,12 +6,12 @@ describe CobotClient::NavigationLinkService, '#install_links' do
 
   context 'when there are links already' do
     before(:each) do
-      api_client.stub(:get).with(
+      allow(api_client).to receive(:get).with(
         'co-up', '/navigation_links') { [{label: 'test link'}] }
     end
 
     it 'installs no links' do
-      api_client.should_not_receive(:post)
+      expect(api_client).to_not receive(:post)
 
       service.install_links [double(:link)]
     end
@@ -25,11 +25,11 @@ describe CobotClient::NavigationLinkService, '#install_links' do
     let(:link) { double(:link, section: 'admin/manage', label: 'test link', iframe_url: '/test') }
 
     before(:each) do
-      api_client.stub(:get).with('co-up', '/navigation_links') { [] }
+      allow(api_client).to receive(:get).with('co-up', '/navigation_links') { [] }
     end
 
     it 'installs the links' do
-      api_client.should_receive(:post).with('co-up', '/navigation_links', {
+      expect(api_client).to receive(:post).with('co-up', '/navigation_links', {
         section: 'admin/manage', label: 'test link', iframe_url: '/test'
       }) { {} }
 
@@ -37,7 +37,7 @@ describe CobotClient::NavigationLinkService, '#install_links' do
     end
 
     it 'returns the links created' do
-      api_client.stub(:post) { {label: 'test link'} }
+      allow(api_client).to receive(:post) { {label: 'test link'} }
 
       expect(service.install_links([link]).map(&:label)).to eql(['test link'])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobot_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 description: Client for the Cobot API plus helpers
 email:
 - alex@cobot.me