fizzy-api 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d765a41a54c71deaa913d8c82240d5dfaea5bec9
-  data.tar.gz: 1629bc82237c2ee23495a8a6f1f39b2e1dca742c
+  metadata.gz: f7c3650bd785f1da29b76e7eb3601ea4c6b20529
+  data.tar.gz: bd84ab4f4c8f6afc2fc00a0827b40d9309156e70
 SHA512:
-  metadata.gz: 3af5c89cbb76c641e49a0bc5543b3f58555e9b4946fdcb7230842d91acec8fbd69a59cbbf9d9b5027e2a04c66c237e6a700c98ec095c4167c4c2078f55b29117
-  data.tar.gz: b0ed37127e42328832831d7758cdae12aaa02af6b26d3dd6171c14ec169325333d5f4c93cab2e56b4109b3d35615648862eaa8ecb83ecacfd099a449fe3554f5
+  metadata.gz: 64e609e8180df1f6447a1bd605dbfea91b319e8bf9395193da81d9de660d18ac83d36f6a9647f6a8ff71b66bdcea1f2f6e7e76060890214aa55a244a145b61d1
+  data.tar.gz: 78dd0fccbe96ffe69035ca590b774aabd017312eef24b056940ad98d962b8c209dd265614066f5ae8b468104e6fe902a2965455adc1856b8df848efa2f8f3dae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fizzy-api (0.0.4)
+    fizzy-api (0.0.6)
       active_interaction (~> 2.0)
       httparty (~> 0.12)
       virtus (~> 1.0)

data/lib/fizzy/api/calculate_outcome.rb

@@ -17,10 +17,17 @@ module Fizzy
         case response.code
         when 200
           response
+        else
+          invalid_response(response)
+        end
+      end
+
+      def invalid_response(response)
+        case response.code
         when 202
-          raise Errors::OutcomeNotAvailableError, 'The results are currently being calculated.'
+          raise Errors::OutcomeNotAvailableError, response.body || 'The results are currently being calculated.'
         when 404
-          raise Errors::GraphNotFoundError, 'Participant not found, or graph not supported.'
+          raise Errors::GraphNotFoundError, response.body || 'Participant not found, or graph not supported.'
         else
           raise Errors::UnexpectedStatusError, "Status code #{response.code} not expected."
         end

data/lib/fizzy/api/render_graph.rb

@@ -19,16 +19,30 @@ module Fizzy
         case response.code
         when 200
           response
+        else
+          invalid_response(response)
+        end
+      end
+
+      def invalid_response(response)
+        case response.code
         when 202
-          raise Errors::OutcomeNotAvailableError, 'The results have not yet been calculated.'
+          raise Errors::OutcomeNotAvailableError, select_measurement_text(response,
+                                                                          'The results have not yet been calculated.')
         when 204
-          raise Errors::TooFewMeasurementsError, 'Not enough measurements available.'
+          raise Errors::TooFewMeasurementsError, select_measurement_text(response,
+                                                                         'Not enough measurements available.')
         when 404
-          raise Errors::GraphNotFoundError, 'Graph not found.'
+          raise Errors::GraphNotFoundError, select_measurement_text(response,
+                                                                    'Graph not found.')
         else
           raise Errors::UnexpectedStatusError, "Status code #{response.code} not expected."
         end
       end
+
+      def select_measurement_text(response, default_message)
+        response.body || default_message
+      end
     end
   end
 end

data/lib/fizzy/api/version.rb

@@ -1,5 +1,5 @@
 module Fizzy
   module Api
-    VERSION = '0.0.5'.freeze
+    VERSION = '0.0.6'.freeze
   end
 end

data/spec/support/httparty_helpers.rb

@@ -1,4 +1,5 @@
 def httparty_response(response_data)
+  allow(response_data).to receive(:body).and_return response_data
   allow(response_data).to receive(:code).and_return 200
   allow(response_data).to receive(:parsed_response).and_return response_data
   response_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fizzy-api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Frank Blaauw
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: API wrapper gem around Fizzy's Graph API