cobot_client 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e15ca6aec9f2e4b87115f96ad199b4e9689badc
-  data.tar.gz: 3d47e5b284423f8984d299f887e55fc74322d945
+  metadata.gz: a67e3173fd83c076f30bce37d2f6a1d9a80e4426
+  data.tar.gz: 7ee2e4a0ac5ef5604f59cfa58ee96a2fdfe37177
 SHA512:
-  metadata.gz: c4ff2fbfd692cce791d982c511a088c8c3226207564d1aa6e5608b10447cba41fb7e83e8bea20591e9ccded1603c9abfa774270e9b2abbbe2c759f5e17df8b1a
-  data.tar.gz: 88df0bde69c06d859a642d099de7cda4926712798fe2feeb2817d0a471c07416e931b596f51968f536d0f962253ac092194019d1b7dc0719fde575281187253b
+  metadata.gz: 94847dfac172d129492c411cac5b64c1c3da5a13f8a2219b7216f3f892d9d64ecb409e48796ae15eaec3a6819397e574748a3ab27e5e1c2b093e72388a5cc45b
+  data.tar.gz: 40c671e342f8d083df6277912583c03d811e1b3bbb9cead2fc18d3b700a0ac79fd91238a92d7f0a1144dbc349e53ec64d3edd7ca59c2a6f56b0a4f86273251e6

data/lib/cobot_client/api_client.rb

@@ -31,43 +31,55 @@ 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
-      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
+      url, subdomain, path, body = parse_args(*args)
+      rewrap_errors do
+        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
     end
 
     # 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)
+      url, subdomain, path, _ = parse_args(*args)
+      rewrap_errors do
+        RestClient.delete(build_url(url || subdomain, path), headers)
+      end
     end
 
     # args: either a full URL or subdomain, path, plus a body as hash
     def post(*args)
-      url, subdomain, path, body = parse_args *args
-      response = RestClient.post(
-          build_url(url || subdomain, path),
-          body.to_json,
-          headers.merge(content_type_header))
-      JSON.parse response.body, symbolize_names: true unless response.code == 204
+      url, subdomain, path, body = parse_args(*args)
+      rewrap_errors do
+        response = RestClient.post(
+            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
     end
 
     # args: either a full URL or subdomain, path, plus an optional params hash
     def get(*args)
-      url, subdomain, path, params = parse_args *args
+      url, subdomain, path, params = parse_args(*args)
       JSON.parse(
-        RestClient.get(
-          build_url(url || subdomain, path, params),
-          headers).body,
-        symbolize_names: true
-      )
+        rewrap_errors do
+          RestClient.get(
+            build_url(url || subdomain, path, params),
+            headers).body
+        end, symbolize_names: true)
     end
 
     private
 
+    def rewrap_errors
+      yield
+      rescue RestClient::Exception => e
+        raise CobotClient::Exceptions::EXCEPTIONS_MAP[e.class].new(e.response)
+    end
+
     def parse_args(*args)
       if args.last.is_a?(Hash)
         params = args.pop

data/lib/cobot_client/exceptions.rb

@@ -0,0 +1,17 @@
+require 'rest_client'
+
+module CobotClient
+  module Exceptions
+    EXCEPTIONS_MAP = {}
+  end
+
+  class Exception < RestClient::Exception
+  end
+
+  RestClient::STATUSES.each_pair do |code, message|
+    superclass = RestClient::Exceptions::EXCEPTIONS_MAP.fetch code
+    klass = Class.new(superclass)
+    klass_constant = const_set message.delete(' \-\''), klass
+    Exceptions::EXCEPTIONS_MAP[superclass] = klass_constant
+  end
+end

data/lib/cobot_client/version.rb

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

data/lib/cobot_client.rb

@@ -1,5 +1,6 @@
 require "cobot_client/version"
 require 'cobot_client/engine' if defined?(Rails)
+require 'cobot_client/exceptions'
 
 module CobotClient
   autoload :ApiClient, 'cobot_client/api_client'

data/spec/cobot_client/api_client_spec.rb

@@ -167,6 +167,28 @@ describe CobotClient::ApiClient do
 
       expect(api_client.get('co-up', '/invoices')).to eql([{number: 1}])
     end
+
+    it 'converts a rest-client error into a cobot error' do
+      allow(RestClient).to receive(:get).and_raise(RestClient::ResourceNotFound)
+
+      expect do
+        api_client.get('co-up', '/invoices')
+      end.to raise_error(CobotClient::ResourceNotFound)
+    end
+
+    it 'includes the response, http code and http body in the exception' do
+      response = double(:response, code: 404, body: 'boom')
+      error = RestClient::ResourceNotFound.new(response)
+      allow(RestClient).to receive(:get).and_raise(error)
+
+      begin
+        api_client.get('co-up', '/invoices')
+      rescue CobotClient::ResourceNotFound => e
+        expect(e.response).to eql(response)
+        expect(e.http_code).to eql(404)
+        expect(e.http_body).to eql('boom')
+      end
+    end
   end
 
   context '#delete' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobot_client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -114,6 +114,7 @@ files:
 - lib/cobot_client.rb
 - lib/cobot_client/api_client.rb
 - lib/cobot_client/engine.rb
+- lib/cobot_client/exceptions.rb
 - lib/cobot_client/navigation_link.rb
 - lib/cobot_client/navigation_link_service.rb
 - lib/cobot_client/url_helper.rb