Issue 59 - handle 204 responses more gracefully

lib/google/api_client/result.rb

@@ -71,7 +71,11 @@ module Google
         _, content_type = self.headers.detect do |h, v|
           h.downcase == 'Content-Type'.downcase
         end
-        content_type[/^([^;]*);?.*$/, 1].strip.downcase
+        if content_type
+          return content_type[/^([^;]*);?.*$/, 1].strip.downcase
+        else
+          return nil
+        end
       end
       
       ##
@@ -121,7 +125,7 @@ module Google
       # @return [TrueClass, FalseClass]
       #   true if body can be parsed
       def data?
-        self.media_type == 'application/json'
+        !(self.body.nil? || self.body.empty? || self.media_type != 'application/json')
       end
       
       ##
@@ -132,6 +136,7 @@ module Google
       #   Object if body parsable from API schema, Hash if JSON, raw body if unable to parse
       def data
         return @data ||= (begin
+          if self.data?
             media_type = self.media_type
             data = self.body
             case media_type
@@ -153,6 +158,7 @@ module Google
               # This value must be indexable like a Hash.
               data
             end
+          end
         end)
       end
 

spec/google/api_client/result_spec.rb

@@ -180,7 +180,27 @@ describe Google::APIClient::Result do
       it 'should return the correct error message' do
         @result.error_message.should == 'Parse Error'
       end
+    end
     
+    describe 'with 204 No Content response' do
+      before do
+        @response.stub(:body).and_return('')
+        @response.stub(:status).and_return(204)
+        @response.stub(:headers).and_return({})
+        @result = Google::APIClient::Result.new(@reference, @response)
+      end
+
+      it 'should indicate no data is available' do
+        @result.data?.should be_false
+      end
+      
+      it 'should return nil for data' do
+        @result.data.should == nil
+      end
+      
+      it 'should return nil for media_type' do
+        @result.media_type.should == nil
+      end
     end
   end
 end