Merge pull request #7 from restaurant-cheetah/enable-to-set-configura…

…tions-on-method-call

Enable to set configurations on method call
Closes #1

README.md

@@ -42,6 +42,14 @@ class KratosService
     end
   end
 
+  # Pass custom options per method call
+  # The class defaults will not be overwritten
+  def kill_baldur
+    call_api_with_retry(retries: 2, retriable: [IOError], retry_proc: proc {}, retry_condition_proc: proc {}, time_to_sleep: 1.11) do
+      # Some logic that might raise..
+    end
+  end
+
 end  
 
 KratosService.new.call_boy

lib/take2.rb

@@ -23,6 +23,10 @@ def self.reset(options = {})
     @configuration = Configuration.new(options)
   end
 
+  def self.local_defaults(options)
+    configuration.validate_options(options)
+  end
+
   def self.configure
     yield(configuration) if block_given?
   end
@@ -51,8 +55,9 @@ module InstanceMethods
     #     end
     #
     #   end
-    def call_api_with_retry
+    def call_api_with_retry(options = {})        
       config = self.class.retriable_configuration
+      config.merge! Take2.local_defaults(options) unless options.empty?
       tries ||= config[:retries]
       begin
         yield

lib/take2/configuration.rb

@@ -17,7 +17,21 @@ def initialize(options = {})
       @retry_condition_proc = proc { false }
       @time_to_sleep = 3
       # Overwriting the defaults
-      options.each do |k, v|        
+      validate_options(options, &setter)
+    end
+
+    def to_hash
+      CONFIG_ATTRS.each_with_object({}) do |key, hash|
+        hash[key] = public_send(key)
+      end
+    end
+
+    def [](value)
+      self.public_send(value)
+    end
+
+    def validate_options(options, &setter)
+      options.each do |k, v|
         raise ArgumentError, "#{k} is not a valid configuration"  unless CONFIG_ATTRS.include?(k)
         case k
           when :retries
@@ -29,18 +43,12 @@ def initialize(options = {})
           when :retry_proc, :retry_condition_proc
             raise ArgumentError, "#{k} must be Proc" unless v.is_a?(Proc)
         end
-        instance_variable_set(:"@#{k}", v)
-      end
-    end
-
-    def to_hash
-      CONFIG_ATTRS.each_with_object({}) do |key, hash|
-        hash[key] = public_send(key)
-      end
+        setter.call(k, v) if block_given?
+      end  
     end
 
-    def [](value)
-      self.public_send(value)
+    def setter
+      proc { |key, value| instance_variable_set(:"@#{key}", value) }
     end
 
   end

spec/take2_spec.rb

@@ -231,6 +231,50 @@ def wrath_the_gods_with(error)
 
     end
 
+    context 'with custom options' do
+
+      let(:retriable_error)     { Net::HTTPRetriableError.new 'Release the Kraken...many times!!', nil }
+      let(:new_retriable_error) { IOError.new 'You shall not PASS!' }
+
+      before(:each) { @tries = 0 }
+
+      it 'overwrites the :retries' do
+        expect do
+          object.call_api_with_retry(retries: 3) { wrath_the_gods_with retriable_error } rescue nil
+        end.to change { @tries }.from(0).to(4)
+      end
+
+      it 'overwrites the :retry_proc' do
+        new_proc = proc { 1**1 }
+        expect(new_proc).to receive(:call).exactly(klass.retriable_configuration[:retries])
+        object.call_api_with_retry(retry_proc: new_proc) { wrath_the_gods_with retriable_error } rescue nil          
+      end
+
+      it 'overwrites the :retry_condition_proc' do
+        new_proc = proc { true }
+        expect(new_proc).to receive(:call).exactly(klass.retriable_configuration[:retries])
+        object.call_api_with_retry(retry_condition_proc: new_proc) { wrath_the_gods_with retriable_error } rescue nil          
+      end
+
+      it 'overwrites the :time_to_sleep' do
+        allow_any_instance_of(Object).to receive(:sleep).with(1.66)
+        object.call_api_with_retry(time_to_sleep: 1.66) { wrath_the_gods_with retriable_error } rescue nil
+      end
+
+      it 'overwrites the :retriable' do
+        expect do                
+          object.call_api_with_retry(retriable: [new_retriable_error]) { wrath_the_gods_with retriable_error } rescue nil
+        end.to change { @tries }.from(0).to(1)
+      end
+
+      it 'raises ArgumentError if there are invalid keys' do
+        expect do                
+          object.call_api_with_retry(invalid_key: :nope) { wrath_the_gods_with retriable_error }
+        end.to raise_error ArgumentError
+      end
+
+    end
+
   end
 
 end