ecircle 0.0.4 → 0.0.5

data/.gitignore

@@ -1,3 +1,4 @@
 .idea
 pkg
-runner.rb
+async_runner.rb
+sync_runner.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ecircle (0.0.4)
+    ecircle (0.0.5)
       activesupport
       i18n
       rake

data/lib/ecircle/client.rb

@@ -49,7 +49,7 @@ module Ecircle
       @response = client.request :logon do
         soap.body = {
           :user   => Ecircle.configuration.user,
-          :realm  => Ecircle.configuration.realm,
+          :realm  => Ecircle.configuration.sync_realm,
           :passwd => Ecircle.configuration.password
         }
       end

data/lib/ecircle/configuration.rb

@@ -4,7 +4,7 @@ module Ecircle
     ENDPOINT  = 'http://webservices.ecircle-ag.com/rpc'
     NAMESPACE = "http://webservices.ecircleag.com/rpcns"
 
-    attr_accessor :user, :password, :realm, :wsdl, :endpoint, :namespace
+    attr_accessor :user, :password, :sync_realm, :async_realm, :wsdl, :endpoint, :namespace
 
     def initialize
       @wsdl      = WSDL

data/lib/ecircle/job_package.rb

@@ -2,59 +2,67 @@ 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'
-          end
-          xml.tag! 'send-date' do
-            xml.date Helper.date_format(options[:send_out_date])
+      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-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
-          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
+          xml.tag! 'send-date' do
+            xml.date Helper.date_format(options[:send_date_for_report])
           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
+end

data/lib/ecircle/version.rb

@@ -1,3 +1,3 @@
 module Ecircle
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecircle
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &78217310 !ruby/object:Gem::Requirement
+  requirement: &81915150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78217310
+  version_requirements: *81915150
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &78216730 !ruby/object:Gem::Requirement
+  requirement: &81914550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78216730
+  version_requirements: *81914550
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &78216260 !ruby/object:Gem::Requirement
+  requirement: &81914140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78216260
+  version_requirements: *81914140
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &78215740 !ruby/object:Gem::Requirement
+  requirement: &81913720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *78215740
+  version_requirements: *81913720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78215320 !ruby/object:Gem::Requirement
+  requirement: &81879230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,7 +65,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *78215320
+  version_requirements: *81879230
 description: The ecircle gem aims to be a full-fledged client for all ecircle services.
 email:
 - timo.roessner@googlemail.com
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -247901923
+      hash: -975259857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -247901923
+      hash: -975259857
 requirements: []
 rubyforge_project: ecircle
 rubygems_version: 1.8.6