diff --git a/lib/woocommerce_api.rb b/lib/woocommerce_api.rb index 4ef29b2..d363a31 100644 --- a/lib/woocommerce_api.rb +++ b/lib/woocommerce_api.rb @@ -97,7 +97,7 @@ def add_query_params endpoint, data endpoint += "?" unless endpoint.include? "?" endpoint += "&" unless endpoint.end_with? "?" - endpoint + URI.encode(flatten_hash(data).join("&")) + endpoint + URI.encode_www_form(flatten_hash(data)) end # Internal: Get URL for requests @@ -189,12 +189,12 @@ def flatten_hash hash case value when Hash value.map do |inner_key, inner_value| - "#{key}[#{inner_key}]=#{inner_value}" + ["#{key}[#{inner_key}]", "#{inner_value}"] end when Array - value.map { |inner_value| "#{key}[]=#{inner_value}" } + value.map { |inner_value| ["#{key}[]", "#{inner_value}"] } else - "#{key}=#{value}" + [["#{key}", "#{value}"]] end end end diff --git a/lib/woocommerce_api/oauth.rb b/lib/woocommerce_api/oauth.rb index c5bc44e..3df7c66 100644 --- a/lib/woocommerce_api/oauth.rb +++ b/lib/woocommerce_api/oauth.rb @@ -42,7 +42,7 @@ def get_oauth_url params["oauth_timestamp"] = Time.new.to_i params["oauth_signature"] = CGI::escape(generate_oauth_signature(params, url)) - query_string = URI::encode(params.map{|key, value| "#{key}=#{value}"}.join("&")) + query_string = URI.encode_www_form(params) "#{url}?#{query_string}" end diff --git a/test/test.rb b/test/test.rb index 58f25f8..71fb3ff 100644 --- a/test/test.rb +++ b/test/test.rb @@ -155,7 +155,7 @@ def test_oauth_put def test_adding_query_params url = @oauth.send(:add_query_params, 'foo.com', filter: { sku: '123' }, order: 'created_at') - assert_equal url, URI.encode('foo.com?filter[sku]=123&order=created_at') + assert_equal url, 'foo.com?filter%5Bsku%5D=123&order=created_at' end def test_invalid_signature_method