capsule_crm 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b2ac3b80afb32c0e5e01fb90ed2677ec5bbc633
-  data.tar.gz: 0e12ab771e075cad5a39598da55d81015111620a
+  metadata.gz: c009a947688f5f89bc4b47b49423502a91523bb9
+  data.tar.gz: 0efb281b53de063eff58eb3ae377111fe1a1399e
 SHA512:
-  metadata.gz: 377306fa489bb3aa8e2f1c19a64d233b47763b7d6ca250fa32ac30a5a536173f1c726dc17b8d402dced4578f9694797fd776095ed811c9d8e8bc6e047d9ec2bc
-  data.tar.gz: 6a34894ec8bd04703a4767dbebe8a91c48164f477a079729be646e8d59e21d4f074bcc7d11fc7c8b6b5ae60215ca1f38f7e53107cc439c03bc5dfaafc70aa767
+  metadata.gz: 4b90a009a0257c2f54885f361191cbf36afce7fe0341f71b18afc4821eaca7d23a7cc095507c71447d1e533d33c301138047b6dc0b54217dd5694d78036221c2
+  data.tar.gz: b621f0a7989688a34e4505fb7952b8f69f26e17f6c715acd313b6a8ea4f4a3f0139334affebb8f02fa35535904b73f32fa7327e3c62e4a42bd3e94af20714751

data/lib/capsule_crm.rb

@@ -24,9 +24,10 @@ require 'capsule_crm/user'
 require 'capsule_crm/website'
 require 'capsule_crm/hash_helper'
 require 'capsule_crm/results_proxy'
+require 'capsule_crm/errors'
 require 'capsule_crm/errors/record_invalid'
 require 'capsule_crm/errors/record_not_saved'
-require 'capsule_crm/errors/unauthorized'
+require 'capsule_crm/errors/response_error'
 require 'capsule_crm/contacts'
 require 'capsule_crm/contactable'
 require 'capsule_crm/configuration'
@@ -38,6 +39,7 @@ require 'capsule_crm/person'
 require 'capsule_crm/milestone'
 require 'capsule_crm/track'
 require 'capsule_crm/version'
+require 'capsule_crm/faraday/middleware/raise_error'
 
 module CapsuleCRM
 

data/lib/capsule_crm/connection.rb

@@ -29,14 +29,6 @@ module CapsuleCRM
     def self.request(method, path, params)
       faraday.send(method, path, params) do |req|
         req.headers.update default_request_headers
-      end.tap do |response|
-        check_response_status(response)
-      end
-    end
-
-    def self.check_response_status(response)
-      if response.status == 401
-        raise CapsuleCRM::Errors::Unauthorized.new(response)
       end
     end
 
@@ -67,9 +59,10 @@ module CapsuleCRM
     end
 
     def self.faraday
-      Faraday.new("https://#{subdomain}.capsulecrm.com").tap do |connection|
+      ::Faraday.new("https://#{subdomain}.capsulecrm.com").tap do |connection|
         connection.basic_auth(CapsuleCRM.configuration.api_token, '')
         connection.request  :json
+        connection.use CapsuleCRM::Faraday::Middleware::RaiseError
       end
     end
 

data/lib/capsule_crm/errors.rb

@@ -0,0 +1,48 @@
+require_relative 'errors/response_error'
+
+module CapsuleCRM
+  module Errors
+    BAD_REQUEST           = 400
+    NOT_AUTHORIZED        = 401
+    NOT_FOUND             = 404
+    INTERNAL_SERVER_ERROR = 500
+
+    class << self
+      def error_constants
+        self.constants.each_with_object({}) do |name, hash|
+          next if (code = Errors.const_get(name)).is_a?(Class)
+          hash[name] = code
+        end
+      end
+
+      def class_name_for_error_name(name)
+        name.to_s.titleize.gsub(' ', '')
+      end
+
+      def class_for_error_name(name)
+        class_name = class_name_for_error_name(name)
+        if const_defined?(class_name)
+          CapsuleCRM::Errors.const_get(class_name)
+        else
+          CapsuleCRM::Errors::InternalServerError
+        end
+      end
+
+      def class_for_error_code(code)
+        name = error_constants.select { |k, v| v == code }.keys.first
+        if name.present?
+          class_for_error_name(name)
+        else
+          CapsuleCRM::Errors::InternalServerError
+        end
+      end
+    end
+  end
+end
+
+CapsuleCRM::Errors.error_constants.each do |name, code|
+  klass = Class.new(CapsuleCRM::Errors::ResponseError)
+  klass.send(:define_method, :code) { code }
+  klass_name = CapsuleCRM::Errors.class_name_for_error_name(name)
+  CapsuleCRM::Errors.const_set(klass_name, klass)
+end

