heroku-api 0.4.1 → 0.4.2

data/changelog.txt

@@ -1,3 +1,7 @@
+0.4.2 03/02/2016
+================
+Rethrow json parsing errors when application/json
+
 0.4.1 02/05/2016
 ================
 Move login parameters from query to post body

data/lib/heroku/api.rb

@@ -112,6 +112,9 @@ module Heroku
         begin
           response.body = MultiJson.load(response.body)
         rescue
+          if response.headers['Content-Type'] === 'application/json'
+            raise
+          end
           # leave non-JSON body as is
         end
       end

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/test/test_api.rb

@@ -0,0 +1,37 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestApi < Minitest::Test
+
+  def test_json_parsing_failure_for_application_json
+    Excon.stub(:expects => 200, :method => :get, :path => "/foobar") do |params|
+      {
+        :body   => "string",
+        :status => 200,
+        :headers => {'Content-Type' => 'application/json'}
+      }
+    end
+
+    begin
+      heroku.request(:expects => 200, :method => :get, :path => "/foobar")
+      fail("Expected MultiJson::ParseError")
+    rescue MultiJson::ParseError
+      # should raise parse error
+    end
+  end
+
+  def test_json_parsing_failure_for_text_plain
+    Excon.stub(:expects => 200, :method => :get, :path => "/foobar") do |params|
+      {
+        :body   => "string",
+        :status => 200,
+        :headers => {'Content-Type' => 'text/plain'}
+      }
+    end
+
+    response = heroku.request(:expects => 200, :method => :get, :path => "/foobar")
+
+    assert_equal(200, response.status)
+    assert_equal("string", response.body)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -133,6 +133,7 @@ files:
 - test/data/site.crt
 - test/data/site.key
 - test/test_addons.rb
+- test/test_api.rb
 - test/test_apps.rb
 - test/test_attachments.rb
 - test/test_buildpacks.rb
@@ -180,6 +181,7 @@ test_files:
 - test/data/site.crt
 - test/data/site.key
 - test/test_addons.rb
+- test/test_api.rb
 - test/test_apps.rb
 - test/test_attachments.rb
 - test/test_buildpacks.rb