job_package.rb in ecircle-0.0.5

- old
+ new
@@ -1,60 +1,68 @@
 module Ecircle
   module JobPackage
     TARGET_CONTENT_ENCODING = 'ISO-8859-1'
 
-    def self.send_asynch_message_to_group(options)
-      xml = xml_for_asynch_calls(options)
+    def self.send_async_message_to_group(options)
+      client = Savon::Client.new do
+        wsdl.endpoint = 'http://webservices.ecircle-ag.com/ws'
+        wsdl.namespace = "http://webservices.ecircleag.com/ws"
+      end
+
+      response = client.request :control, 'xmlns' => "http://webservices.ecircle-ag.com/ecm", 'request-id' => options[:request_id], 'group-id' => options[:group_id] do
+        soap.header =  { :authenticate => { :realm    => Ecircle.configuration.async_realm,
+                                            :email    => Ecircle.configuration.user,
+                                            :password => Ecircle.configuration.password },
+                                            :attributes! => { :authenticate => { "xmlns" => "http://webservices.ecircle-ag.com/ws" } } }
+        soap.body   = soap_body(options)
+      end
     end
 
-    def self.xml_for_asynch_calls(options)
+    def self.soap_body(options)
       xml = Builder::XmlMarkup.new(:indent => 2)
-      xml.instruct!
-      xml.control :xmlns => 'http://webservices.ecircle-ag.com/ecm', 'request-id' => options[:request_id], 'group-id' => options[:group_id] do
-        xml.message 'message-id' => 'new', 'delete' => 'false' do
-          xml.tag! 'sendout-preferences' do
-            xml.tag! 'object-handling', 'html-images' => 'untouched'
-            xml.tag! 'email-channel', 'preferred-format' => 'email-html-multipart'
+      xml.message 'message-id' => 'new', 'delete' => 'false' do
+        xml.tag! 'sendout-preferences' do
+          xml.tag! 'object-handling', 'html-images' => 'untouched'
+          xml.tag! 'email-channel', 'preferred-format' => 'email-html-multipart'
+        end
+        xml.tag! 'send-date' do
+          xml.date Helper.date_format(options[:send_out_date])
+        end
+        xml.tag! 'send-report-address' do
+          xml.tag! 'email-address' do
+            xml.email options[:report_email]
+            xml.name "Send report for newsletter for location #{options[:location_name]} sent out on #{options[:send_out_date]}"
           end
-          xml.tag! 'send-date' do
-            xml.date Helper.date_format(options[:send_out_date])
-          end
-          xml.tag! 'send-report-address' do
+        end
+        xml.tag! 'status-report', 'report-id' => 'new', 'delete' => 'false', 'user-tracking-details' => 'false',  'link-tracking-details' => 'false', 'bouncing-details' => 'false' do
+          xml.tag! 'report-address' do
             xml.tag! 'email-address' do
               xml.email options[:report_email]
-              xml.name "Send report for newsletter for location #{options[:location_name]} sent out on #{options[:send_out_date]}"
+              xml.name "Status report for newsletter for location #{options[:location_name]} sent out on #{options[:send_out_date]}"
             end
           end
-          xml.tag! 'status-report', 'report-id' => 'new', 'delete' => 'false', 'user-tracking-details' => 'false',  'link-tracking-details' => 'false', 'bouncing-details' => 'false' do
-            xml.tag! 'report-address' do
-              xml.tag! 'email-address' do
-                xml.email options[:report_email]
-                xml.name "Status report for newsletter for location #{options[:location_name]} sent out on #{options[:send_out_date]}"
-              end
-            end
-            xml.tag! 'send-date' do
-              xml.date Helper.date_format(options[:send_date_for_report])
-            end
+          xml.tag! 'send-date' do
+            xml.date Helper.date_format(options[:send_date_for_report])
           end
-          xml.content 'target-content-encoding' => TARGET_CONTENT_ENCODING do
-            xml.subject options[:subject], 'target-encoding' => TARGET_CONTENT_ENCODING
-            xml.text options[:text], 'target-content-encoding' => TARGET_CONTENT_ENCODING
-            xml.html options[:html], 'target-content-encoding' => TARGET_CONTENT_ENCODING
-          end
         end
-        xml.tag! 'success-report-address' do
-          xml.tag! 'email-address' do
-            xml.email options[:report_email]
-            xml.name "Success report for newsletter for location #{options[:location_name]} sent out on #{options[:send_out_date]}"
-          end
+        xml.content 'target-content-encoding' => TARGET_CONTENT_ENCODING do
+          xml.subject options[:subject], 'target-encoding' => TARGET_CONTENT_ENCODING
+          xml.text options[:text], 'target-content-encoding' => TARGET_CONTENT_ENCODING
+          xml.html options[:html], 'target-content-encoding' => TARGET_CONTENT_ENCODING
         end
-        xml.tag! 'failure-report-address' do
-          xml.tag! 'email-address' do
-            xml.email options[:report_email]
-            xml.name "Failure report for newsletter for location #{options[:location_name]} sent out on #{options[:send_out_date]}"
-          end
+      end
+      xml.tag! 'success-report-address' do
+        xml.tag! 'email-address' do
+          xml.email options[:report_email]
+          xml.name "Success report for newsletter for location #{options[:location_name]} sent out on #{options[:send_out_date]}"
         end
       end
+      xml.tag! 'failure-report-address' do
+        xml.tag! 'email-address' do
+          xml.email options[:report_email]
+          xml.name "Failure report for newsletter for location #{options[:location_name]} sent out on #{options[:send_out_date]}"
+        end
+      end
       xml.target!
     end
   end
-end
\ No newline at end of file
+end