data/lib/capsule_crm/errors/{unauthorized.rb → response_error.rb}

@@ -1,6 +1,6 @@
 module CapsuleCRM
   module Errors
-    class Unauthorized < StandardError
+    class ResponseError < StandardError
       attr_reader :response
 
       def initialize(response)

data/lib/capsule_crm/faraday/middleware/raise_error.rb

@@ -0,0 +1,13 @@
+module CapsuleCRM
+  module Faraday
+    module Middleware
+      class RaiseError < ::Faraday::Response::Middleware
+        def on_complete(env)
+          return if env[:status] < 400
+          raise CapsuleCRM::Errors.class_for_error_code(env[:status]).
+            new(env[:response])
+        end
+      end
+    end
+  end
+end

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/lib/capsule_crm/connection_spec.rb

@@ -25,8 +25,8 @@ describe CapsuleCRM::Connection do
       end
       subject { CapsuleCRM::Connection.get('/api/v1/foo') }
 
-      it 'should raise an Unauthorized error' do
-        expect { subject }.to raise_error(CapsuleCRM::Errors::Unauthorized)
+      it 'should raise an NotAuthorized error' do
+        expect { subject }.to raise_error(CapsuleCRM::Errors::NotAuthorized)
       end
     end
   end
@@ -64,8 +64,8 @@ describe CapsuleCRM::Connection do
         stub_request(:post, /.*/).to_return(status: 401, body: '<html></html>')
       end
 
-      it 'should raise an Unauthorized error' do
-        expect { subject }.to raise_error(CapsuleCRM::Errors::Unauthorized)
+      it 'should raise an NotAuthorized error' do
+        expect { subject }.to raise_error(CapsuleCRM::Errors::NotAuthorized)
       end
     end
   end
@@ -88,8 +88,8 @@ describe CapsuleCRM::Connection do
         stub_request(:put, /\.*/).to_return(status: 401)
       end
 
-      it 'should raise an Unauthorized error' do
-        expect { subject }.to raise_error(CapsuleCRM::Errors::Unauthorized)
+      it 'should raise an NotAuthorized error' do
+        expect { subject }.to raise_error(CapsuleCRM::Errors::NotAuthorized)
       end
     end
   end
@@ -112,8 +112,8 @@ describe CapsuleCRM::Connection do
         stub_request(:delete, /.*/).to_return(status: 401)
       end
 
-      it 'should raise an Unauthorized error' do
-        expect { subject }.to raise_error(CapsuleCRM::Errors::Unauthorized)
+      it 'should raise an NotAuthorized error' do
+        expect { subject }.to raise_error(CapsuleCRM::Errors::NotAuthorized)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Beedle
@@ -271,9 +271,11 @@ files:
 - lib/capsule_crm/currency.rb
 - lib/capsule_crm/custom_field.rb
 - lib/capsule_crm/email.rb
+- lib/capsule_crm/errors.rb
 - lib/capsule_crm/errors/record_invalid.rb
 - lib/capsule_crm/errors/record_not_saved.rb
-- lib/capsule_crm/errors/unauthorized.rb
+- lib/capsule_crm/errors/response_error.rb
+- lib/capsule_crm/faraday/middleware/raise_error.rb
 - lib/capsule_crm/hash_helper.rb
 - lib/capsule_crm/history.rb
 - lib/capsule_crm/milestone.rb