parallizer 0.1.0 → 0.2.0

data/README.md

@@ -137,6 +137,22 @@ http_service.get('www.google.com', '/search?q=foobar') # makes an HTTP request a
 ```
 
 
+### Service Method Retries
+
+Parallize also allows you to retry methods that fail (any exception raised is considered a failure).
+
+```ruby
+require 'net/http'
+require 'parallizer'
+
+parallizer = Parallizer.new(Net::HTTP, :retries => 3)
+parallizer.add.get('www.google.com', '/?q=foo')
+http_service = parallizer.create_proxy
+
+http_service.get('www.google.com', '/?q=foo') # Will be called up to 4 times
+```
+
+
 # Credits
 
 [Parallizer](https://github.com/michaelgpearce/parallizer) is maintained by [Michael Pearce](http://github.com/michaelgpearce) and is funded by [Rafter](http://www.rafter.com "Rafter").

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/parallizer.rb

@@ -3,10 +3,11 @@ require 'parallizer/proxy'
 require 'parallizer/method_call_notifier'
 
 class Parallizer
-  attr_reader :calls, :call_infos, :client, :proxy
+  attr_reader :calls, :call_infos, :client, :proxy, :options
   
-  def initialize(client)
+  def initialize(client, options = {})
     @client = client
+    @options = {:retries => 0}.merge(options)
     @call_infos = {}
   end
   
@@ -30,22 +31,12 @@ class Parallizer
       :result => nil,
       :exception => nil,
       :condition_variable => ConditionVariable.new,
-      :mutex => Mutex.new
+      :mutex => Mutex.new,
+      :retries => options[:retries]
     }
     call_infos[method_name_and_args] = call_info
     
-    Parallizer.work_queue.enqueue_b do
-      call_info[:mutex].synchronize do
-        begin
-          call_info[:result] = client.send(*method_name_and_args)
-        rescue Exception => e
-          call_info[:exception] = e
-        ensure
-          call_info[:complete?] = true
-          call_info[:condition_variable].signal
-        end
-      end
-    end
+    enqueue_call_info(call_info, method_name_and_args)
   end
   
   def create_proxy
@@ -57,4 +48,27 @@ class Parallizer
   def self.work_queue
     @parallizer_work_queue ||= WorkQueue.new(10)
   end
+  
+  private
+  
+  def enqueue_call_info(call_info, method_name_and_args)
+    Parallizer.work_queue.enqueue_b do
+      call_info[:mutex].synchronize do
+        begin
+          (call_info[:retries] + 1).times do
+            begin
+              call_info[:exception] = nil # reset exception before each send attempt
+              call_info[:result] = client.send(*method_name_and_args)
+              break # success
+            rescue Exception => e
+              call_info[:exception] = e
+            end
+          end
+        ensure
+          call_info[:complete?] = true
+          call_info[:condition_variable].signal
+        end
+      end
+    end
+  end
 end

data/lib/parallizer/proxy.rb

@@ -19,7 +19,12 @@ class Parallizer
           end
           # we now have our result from the worker thread
           
-          raise call_info[:exception] if call_info[:exception]
+          if call_info[:exception]
+            # add the current call stack to the exception backtrace
+            exception = call_info[:exception].clone
+            exception.set_backtrace((call_info[:exception].backtrace || []) + caller)
+            raise exception
+          end
           
           value = call_info[:result]
         end

data/parallizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parallizer"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Pearce"]
-  s.date = "2012-08-04"
+  s.date = "2012-08-15"
   s.description = "Execute your service layer in parallel."
   s.email = "michael.pearce@bookrenter.com"
   s.extra_rdoc_files = [

data/test/parallizer/proxy_test.rb

@@ -49,10 +49,26 @@ class Parallizer::ProxyTest < Test::Unit::TestCase
           context "with an exception" do
             setup do
               @call_info[:exception] = StandardError.new('An Exception')
+              @call_info[:exception].set_backtrace(["/tmp/foo.rb:123:in `in a_worker_thread_method'"])
             end
             
+            execute do
+              def a_calling_thread_method
+                call_infos = { @call_key => @call_info }
+                proxy = Parallizer::Proxy.new(@client, call_infos)
+                proxy.send(*@call_key) rescue $!
+              end
+              a_calling_thread_method
+            end
+
             should "raise exception" do
-              assert_equal @call_info[:exception], @execute_result
+              assert_equal @call_info[:exception].class, @execute_result.class
+              assert_equal @call_info[:exception].message, @execute_result.message
+            end
+            
+            should "append backtrace of current call" do
+              assert @execute_result.backtrace.grep /a_worker_thread_method/
+              assert @execute_result.backtrace.grep /a_calling_thread_method/
             end
           end
           

data/test/parallizer_test.rb

@@ -110,6 +110,43 @@ class ParallizerTest < Test::Unit::TestCase
         assert_equal ArgumentError, @execute_result.class
       end
     end
+  end
+  
+  context "with retries" do
+    setup do
+      @retries = 3
+      @client = stub('a client')
+      @method = :a_sometimes_failing_method
+    end
+    
+    execute do
+      parallizer = Parallizer.new(@client, :retries => @retries)
+      parallizer.add_call(@method)
+      proxy = parallizer.create_proxy
+      proxy.send(@method) rescue $!
+    end
     
+    context "with success on last retry" do
+      setup do
+        # NOTE: added reverse order
+        @client.expects(@method).returns('success')
+        @retries.times { @client.expects(@method).raises('an error') }
+      end
+      
+      should "return successful method response" do
+        assert_equal 'success', @execute_result
+      end
+    end
+    
+    
+    context "with failures greater than retries" do
+      setup do
+        (@retries + 1).times { @client.expects(@method).raises('an error') }
+      end
+      
+      should "return successful method response" do
+        assert_equal 'an error', @execute_result.message
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallizer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -894887093549594031
+      hash: 1438464558148381221
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: