moosex 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9e5e041a9a4a5b6dbc6c7f3172983566bfd071
-  data.tar.gz: 3922f36665039d14f2b84dd6eb95fb83832479c1
+  metadata.gz: adec6f28fb1f2d50839aa7eccc0aca75d59541f2
+  data.tar.gz: 4883921244c4bd67a5f767a5cc4cdc03e91c8874
 SHA512:
-  metadata.gz: fd4f9224783d8ab1f5dde9d268eb497a2502d29dc67d93e2673cf71c0b941c60754e0b3802baf30e26e2c4034d95d4cfcbcd03b59ab608dccd8582ad1ef2c500
-  data.tar.gz: b651e838ea0f2920847692eca70f3a2d7ab5678f59936175912cfa20866fde0d5c3481fbfb9d152511ed93f29ebdb5a379f792f7b08717c3eeb7c508b77ab1cc
+  metadata.gz: 95cee02f36c62c6e8864fb4aab9cbfacc9d552ca81f29283ae67fef75cb861de24a16a1716e352ad947ff9e1889477957dbf633e2d44969e9c35b10f249fea79
+  data.tar.gz: 1a5ae462cf7a223f03ae19433ad8b7a3361e6ce3137610c86395450766f0be01a4de959e1d41a353d9c89cf21b3591d877a8400f38f1d50ca8f2ea4892d8eedf

data/Changelog

@@ -1,3 +1,6 @@
+0.0.14 - 2013-02-05
+	- roles with around/before/after basic support #41
+
 0.0.13 - 2013-02-05
 	- change around to receive a lambda #42
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    moosex (0.0.13)
+    moosex (0.0.14)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -384,7 +384,9 @@ instead redefine the 'clear!' method in the subclass, we just add a piece of cod
 
 Each after/before/around will **redefine** the original method in order. If you want override the method in some subclass, you will loose all hooks. The best way to preserve all hooks is using after/before/around to modify the behavior if possible. 
 
