Skip to content
Browse files

fixing conflicts

  • Loading branch information...
2 parents 80be74c + bad4c5a commit 65c66b46ad1fd2d7f99611e70b961ae312bbd23d Derrick Camerino committed
Showing with 4 additions and 3 deletions.
  1. +1 −1 exact-target.gemspec
  2. +3 −2 lib/exact_target.rb
View
2 exact-target.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{exact-target}
- s.version = "0.1.1"
+ s.version = "0.1.2"
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
s.authors = ["David McCullars", "Paul Nock"]
View
5 lib/exact_target.rb
@@ -71,7 +71,7 @@ def call(method, *args, &block)
def send_to_exact_target(request)
verify_configure
- uri = URI.parse "#{configuration.base_url}?qf=xml&xml=#{URI.escape(URI.escape(request), '+')}"
+ uri = URI.parse configuration.base_url
http = net_http_or_proxy.new(uri.host, uri.port)
http.use_ssl = configuration.secure?
http.open_timeout = configuration.http_open_timeout
@@ -79,7 +79,7 @@ def send_to_exact_target(request)
if configuration.log_only
log(uri)
else
- resp = http.get(uri.request_uri)
+ resp = http.post(uri.request_uri, { 'qf' => 'xml', 'xml'=> request }.to_query)
if resp.is_a?(Net::HTTPSuccess)
resp.body
else
@@ -88,6 +88,7 @@ def send_to_exact_target(request)
end
end
+
# Define ExactTarget methods
(RequestBuilder.instance_methods(false) & ResponseHandler.instance_methods(false)).each do |m|
define_method(m) do |*args|

0 comments on commit 65c66b4

Please sign in to comment.
Something went wrong with that request. Please try again.