lib/kentaa/api/request.rb in kentaa-api-0.6.0 vs lib/kentaa/api/request.rb in kentaa-api-0.7.0

@@ -11,56 +11,67 @@
 
       def initialize(config)
         @config = config
       end
 
-      def get(path, params = {})
-        request(:get, path, params)
+      def get(path, params = {}, options = {})
+        request(:get, path, params, nil, options)
       end
 
-      def post(path, params = {}, body = {})
-        request(:post, path, params, body)
+      def post(path, params = {}, body = {}, options = {})
+        request(:post, path, params, body, options)
       end
 
-      def patch(path, params = {}, body = {})
-        request(:patch, path, params, body)
+      def patch(path, params = {}, body = {}, options = {})
+        request(:patch, path, params, body, options)
       end
 
-      def delete(path, params = {})
-        request(:delete, path, params)
+      def delete(path, params = {}, options = {})
+        request(:delete, path, params, nil, options)
       end
 
       private
 
-      def request(http_method, path, params = {}, body = {})
+      def request(http_method, path, params = {}, body = nil, options = {})
         uri = URI.parse(File.join(config.api_url, path))
         uri.query = URI.encode_www_form(params) unless params.empty?
 
+        content_type = options.fetch(:content_type, 'application/json')
+
+        # Body can be passed as an IO-like object or an object that can be serialized to JSON.
+        if body
+          if body.respond_to?(:read)
+            body = body.read
+          elsif body.respond_to?(:to_json)
+            body = body.to_json
+          end
+        end
+
         case http_method
         when :get
           request = Net::HTTP::Get.new(uri)
         when :post
           request = Net::HTTP::Post.new(uri)
-          request.body = body.to_json
+          request.body = body
         when :patch
           request = Net::HTTP::Patch.new(uri)
-          request.body = body.to_json
+          request.body = body
         when :delete
           request = Net::HTTP::Delete.new(uri)
         else
           raise Kentaa::Api::Exception, "Invalid HTTP method: #{http_method}"
         end
 
         logger.debug("[Kentaa-API] Request: #{http_method.upcase} #{uri}") if config.debug?
 
-        request["Accept"] = "application/json"
-        request["Content-Type"] = "application/json"
-        request["X-Api-Key"] = config.api_key
-        request["User-Agent"] = "Ruby kentaa-api/#{Kentaa::Api::VERSION}"
+        request['Accept'] = 'application/json'
+        request['Content-Type'] = content_type
+        request['X-Api-Key'] = config.api_key
+        request['User-Agent'] = "Ruby kentaa-api/#{Kentaa::Api::VERSION}"
 
         client = Net::HTTP.new(uri.hostname, uri.port)
-        client.use_ssl = uri.scheme == "https"
+        client.use_ssl = uri.scheme == 'https'
         client.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
         begin
           response = Kentaa::Api::Response.new(client.request(request))
         # Try to catch some common exceptions Net::HTTP might raise.
@@ -70,12 +81,10 @@
           raise Kentaa::Api::Exception, e.message
         end
 
         logger.debug("[Kentaa-API] Response: #{response.http_code}, body: #{response.body}") if config.debug?
 
-        if response.error?
-          raise Kentaa::Api::RequestError, response
-        end
+        raise Kentaa::Api::RequestError, response if response.error?
 
         response
       end
 
       def logger