Conditionator 0.2 → 0.3

data/lib/conditionator/hooks.rb

@@ -31,6 +31,10 @@ module ConditionatorHooks
 		conditions :post
 	end
 
+	def failsafe_for method
+		self.class.data[self.class.name][method][:pre][:failsafe]
+	end
+
 	#Creates all methods needed for the hooks to take place.
 	def load_conditions
 
@@ -44,27 +48,30 @@ module ConditionatorHooks
 
 				if !self.respond_to? "#{method}_with_#{_when}_cond".to_sym
 					self.class.send :define_method, "#{method}_with_#{_when}_cond".to_sym do |*p|
+						execute_method = true
 						if(_when == :pre)
 							returns = arr_methods.collect do |m| 
 								self.send(m, *p) ? true : false
 							end
 							returns.uniq!
 
+							#if one of the preconditions returned false, we act accordingly
 							if returns.include? false
-								raise PreconditionsNotMet
+								execute_method = false
+								if !data[:failsafe].nil? #if we had setup a failsafe method, we use that
+									ret_value = self.send(data[:failsafe], *p) #if we execute the failsafe, that method will give us the returning value
+								else #otherwise, we raise the exception if the dev didn't mute it
+									raise PreconditionsNotMet if !data[:mute]
+								end
 							end
-							#if returns.length == 1 and returns.include? true	
-								#data[:block].call(self) if !data[:block].nil?
-							#else
-								#raise PreconditionsNotMet
-							#end
 						end 
-						ret_value = self.send "#{method}_without_#{_when}_cond".to_sym, *p
+						if execute_method
+							ret_value = self.send "#{method}_without_#{_when}_cond".to_sym, *p
+						end
 						if(_when == :post)
 							arr_methods.each do |m| 
 								self.send m, *p, ret_value 
 							end
-							#data[:block].call(self) if !data[:block].nil?
 						end 
 						return ret_value
 					end
@@ -79,7 +86,7 @@ module ConditionatorHooks
 	private
 
 		#Adds a pre or post condition to the list of conditions to be used
-		def add_condition_for type, for_method, conditions
+		def add_condition_for type, for_method, conditions, options = {}
 			key = self.name.to_s
 			if conditions.is_a? Array
 				condition_list = conditions
@@ -93,6 +100,9 @@ module ConditionatorHooks
 
 			_data[key][for_method][type] = Hash.new if _data[key][for_method][type].nil?
 			_data[key][for_method][type][:methods] = condition_list
+			_data[key][for_method][type][:failsafe] = options[:failsafe]
+			_data[key][for_method][type][:mute] = options[:mute]
+
 		end
 
 
@@ -108,13 +118,13 @@ module ConditionatorHooks
 		#Adds a precondition for the method 'method_name'
 		#method_name can be an array of methods, in which case, we add the same
 		#preconditions for all methos inside it.
-		def precondition_for method_name, preconditions
+		def precondition_for method_name, preconditions, options = {}
 			if method_name.is_a? Array 
 				method_name.each do |m| 
-					add_condition_for :pre, m, preconditions
+					add_condition_for :pre, m, preconditions, options
 				end
 			else
-				add_condition_for :pre, method_name, preconditions
+				add_condition_for :pre, method_name, preconditions, options
 			end
 		end
 

data/lib/conditionator.rb

@@ -1,8 +1,8 @@
 require 'conditionator/hooks'
-
+	
 #Main module, including this module in your class will attach it the methods 
 module Conditionator
-	VERSION = 0.2
+	VERSION = 0.3
 
 	def self.included base
 		base.send :include, ConditionatorHooks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Conditionator
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000Z
+date: 2012-05-18 00:00:00.000000000Z
 dependencies: []
 description: This gem allows you to set pre and post conditions to your methods, in
   order to assure their successfull excecution
@@ -20,7 +20,7 @@ extra_rdoc_files: []
 files:
 - lib/conditionator.rb
 - lib/conditionator/hooks.rb
-homepage: https://github.com/deleteman/conditionatorr
+homepage: https://github.com/deleteman/conditionator
 licenses: []
 post_install_message: 
 rdoc_options: []