3 files changed, 16 insertions, 13 deletions
diff --git a/lib/net/hippie/client.rb b/lib/net/hippie/client.rb
index b32c0f8..53f80d7 100644
--- a/lib/net/hippie/client.rb
+++ b/lib/net/hippie/client.rb
@@ -20,7 +20,7 @@ module Net
         @certificate = certificate
         @default_headers = headers
         @key = key
-        @mapper = JsonMapper.new
+        @mapper = ContentTypeMapper.new
         @passphrase = passphrase
         @verify_mode = verify_mode
       end
@@ -70,8 +70,9 @@ module Net
       end
 
       def request_for(type, uri, headers: {}, body: {})
-        type.new(uri, default_headers.merge(headers)).tap do |x|
-          x.body = mapper.map_from(body) unless body.empty?
+        final_headers = default_headers.merge(headers)
+        type.new(uri, final_headers).tap do |x|
+          x.body = mapper.map_from(final_headers, body) unless body.empty?
         end
       end
 
diff --git a/lib/net/hippie/content_type_mapper.rb b/lib/net/hippie/content_type_mapper.rb
new file mode 100644
index 0000000..132ee27
--- /dev/null
+++ b/lib/net/hippie/content_type_mapper.rb
@@ -0,0 +1,12 @@
+module Net
+  module Hippie
+    # Converts a ruby hash into a JSON string
+    class ContentTypeMapper
+      def map_from(headers, body)
+        content_type = headers['Content-Type'] || ''
+        return JSON.generate(body) if content_type.include?("json")
+        body
+      end
+    end
+  end
+end
diff --git a/lib/net/hippie/json_mapper.rb b/lib/net/hippie/json_mapper.rb
deleted file mode 100644
index e04a545..0000000
--- a/lib/net/hippie/json_mapper.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Net
-  module Hippie
-    # Converts a ruby hash into a JSON string
-    class JsonMapper
-      def map_from(hash)
-        JSON.generate(hash)
-      end
-    end
-  end
-end