@@ -1,3 +1,4 @@
+require "cgi"
module Clickatell
class API
@@ -14,8 +15,8 @@ module Clickatell
# Returns a URL for the given parameters (a hash).
def with_params(param_hash)
- param_string = '?' + param_hash.map { |key, value| "#{key}=#{value}" }.sort.join('&')
- return URI.parse(File.join(api_service_uri, @command_name + URI.encode(param_string)))
+ param_string = '?' + param_hash.map { |key, value| "#{::CGI.escape(key.to_s)}=#{::CGI.escape(value.to_s)}" }.sort.join('&')
+ return URI.parse(File.join(api_service_uri, @command_name + param_string))
end
protected
lib/clickatell/api/command.rb
@@ -24,8 +24,8 @@ module Clickatell
end
it "should URL encode any special characters in parameters" do
- url = @command.with_params(:param_one => 'abc', :param_two => 'hello world')
- url.should == URI.parse("http://api.clickatell.com/http/cmdname?param_one=abc¶m_two=hello%20world")
+ url = @command.with_params(:param_one => 'abc', :param_two => 'hello world & goodbye cruel world <grin>')
+ url.should == URI.parse("http://api.clickatell.com/http/cmdname?param_one=abc¶m_two=hello+world+%26+goodbye+cruel+world+%3Cgrin%3E")
end
it "should use a custom host when constructing command URLs if specified" do
@@ -113,10 +113,10 @@ module Clickatell
it "should support sending messages to a specified number, returning the message id" do
@executor.expects(:execute).with('sendmsg', 'http',
:to => '4477791234567',
- :text => 'hello world'
+ :text => 'hello world & goodbye'
).returns(response = stub('response'))
Response.stubs(:parse).with(response).returns('ID' => 'message_id')
- @api.send_message('4477791234567', 'hello world').should == 'message_id'
+ @api.send_message('4477791234567', 'hello world & goodbye').should == 'message_id'
end
it "should set the :from parameter and set the :req_feat to 48 when using a custom from string when sending a message" do
spec/api_spec.rb
8e833740212eb7eccd69c144446f70e4b54811f9
Tom Brice
tomtoday@gmail.com
http://github.com/lukeredpath/clickatell/commit/a3a6b33f908690049e2e0f65ae23de9f0b32f385
a3a6b33f908690049e2e0f65ae23de9f0b32f385
2009-06-25T03:12:09-07:00
2009-06-24T20:45:13-07:00
Adjust Clickatell::API::Command#with_params to create query strings that handle special characters properly.
This fix was made to handle ampersands in text message bodies correctly. Prior to this ampersands in the message would truncate the message
Signed-off-by: Luke Redpath <luke@lukeredpath.co.uk>
a009fa79d1b0c1655b249d14b1c84cd230359070
Luke Redpath
luke@lukeredpath.co.uk