-**IMPORTANT** This behavior is temporary, there is an issue for this [here](https://github.com/peczenyj/MooseX/issues/41 "issue in github").
+Roles and Hooks
+
+If you try to add one role to a method who does not exists yet, this will be added in the next class. BE CAREFUL, THIS IS EXPERIMENTAL! PLEASE REPORT ANY BUG IF YOU FIND!!!
 
 ### after 
 

data/lib/moosex.rb

@@ -34,6 +34,9 @@ module MooseX
 
 			return unless x.is_a? Class
 
+			x.__meta.load_hooks(self.__meta)
+			self.__meta.init_klass(x)
+
 			x.__meta.requires.each do |method|
 				unless x.public_instance_methods.include? method
 					warn "[MooseX] you must implement method '#{method}' in #{x} #{x.class}: required" if $MOOSEX_DEBUG
@@ -46,6 +49,9 @@ module MooseX
 		unless c.respond_to? :__meta
 			c.class_exec do 
 				define_singleton_method(:__meta) { meta }
+				define_singleton_method(:__meta_define_method) do |method_name, &proc| 
+					define_method(method_name, proc)
+				end				
 			end
 		end
 				
@@ -74,11 +80,16 @@ module MooseX
 	end
 	
 	class Meta
-		attr_reader :attrs, :requires
+		attr_reader :attrs, :requires, :before, :after, :around
 
 		def initialize(old_meta=nil)
+			@initialized = false
 			@attrs    = {}
 			@requires = []
+			@before   = Hash.new { |hash, key| hash[key] = [] }
+			@after    = Hash.new { |hash, key| hash[key] = [] }
+			@around   = Hash.new { |hash, key| hash[key] = [] }
+
 			if old_meta
 				old_meta.attrs.each_pair do |key, value|
 					@attrs[key] = value.clone
@@ -94,6 +105,18 @@ module MooseX
 			@requires += other_meta.requires
 		end
 		
+		def load_hooks(other_meta)
+			other_meta.before.each_pair do |m, b|
+				@before[m] += b.clone
+			end
+			other_meta.after.each_pair do |m, b|
+				@after[m] += b.clone
+			end
+			other_meta.around.each_pair do |m, b|
+				@around[m] += b.clone
+			end							
+		end
+
 		def add(attr)
 			@attrs[attr.attr_symbol] = attr
 		end
@@ -102,6 +125,46 @@ module MooseX
 			@requires << method
 		end
 
+		def add_before(method_name, block)
+			@before[method_name] << block.clone
+		end
+
+		def add_after(method_name, block)
+			@after[method_name] << block.clone
+		end
+
+		def add_around(method_name, block)
+			@around[method_name] << block.clone
+		end
+
+		def init_klass(klass)
+			#return if @initialized
+
+			[@before.keys + @after.keys + @around.keys].flatten.uniq.each do |method_name|
+				method = klass.instance_method method_name
+
+				before = @before[method_name]
+				after  = @after[method_name]
+				around = @around[method_name]
+
+				klass.__meta_define_method(method_name) do |*args|
+					before.each{|b| b.call(self,*args)}
+					
+					original = lambda do |object, *args| 
+						method.bind(object).call(*args)
+					end	
+
+					result = around.inject(original) do |lambda1, lambda2|
+						lambda2.curry[lambda1] 
+					end.call(self, *args)
+
+					after.each{|b| b.call(self,*args)}
+					
+					result
+				end
+			end
+		end
+
 		def init(object, args)
 			@attrs.each_pair{ |symbol, attr| attr.init(object, args) }
 
@@ -118,41 +181,48 @@ module MooseX
 
 	module Core
 		def after(method_name, &block)
-			method = instance_method method_name
-
-			define_method method_name do |*args|
-				result = method.bind(self).call(*args)
-				block.call(self,*args)
-				result
-			end
+			begin
+				method = instance_method method_name
 
-#			__meta.add_after(method_name, block)
+				define_method method_name do |*args|
+					result = method.bind(self).call(*args)
+					block.call(self,*args)
+					result
+				end
+			rescue => e
+				__meta.add_after(method_name, block)
+			end	
 		end
 
 		def before(method_name, &block)
-			method = instance_method method_name
+			begin
+				method = instance_method method_name
 
-			define_method method_name do |*args|
-				block.call(self,*args)
-				method.bind(self).call(*args)
-			end
-
-#			__meta.add_before(method_name, block)
+				define_method method_name do |*args|
+					block.call(self,*args)
+					method.bind(self).call(*args)
+				end
+			rescue => e
+				__meta.add_before(method_name, block)			
+			end	
 		end
 
 		def around(method_name, &block)
-			method = instance_method method_name
+			begin			
+				method = instance_method method_name
 
-			code = Proc.new do | o, *a| 
-				method.bind(o).call(*a) 
-			end
+				code = Proc.new do | o, *a| 
+					method.bind(o).call(*a) 
+				end
 
-			define_method method_name do |*args|
-				
-				block.call(code, self,*args)
-				
-			end			
-#			__meta.add_around(method, block)
+				define_method method_name do |*args|
+					
+					block.call(code, self,*args)
+					
+				end		
+			rescue => e	
+				__meta.add_around(method_name, block)
+			end
 		end
 
 		def requires(*methods)

data/lib/moosex/version.rb

@@ -1,3 +1,3 @@
 module MooseX
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/hooks_spec.rb

@@ -80,6 +80,7 @@ class OtherPoint3D < OtherPoint
 		object.z = 0
 	end
 end
+
 describe "OtherPoint3D" do
 	it "should clear a 3d point" do 
 		p = OtherPoint3D.new(x: 1, y: 2, z: 3)
@@ -93,4 +94,30 @@ describe "OtherPoint3D" do
 		p.y.should == 0
 		p.z.should == 0
 	end
-end	
+end	
+
+class OtherPoint4D < OtherPoint3D
+
+	has t: { is: :rw, required: true }
+
+	after :clear! do |object|
+		object.t = 0
+	end
+end
+
+describe "OtherPoint4D" do
+	it "should clear a 3d point" do 
+		p = OtherPoint4D.new(x: 1, y: 2, z: 3, t: 4)
+		p.x.should == 1
+		p.y.should == 2
+		p.z.should == 3
+		p.t.should == 4
+
+		p.clear!
+
+		p.x.should == 0
+		p.y.should == 0
+		p.z.should == 0
+		p.t.should == 0		
+	end
+end

data/spec/role_spec.rb

@@ -81,3 +81,133 @@ describe ComplexRole::WrongClass do
 			"you must implement method 'equal' in ComplexRole::WrongClass: required")
 	end
 end
