fix pubsub

timruffles · timruffles · commit f1d8ac94e1ef · 2014-12-03T20:04:23.000Z
- content type was being passed but ignored
- jsonize was overwriting every non-json body for non-get requests
diff --git a/lib/github_api/connection.rb b/lib/github_api/connection.rb
@@ -26,7 +26,12 @@ def default_options(options = {})
         },
         ssl: options[:ssl],
         url: options[:endpoint]
-      }
+      }.tap do |h|
+        if type = options[:headers] && options[:headers][CONTENT_TYPE]
+          h[:headers][CONTENT_TYPE] = type
+        end
+        h
+      end
     end
 
     def clear_cache
diff --git a/lib/github_api/request/jsonize.rb b/lib/github_api/request/jsonize.rb
@@ -14,9 +14,9 @@ def call(env)
       if request_with_body?(env)
         env[:request_headers][CONTENT_TYPE] ||= MIME_TYPE
         env[:body] = encode_body env[:body] unless env[:body].respond_to?(:to_str)
-      else
+      elsif safe_to_modify?(env)
         # Ensure valid body for put and post requests
-        if [:put, :patch, :post].include? env[:method]
+        if [:put, :patch, :post].include?(env[:method])
           env[:body] = encode_body({})
         end
       end
@@ -33,7 +33,12 @@ def encode_body(value)
 
     def request_with_body?(env)
       type = request_type(env)
-      has_body?(env) and (type.empty? or type == MIME_TYPE)
+      has_body?(env) and safe_to_modify?(env)
+    end
+
+    def safe_to_modify?(env)
+      type = request_type(env)
+      type.empty? or type == MIME_TYPE
     end
 
     # Don't encode bodies in string form
