moosex 0.0.9 → 0.0.10

data/lib/moosex.rb

@@ -1,8 +1,10 @@
 # Module MooseX
-# A postmodern object system for Ruby
+# A postmodern object DSL for Ruby
+#
+# Author::    Tiago Peczenyj  (mailto:tiago.peczenyj@gmail.com)
+# Copyright:: Copyright (c) 2014 Tiago Peczenyj
+# License::   MIT
 #
-# MooseX is an extension of Ruby object system. The main goal of MooseX is to make Ruby Object Oriented programming easier, more consistent, and less tedious. With MooseX you can think more about what you want to do and less about the mechanics of OOP. It is a port of Moose/Moo from Perl to Ruby world.
-
 require "moosex/version"
 
 module MooseX
@@ -17,16 +19,16 @@ module MooseX
 			define_singleton_method(:__meta) { meta }
 		end
 
-		def initialize(args={})
-			args = BUILDARGS(args)
-
-			self.class.__meta().init(self, args)
+		def initialize(*args)	
+			args = BUILDARGS(*args)
+			
+			self.class.__meta().init(self, args || {})
 
 			BUILD()
 		end
 
-		def BUILDARGS(args)
-			args
+		def BUILDARGS(*args)
+			args[0]
 		end
 
 		def BUILD
@@ -74,20 +76,15 @@ module MooseX
 
 				attr = MooseX::Attribute.new(attr_name, attr_options)
 
-				g = attr.generate_getter
-				
-	    	define_method attr.reader, &g
-	 
-	 			s = attr.generate_setter
-	 		
-	 			case attr.is 
-	 			when :rw 				
-					define_method attr.writter, &s
-				
-				when :rwp
-					define_method attr.writter, &s
-					
+				attr.methods.each_pair do |method, proc|
+					define_method method, &proc
+				end
+
+	 			if attr.is.eql?(:rwp) 
+					private attr.writter
+				elsif attr.is.eql?(:private)
 					private attr.writter
+					private attr.reader
 				end
 
 				__meta.add(attr)
@@ -97,7 +94,7 @@ module MooseX
 	
 	class Attribute
 
-		attr_reader :attr_symbol, :is, :reader, :writter, :lazy, :builder
+		attr_reader :attr_symbol, :is, :reader, :writter, :lazy, :builder, :methods
 		DEFAULTS= { 
 			lazy: false,
 			clearer: false,
@@ -113,8 +110,8 @@ module MooseX
 
 		VALIDATE = {
 			is: lambda do |is, field_name| 
-				unless [:rw, :rwp, :ro, :lazy].include?(is)
-					raise "invalid value for field '#{field_name}' is '#{is}', must be one of :rw, :rwp, :ro or :lazy"  
+				unless [:rw, :rwp, :ro, :lazy, :private].include?(is)
+					raise "invalid value for field '#{field_name}' is '#{is}', must be one of :private, :rw, :rwp, :ro or :lazy"  
 				end
 			end,
 		};
@@ -161,7 +158,7 @@ module MooseX
 				if ! clearer
 					return false
 				elsif clearer.is_a? TrueClass
-					return "reset_#{field_name}!".to_sym
+					return "clear_#{field_name}!".to_sym
 				end
 		
 				begin
@@ -252,6 +249,7 @@ module MooseX
 		};
 
 		def initialize(a, o)
