cobot_client 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edde06faa298e759ef9c0297bb630c6604cb514a
-  data.tar.gz: 7eeaf64c025863c2dd3f3067d8a1cd5cffcae0f8
+  metadata.gz: 31d7c3f30c6c94506857a0a005f65976a494818a
+  data.tar.gz: 5625e0d5d2a99c7b747de56399ab92c6e23d2cba
 SHA512:
-  metadata.gz: 869540276f24db43b81ab36861ae176b66b8ed129ad02931f7ccadb88e6b02035949c341427ab9d5d9fc02e67c1548259ea194487b7e7bed5f5015b4397b2610
-  data.tar.gz: 0d486f2cf44234b69ed457bcc6580068670396a3690775e50db5ff73c3a37bbb7121e137029aec8af5aa81f3305144b22ee03f63df7e97503bf76aa198bf364c
+  metadata.gz: 0d713d3b32b0b7fbc8edae0f8b314793056bae5cae9dd19e3dda82d1513e9b2ae717dda8bc83581557c37fde63d68e2e362c03189afbeedc89454287a3ad3120
+  data.tar.gz: 75138f1446fd3fb6f732f0838145897d021e3129179cfc785bb78e8462413261e2da5fd4c00d9b376796301b99fdf9c75042c1a27015d35bb094f37d04fa254b

data/lib/cobot_client/api_client.rb

@@ -5,6 +5,10 @@ module CobotClient
   class ApiClient
     include UrlHelper
 
+    class << self
+      attr_accessor :user_agent
+    end
+
     def initialize(access_token)
       @access_token = access_token
     end
@@ -26,28 +30,31 @@ module CobotClient
     end
 
     def put(subdomain, path, params)
-      JSON.parse RestClient.put(cobot_url(subdomain, "/api#{path}"), params, auth_headers).body,
+      JSON.parse RestClient.put(cobot_url(subdomain, "/api#{path}"), params, headers).body,
         symbolize_names: true
     end
 
     def delete(subdomain, path)
-      RestClient.delete(cobot_url(subdomain, "/api#{path}"), auth_headers)
+      RestClient.delete(cobot_url(subdomain, "/api#{path}"), headers)
     end
 
     def post(subdomain, path, params)
-      JSON.parse RestClient.post(cobot_url(subdomain, "/api#{path}"), params, auth_headers).body,
+      JSON.parse RestClient.post(cobot_url(subdomain, "/api#{path}"), params, headers).body,
         symbolize_names: true
     end
 
     def get(subdomain, path, params = {})
       JSON.parse(
-        RestClient.get(cobot_url(subdomain, "/api#{path}", params: params), auth_headers).body,
+        RestClient.get(cobot_url(subdomain, "/api#{path}", params: params), headers).body,
         symbolize_names: true
       )
     end
 
-    def auth_headers
-      {'Authorization' => "Bearer #{@access_token}"}
+    def headers
+      {
+        'Authorization' => "Bearer #{@access_token}",
+        'User-Agent' => self.class.user_agent || "Cobot Client #{CobotClient::VERSION}"
+      }
     end
   end
 end

data/lib/cobot_client/version.rb

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

data/spec/cobot_client/api_client_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe CobotClient::ApiClient do
   let(:api_client) { CobotClient::ApiClient.new('token-123') }
-  let(:default_response) { stub(:default_response, body: '{}') }
+  let(:default_response) { double(:default_response, body: '{}') }
 
   context 'listing resources' do
     it 'calls rest client' do
       RestClient.should_receive(:get).with('https://co-up.cobot.me/api/resources',
-        'Authorization' => 'Bearer token-123') { default_response }
+        hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.get_resources 'co-up'
     end
 
     it 'returns the json' do
-      RestClient.stub(:get) { stub(:response, body: [{id: 'resource-1'}].to_json) }
+      RestClient.stub(:get) { double(:response, body: [{id: 'resource-1'}].to_json) }
 
       resources = api_client.get_resources 'co-up'
 
@@ -25,13 +25,13 @@ describe CobotClient::ApiClient do
     it 'calls rest client' do
       RestClient.should_receive(:post).with('https://co-up.cobot.me/api/resources/res-1/bookings',
         {title: 'meeting'},
-        'Authorization' => 'Bearer token-123') { default_response }
+        hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.create_booking 'co-up', 'res-1', title: 'meeting'
     end
 
     it 'returns the json' do
