email_vision 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/email_vision.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{email_vision}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/lib/email_vision.rb

@@ -70,17 +70,7 @@ class EmailVision
   private
 
   def connection
-    unless connected?
-      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_requested = Time.now.to_i
-    end
+    connect! unless connected?
     client
   end
 
@@ -94,6 +84,18 @@ class EmailVision
     @token and @token_requested > (Time.now.to_i - SESSION_TIMEOUT)
   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_requested = Time.now.to_i
+  end
+
   def execute_by_email_or_id(method, email_or_id)
     if email_or_id.to_s.include?('@')
       execute("#{method}_by_email", :email => email_or_id)
@@ -120,6 +122,21 @@ class EmailVision
   def execute(method, options={})
     response = connection.request(method){|r| r.body = options.merge(:token => @token) }
     response.to_hash["#{method}_response".to_sym][:return]
+  rescue Object => e
+    if e.respond_to?(:http) and e.http.respond_to?(:body)
+      retries ||= -1
+      retries += 1
+      session_error = (e.http.body =~ /status>(SESSION_RETRIEVING_FAILED|CHECK_SESSION_FAILED)</)
+      if session_error
+        if retries < 1
+          connect!
+          retry
+        else
+          e.message << " -- retried #{retries}"
+        end
+      end
+    end
+    raise e
   end
 
   def convert_to_hash(entries, key, value)

data/spec/email_vision_spec.rb

@@ -7,6 +7,16 @@ describe "EmailVision" do
   let(:random_value){rand(11111111111).to_s}
   let(:expired_token){'Duy-M5FktALawBJ7dZN94s6hLEgLGKXC_j7cCqlDUMXRGw2shqHYbR9Zud_19EBtFkSCbJ0ZmrZ_d0ieBqgR'}
 
+  def error_with_status(status)
+    # mock / stub did not work...
+    $the_status = status
+    http = ""
+    def http.error?; true; end
+    def http.body; "<status>#{$the_status}</status>"; end
+    def http.code; 500; end
+    Savon::HTTP::Error.new(http)
+  end
+
   # updates need some time to finish on the server...
   def wait_for_job_to_finish
     client.wait_for_job_to_finish yield
@@ -63,6 +73,37 @@ describe "EmailVision" do
     end
   end
 
+  describe 'error handling' do
+    before do
+      @connection = client.send(:connection)
+      client.stub!(:connection).and_return @connection
+    end
+
+    it "retries if it failed due to session timeout" do
+      error = error_with_status("CHECK_SESSION_FAILED")
+      @connection.should_receive(:request).exactly(2).and_raise(error)
+      lambda{
+        client.find('aaaa')
+      }.should raise_error#(error)
+    end
+
+    it "retries if it failed due to maximum request per session" do
+      error = error_with_status("SESSION_RETRIEVING_FAILED")
+      @connection.should_receive(:request).exactly(2).and_raise(error)
+      lambda{
+        client.find('aaaa')
+      }.should raise_error#(error)
+    end
+
+    it "does not retry if it failed otherwise" do
+      error = error_with_status("FOO_BAR")
+      @connection.should_receive(:request).exactly(1).and_raise(error)
+      lambda{
+        client.find('aaaa')
+      }.should raise_error#(error)
+    end
+  end
+
   describe :update do
     it "can update an attribute" do
       wait_for_job_to_finish do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: email_vision
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Michael Grosser