Make year a proportional derived unit of month

source/BaselineOfChalten/BaselineOfChalten.class.st

@@ -16,7 +16,7 @@ BaselineOfChalten >> baseline: spec [
 		do: [ self setUpDependencies: spec.
 			spec
 				package: 'Chalten-Core' with: [ spec requires: 'Aconcagua-Deployment' ];
-				package: 'Chalten-Gregorian-Calendar' with: [ spec requires: 'Chalten-Roman-Calendar' ];
+				package: 'Chalten-Gregorian-Calendar' with: [ spec requires: #('Chalten-Roman-Calendar' 'Buoy-Deployment') ];
 				package: 'Chalten-Hebrew-Calendar' with: [ spec requires: 'Chalten-Core' ];
 				package: 'Chalten-Islamic-Calendar' with: [ spec requires: 'Chalten-Core' ];
 				package: 'Chalten-Julian-Calendar' with: [ spec requires: 'Chalten-Roman-Calendar' ];
@@ -51,7 +51,6 @@ BaselineOfChalten >> baseline: spec [
 BaselineOfChalten >> postLoadInitialization [
 
 	ChaltenEnvironmentBehavior initializeAfterLoad.
-	TimeUnitsGlobals initializeAfterLoad.
 	CalendarDefinition allSubclassesDo: [ :each | each subclasses ifEmpty: [ each initializeAfterLoad ] ].
 	TimeOfDay initializeAfterLoad.
 	TimeZonesGlobals initializeAfterLoad
@@ -68,5 +67,9 @@ BaselineOfChalten >> setUpDependencies: spec [
 
 	spec
 		baseline: 'Aconcagua' with: [ spec repository: 'github://ba-st/Aconcagua:v8' ];
-		project: 'Aconcagua-Deployment' copyFrom: 'Aconcagua' with: [ spec loads: #('Deployment') ]
+		project: 'Aconcagua-Deployment' copyFrom: 'Aconcagua' with: [ spec loads: #( 'Deployment' ) ].
+
+	spec
+		baseline: 'Buoy' with: [ spec repository: 'github://github://ba-st/Buoy:v6' ];
+		project: 'Buoy-Deployment' copyFrom: 'Buoy' with: [ spec loads: 'Deployment' ]
 ]

source/Chalten-Gregorian-Calendar/GregorianCalendarConcepts.class.st

@@ -0,0 +1,82 @@
+"
+A TimeUnitsGlobals is a helper object with common time units. Use it calling to TimeUnits, for example TimeUnits month.
+
+"
+Class {
+	#name : #GregorianCalendarConcepts,
+	#superclass : #SharedPool,
+	#classVars : [
+		'Constants',
+		'GregorianCalendar',
+		'GregorianTimeUnits'
+	],
+	#category : #'Chalten-Gregorian-Calendar'
+}
+
+{ #category : #initialization }
+GregorianCalendarConcepts class >> initialize [
+
+	self initializeAfterLoad
+]
+
+{ #category : #initialization }
+GregorianCalendarConcepts class >> initializeAfterLoad [
+
+	self initializeTimeUnits.
+	GregorianCalendar := GregorianCalendarDefinition new
+]
+
+{ #category : #initialization }
+GregorianCalendarConcepts class >> initializeDayBasedUnits [
+
+	| week day millisecond hour minute second |
+
+	day := BaseUnit named: 'day'.
+	week := ProportionalDerivedUnit baseUnit: day conversionFactor: 7 named: 'week'.
+	hour := ProportionalDerivedUnit baseUnit: day conversionFactor: 1 / 24 named: 'hour'.
+	minute := ProportionalDerivedUnit baseUnit: day conversionFactor: 1 / ( 24 * 60 ) named: 'minute'.
+	second := ProportionalDerivedUnit baseUnit: day
+		          conversionFactor: 1 / ( 24 * 60 * 60 )
+		          named: 'second'.
+	millisecond := ProportionalDerivedUnit baseUnit: day
+		               conversionFactor: 1 / ( 24 * 60 * 60 * 1000 )
+		               named: 'millisecond'.
+
+	GregorianTimeUnits
+		bind: #week to: week;
+		bind: #day to: day;
+		bind: #hour to: hour;
+		bind: #minute to: minute;
+		bind: #second to: second;
+		bind: #millisecond to: millisecond
+]
+
+{ #category : #initialization }
+GregorianCalendarConcepts class >> initializeMonthBasedUnits [
+
+	| month year decade century millennium |
+
+	month := BaseUnit named: 'month'.
+	year := ProportionalDerivedUnit baseUnit: month
+		        conversionFactor: GregorianCalendar amountOfMonthsPerYear
+		        named: 'year'.
+	decade := ProportionalDerivedUnit baseUnit: year conversionFactor: 10 named: 'decade'.
+	century := ProportionalDerivedUnit baseUnit: year conversionFactor: 100 named: 'century'.
+	millennium := ProportionalDerivedUnit baseUnit: year conversionFactor: 1000 named: 'millennium'.
+
+	GregorianTimeUnits
+		bind: #month to: month;
+		bind: #year to: year;
+		bind: #decade to: decade;
+		bind: #century to: century;
+		bind: #millennium to: millennium
+]
+
+{ #category : #initialization }
+GregorianCalendarConcepts class >> initializeTimeUnits [
+
+	GregorianTimeUnits := Namespace new.
+	self
+		initializeDayBasedUnits;
+		initializeMonthBasedUnits
+]

source/Chalten-Gregorian-Calendar/GregorianCalendarDefinition.class.st

@@ -29,12 +29,6 @@ Class {
 	#category : #'Chalten-Gregorian-Calendar'
 }
 
-{ #category : #initialization }
-GregorianCalendarDefinition class >> initializeGlobalNameCalendar [
-
-	Smalltalk at: #GregorianCalendar put: uniqueInstance
-]
-
 { #category : #initialization }
 GregorianCalendarDefinition class >> initializeUniqueInstance [
 
@@ -44,7 +38,8 @@ GregorianCalendarDefinition class >> initializeUniqueInstance [
 { #category : #'instance creation' }
 GregorianCalendarDefinition class >> new [
 
-	^uniqueInstance
+	uniqueInstance ifNil: [ self initializeUniqueInstance ].
+	^ uniqueInstance
 ]
 
 { #category : #'converting - private' }