cobot_client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d97efe9d55e36afb226b47dfd1b27fb96a6ca8e5
-  data.tar.gz: a930cbe33ae0f205409e1e4c47ad627b4849b574
+  metadata.gz: 01c5e183c0d951a2b1d0670e521e416ce12c5763
+  data.tar.gz: ec90ac312c8481a42cc17b8027db038a3d2f415e
 SHA512:
-  metadata.gz: 9376fa5ff793d02f983d80b084f7349e3d6ba3c203915c24aaa56c249d6f932204f81a398b07837c22faf96ac0579f65cae0238d7ecc113e11942316c424b484
-  data.tar.gz: e390b92e01f27a8f3065bb78f68bc2b33981ede0e7914905ee5d37ef51abd3062417c1406e9554b9ab1d334bb6f7eea91e4d18a8aab90da2a008ea64c4ce54db
+  metadata.gz: 1968d198e816a0d3712fcfb1cf2790d273568a8b5565d21f8b4612dcd1a0e1c7c5677f94b500d5a3d605713a2826dd3a057ad8a72c9806a2def04224c4f7c653
+  data.tar.gz: 93d4f4a79520d93d1170263aeae5e98dfb9d53837a15133270f4cf9130d074fe9c234b901e1cc3fe612d4c43d2e117916b3383f871c9f924d5ddea72e001f2c9

data/README.md

@@ -74,6 +74,10 @@ For everything else you can use the low-level get/post/put/delete metods:
     client.get 'www', '/user'
     client.post 'my-subdomain', '/users', {"email": "joe@doe.com"}
 
+You can also pass a URL instead of subdomain/path:
+
+    client.get 'https://www/cobot.me/user'
+
 ## Contributing
 
 1. Fork it

data/lib/cobot_client/api_client.rb

@@ -29,35 +29,73 @@ module CobotClient
       delete subdomain, "/bookings/#{id}"
     end
 
-    def put(subdomain, path, body)
+    # 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(
-          cobot_url(subdomain, "/api#{path}"),
+          build_url(url || subdomain, path),
           body.to_json,
           headers.merge(content_type_header)).body,
         symbolize_names: true
     end
 
-    def delete(subdomain, path)
-      RestClient.delete(cobot_url(subdomain, "/api#{path}"), headers)
+    # args: either a full URL or subdomain, path
+    def delete(*args)
+      url, subdomain, path, _ = parse_args *args
+      RestClient.delete(build_url(url || subdomain, path), headers)
     end
 
-    def post(subdomain, path, body)
+    # 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(
-          cobot_url(subdomain, "/api#{path}"),
+          build_url(url || subdomain, path),
           body.to_json,
           headers.merge(content_type_header)).body,
         symbolize_names: true
     end
 
-    def get(subdomain, path, params = {})
+    # args: either a full URL or subdomain, path, plus an optional params hash
+    def get(*args)
+      url, subdomain, path, params = parse_args *args
       JSON.parse(
         RestClient.get(
-          cobot_url(subdomain, "/api#{path}", params: params),
+          build_url(url || subdomain, path, params),
           headers).body,
         symbolize_names: true
       )
     end
 
+    private
+
+    def parse_args(*args)
+      if args.last.is_a?(Hash)
+        params = args.pop
+      else
+        params = {}
+      end
+      if args.size == 1
+        url = args[0]
+        path = nil
+        subdomain = nil
+      else
+        subdomain = args[0]
+        path = args[1]
+        url = nil
+      end
+      [url, subdomain, path, params]
+    end
+
+    def build_url(subdomain_or_url, path, params = {})
+      if path
+        cobot_url(subdomain_or_url, "/api#{path}", params: params)
+      else
+        uri = URI.parse(subdomain_or_url)
+        uri.query = URI.encode_www_form(params) if params && params.any?
+        uri.to_s
+      end
+    end
+
     def content_type_header
       {'Content-Type' => 'application/json'}
     end

data/lib/cobot_client/navigation_link_service.rb

@@ -3,7 +3,7 @@ require 'oauth2'
 module CobotClient
   # Used to install links into the Cobot navigation of a space.
   class NavigationLinkService
-    # oauth_client - an CobotClient::ApiClient
+    # api_client - an CobotClient::ApiClient
     # access_token - an access token string (owner must be admin of the space to be used)
     def initialize(api_client, space_sudomain)
       @api_client = api_client

data/lib/cobot_client/version.rb

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

data/spec/cobot_client/api_client_spec.rb

@@ -83,6 +83,17 @@ describe CobotClient::ApiClient do
       api_client.put 'co-up', '/invoices', {id: '1'}
     end
 
+    it 'accepts a url' do
+      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 'https://co-up.cobot.me/api/invoices', {id: '1'}
+    end
+
     it 'returns the response json' do
       RestClient.stub(:put) { double(:response, body: [{number: 1}].to_json) }
 
@@ -102,6 +113,17 @@ describe CobotClient::ApiClient do
       api_client.post 'co-up', '/invoices', {id: '1'}
     end
 
+    it 'accepts a url' 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 'https://co-up.cobot.me/api/invoices', {id: '1'}
+    end
+
     it 'returns the response json' do
       RestClient.stub(:post) { double(:response, body: [{number: 1}].to_json) }
 
@@ -117,6 +139,13 @@ describe CobotClient::ApiClient do
       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',
+        '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) }
 
@@ -132,5 +161,13 @@ describe CobotClient::ApiClient do
 
       api_client.delete 'co-up', '/invoices/1'
     end
+
+    it 'accepts a url' 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 'https://co-up.cobot.me/api/invoices/1'
+    end
   end
 end

metadata

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