+
+module AfterBefore
+	module Sayhi
+		include MooseX
+		requires :say
+		before(:say) do |object, message|
+			object.logger.before_say_2(message)
+		end
+	end
+
+	module Sayhi2
+		include MooseX
+		requires :say
+		after(:say) do |object, message|
+			object.logger.after_say_2(message)
+		end
+	end
+
+	module Sayhi3
+		include MooseX
+		requires :say
+		around(:say) do |lambda, object, message|
+			object.logger.around_say_2(message)
+			v = lambda.call(object,message + 1)
+			object.logger.around_say_2(message)
+			v + 2
+		end	
+	end
+
+	class Undertest
+		include MooseX
+		has logger: { is: :rw, required: true }
+
+		def say(message)
+			self.logger.say(message)
+			message
+		end
+
+		around(:say) do |lambda, object, message|
+			object.logger.around_say_1(message)
+			v = lambda.call(object,message + 1)
+			object.logger.around_say_1(message)
+			v + 1
+		end
+
+		after(:say) do |object, message|
+			object.logger.after_say_1(message)
+		end
+
+		before(:say) do |object, message|
+			object.logger.before_say_1(message)
+		end
+
+		include Sayhi
+		include Sayhi2
+		include Sayhi3
+
+		after(:say) do |object, message|
+			object.logger.after_say_3(message)
+		end		
+
+		before(:say) do |object, message|
+			object.logger.before_say_3(message)
+		end
+
+		around(:say) do |lambda, object, message|
+			object.logger.around_say_3(message)
+			v = lambda.call(object,message + 1)
+			object.logger.around_say_3(message)
+			v + 1
+		end			
+	end	
+
+	class Undertest2 < Undertest
+		def say(x) ; self.logger.say(x); 2*x; end
+		include Sayhi; include Sayhi3
+	end
+end
+
+describe "AfterBefore::Undertest" do
+	it "should print two messages" do
+		logger = double()
+
+		logger.should_receive(:around_say_3).with(1).once()
+
+		logger.should_receive(:before_say_3).with(2).once()
+		
+		logger.should_receive(:around_say_2).with(2).once()
+
+		logger.should_receive(:before_say_2).with(3).once()
+		
+		logger.should_receive(:before_say_1).with(3).once()
+		
+		logger.should_receive(:around_say_1).with(3).once()
+
+		logger.should_receive(:say).with(4).once()
+		
+		logger.should_receive(:around_say_1).with(3).once()
+		
+		logger.should_receive(:after_say_1).with(3).once()
+
+		logger.should_receive(:after_say_2).with(3).once()
+		
+		logger.should_receive(:around_say_2).with(2).once()	
+
+		logger.should_receive(:after_say_3).with(2).once()
+		
+		logger.should_receive(:around_say_3).with(1).once()
+
+		u = AfterBefore::Undertest.new(logger: logger)
+		u.say(1).should == 8
+	end
+end 
+
+describe "AfterBefore::Undertest2" do
+	it "should print two messages" do
+		logger = double()
+		
+		logger.should_receive(:before_say_2).with(2).once()
+
+		logger.should_receive(:around_say_2).with(1).once()
+		
+		logger.should_receive(:say).with(2).once()
+
+		logger.should_receive(:around_say_2).with(1).once()
+		
+		u = AfterBefore::Undertest2.new(logger: logger)
+		u.say(1).should == 6 # 1 -> 1+1 -> 2*2 -> 4+2
+	end
+end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moosex
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Tiago Peczenyj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ files:
 - spec/build_spec.rb
 - spec/buildargs_spec.rb
 - spec/coerce_spec.rb
-- spec/complex_spec.rb
+- spec/complex_type_spec.rb
 - spec/foo_spec.rb
 - spec/hooks_spec.rb
 - spec/lazy_spec.rb
@@ -139,7 +139,7 @@ test_files:
 - spec/build_spec.rb
 - spec/buildargs_spec.rb
 - spec/coerce_spec.rb
-- spec/complex_spec.rb
+- spec/complex_type_spec.rb
 - spec/foo_spec.rb
 - spec/hooks_spec.rb
 - spec/lazy_spec.rb