-      RestClient.stub(:post) { stub(:response, body: {title: 'meeting'}.to_json) }
+      RestClient.stub(:post) { double(:response, body: {title: 'meeting'}.to_json) }
 
       booking = api_client.create_booking 'co-up', 'res-1', title: 'meeting'
 
@@ -43,13 +43,13 @@ describe CobotClient::ApiClient do
     it 'calls rest client' do
       RestClient.should_receive(:put).with('https://co-up.cobot.me/api/bookings/booking-1',
         {title: 'meeting'},
-        'Authorization' => 'Bearer token-123') { default_response }
+        hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.update_booking 'co-up', 'booking-1', title: 'meeting'
     end
 
     it 'returns the json' do
-      RestClient.stub(:put) { stub(:response, body: {title: 'meeting'}.to_json) }
+      RestClient.stub(:put) { double(:response, body: {title: 'meeting'}.to_json) }
 
       booking = api_client.update_booking 'co-up', 'booking-1', title: 'meeting'
 
@@ -60,7 +60,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',
-        'Authorization' => 'Bearer token-123') { default_response }
+        hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.delete_booking 'co-up', 'booking-1'
     end
@@ -69,13 +69,22 @@ describe CobotClient::ApiClient do
   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',
-        'Authorization' => 'Bearer token-123') { default_response }
+        hash_including('Authorization' => 'Bearer token-123')) { default_response }
 
       api_client.get 'co-up', '/invoices', {from: '2013-10-6', to: '2013-10-12'}
     end
 
+    it 'sends a user agent header' do
+      CobotClient::ApiClient.user_agent = 'test agent'
+
+      RestClient.should_receive(:get).with(anything,
+        hash_including('User-Agent' => 'test agent')) { default_response }
+
+      api_client.get 'co-up', '/invoices'
+    end
+
     it 'returns the response json' do
-      RestClient.stub(:get) { stub(:response, body: [{number: 1}].to_json) }
+      RestClient.stub(:get) { double(:response, body: [{number: 1}].to_json) }
 
       expect(api_client.get('co-up', '/invoices')).to eql([{number: 1}])
     end

data/spec/cobot_client/navigation_link_service_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe CobotClient::NavigationLinkService, '#install_links' do
   let(:service) { CobotClient::NavigationLinkService.new(oauth_client, 'token-1', 'co-up') }
-  let(:oauth_client) { stub(:oauth_client) }
+  let(:oauth_client) { double(:oauth_client) }
 
   before(:each) do
-    @token = stub(:token).as_null_object
+    @token = double(:token).as_null_object
     OAuth2::AccessToken.stub(new: @token)
   end
 
   context 'when there are links already' do
     before(:each) do
-      @token.stub(:get).with('https://co-up.cobot.me/api/navigation_links') do stub(:response, parsed: [
+      @token.stub(:get).with('https://co-up.cobot.me/api/navigation_links') do double(:response, parsed: [
         {label: 'test link'}])
       end
     end
@@ -19,30 +19,30 @@ describe CobotClient::NavigationLinkService, '#install_links' do
     it 'installs no links' do
       @token.should_not_receive(:post)
 
-      service.install_links [stub(:link)]
+      service.install_links [double(:link)]
     end
 
     it 'returns the links' do
-      expect(service.install_links([stub(:link)]).map(&:label)).to eql(['test link'])
+      expect(service.install_links([double(:link)]).map(&:label)).to eql(['test link'])
     end
   end
 
   context 'when there are no links installed' do
-    let(:link) { stub(:link, section: 'admin/manage', label: 'test link', iframe_url: '/test') }
+    let(:link) { double(:link, section: 'admin/manage', label: 'test link', iframe_url: '/test') }
     before(:each) do
-      @token.stub(:get).with('https://co-up.cobot.me/api/navigation_links') { stub(:response, parsed: []) }
+      @token.stub(:get).with('https://co-up.cobot.me/api/navigation_links') { double(:response, parsed: []) }
     end
 
     it 'installs the links' do
       @token.should_receive(:post).with('https://co-up.cobot.me/api/navigation_links', body: {
         section: 'admin/manage', label: 'test link', iframe_url: '/test'
-      }) { stub(:response, status: 201, parsed: {}) }
+      }) { double(:response, status: 201, parsed: {}) }
 
       service.install_links [link]
     end
 
     it 'returns the links created' do
-      response = stub(:response, status: 201, parsed: {label: 'test link'})
+      response = double(:response, status: 201, parsed: {label: 'test link'})
       @token.stub(:post) { response }
 
       expect(service.install_links([link]).map(&:label)).to eql(['test link'])

metadata

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