email_vision 0.2.3 → 0.2.4

data/Rakefile

@@ -41,12 +41,11 @@ end
 
 begin
   require 'jeweler'
-  project_name = 'email_vision'
   Jeweler::Tasks.new do |gem|
-    gem.name = project_name
+    gem.name =  'email_vision'
     gem.summary = "Ruby SOAP Api Client for EmailVision / CampaignCommander"
     gem.email = "michael@grosser.it"
-    gem.homepage = "http://github.com/grosser/#{project_name}"
+    gem.homepage = "http://github.com/grosser/#{gem.name}"
     gem.authors = ["Michael Grosser"]
     gem.add_dependency 'savon'
   end

data/Readme.md

@@ -21,8 +21,12 @@ Usage
     # create, create_or_update, update, change_email return a job-id
     emv.job_status job_id
 
+Docs
+====
+ - [EmailVision api](https://docs.google.com/viewer?a=v&pid=explorer&chrome=true&srcid=1FLFs3Jautozs6-ZNcT34oSXJbH6K7szw1wD8cU5i9jpEWjA4p64StquqYa6P&hl=de&authkey=CO383_EP)
+
 Author
 ======
-[Michael Grosser](http://grosser.it)  
-michael@grosser.it  
+[Michael Grosser](http://grosser.it)<br/>
+michael@grosser.it<br/>
 Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/email_vision.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{email_vision}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-02-17}
   s.email = %q{michael@grosser.it}
   s.files = [
     "Gemfile",

data/lib/email_vision.rb

@@ -2,6 +2,7 @@ require 'savon'
 
 class EmailVision
   WSDL = "http://emvapi.emv3.com/apimember/services/MemberService?wsdl"
+  NAMESPACE = 'http://api.service.apimember.emailvision.com/'
   SESSION_TIMEOUT = 10*60
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
   attr_accessor :options
@@ -85,14 +86,12 @@ class EmailVision
   end
 
   def connect!
-    response = client.request :open_api_connection do |r|
-      r.body = {
-        :login => options[:login],
-        :pwd => options[:password],
-        :key => options[:key]
-      }
-    end
-    @token = response.to_hash[:open_api_connection_response][:return]
+    @token = request_without_protection(:open_api_connection,
+      :login => options[:login],
+      :pwd => options[:password],
+      :key => options[:key],
+      :soap_client => client
+    )
     @token_requested = Time.now.to_i
   end
 
@@ -120,8 +119,7 @@ class EmailVision
   end
 
   def execute(method, options={})
-    response = connection.request(method){|r| r.body = options.merge(:token => @token) }
-    response.to_hash["#{method}_response".to_sym][:return]
+    request_without_protection(method, options.merge(:token => true))
   rescue Object => e
     if e.respond_to?(:http) and e.http.respond_to?(:body)
       retries ||= -1
@@ -139,10 +137,24 @@ class EmailVision
     raise e
   end
 
+  def request_without_protection(method, options)
+    client = options.delete(:soap_client) || connection
+    response = client.request(api_namespaced(method)) do |r|
+      r.namespaces['xmlns:api'] = NAMESPACE
+      options[:token] = @token if options[:token] # token first is generated via connection method
+      r.body = options
+    end
+    response.to_hash["#{method}_response".to_sym][:return]
+  end
+
   def convert_to_hash(entries, key, value)
     entries.inject({}) do |hash, part|
       hash[to_ruby_style(part[key])] = part[value]
       hash
     end
   end
+
+  def api_namespaced(method)
+    "api:#{method.to_s.gsub(/_./){|x| x.slice(1,1).upcase }}"
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: email_vision
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +01:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency