moosex 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762256a8cbd9378b2e80924fda5e278861f38f7e
-  data.tar.gz: fdbd36add8e84286e0094a907f5b24830d1d0e80
+  metadata.gz: bf755e4f809015aa27587ea4009cb8e15d082154
+  data.tar.gz: ec5ee2722ed7fe31bc88050722a803cc366f5958
 SHA512:
-  metadata.gz: 2215ab98afd2f0b15faa905e8de8dfc2c436814efb16bcd62c6f29474ccb7b371b96a463d45845d3e868adfb7a17df1ff2a06c7d3da1ec3e82138670fe7a8df8
-  data.tar.gz: 7474bb350e05b1734aec6257ec83b2a279e34839592ca48a907c6d4730c74f1fc0fe66fb4cd43cdc1d5cea5635525c08ca00013d6367d066ec7929cf7942052b
+  metadata.gz: 0b5c7d36b5ef46c18cdb83893ce74da0b500c0d11706c08e3f15438c0f3e486d937f73bc2a860993fe1b365559b0c651c84060875f443a04cd1d6c49f07ef9bc
+  data.tar.gz: 4cf80c9f428fe865904ad8c8e79d37460ac1ca4a8cbaf5305ab26a962fefade283ef10ecabf262a58a30e1e852c9c026e933139c09248d0017dc83c31e07baed

data/Changelog

@@ -1,3 +1,8 @@
+0.0.9 - 2014-02-02
+	- support to BUILD and BUILDARGS #5 and #6
+	- support to trigger #7
+	- support to coerce #8
+
 0.0.8 - 2014-02-01
   - should support init_arg option in attr #14
 	- support lazy attributes / builder #4

data/Gemfile.lock

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

data/lib/moosex.rb

@@ -18,9 +18,18 @@ module MooseX
 		end
 
 		def initialize(args={})
+			args = BUILDARGS(args)
 
 			self.class.__meta().init(self, args)
 
+			BUILD()
+		end
+
+		def BUILDARGS(args)
+			args
+		end
+
+		def BUILD
 		end
 
 		def c.inherited(subclass)
@@ -94,8 +103,10 @@ module MooseX
 			clearer: false,
 			required: false, 
 			predicate: false,
-			isa: lambda { |x| true },
+			isa: lambda { |value| true },
 			handles: {},
+			trigger: lambda {|object,value|},  # TODO: implement
+			coerce: lambda {|object| object},  # TODO: implement
 		}
 
 		REQUIRED = [ :is ]
@@ -218,11 +229,30 @@ module MooseX
 			init_arg: lambda do |init_arg, field_name|
 				init_arg.to_sym
 			end,
+			trigger: lambda do |trigger, field_name|
+				unless trigger.is_a? Proc
+					trigger_method_name = trigger.to_sym
+					trigger = lambda do |object, value|
+						object.send(trigger_method_name,value)
+					end
+				end
+
+				trigger				
+			end,
+			coerce: lambda do |coerce, field_name|
+				unless coerce.is_a? Proc
+					coerce_method_name = coerce.to_sym
+					coerce = lambda do |object|
+						object.send(coerce_method_name)
+					end
+				end
+
+				coerce				
+			end,
 		};
 
 		def initialize(a, o)
 			# todo extract this to a framework, see issue #21 on facebook
-
 			o = DEFAULTS.merge({
 				reader: a,
 				writter: a.to_s.concat("=").to_sym,
@@ -267,6 +297,8 @@ module MooseX
 			@writter     = o[:writter]
 			@builder     = o[:builder]
 			@init_arg    = o[:init_arg]
+			@trigger     = o[:trigger]
+			@coerce      = o[:coerce]
 		end
 		
 		def init(object, args)
@@ -295,30 +327,28 @@ module MooseX
 				end
 			end
 
+			value_from_default = false
 			if args.has_key? @init_arg
 				value = args[ @init_arg ]
 			elsif @default
 				value = @default.call
+				value_from_default = true
 			elsif @required
 				raise "attr \"#{@attr_symbol}\" is required"
 			else
 				return
 			end
  
- 			if @is.eql?(:ro) || @is.eql?(:lazy)
-
- 				# TODO: remove redundancy
 
-				type_check = @isa
-				type_check.call(value)
+			value = @coerce.call(value)
 
-				object.instance_variable_set inst_variable_name, value
+			@isa.call( value )
+			unless value_from_default
+				@trigger.call(object, value)
+			end
+			
+			object.instance_variable_set inst_variable_name, value
 			
-			else
-
-				object.send( @writter, value )
-				
-			end	
 		end
 		
 		def generate_getter
@@ -329,13 +359,15 @@ module MooseX
 
 			if @lazy
 				type_check = @isa
-
+				coerce     = @coerce
+				trigger    = @trigger
 				before_get = lambda do |object|
 					return if object.instance_variable_defined? inst_variable_name
 
 					value = builder.call(object)
+					value = coerce.call(value)
 					type_check.call(value)
-
+					trigger.call(object, value)
 					object.instance_variable_set(inst_variable_name, value)					
 				end
 			end
@@ -348,9 +380,13 @@ module MooseX
 		
 		def generate_setter
 			inst_variable_name = "@#{@attr_symbol}".to_sym
+			coerce     = @coerce
 			type_check = @isa
+			trigger    = @trigger
 			Proc.new  do |value| 
+				value = coerce.call(value)
 				type_check.call(value)
+				trigger.call(self,value)
 				instance_variable_set inst_variable_name, value
 			end
 		end	

data/lib/moosex/version.rb

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

data/spec/moosex_spec.rb

@@ -575,4 +575,181 @@ describe "LazyFox" do
 		end
 		l.last_lazy_attr.should be_zero
 	end
+end
+
+class CoerceTest
+	include MooseX
+
+	has attribute_ro: {
+		is: :ro,
+		isa: Integer,
+		coerce: lambda {|value| value.to_i },
+	}
+
+	has attribute_rw: {
+		is: :rw,
+		isa: Integer,
+		coerce: lambda {|value| value.to_i },
+	}
+
+	has attribute_lazy: {
+		is: :lazy,
+		isa: Integer,
+		coerce: lambda {|value| value.to_i },
+		builder: lambda{|object| "2048" },
+	}
+
+	def trigger_attr(new_value)
+		puts "change value of attribute to #{new_value}"
+	end
+end
+
+describe "CoerceTest" do
+	it "should coerce the argument using to_i on constructor" do
+		ct = CoerceTest.new(attribute_ro: "12")
+		ct.attribute_ro.should == 12
+	end
+
+	it "should coerce the argument using to_i on constructor" do
+		ct = CoerceTest.new(attribute_rw: "12")
+		ct.attribute_rw.should == 12
+	end
+
+	it "should coerce in the setter" do
+		ct = CoerceTest.new
+		ct.attribute_rw= "128"
+		ct.attribute_rw.should == 128
+	end
+
+	it "should coerce from builder" do
+		ct = CoerceTest.new
+		ct.attribute_lazy.should == 2048
+	end
+end
+
+class TriggerTest
+	include MooseX
+
+	has logger: {
+		is: :ro
+	}
+
+	has attr_with_trigger: {
+		is: :rw,
+		trigger: :my_method,
+	}
+
+	has attr_with_trigger_ro: {
+		is: :ro,
+		trigger: :my_method,
+	}
+
+	has attr_with_default: {
+		is: :rw,
+		trigger: lambda do |object, new_value| 
+			object.logger.log "will update attr_with_trigger with new value #{new_value}"
+		end,
+		default: 1,
+	}
+
+	has attr_lazy_trigger: {
+		is: :lazy,
+		trigger: :my_method,
+		builder: lambda{ |x| 1},
+	}
+
+	def my_method(new_value)
+		logger.log "will update attr_with_trigger with new value #{new_value}"
+	end
+end
+
+describe "TriggerTest" do
+	it "should call trigger on constructor" do
+		log = double
+		log.should_receive(:log)
+		t = TriggerTest.new(attr_with_trigger: 1, logger: log)
+
+	end
+
+	it "should call trigger on constructor (ro)" do
+		log = double
+		log.should_receive(:log)
+		t = TriggerTest.new(attr_with_trigger_ro: 1, logger: log)
+
+	end
+
+	it "should NOT call trigger on constructor (with default)" do
+		log = double
+		log.should_not_receive(:log)
+		t = TriggerTest.new(logger: log)
+	end
+
+	it "should NOT call trigger on constructor (with default)" do
+		log = double
+		log.should_receive(:log)
+		t = TriggerTest.new(logger: log)
+
+		t.attr_with_default = 1
+	end
+
+	it "should call trigger on setter" do
+		log = double
+		log.should_receive(:log)
+		t = TriggerTest.new(logger: log)
+		
+		t.attr_with_trigger = 1
+	end
+
+	it "should call trigger on setter" do
+		log = double
+		log.should_receive(:log)
+		t = TriggerTest.new(logger: log)
+		
+		t.attr_lazy_trigger.should == 1
+	end	
+end
+
+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 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moosex
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tiago Peczenyj