Conditionator 0.1 → 0.2

data/lib/conditionator.rb

@@ -1,17 +1,13 @@
 require 'conditionator/hooks'
 
-#Extends all objects to check for conditions
-class Object
-	include Conditionator
-
-	class << self
-		alias_method :old_new, :new
-
-		def new *args
-			o = old_new(*args)
-			o.load_conditions
-			o
+#Main module, including this module in your class will attach it the methods 
+module Conditionator
+	VERSION = 0.2
+
+	def self.included base
+		base.send :include, ConditionatorHooks
+		def base.new(*)
+			super.tap(&:load_conditions)
 		end
 	end
-
 end

data/lib/conditionator/hooks.rb

@@ -1,13 +1,13 @@
-module Conditionator
+module ConditionatorHooks
 
-	class PreconditionsNotMet < Exception
+	class PreconditionsNotMet < StandardError
 	end
 
-private
+	private
 	def conditions type
 		conds = {}
 		data = self.class.data
-	
+
 		data[self.class.name].each do |method, filter|
 			if filter.key? type
 				conds[method] = [] if conds[method].nil?
@@ -21,7 +21,7 @@ private
 		base.send :extend, ClassLevelConditionator
 	end
 
-public	
+	public	
 	#Returns a list of all preconditions, grouped by the method they're a precondition to.
 	def preconditions
 		conditions :pre
@@ -36,31 +36,37 @@ public
 
 		_data = self.class.data
 		_data[self.class.name] = {} if _data[self.class.name].nil?
-	
+
 		_data[self.class.name].each { |method, type|
 			type.each { |_when, data|
-				
+
 				arr_methods = data[:methods]
-	
+
 				if !self.respond_to? "#{method}_with_#{_when}_cond".to_sym
 					self.class.send :define_method, "#{method}_with_#{_when}_cond".to_sym do |*p|
 						if(_when == :pre)
 							returns = arr_methods.collect do |m| 
-								self.send(m) ? true : false
+								self.send(m, *p) ? true : false
 							end
 							returns.uniq!
-							if returns.length == 1 and returns.include? true	
-								data[:block].call(self) if !data[:block].nil?
-							else
+
+							if returns.include? false
 								raise PreconditionsNotMet
 							end
+							#if returns.length == 1 and returns.include? true	
+								#data[:block].call(self) if !data[:block].nil?
+							#else
+								#raise PreconditionsNotMet
+							#end
 						end 
-						self.send "#{method}_without_#{_when}_cond".to_sym, *p
+						ret_value = self.send "#{method}_without_#{_when}_cond".to_sym, *p
 						if(_when == :post)
-							arr_methods.each do |m| self.send m end
-							data[:block].call(self) if !data[:block].nil?
+							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
 					self.class.send :alias_method, "#{method}_without_#{_when}_cond".to_sym, method
 					self.class.send :alias_method, method, "#{method}_with_#{_when}_cond".to_sym
@@ -121,9 +127,5 @@ public
 				add_condition_for :post, method_name, conditions
 			end
 		end
-
-
 	end
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Conditionator
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000Z
+date: 2012-05-17 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: 
+homepage: https://github.com/deleteman/conditionatorr
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -31,7 +31,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: