Merge 947cdfb

Author: badetitou

src/Fame-LazyRelations-Tests/FMLazyRelationTest.class.st

@@ -66,8 +66,7 @@ FMLazyRelationTest >> testAddToLazyRelation [
 	self assert: dragon killedBy size equals: 1.
 	self assert: dragon killedBy anyOne equals: entity.
 	self assert: entity kills size equals: 3.
-	self assert: entity kills last identicalTo: dragon.
-	
+	self assert: entity kills last identicalTo: dragon
 ]
 
 { #category : 'tests' }
@@ -86,12 +85,10 @@ FMLazyRelationTest >> testByPassByDirectlyAdding [
 
 	dragon := RPGLazyDragon new.
 
-
 	entity kills: { dragon }.
 
 	self assert: entity kills size equals: 1.
 	self assert: entity kills anyOne identicalTo: dragon
-	
 ]
 
 { #category : 'tests' }
@@ -105,8 +102,7 @@ FMLazyRelationTest >> testDefaultBehavior [
 	self assert: dragon killedBy size equals: 1.
 	self assert: dragon killedBy anyOne equals: entity.
 	self assert: entity kills size equals: 1.
-	self assert: entity kills anyOne equals: dragon.
-	
+	self assert: entity kills anyOne equals: dragon
 ]
 
 { #category : 'tests' }
@@ -132,20 +128,18 @@ FMLazyRelationTest >> testManyToOneWithlazyOne [
 { #category : 'tests' }
 FMLazyRelationTest >> testOneToManyRelation [
 
-    | entity hero |
-
-    entity := RPGLazyTalisman new.
-    hero := RPGLazyHero new.
+	| entity hero |
+	entity := RPGLazyTalisman new.
+	hero := RPGLazyHero new.
 
-    FMLazyValue
-        makeRelation: #owner
-        of: entity
-        lazyUsing: [ :rel :entit |
-            rel value: hero ].
+	FMLazyValue
+		makeRelation: #owner
+		of: entity
+		lazyUsing: [ :rel :entit | rel value: hero ].
 
-    self assert: entity owner identicalTo: hero.
-    self assert: hero talismans size equals: 1.
-    self assert: hero talismans anyOne identicalTo: entity.
+	self assert: entity owner identicalTo: hero.
+	self assert: hero talismans size equals: 1.
+	self assert: hero talismans anyOne identicalTo: entity
 ]
 
 { #category : 'tests' }

src/Fame-LazyRelations/FMLazyOne.class.st

@@ -8,24 +8,16 @@ Class {
 { #category : 'accessing' }
 FMLazyOne >> materializeFor: anObject slot: aSlot [
 
-    | holder value |
-	
-    holder := FMLazyOneHolder new.
+	| holder value |
+	holder := FMLazyOneHolder new.
 
-    loader
-        value: holder
-        value: anObject.
+	loader value: holder value: anObject.
 
-    value := holder value.
+	value := holder value.
 
-    aSlot
-        writeMaterialized: value
-        to: anObject.
+	aSlot writeMaterialized: value to: anObject.
 
-    value ifNotNil: [
-        aSlot
-            addAssociationFrom: anObject
-            to: value ].
+	value ifNotNil: [ aSlot addAssociationFrom: anObject to: value ].
 
-    ^ value
+	^ value
 ]

src/Fame-LazyRelations/FMLazyValue.class.st

@@ -1,6 +1,6 @@
 "
 I am an uninitialized relation.
-When first accessed, I relsolved my loader block
+When first accessed, my `loader` block is evaluated.
 "
 Class {
 	#name : 'FMLazyValue',
@@ -38,9 +38,8 @@ FMLazyValue class >> makeRelation: aSymbol of: anEntity lazyUsing: aBlock [
 
 { #category : 'accessing' }
 FMLazyValue >> fmValueReadFrom: aSlot owner: anObject [
-    ^ self
-        materializeFor: anObject
-        slot: aSlot
+
+	^ self materializeFor: anObject slot: aSlot
 ]
 
 { #category : 'accessing' }
@@ -50,9 +49,9 @@ FMLazyValue >> loader [
 ]
 
 { #category : 'accessing' }
-FMLazyValue >> loader: anObject [
+FMLazyValue >> loader: aBlock [
 
-	loader := anObject
+	loader := aBlock
 ]
 
 { #category : 'accessing' }