basecrm 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88761921e923b850ccbc638210030e189d127c78b6311cfc80b77d627d2330b0
-  data.tar.gz: 5dd57f40287add6123640959a273d7492fa6fa3ad7a3a7df8db8f5f560605371
+  metadata.gz: a9b11989ce99c253d1924a4cf9994e941d28c003d2f4af414224bc0b05990b82
+  data.tar.gz: 129afc0658fb9f5320fef56bc3f243651e4725ce485a94976c22b3c4c5f0c1f8
 SHA512:
-  metadata.gz: bee7621373635902f674517cf4a88d3342968b51a559971ace04d1f6e79dcd57f3c7cfb9af09a166f7c5acaeff10559cc97f7b3a9bdcc0dbb2490d50c5c52590
-  data.tar.gz: 3f022e27eb46babad11cc02e9a4479f714851fb0c5a31e62e13cd3c2351ca22afce0960b81a7717b2456bf028e1e710ceafb4aa432bdb149c093dad85e71fa04
+  metadata.gz: 5330a0039bced2ce1aca5bbb078f8698e495737a41d14a63682638d7cddf4633c9d290cd402ff8e03a34fbffce4c758d0f768bbb1c870fa54d23f6253808eaf8
+  data.tar.gz: d2bfcdf4ad1868f75bf24ca628c7cf2739391730f99173de9e8068932dec3b6420327e7413fc4a7238b559d043e88f6369ef64573d2e5c778135b650ee0ef0b0

data/lib/basecrm/middlewares/raise_error.rb

@@ -8,9 +8,6 @@ module BaseCRM
 
         content_type = env[:response_headers]['content-type']
 
-        unless content_type.include?('json')
-          raise "status=#{status} error=Unknown error occurred."
-        end
 
         error_klass = case status
         when 422 then BaseCRM::ResourceError
@@ -18,7 +15,12 @@ module BaseCRM
         when 500...600 then BaseCRM::ServerError
         end
 
-        raise errors_collection(env, error_klass)
+        if  !content_type.nil? && content_type.include?('json')
+          raise errors_collection(env, error_klass)
+        else
+          error = {:error=>{:code=>status, :message=>"Unknown error occurred."}, :meta=>{}}
+          raise error_klass.new(error)
+        end
       end
 
       def errors_collection(env, error_klass)

data/lib/basecrm/version.rb

@@ -1,3 +1,3 @@
 module BaseCRM
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/spec/middlewares/raise_error_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+
+describe BaseCRM::Middlewares::RaiseError do
+  before { @raise_error = BaseCRM::Middlewares::RaiseError.new }
+
+  describe :on_complete do
+
+    it "returns nil when code 200..300" do
+      expect { @raise_error.on_complete({:status => 204}) }.not_to raise_error
+    end
+
+    it "raises ResourceError when code 422 and no content type" do
+      expect { @raise_error.on_complete({:status => 422, :response_headers => {}}) }
+        .to raise_error do |error|
+          expect(error).to be_a(BaseCRM::ResourceError)
+          expect(error.code).to eql(422)
+          expect(error.message).to eql("Unknown error occurred.")
+        end
+    end
+
+    it "raises RequestError when code 400..500 and no content type" do
+      expect { @raise_error.on_complete({:status => 400, :response_headers => {}}) }
+        .to raise_error do |error|
+          expect(error).to be_a(BaseCRM::RequestError)
+          expect(error.code).to eql(400)
+          expect(error.message).to eql("Unknown error occurred.")
+        end
+    end
+
+    it "raises ServerError when code 500..600 and no content type" do
+      expect { @raise_error.on_complete({:status => 500, :response_headers => {}}) }
+        .to raise_error do |error|
+          expect(error).to be_a(BaseCRM::ServerError)
+          expect(error.code).to eql(500)
+          expect(error.message).to eql("Unknown error occurred.")
+        end
+    end
+
+    it "raises ResourceError when code 422 and XML (not supported) content type" do
+      expect { @raise_error.on_complete({:status => 422, :response_headers => {'content-type' => "application/xml"}}) }
+        .to raise_error do |error|
+          expect(error).to be_a(BaseCRM::ResourceError)
+          expect(error.code).to eql(422)
+          expect(error.message).to eql("Unknown error occurred.")
+        end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basecrm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - BaseCRM developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -193,6 +193,7 @@ files:
 - spec/factories/source.rb
 - spec/factories/tag.rb
 - spec/factories/task.rb
+- spec/middlewares/raise_error_spec.rb
 - spec/models/sync_meta_spec.rb
 - spec/services/accounts_service_spec.rb
 - spec/services/associated_contacts_service_spec.rb
@@ -243,6 +244,7 @@ specification_version: 4
 summary: BaseCRM Official API V2 library client for ruby
 test_files:
 - spec/spec_helper.rb
+- spec/middlewares/raise_error_spec.rb
 - spec/utils/coercion_spec.rb
 - spec/utils/coercion.rb
 - spec/models/sync_meta_spec.rb