Merge pull request #60 from gmaliar/fix/500-errors-json-parse

Handle 500 errors as Unsplash::Error

lib/unsplash/connection.rb

@@ -127,10 +127,14 @@ def request(verb, path, params = {})
 
       status_code = response.respond_to?(:status) ? response.status : response.code
 
-      if !(200..299).include?(status_code)
-        body = JSON.parse(response.body)
-        msg = body["error"] || body["errors"].join(" ")
-        raise Unsplash::Error.new msg
+      begin
+        if !(200..299).include?(status_code)
+          body = JSON.parse(response.body)
+          msg = body["error"] || body["errors"].join(" ")
+          raise Unsplash::Error.new msg
+        end
+      rescue JSON::ParserError
+        raise Unsplash::Error.new response.body
       end
 
       response

spec/unsplash_spec.rb

@@ -12,4 +12,15 @@
     expect(Unsplash.configuration.logger).to receive(:warn).with("Watch out!")
     Unsplash::CuratedBatch.all
   end
+
+  it "handles 5** errors as Unsplash Errors" do
+    response = double(
+      body: "We are experiencing errors. Please check https://status.unsplash.com for updates.",
+      status: 503,
+      headers: { "Content-Type" => "text/plain" }
+    )
+    allow(Unsplash::Connection).to receive(:public_send).and_return(response)
+
+    expect { Unsplash::CuratedBatch.all }.to raise_error(Unsplash::Error)
+  end
 end