+			#o ||= {}
 			# todo extract this to a framework, see issue #21 on facebook
 			o = DEFAULTS.merge({
 				reader: a,
@@ -276,13 +274,16 @@ module MooseX
 				validate.call(o[field], a)
 			end
 
-			if o[:is].eql? :lazy
+			if o[:is].eql? :ro	
+				o[:writter] = nil
+			elsif o[:is].eql? :lazy
 				o[:lazy] = true
+				o[:writter] = nil
 			end
 
 			unless o[:lazy]
 				o[:builder] = nil
-			end	
+			end
 
 			@attr_symbol = a
 			@is          = o[:is]
@@ -299,35 +300,42 @@ module MooseX
 			@init_arg    = o[:init_arg]
 			@trigger     = o[:trigger]
 			@coerce      = o[:coerce]
-		end
-		
-		def init(object, args)
-			inst_variable_name = "@#{@attr_symbol}".to_sym
-			
-			value  = nil
+			@methods     = {}
 
-			attr_symbol = @attr_symbol
-			@handles.each_pair do | method, target_method |
-				object.define_singleton_method method do |*args|
-					self.send(attr_symbol).send(target_method, *args)
-				end
+			if @reader 
+				@methods[@reader] = generate_reader
 			end
-
+			
+			if @writter 
+				@methods[@writter] = generate_writter
+			end
+			inst_variable_name = "@#{@attr_symbol}".to_sym
 			if @predicate
-				object.define_singleton_method @predicate do
+				@methods[@predicate] = Proc.new do
 					instance_variable_defined? inst_variable_name
 				end
 			end
 
 			if @clearer
-				object.define_singleton_method @clearer do
+				@methods[@clearer] = Proc.new do
 					if instance_variable_defined? inst_variable_name
 						remove_instance_variable inst_variable_name
 					end
 				end
 			end
-
+			
+			attr_symbol = @attr_symbol
+			@handles.each_pair do | method, target_method |
+				@methods[method] = Proc.new do |*args|
+					self.send(attr_symbol).send(target_method, *args)
+				end
+			end			
+		end
+		
+		def init(object, args)
+			value  = nil
 			value_from_default = false
+			
 			if args.has_key? @init_arg
 				value = args[ @init_arg ]
 			elsif @default
@@ -347,11 +355,12 @@ module MooseX
 				@trigger.call(object, value)
 			end
 			
+			inst_variable_name = "@#{@attr_symbol}".to_sym
 			object.instance_variable_set inst_variable_name, value
-			
 		end
-		
-		def generate_getter
+
+		private
+		def generate_reader
 			inst_variable_name = "@#{@attr_symbol}".to_sym
 			
 			builder    = @builder
@@ -378,7 +387,7 @@ module MooseX
 			end
 		end
 		
-		def generate_setter
+		def generate_writter
 			inst_variable_name = "@#{@attr_symbol}".to_sym
 			coerce     = @coerce
 			type_check = @isa

data/lib/moosex/version.rb

@@ -1,3 +1,3 @@
 module Moosex
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/moosex.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Moosex::VERSION
   spec.authors       = ["Tiago Peczenyj"]
   spec.email         = ["tiago.peczenyj@gmail.com"]
-  spec.summary       = %q{A postmodern object system for Ruby}
-  spec.description   = %q{MooseX is an extension of Ruby object system. The main goal of MooseX is to make Ruby Object Oriented programming easier, more consistent, and less tedious. With MooseX you can think more about what you want to do and less about the mechanics of OOP. It is a port of Moose/Moo from Perl to Ruby world.}
+  spec.summary       = %q{A postmodern object DSL for Ruby}
+  spec.description   = %q{MooseX is an extension of Ruby object DSL. The main goal of MooseX is to make Ruby Object Oriented programming easier, more consistent, and less tedious. With MooseX you can think more about what you want to do and less about the mechanics of OOP. It is a port of Moose/Moo from Perl to Ruby world.}
   spec.homepage      = "http://github.com/peczenyj/MooseX"
   spec.license       = "MIT"
 

data/samples/point.rb

@@ -0,0 +1,59 @@
+require 'moosex'
+
+class Point
+	include MooseX
+
+	has x: {
+		is: :rw,      # read-write (mandatory)
+		isa: Integer, # should be Integer
+		default: 0,   # default value is 0 (constant)
+	}
+
+	has y: {
+		is: :rw,
+		isa: Integer,
+		default: lambda { 0 }, # you should specify a lambda
+	}
+
+	def clear! 
+		self.x= 0      # to run with type-check you must
+		self.y= 0      # use the setter instad @x=
+	end
+
+	def to_s
+		"Point[x=#{self.x}, y=#{self.y}]"
+	end	
+end 
+
+class Point3D < Point	
+	has z: {
+		is: :rw,      # read-write (mandatory)
+		isa: Integer, # should be Integer
+		default: 0,   # default value is 0 (constant)
+	}
+
+	def clear! 
+		self.x= 0      # to run with type-check you must
+		self.y= 0      # use the setter instad @x=
+		self.z= 0
+	end
+
+	def to_s
+		"Point[x=#{self.x}, y=#{self.y}, z=#{self.z}]"
+	end		
+end 
+
+p1 = Point.new(x: 4, y:5)
+p2 = Point.new()
+p3 = Point3D.new(x: 4, y:5, z:6)
+p4 = Point3D.new(x: 4, y:5)
+p5 = Point3D.new()
+
+puts ">> objects"
+puts p1, p2, p3, p4, p5
+
+p1.clear!
+p3.clear!
+
+puts ">> clear"
+puts p1, p3

data/spec/baz_spec.rb

@@ -0,0 +1,85 @@
+require 'moosex'
+
+class Baz
+    include MooseX
+
+    has bam: {
+      is: :ro,             # read-only, you should specify in new only
+      isa: lambda do |bam| # you should add your own validator
+          raise 'bam should be less than 100' if bam > 100
+      end,
+      required: true,
+    }
+
+  has boom: {
+    is: :rw,
+    predicate: true,     # add has_boom? method, ask if the attribute is unset
+    clearer: true,       # add clear_boom! method, unset the attribute
+  }
+end
+
+describe "Baz" do
+  it "should require bam if necessary" do 
+    baz = Baz.new( bam: 99 )
+    baz.bam.should == 99
+  end
+
+  it "should not be possible update baz (read only)" do 
+    baz = Baz.new( bam: 99 )
+    expect {
+      baz.bam = 1024
+    }.to raise_error(NoMethodError)
+  end
+
+  it "should run the lambda isa" do 
+    expect {
+      Baz.new( bam: 199 )
+    }.to raise_error(/bam should be less than 100/)
+  end
+
+  it "should inject methods in the class (predicate)" do
+    baz = Baz.new( bam: 99 )
+    
+    baz.respond_to?(:has_boom?).should be_true
+    Baz.instance_methods.member?(:has_boom?).should be_true 
+  end
+  
+  it "should inject methods in the class (clearer)" do
+    baz = Baz.new( bam: 99 )
+    
+    baz.respond_to?(:clear_boom!).should be_true
+    Baz.instance_methods.member?(:clear_boom!).should be_true     
+  end
+
+  it "rw acessor should has nil value, supports predicate" do
+    baz = Baz.new( bam: 99 )
+    
+    baz.has_boom?.should be_false
+    baz.boom.should be_nil
+    baz.boom= 0
+    baz.has_boom?.should be_true
+    baz.boom.should be_zero
+  end
+
+  it "rw acessor should has nil value, supports clearer" do
+    baz = Baz.new( bam: 99, boom: 0 )
+    
+    baz.has_boom?.should be_true
+    baz.boom.should be_zero
+    
+    baz.clear_boom!
+
+    baz.has_boom?.should be_false
+    baz.boom.should be_nil
+  end 
+
+  it "should be possible call the clearer twice" do
+    baz = Baz.new( bam: 99, boom: 0 )
+    
+    baz.clear_boom!
+    baz.clear_boom!
+    
+    baz.has_boom?.should be_false
+    baz.boom.should be_nil
+  end   
+end

data/spec/build_spec.rb

@@ -0,0 +1,23 @@
+require 'moosex'
+
+class BuildExample 
+	include MooseX
+
+	has [:x, :y], {
+		is: :rw,
+		required: true,
+	}
+	def BUILD
+		if self.x == self.y 
+			raise "invalid: you should use x != y"
+		end 
+	end
+end
+
+describe "BuildExample" do
+	it "should raise exception on build" do
+		expect {
+			BuildExample.new(x: 0, y: 0)
+			}.to raise_error(/invalid: you should use x != y/)
+	end
+end

data/spec/buildargs_spec.rb

@@ -0,0 +1,106 @@
+require 'moosex'
+
+class BuildArgsExample 
+	include MooseX
+
+	has [:x, :y], {
+		is: :rw,
+		required: true,
+	}
+
+	def BUILDARGS(args)
+	
+		args[:x] = 1024
+		args[:y] = - args[:y]
+		
+		args
+	end
+end
+
+describe "BuildArgsExample" do
+	it "should create the object" do
+		ex = BuildArgsExample.new(x: 10, y: -2)
+		ex.x.should == 1024
+		ex.y.should == 2
+	end
+end 
+
+class BuildArgsExample2 
+	include MooseX
+
+	has [:x, :y], {
+		is: :rw,
+		required: true,
+	}
+
+	def BUILDARGS(x=4,y=8)
+		args = {}
+		args[:x] = x
+		args[:y] = y
+		
+		args
+	end
+end
+
+describe "BuildArgsExample2" do
+	it "should create the object" do
+		ex = BuildArgsExample2.new(1,2)
+		ex.x.should == 1
+		ex.y.should == 2
+	end
+	
+	it "should create the object II" do
+		ex = BuildArgsExample2.new(1)
+		ex.x.should == 1
+		ex.y.should == 8
+	end	
+	
+	it "should create the object III" do
+		ex = BuildArgsExample2.new()
+		ex.x.should == 4
+		ex.y.should == 8
+	end	
+end
+
+class BuildArgsExample3 
+	include MooseX
+
+	has [:x, :y], {
+		is: :rw,
+		required: true,
+	}
+
+	def BUILDARGS(x: 4,y: 8)
+		args = {}
+		args[:x] = x
+		args[:y] = y
+		
+		args
+	end
+end
+
+describe "BuildArgsExample3" do
+	it "should create the object" do
+		ex = BuildArgsExample3.new(x: 1, y:2)
+		ex.x.should == 1
+		ex.y.should == 2
+	end
+	
+	it "should create the object II" do
+		ex = BuildArgsExample3.new(x: 1)
+		ex.x.should == 1
+		ex.y.should == 8
+	end	
+	
+	it "should create the object III" do
+		ex = BuildArgsExample3.new()
+		ex.x.should == 4
+		ex.y.should == 8
+	end	
+	
+	it "should create the object III" do
+		ex = BuildArgsExample3.new(y: 6)
+		ex.x.should == 4
+		ex.y.should == 6
+	end	
+end