Setting request body to JSON fixes webhook API JSON decoding error

includes Tests for JSON conversion

Author: dmgarland

lib/bitbucket_rest_api/connection.rb

@@ -89,7 +89,9 @@ def connection(options = {})
       clear_cache unless options.empty?
       puts "OPTIONS:#{conn_options.inspect}" if ENV['DEBUG']
 
-      @connection ||= Faraday.new(conn_options.merge(:builder => stack(options)))
+      @connection ||= Faraday.new(conn_options.merge(:builder => stack(options))) do |faraday|
+        faraday.response :logger if ENV['DEBUG']
+      end
     end
 
   end # Connection

lib/bitbucket_rest_api/request.rb

@@ -47,18 +47,25 @@ def request(method, path, params, options)
           request.url(path, params)
         when *METHODS_WITH_BODIES
           request.path = path
-          request.body = extract_data_from_params(params) unless params.empty?
+          unless params.empty?
+            # data = extract_data_from_params(params)
+            # request.body = MultiJson.dump(data)
+            request.body = MultiJson.dump(params)
+          end
         end
       end
       response.body
     end
 
     private
 
-    def extract_data_from_params(params) # :nodoc:
-      return params['data'] if params.has_key?('data') and !params['data'].nil?
-      return params
-    end
+    # def extract_data_from_params(params) # :nodoc:
+    #   if params.has_key?('data') and !params['data'].nil?
+    #     params['data']
+    #   else
+    #     params
+    #   end
+    # end
 
     def _extract_mime_type(params, options) # :nodoc:
       options['resource']  = params['resource'] ? params.delete('resource') : ''

spec/bitbucket_rest_api/request_spec.rb

@@ -7,7 +7,7 @@
 
   describe "request" do
     it "raises an ArgumentError if an unsupported HTTP verb is used" do
-      expect { fake_api.new.request(:i_am_a_teapot, '/', {}, {}) }.to raise_error(ArgumentError)
+      expect { fake_api.new.request(:i_am_a_teapot, '/') }.to raise_error(ArgumentError)
     end
 
     context "with a connection" do
@@ -17,64 +17,64 @@
       end
 
       it "supports get" do
-        stub_request(:get, "https://api.bitbucket.org/1.0/repositories").
+        stub_request(:get, "https://api.bitbucket.org/1.0/endpoint").
          with(:headers => {
           'Accept' => '*/*',
           'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
           'Authorization' => 'Bearer 12345',
           'User-Agent' => 'Faraday v0.9.2'
           })
 
-        fake_api.new.request(:get, '/1.0/repositories', {}, {})
+        fake_api.new.request(:get, '/1.0/endpoint', {}, {})
       end
 
       it "supports put" do
-        stub_request(:put, "https://api.bitbucket.org/1.0/repositories").
-         with(:body => { "data" => "payload" },
+        stub_request(:put, "https://api.bitbucket.org/1.0/endpoint").
+         with(:body => "{\"data\":{\"key\":\"value\"}}",
           :headers => {
             'Accept' => '*/*',
             'Content-Type'=>'application/x-www-form-urlencoded',
             'Authorization' => 'Bearer 12345',
             'User-Agent' => 'Faraday v0.9.2'
           })
 
-        fake_api.new.request(:put, '/1.0/repositories', { :data => "payload" }, {})
+        fake_api.new.request(:put, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {})
       end
 
       it "supports patch" do
-        stub_request(:patch, "https://api.bitbucket.org/1.0/repositories").
-         with(:body => { "data" => "payload" },
+        stub_request(:patch, "https://api.bitbucket.org/1.0/endpoint").
+         with(:body => "{\"data\":{\"key\":\"value\"}}",
           :headers => {
             'Accept' => '*/*',
             'Content-Type'=>'application/x-www-form-urlencoded',
             'Authorization' => 'Bearer 12345',
             'User-Agent' => 'Faraday v0.9.2'
           })
 
-        fake_api.new.request(:patch, '/1.0/repositories', { :data => "payload" }, {})
+        fake_api.new.request(:patch, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {})
       end
 
       it "supports delete" do
-        stub_request(:delete, "https://api.bitbucket.org/1.0/repositories").
+        stub_request(:delete, "https://api.bitbucket.org/1.0/endpoint").
          with(:headers => {
           'Accept' => '*/*',
           'Authorization' => 'Bearer 12345',
           'User-Agent' => 'Faraday v0.9.2'
           })
-        fake_api.new.request(:delete, '/1.0/repositories', {}, {})
+        fake_api.new.request(:delete, '/1.0/endpoint', {}, {})
       end
 
       it "supports post" do
-        stub_request(:post, "https://api.bitbucket.org/1.0/repositories").
-         with(:body => { "data" => "payload" },
+        stub_request(:post, "https://api.bitbucket.org/1.0/endpoint").
+         with(:body => "{\"data\":{\"key\":\"value\"}}",
           :headers => {
             'Accept' => '*/*',
             'Content-Type'=>'application/x-www-form-urlencoded',
             'Authorization' => 'Bearer 12345',
             'User-Agent' => 'Faraday v0.9.2'
           })
 
-        fake_api.new.request(:post, '/1.0/repositories', { :data => "payload" }, {})
+        fake_api.new.request(:post, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {})
       end
     end
   end

spec/spec_helper.rb

@@ -18,7 +18,7 @@
   end
 end
 
-VCR.configure do |config|
-  config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
-  config.hook_into :webmock
-end
+# VCR.configure do |config|
+#   config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
+#   config.hook_into :webmock
+# end