apsis-on-steroids 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/apsis-on-steroids.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "apsis-on-steroids"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kaspernj"]
-  s.date = "2013-08-29"
+  s.date = "2013-10-14"
   s.description = "A Ruby API for the Apsis mail service. "
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/include/subscriber.rb

@@ -37,28 +37,41 @@ class ApsisOnSteroids::Subscriber < ApsisOnSteroids::SubBase
   
   # Update one or more details on the subscriber.
   def update(data)
-    res = aos.req_json("v1/subscribers/queue", :post, :json => [data.merge(:Id => self.data(:id))])
-    url = URI.parse(res["Result"]["PollURL"])
-    data = nil
-    
-    Timeout.timeout(300) do
-      loop do
-        sleep 1
-        res = aos.req_json(url.path)
+    begin
+      res = aos.req_json("v1/subscribers/queue", :post, :json => [data.merge(:Id => self.data(:id))])
+      url = URI.parse(res["Result"]["PollURL"])
+      data = nil
+      
+      Timeout.timeout(300) do
+        loop do
+          sleep 1
+          res = aos.req_json(url.path)
+          
+          if res["State"] == "2"
+            url_data = URI.parse(res["DataUrl"])
+            data = aos.req_json(url_data.path)
+            break
+          elsif res["State"] == "0" || res["State"] == "1"
+            # Keep waiting.
+          else
+            raise "Unknown state '#{res["State"]}': #{res}"
+          end
+        end
+      end
+      
+      if data["FailedUpdatedSubscribers"] && data["FailedUpdatedSubscribers"].any?
+        msg = raise data["FailedUpdatedSubscribers"].to_s
         
-        if res["State"] == "2"
-          url_data = URI.parse(res["DataUrl"])
-          data = aos.req_json(url_data.path)
-          break
-        elsif res["State"] == "0" || res["State"] == "1"
-          # Keep waiting.
+        if msg.include?("Timeout expired.")
+          raise Errno::EAGAIN, msg
         else
-          raise "Unknown state '#{res["State"]}': #{res}"
+          raise msg
         end
       end
+    rescue Errno::EAGAIN
+      retry
     end
     
-    raise data["FailedUpdatedSubscribers"].to_s if data["FailedUpdatedSubscribers"] && data["FailedUpdatedSubscribers"].any?
     @details = nil
     return nil
   end

metadata

@@ -2,14 +2,14 @@
 name: apsis-on-steroids
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -175250249640410280
+      hash: 3562323748187829359
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false