From bd11beb75389fbb7333310a6ecb4ab671779bc62 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 11:57:35 +0200 Subject: [PATCH 1/9] Add TranslatedText>>= --- src/Heimdall-Core.package/.filetree | 5 +++-- .../HMAdminGroup.class/properties.json | 19 ++++++++----------- .../HMGroup.class/properties.json | 19 +++++++++---------- .../properties.json | 19 +++++++++---------- .../properties.json | 19 ++++++++----------- .../String.extension/properties.json | 3 ++- .../TLoggable.trait/properties.json | 5 +++-- .../TRightConstrained.trait/properties.json | 5 +++-- .../TUser.trait/properties.json | 9 +++++---- .../TranslateText.class/instance/^equals.st | 3 +++ .../instance/frenchText.st | 3 +++ .../TranslateText.class/properties.json | 19 +++++++++---------- src/Heimdall-Core.package/properties.json | 3 +-- 13 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/^equals.st create mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st diff --git a/src/Heimdall-Core.package/.filetree b/src/Heimdall-Core.package/.filetree index 8998102..57a6797 100644 --- a/src/Heimdall-Core.package/.filetree +++ b/src/Heimdall-Core.package/.filetree @@ -1,4 +1,5 @@ { - "noMethodMetaData" : true, "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMAdminGroup.class/properties.json b/src/Heimdall-Core.package/HMAdminGroup.class/properties.json index b16258c..ba870b8 100644 --- a/src/Heimdall-Core.package/HMAdminGroup.class/properties.json +++ b/src/Heimdall-Core.package/HMAdminGroup.class/properties.json @@ -1,14 +1,11 @@ { - "category" : "Heimdall-Core-util", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "GuillaumeLarcheveque 4/13/2016 11:04", - "instvars" : [ - ], - "name" : "HMAdminGroup", - "pools" : [ - ], "super" : "HMGroup", - "type" : "normal" } + "category" : "Heimdall-Core-util", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "HMAdminGroup", + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/properties.json b/src/Heimdall-Core.package/HMGroup.class/properties.json index 3c00e35..128fe41 100644 --- a/src/Heimdall-Core.package/HMGroup.class/properties.json +++ b/src/Heimdall-Core.package/HMGroup.class/properties.json @@ -1,18 +1,17 @@ { - "category" : "Heimdall-Core-util", - "classinstvars" : [ - ], "classtraitcomposition" : "TRightConstrained classTrait", - "classvars" : [ - ], - "commentStamp" : "", + "classvars" : [ ], "instvars" : [ "users", "rights", - "name" ], + "name" + ], "name" : "HMGroup", - "pools" : [ - ], + "commentStamp" : "", "super" : "Object", "traitcomposition" : "TRightConstrained", - "type" : "normal" } + "type" : "normal", + "classinstvars" : [ ], + "pools" : [ ], + "category" : "Heimdall-Core-util" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/properties.json b/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/properties.json index 08e807a..b209200 100644 --- a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/properties.json +++ b/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/properties.json @@ -1,14 +1,13 @@ { - "category" : "Heimdall-Core-Exception", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "GuillaumeLarcheveque 4/14/2016 11:37", + "super" : "Error", + "category" : "Heimdall-Core-Exception", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], "instvars" : [ - "name" ], + "name" + ], "name" : "HMNoUserWithThisNameException", - "pools" : [ - ], - "super" : "Error", - "type" : "normal" } + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMWrongPasswordException.class/properties.json b/src/Heimdall-Core.package/HMWrongPasswordException.class/properties.json index 257491b..b55c43c 100644 --- a/src/Heimdall-Core.package/HMWrongPasswordException.class/properties.json +++ b/src/Heimdall-Core.package/HMWrongPasswordException.class/properties.json @@ -1,14 +1,11 @@ { - "category" : "Heimdall-Core-Exception", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "GuillaumeLarcheveque 4/14/2016 11:39", - "instvars" : [ - ], - "name" : "HMWrongPasswordException", - "pools" : [ - ], "super" : "Error", - "type" : "normal" } + "category" : "Heimdall-Core-Exception", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "HMWrongPasswordException", + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/String.extension/properties.json b/src/Heimdall-Core.package/String.extension/properties.json index c213850..b20f2de 100644 --- a/src/Heimdall-Core.package/String.extension/properties.json +++ b/src/Heimdall-Core.package/String.extension/properties.json @@ -1,2 +1,3 @@ { - "name" : "String" } + "name" : "String" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/properties.json b/src/Heimdall-Core.package/TLoggable.trait/properties.json index a2290ab..98ba7ba 100644 --- a/src/Heimdall-Core.package/TLoggable.trait/properties.json +++ b/src/Heimdall-Core.package/TLoggable.trait/properties.json @@ -1,4 +1,5 @@ { - "category" : "Heimdall-Core-Traits", + "name" : "TLoggable", "commentStamp" : "GuillaumeLarcheveque 8/18/2015 17:21", - "name" : "TLoggable" } + "category" : "Heimdall-Core-Traits" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/properties.json b/src/Heimdall-Core.package/TRightConstrained.trait/properties.json index c3e6ecd..c8db3bf 100644 --- a/src/Heimdall-Core.package/TRightConstrained.trait/properties.json +++ b/src/Heimdall-Core.package/TRightConstrained.trait/properties.json @@ -1,4 +1,5 @@ { - "category" : "Heimdall-Core-Traits", + "name" : "TRightConstrained", "commentStamp" : "", - "name" : "TRightConstrained" } + "category" : "Heimdall-Core-Traits" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/properties.json b/src/Heimdall-Core.package/TUser.trait/properties.json index 40ee377..0695c24 100644 --- a/src/Heimdall-Core.package/TUser.trait/properties.json +++ b/src/Heimdall-Core.package/TUser.trait/properties.json @@ -1,6 +1,7 @@ { - "category" : "Heimdall-Core-Traits", - "classtraitcomposition" : "TRightConstrained classTrait", "commentStamp" : "", - "name" : "TUser", - "traitcomposition" : "TRightConstrained" } + "traitcomposition" : "TRightConstrained", + "classtraitcomposition" : "TRightConstrained classTrait", + "category" : "Heimdall-Core-Traits", + "name" : "TUser" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/^equals.st b/src/Heimdall-Core.package/TranslateText.class/instance/^equals.st new file mode 100644 index 0000000..80b92d9 --- /dev/null +++ b/src/Heimdall-Core.package/TranslateText.class/instance/^equals.st @@ -0,0 +1,3 @@ +comparing += anObject + ^ self == anObject or: [ self englishText = anObject englishText and: [ self frenchText = anObject frenchText ] ] \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st b/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st new file mode 100644 index 0000000..5e3ae7b --- /dev/null +++ b/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st @@ -0,0 +1,3 @@ +as yet unclassified +frenchText + ^ self textsByLanguage at: #french \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/properties.json b/src/Heimdall-Core.package/TranslateText.class/properties.json index a97315b..4e4d41c 100644 --- a/src/Heimdall-Core.package/TranslateText.class/properties.json +++ b/src/Heimdall-Core.package/TranslateText.class/properties.json @@ -1,14 +1,13 @@ { - "category" : "Heimdall-Core-util", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "GuillaumeLarcheveque 12/24/2015 11:10", + "super" : "Object", + "category" : "Heimdall-Core-util", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], "instvars" : [ - "textsByLanguage" ], + "textsByLanguage" + ], "name" : "TranslateText", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Core.package/properties.json b/src/Heimdall-Core.package/properties.json index f037444..6f31cf5 100644 --- a/src/Heimdall-Core.package/properties.json +++ b/src/Heimdall-Core.package/properties.json @@ -1,2 +1 @@ -{ - } +{ } \ No newline at end of file From 3bf6d1c10d7bb4417d43549ce1a798797b2f8291 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 11:58:43 +0200 Subject: [PATCH 2/9] Add Translations --- src/Heimdall-Seaside.package/.filetree | 5 +++-- .../HeimdallFileLibrary.class/properties.json | 19 ++++++++----------- .../properties.json | 19 ++++++++----------- .../instance/errorOnLogin..st | 6 +++++- .../instance/messageIfNoWarning.st | 9 ++++++--- .../instance/renderContentOn..st | 11 +++++------ .../instance/renderLogoutAnchorOn..st | 2 +- .../instance/renderPasswordOn..st | 5 ++--- .../instance/renderSubmitOn..st | 5 ++--- .../instance/renderUserOn..st | 5 ++--- .../properties.json | 19 +++++++++---------- .../HeimdallSession.class/properties.json | 19 +++++++++---------- .../properties.json | 19 +++++++++---------- .../THeimdallComponent.trait/properties.json | 5 +++-- .../WAObject.extension/properties.json | 3 ++- src/Heimdall-Seaside.package/properties.json | 3 +-- 16 files changed, 75 insertions(+), 79 deletions(-) diff --git a/src/Heimdall-Seaside.package/.filetree b/src/Heimdall-Seaside.package/.filetree index 8998102..57a6797 100644 --- a/src/Heimdall-Seaside.package/.filetree +++ b/src/Heimdall-Seaside.package/.filetree @@ -1,4 +1,5 @@ { - "noMethodMetaData" : true, "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/properties.json b/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/properties.json index ca9b38c..c911d73 100644 --- a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/properties.json +++ b/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/properties.json @@ -1,14 +1,11 @@ { - "category" : "Heimdall-Seaside", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "CyrilFerlicot 2/1/2016 16:07", - "instvars" : [ - ], - "name" : "HeimdallFileLibrary", - "pools" : [ - ], "super" : "WAFileLibrary", - "type" : "normal" } + "category" : "Heimdall-Seaside", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "HeimdallFileLibrary", + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/properties.json b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/properties.json index 48abc7b..88d5505 100644 --- a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/properties.json +++ b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/properties.json @@ -1,14 +1,11 @@ { - "category" : "Heimdall-Seaside", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "CyrilFerlicot 2/1/2016 16:07", - "instvars" : [ - ], - "name" : "HeimdallLanguageSelectionComponent", - "pools" : [ - ], "super" : "WAComponent", - "type" : "normal" } + "category" : "Heimdall-Seaside", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "HeimdallLanguageSelectionComponent", + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/errorOnLogin..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/errorOnLogin..st index 0a6c51d..1bcf9d0 100644 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/errorOnLogin..st +++ b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/errorOnLogin..st @@ -1,3 +1,7 @@ hook errorOnLogin: error - self warning: 'Wrong username or password.' \ No newline at end of file + self + warning: + (self + translate: 'Wrong username or password.' + french: 'Mauvais pseudo utilisateur ou mot de passe') \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/messageIfNoWarning.st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/messageIfNoWarning.st index 734ca0b..67256bb 100644 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/messageIfNoWarning.st +++ b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/messageIfNoWarning.st @@ -1,7 +1,10 @@ accessing messageIfNoWarning self session loggable notNil - ifTrue: [ ^ 'Logged in as ' , self session loggable login ]. + ifTrue: [ ^ (self translate: 'Logged in as ' french: 'Connecté en tant que ') + , self session loggable login ]. (userID isNil or: [ userID isEmpty ]) - ifTrue: [ ^ 'Please enter User ID and Password' ]. - ^ 'Login failed!' \ No newline at end of file + ifTrue: [ ^ self + translate: 'Please enter User ID and Password' + french: 'Merci d''entrer votre pseudo d''utilisateur et votre mot de passe' ]. + ^ self translate: 'Login failed!' french: 'Echec de la connexion' \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderContentOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderContentOn..st index 8316dd8..1bd5e32 100644 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderContentOn..st +++ b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderContentOn..st @@ -2,9 +2,8 @@ rendering renderContentOn: html html div class: 'heimdall'; - with: [ - self session loggable - ifNil: [ self renderFormOn: html ] - ifNotNil: [ - html heading: 'Welcome, ' , self session loggable login. - self renderLogoutAnchorOn: html ] ] \ No newline at end of file + with: [ self session loggable + ifNil: [ self renderFormOn: html ] + ifNotNil: [ html + heading: (self translate: 'Welcome, ' french: 'Bienvenue ') , self session loggable login. + self renderLogoutAnchorOn: html ] ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderLogoutAnchorOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderLogoutAnchorOn..st index 92f56e3..d481be9 100644 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderLogoutAnchorOn..st +++ b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderLogoutAnchorOn..st @@ -2,4 +2,4 @@ rendering renderLogoutAnchorOn: html html anchor callback: [ self session disconnect ]; - with: 'Logout ' , self session loggable login \ No newline at end of file + with: (self translate: 'Logout ' french: 'Déconnexion') , self session loggable login \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderPasswordOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderPasswordOn..st index 7833f0f..59d8521 100644 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderPasswordOn..st +++ b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderPasswordOn..st @@ -2,10 +2,9 @@ rendering renderPasswordOn: html | htmlID | html - div: [ - html label + div: [ html label for: (htmlID := html nextId); - with: 'Password:'. + with: (self translate: 'Password:' french: 'Mot de passe:'). html passwordInput id: htmlID; value: password; diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderSubmitOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderSubmitOn..st index ca2e61b..0254c3d 100644 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderSubmitOn..st +++ b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderSubmitOn..st @@ -1,7 +1,6 @@ fields renderSubmitOn: html html - div: [ - html submitButton + div: [ html submitButton callback: [ self login ]; - with: 'Login' ] \ No newline at end of file + with: (self translate: 'Login' french: 'Connection') ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderUserOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderUserOn..st index 2bd6252..ebd9677 100644 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderUserOn..st +++ b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderUserOn..st @@ -2,10 +2,9 @@ rendering renderUserOn: html | htmlID | html - div: [ - html label + div: [ html label for: (htmlID := html nextId); - with: 'User:'. + with: (self translate: 'User:' french: 'Utilisateur'). html textInput id: htmlID; value: userID; diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/properties.json b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/properties.json index 279c407..a9c44a8 100644 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/properties.json +++ b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/properties.json @@ -1,18 +1,17 @@ { - "category" : "Heimdall-Seaside", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "GuillaumeLarcheveque 8/20/2015 14:02", + "super" : "WAComponent", + "category" : "Heimdall-Seaside", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], "instvars" : [ "userID", "password", "loggableManager", "postLoginActionBlock", - "warning" ], + "warning" + ], "name" : "HeimdallLoginComponent", - "pools" : [ - ], - "super" : "WAComponent", - "type" : "normal" } + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/properties.json b/src/Heimdall-Seaside.package/HeimdallSession.class/properties.json index bf7c056..e2b30e3 100644 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/properties.json +++ b/src/Heimdall-Seaside.package/HeimdallSession.class/properties.json @@ -1,17 +1,16 @@ { - "category" : "Heimdall-Seaside", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "GuillaumeLarcheveque 8/18/2015 17:29", + "super" : "WASession", + "category" : "Heimdall-Seaside", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], "instvars" : [ "loggable", "language", "rootComponent", - "errorMessages" ], + "errorMessages" + ], "name" : "HeimdallSession", - "pools" : [ - ], - "super" : "WASession", - "type" : "normal" } + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/properties.json b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/properties.json index 9ac9a9d..80de8dc 100644 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/properties.json +++ b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/properties.json @@ -1,18 +1,17 @@ { - "category" : "Heimdall-Seaside", - "classinstvars" : [ - ], "classtraitcomposition" : "TLoggable classTrait", - "classvars" : [ - ], - "commentStamp" : "", + "classvars" : [ ], "instvars" : [ "login", "password", - "id" ], + "id" + ], "name" : "HeimdallSimpleLoggable", - "pools" : [ - ], + "commentStamp" : "", "super" : "Object", "traitcomposition" : "TLoggable", - "type" : "normal" } + "type" : "normal", + "classinstvars" : [ ], + "pools" : [ ], + "category" : "Heimdall-Seaside" +} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/THeimdallComponent.trait/properties.json b/src/Heimdall-Seaside.package/THeimdallComponent.trait/properties.json index 38c7e61..b9410d4 100644 --- a/src/Heimdall-Seaside.package/THeimdallComponent.trait/properties.json +++ b/src/Heimdall-Seaside.package/THeimdallComponent.trait/properties.json @@ -1,4 +1,5 @@ { - "category" : "Heimdall-Seaside-Traits", + "name" : "THeimdallComponent", "commentStamp" : "", - "name" : "THeimdallComponent" } + "category" : "Heimdall-Seaside-Traits" +} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/WAObject.extension/properties.json b/src/Heimdall-Seaside.package/WAObject.extension/properties.json index 6ff9532..32d1681 100644 --- a/src/Heimdall-Seaside.package/WAObject.extension/properties.json +++ b/src/Heimdall-Seaside.package/WAObject.extension/properties.json @@ -1,2 +1,3 @@ { - "name" : "WAObject" } + "name" : "WAObject" +} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/properties.json b/src/Heimdall-Seaside.package/properties.json index f037444..6f31cf5 100644 --- a/src/Heimdall-Seaside.package/properties.json +++ b/src/Heimdall-Seaside.package/properties.json @@ -1,2 +1 @@ -{ - } +{ } \ No newline at end of file From ebe7fe6b90fe81a366d7867560c8c5f75ef990e4 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 13:09:44 +0200 Subject: [PATCH 3/9] Rework baseline --- src/BaselineOfHeimdall.package/.filetree | 5 +++-- .../instance/baseline..st | 13 +++++++++++-- .../instance/projectClass.st | 12 +----------- .../instance/seaside3..st | 6 +++--- .../BaselineOfHeimdall.class/properties.json | 19 ++++++++----------- .../properties.json | 3 +-- 6 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/BaselineOfHeimdall.package/.filetree b/src/BaselineOfHeimdall.package/.filetree index 8998102..57a6797 100644 --- a/src/BaselineOfHeimdall.package/.filetree +++ b/src/BaselineOfHeimdall.package/.filetree @@ -1,4 +1,5 @@ { - "noMethodMetaData" : true, "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st index ce8527f..d766347 100644 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st +++ b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st @@ -3,7 +3,16 @@ baseline: spec spec for: #common - do: [ self seaside3: spec. + do: [ + "Dependencies" + self seaside3: spec. + + "Packages" spec package: #'Heimdall-Core'; - package: #'Heimdall-Seaside' with: [ spec requires: #('Heimdall-Core' 'Seaside3') ] ] \ No newline at end of file + package: #'Heimdall-Seaside' with: [ spec requires: #('Heimdall-Core' 'Seaside3') ]. + + "Groups" + spec + group: 'minimal' with: #(#'Heimdall-Core'); + group: 'seaside' with: #(#'Heimdall-Seaside') ] \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/projectClass.st b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/projectClass.st index 18d162c..319afc3 100644 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/projectClass.st +++ b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/projectClass.st @@ -1,15 +1,5 @@ accessing projectClass - self flag: #clean. "This is a hack that need to be remove after the default version of Metacello includes Cypress suport." ^ [ self class environment at: #MetacelloCypressBaselineProject ] on: NotFound - do: [ Metacello new - baseline: 'Metacello'; - repository: 'github://dalehenrich/metacello-work:master/repository'; - get. - Metacello new - baseline: 'Metacello'; - repository: 'github://dalehenrich/metacello-work:master/repository'; - onConflict: [ :ex | ex allow ]; - load. - self projectClass ] \ No newline at end of file + do: [ super projectClass ] \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/seaside3..st b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/seaside3..st index 0d94754..668108c 100644 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/seaside3..st +++ b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/seaside3..st @@ -1,7 +1,7 @@ dependencies seaside3: spec spec - configuration: 'Seaside3' + baseline: 'Seaside3' with: [ spec - version: #'release3.2'; - repository: 'http://smalltalkhub.com/mc/Seaside/MetacelloConfigurations/main' ] \ No newline at end of file + loads: #('Core'); + repository: 'github://SeasideSt/Seaside/repository' ] \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/properties.json b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/properties.json index 7bfb8af..d1d03d0 100644 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/properties.json +++ b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/properties.json @@ -1,14 +1,11 @@ { - "category" : "BaselineOfHeimdall", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "", - "instvars" : [ - ], - "name" : "BaselineOfHeimdall", - "pools" : [ - ], "super" : "BaselineOf", - "type" : "normal" } + "category" : "BaselineOfHeimdall", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "BaselineOfHeimdall", + "type" : "normal" +} \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/properties.json b/src/BaselineOfHeimdall.package/properties.json index f037444..6f31cf5 100644 --- a/src/BaselineOfHeimdall.package/properties.json +++ b/src/BaselineOfHeimdall.package/properties.json @@ -1,2 +1 @@ -{ - } +{ } \ No newline at end of file From 7e327718da46f86a3cd059e7b6d128de9bc887ac Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 13:20:25 +0200 Subject: [PATCH 4/9] Add tests --- .../BaselineOfHeimdall.class/instance/baseline..st | 4 +++- src/Heimdall-Core-Tests.package/.filetree | 5 +++++ .../TranslateTextTest.class/README.md | 1 + .../instance/testEnglishText.st | 5 +++++ .../TranslateTextTest.class/instance/testEquals.st | 12 ++++++++++++ .../instance/testFrenchText.st | 5 +++++ .../TranslateTextTest.class/instance/testInto.st | 6 ++++++ .../TranslateTextTest.class/properties.json | 11 +++++++++++ .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 + src/Heimdall-Core-Tests.package/properties.json | 1 + .../TranslateText.class/instance/frenchText.st | 2 +- 13 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 src/Heimdall-Core-Tests.package/.filetree create mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/README.md create mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEnglishText.st create mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEquals.st create mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testFrenchText.st create mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testInto.st create mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/properties.json create mode 100644 src/Heimdall-Core-Tests.package/monticello.meta/categories.st create mode 100644 src/Heimdall-Core-Tests.package/monticello.meta/initializers.st create mode 100644 src/Heimdall-Core-Tests.package/monticello.meta/package create mode 100644 src/Heimdall-Core-Tests.package/properties.json diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st index d766347..633e704 100644 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st +++ b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st @@ -10,9 +10,11 @@ baseline: spec "Packages" spec package: #'Heimdall-Core'; + package: #'Heimdall-Core-Tests' with: [ spec requires: #('Heimdall-Core') ]; package: #'Heimdall-Seaside' with: [ spec requires: #('Heimdall-Core' 'Seaside3') ]. "Groups" spec group: 'minimal' with: #(#'Heimdall-Core'); - group: 'seaside' with: #(#'Heimdall-Seaside') ] \ No newline at end of file + group: 'seaside' with: #(#'Heimdall-Seaside'); + group: 'tests' with: #(#'Heimdall-Core-Tests') ] \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/.filetree b/src/Heimdall-Core-Tests.package/.filetree new file mode 100644 index 0000000..57a6797 --- /dev/null +++ b/src/Heimdall-Core-Tests.package/.filetree @@ -0,0 +1,5 @@ +{ + "separateMethodMetaAndSource" : false, + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/README.md b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/README.md new file mode 100644 index 0000000..665966e --- /dev/null +++ b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/README.md @@ -0,0 +1 @@ +A TranslateTextTest is a test class for testing the behavior of TranslateText \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEnglishText.st b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEnglishText.st new file mode 100644 index 0000000..78938df --- /dev/null +++ b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEnglishText.st @@ -0,0 +1,5 @@ +tests +testEnglishText + | text | + text := 'English' french: 'French'. + self assert: text englishText equals: 'English' \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEquals.st b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEquals.st new file mode 100644 index 0000000..637889b --- /dev/null +++ b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEquals.st @@ -0,0 +1,12 @@ +tests +testEquals + | inst1 inst2 | + inst1 := 'English' french: 'French'. + inst2 := 'English' french: 'French'. + self assert: inst1 equals: inst2. + + inst2 := 'English2' french: 'French'. + self deny: inst1 equals: inst2. + + inst2 := 'English' french: 'French2'. + self deny: inst1 equals: inst2 \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testFrenchText.st b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testFrenchText.st new file mode 100644 index 0000000..6aa42c1 --- /dev/null +++ b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testFrenchText.st @@ -0,0 +1,5 @@ +tests +testFrenchText + | text | + text := 'English' french: 'French'. + self assert: text frenchText equals: 'French' \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testInto.st b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testInto.st new file mode 100644 index 0000000..3f7be9e --- /dev/null +++ b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testInto.st @@ -0,0 +1,6 @@ +tests +testInto + | text | + text := 'English' french: 'French'. + self assert: (text into: #french) equals: 'French'. + self assert: (text into: #english) equals: 'English' \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/properties.json b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/properties.json new file mode 100644 index 0000000..b33a378 --- /dev/null +++ b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "", + "super" : "TestCase", + "category" : "Heimdall-Core-Tests", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "TranslateTextTest", + "type" : "normal" +} \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/monticello.meta/categories.st b/src/Heimdall-Core-Tests.package/monticello.meta/categories.st new file mode 100644 index 0000000..26e5c6e --- /dev/null +++ b/src/Heimdall-Core-Tests.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'Heimdall-Core-Tests'! diff --git a/src/Heimdall-Core-Tests.package/monticello.meta/initializers.st b/src/Heimdall-Core-Tests.package/monticello.meta/initializers.st new file mode 100644 index 0000000..e69de29 diff --git a/src/Heimdall-Core-Tests.package/monticello.meta/package b/src/Heimdall-Core-Tests.package/monticello.meta/package new file mode 100644 index 0000000..1c98734 --- /dev/null +++ b/src/Heimdall-Core-Tests.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'Heimdall-Core-Tests') \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/properties.json b/src/Heimdall-Core-Tests.package/properties.json new file mode 100644 index 0000000..6f31cf5 --- /dev/null +++ b/src/Heimdall-Core-Tests.package/properties.json @@ -0,0 +1 @@ +{ } \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st b/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st index 5e3ae7b..6c76547 100644 --- a/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st +++ b/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st @@ -1,3 +1,3 @@ -as yet unclassified +accessing frenchText ^ self textsByLanguage at: #french \ No newline at end of file From efc07147ba6af5804627ab5cf792276c770cc225 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 13:35:22 +0200 Subject: [PATCH 5/9] Migration to Tonel --- src/.filetree | 3 - src/.properties | 3 + src/BaselineOfHeimdall.package/.filetree | 5 - .../BaselineOfHeimdall.class/README.md | 0 .../instance/baseline..st | 20 -- .../instance/projectClass.st | 5 - .../instance/seaside3..st | 7 - .../BaselineOfHeimdall.class/properties.json | 11 -- .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 - .../properties.json | 1 - .../BaselineOfHeimdall.class.st | 43 ++++ src/BaselineOfHeimdall/package.st | 1 + src/Heimdall-Core-Tests.package/.filetree | 5 - .../TranslateTextTest.class/README.md | 1 - .../instance/testEnglishText.st | 5 - .../instance/testEquals.st | 12 -- .../instance/testFrenchText.st | 5 - .../instance/testInto.st | 6 - .../TranslateTextTest.class/properties.json | 11 -- .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 - .../properties.json | 1 - .../TranslateTextTest.class.st | 44 +++++ src/Heimdall-Core-Tests/package.st | 1 + src/Heimdall-Core.package/.filetree | 5 - .../HMAdminGroup.class/README.md | 1 - .../instance/isAllowedTo..st | 3 - .../HMAdminGroup.class/properties.json | 11 -- .../HMGroup.class/README.md | 1 - .../HMGroup.class/class/named..st | 5 - .../HMGroup.class/class/translatedKind.st | 3 - .../HMGroup.class/instance/addUser..st | 3 - .../HMGroup.class/instance/initialize.st | 5 - .../HMGroup.class/instance/name..st | 3 - .../HMGroup.class/instance/name.st | 3 - .../HMGroup.class/instance/printOn..st | 6 - .../HMGroup.class/instance/removeUser..st | 3 - .../HMGroup.class/instance/rights..st | 3 - .../HMGroup.class/instance/rights.st | 3 - .../HMGroup.class/instance/users..st | 3 - .../HMGroup.class/instance/users.st | 3 - .../HMGroup.class/properties.json | 17 -- .../README.md | 1 - .../class/signalWithName..st | 5 - .../instance/name..st | 3 - .../instance/name.st | 3 - .../properties.json | 13 -- .../HMWrongPasswordException.class/README.md | 1 - .../properties.json | 11 -- .../String.extension/instance/french..st | 3 - .../String.extension/properties.json | 3 - .../TLoggable.trait/README.md | 1 - .../TLoggable.trait/instance/hydePassword..st | 3 - .../TLoggable.trait/instance/isLogged.st | 3 - .../instance/loggableManager.st | 3 - .../TLoggable.trait/instance/login..st | 3 - .../TLoggable.trait/instance/login.st | 3 - .../TLoggable.trait/instance/password..st | 3 - .../TLoggable.trait/instance/password.st | 3 - .../instance/verifyPassword..st | 3 - .../TLoggable.trait/properties.json | 5 - .../TRightConstrained.trait/README.md | 0 .../instance/addRight..st | 3 - .../instance/isAllowedTo..st | 3 - .../instance/possessRight..st | 3 - .../instance/removeRight..st | 3 - .../instance/rights..st | 3 - .../instance/rights.st | 3 - .../instance/toggleRight..st | 5 - .../TRightConstrained.trait/properties.json | 5 - .../TUser.trait/README.md | 0 .../TUser.trait/instance/addToGroup..st | 4 - .../TUser.trait/instance/groups..st | 3 - .../TUser.trait/instance/groups.st | 3 - .../TUser.trait/instance/isAllowedTo..st | 3 - .../TUser.trait/instance/removeFromGroup..st | 4 - .../TUser.trait/instance/rights..st | 3 - .../TUser.trait/instance/rights.st | 3 - .../TUser.trait/instance/toggleGroup..st | 5 - .../TUser.trait/properties.json | 7 - .../TranslateText.class/README.md | 3 - .../TranslateText.class/class/english..st | 3 - .../class/english.french..st | 3 - .../TranslateText.class/instance/^equals.st | 3 - .../instance/englishText..st | 3 - .../instance/englishText.st | 3 - .../instance/frenchText..st | 3 - .../instance/frenchText.st | 3 - .../instance/initialize.st | 4 - .../TranslateText.class/instance/into..st | 3 - .../TranslateText.class/instance/printOn..st | 7 - .../TranslateText.class/instance/putOn..st | 3 - .../instance/textInLanguage..st | 3 - .../instance/textsByLanguage..st | 3 - .../instance/textsByLanguage.st | 3 - .../TranslateText.class/properties.json | 13 -- .../monticello.meta/categories.st | 4 - .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 - src/Heimdall-Core.package/properties.json | 1 - src/Heimdall-Core/HMAdminGroup.class.st | 13 ++ src/Heimdall-Core/HMGroup.class.st | 82 ++++++++ .../HMNoUserWithThisNameException.class.st | 28 +++ .../HMWrongPasswordException.class.st | 8 + src/Heimdall-Core/String.extension.st | 6 + src/Heimdall-Core/TLoggable.trait.st | 47 +++++ src/Heimdall-Core/TRightConstrained.trait.st | 41 ++++ src/Heimdall-Core/TUser.trait.st | 50 +++++ src/Heimdall-Core/TranslateText.class.st | 88 +++++++++ src/Heimdall-Core/package.st | 1 + src/Heimdall-Seaside.package/.filetree | 5 - .../HeimdallFileLibrary.class/README.md | 1 - .../instance/frPng.st | 3 - .../HeimdallFileLibrary.class/properties.json | 11 -- .../README.md | 1 - .../instance/renderContentOn..st | 12 -- .../instance/renderEnglishFlagOn..st | 5 - .../instance/renderFrenchFlagOn..st | 5 - .../instance/urlOfEnFlag.st | 3 - .../instance/urlOfFrFlag.st | 3 - .../properties.json | 11 -- .../HeimdallLoginComponent.class/README.md | 1 - .../class/withLoggableManager..st | 3 - .../class/withLoggableManager.postAction..st | 6 - .../instance/errorOnLogin..st | 7 - .../instance/initialize.st | 4 - .../instance/loggableManager..st | 3 - .../instance/loggableManager.st | 3 - .../instance/login.st | 13 -- .../instance/messageIfNoWarning.st | 10 - .../instance/postLoginActionBlock..st | 3 - .../instance/postLoginActionBlock.st | 3 - .../instance/postLoginActionOn..st | 3 - .../instance/renderContentOn..st | 9 - .../instance/renderFormOn..st | 11 -- .../instance/renderLogoutAnchorOn..st | 5 - .../instance/renderPasswordOn..st | 11 -- .../instance/renderSubmitOn..st | 6 - .../instance/renderUserOn..st | 12 -- .../instance/renderWarningOn..st | 11 -- .../instance/warning..st | 3 - .../instance/warning.st | 3 - .../properties.json | 17 -- .../HeimdallSession.class/README.md | 1 - .../instance/disconnect.st | 3 - .../instance/errorMessages..st | 3 - .../instance/errorMessages.st | 3 - .../instance/initialize.st | 4 - .../instance/isLogged.st | 3 - .../instance/language..st | 3 - .../instance/language.st | 3 - .../instance/loggable..st | 3 - .../instance/loggable.st | 3 - .../instance/popAllErrorMessages.st | 6 - .../instance/pushErrorMessage..st | 3 - .../instance/rootComponent..st | 3 - .../instance/rootComponent.st | 3 - .../HeimdallSession.class/properties.json | 16 -- .../HeimdallSimpleLoggable.class/README.md | 0 .../class/userWithID.password..st | 3 - .../instance/id..st | 3 - .../instance/id.st | 3 - .../instance/loggableManager.st | 3 - .../instance/login..st | 3 - .../instance/login.st | 3 - .../instance/password..st | 3 - .../instance/password.st | 3 - .../properties.json | 17 -- .../THeimdallComponent.trait/README.md | 1 - .../instance/popAllErrorMessages.st | 3 - .../instance/pushErrorMessage..st | 3 - .../THeimdallComponent.trait/properties.json | 5 - .../WAObject.extension/instance/translate..st | 3 - .../instance/translate.french..st | 3 - .../WAObject.extension/properties.json | 3 - .../monticello.meta/categories.st | 2 - .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 - src/Heimdall-Seaside.package/properties.json | 1 - .../HeimdallFileLibrary.class.st} | 21 +- ...eimdallLanguageSelectionComponent.class.st | 46 +++++ .../HeimdallLoginComponent.class.st | 184 ++++++++++++++++++ src/Heimdall-Seaside/HeimdallSession.class.st | 83 ++++++++ .../HeimdallSimpleLoggable.class.st | 52 +++++ .../THeimdallComponent.trait.st | 17 ++ src/Heimdall-Seaside/WAObject.extension.st | 11 ++ src/Heimdall-Seaside/package.st | 1 + 190 files changed, 868 insertions(+), 724 deletions(-) delete mode 100644 src/.filetree create mode 100644 src/.properties delete mode 100644 src/BaselineOfHeimdall.package/.filetree delete mode 100644 src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/README.md delete mode 100644 src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st delete mode 100644 src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/projectClass.st delete mode 100644 src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/seaside3..st delete mode 100644 src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/properties.json delete mode 100644 src/BaselineOfHeimdall.package/monticello.meta/categories.st delete mode 100644 src/BaselineOfHeimdall.package/monticello.meta/initializers.st delete mode 100644 src/BaselineOfHeimdall.package/monticello.meta/package delete mode 100644 src/BaselineOfHeimdall.package/properties.json create mode 100644 src/BaselineOfHeimdall/BaselineOfHeimdall.class.st create mode 100644 src/BaselineOfHeimdall/package.st delete mode 100644 src/Heimdall-Core-Tests.package/.filetree delete mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/README.md delete mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEnglishText.st delete mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEquals.st delete mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testFrenchText.st delete mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testInto.st delete mode 100644 src/Heimdall-Core-Tests.package/TranslateTextTest.class/properties.json delete mode 100644 src/Heimdall-Core-Tests.package/monticello.meta/categories.st delete mode 100644 src/Heimdall-Core-Tests.package/monticello.meta/initializers.st delete mode 100644 src/Heimdall-Core-Tests.package/monticello.meta/package delete mode 100644 src/Heimdall-Core-Tests.package/properties.json create mode 100644 src/Heimdall-Core-Tests/TranslateTextTest.class.st create mode 100644 src/Heimdall-Core-Tests/package.st delete mode 100644 src/Heimdall-Core.package/.filetree delete mode 100644 src/Heimdall-Core.package/HMAdminGroup.class/README.md delete mode 100644 src/Heimdall-Core.package/HMAdminGroup.class/instance/isAllowedTo..st delete mode 100644 src/Heimdall-Core.package/HMAdminGroup.class/properties.json delete mode 100644 src/Heimdall-Core.package/HMGroup.class/README.md delete mode 100644 src/Heimdall-Core.package/HMGroup.class/class/named..st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/class/translatedKind.st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/addUser..st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/initialize.st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/name..st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/name.st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/printOn..st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/removeUser..st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/rights..st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/rights.st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/users..st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/instance/users.st delete mode 100644 src/Heimdall-Core.package/HMGroup.class/properties.json delete mode 100644 src/Heimdall-Core.package/HMNoUserWithThisNameException.class/README.md delete mode 100644 src/Heimdall-Core.package/HMNoUserWithThisNameException.class/class/signalWithName..st delete mode 100644 src/Heimdall-Core.package/HMNoUserWithThisNameException.class/instance/name..st delete mode 100644 src/Heimdall-Core.package/HMNoUserWithThisNameException.class/instance/name.st delete mode 100644 src/Heimdall-Core.package/HMNoUserWithThisNameException.class/properties.json delete mode 100644 src/Heimdall-Core.package/HMWrongPasswordException.class/README.md delete mode 100644 src/Heimdall-Core.package/HMWrongPasswordException.class/properties.json delete mode 100644 src/Heimdall-Core.package/String.extension/instance/french..st delete mode 100644 src/Heimdall-Core.package/String.extension/properties.json delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/README.md delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/instance/hydePassword..st delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/instance/isLogged.st delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/instance/loggableManager.st delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/instance/login..st delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/instance/login.st delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/instance/password..st delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/instance/password.st delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/instance/verifyPassword..st delete mode 100644 src/Heimdall-Core.package/TLoggable.trait/properties.json delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/README.md delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/instance/addRight..st delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/instance/isAllowedTo..st delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/instance/possessRight..st delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/instance/removeRight..st delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/instance/rights..st delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/instance/rights.st delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/instance/toggleRight..st delete mode 100644 src/Heimdall-Core.package/TRightConstrained.trait/properties.json delete mode 100644 src/Heimdall-Core.package/TUser.trait/README.md delete mode 100644 src/Heimdall-Core.package/TUser.trait/instance/addToGroup..st delete mode 100644 src/Heimdall-Core.package/TUser.trait/instance/groups..st delete mode 100644 src/Heimdall-Core.package/TUser.trait/instance/groups.st delete mode 100644 src/Heimdall-Core.package/TUser.trait/instance/isAllowedTo..st delete mode 100644 src/Heimdall-Core.package/TUser.trait/instance/removeFromGroup..st delete mode 100644 src/Heimdall-Core.package/TUser.trait/instance/rights..st delete mode 100644 src/Heimdall-Core.package/TUser.trait/instance/rights.st delete mode 100644 src/Heimdall-Core.package/TUser.trait/instance/toggleGroup..st delete mode 100644 src/Heimdall-Core.package/TUser.trait/properties.json delete mode 100644 src/Heimdall-Core.package/TranslateText.class/README.md delete mode 100644 src/Heimdall-Core.package/TranslateText.class/class/english..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/class/english.french..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/^equals.st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/englishText..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/englishText.st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/frenchText..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/initialize.st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/into..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/printOn..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/putOn..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/textInLanguage..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/textsByLanguage..st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/instance/textsByLanguage.st delete mode 100644 src/Heimdall-Core.package/TranslateText.class/properties.json delete mode 100644 src/Heimdall-Core.package/monticello.meta/categories.st delete mode 100644 src/Heimdall-Core.package/monticello.meta/initializers.st delete mode 100644 src/Heimdall-Core.package/monticello.meta/package delete mode 100644 src/Heimdall-Core.package/properties.json create mode 100644 src/Heimdall-Core/HMAdminGroup.class.st create mode 100644 src/Heimdall-Core/HMGroup.class.st create mode 100644 src/Heimdall-Core/HMNoUserWithThisNameException.class.st create mode 100644 src/Heimdall-Core/HMWrongPasswordException.class.st create mode 100644 src/Heimdall-Core/String.extension.st create mode 100644 src/Heimdall-Core/TLoggable.trait.st create mode 100644 src/Heimdall-Core/TRightConstrained.trait.st create mode 100644 src/Heimdall-Core/TUser.trait.st create mode 100644 src/Heimdall-Core/TranslateText.class.st create mode 100644 src/Heimdall-Core/package.st delete mode 100644 src/Heimdall-Seaside.package/.filetree delete mode 100644 src/Heimdall-Seaside.package/HeimdallFileLibrary.class/README.md delete mode 100644 src/Heimdall-Seaside.package/HeimdallFileLibrary.class/instance/frPng.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallFileLibrary.class/properties.json delete mode 100644 src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/README.md delete mode 100644 src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderContentOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderEnglishFlagOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderFrenchFlagOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/urlOfEnFlag.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/urlOfFrFlag.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/properties.json delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/README.md delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/class/withLoggableManager..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/class/withLoggableManager.postAction..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/errorOnLogin..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/initialize.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/loggableManager..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/loggableManager.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/login.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/messageIfNoWarning.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionBlock..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionBlock.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderContentOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderFormOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderLogoutAnchorOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderPasswordOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderSubmitOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderUserOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderWarningOn..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/warning..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/warning.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallLoginComponent.class/properties.json delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/README.md delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/disconnect.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/errorMessages..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/errorMessages.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/initialize.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/isLogged.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/language..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/language.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/loggable..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/loggable.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/popAllErrorMessages.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/pushErrorMessage..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/rootComponent..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/instance/rootComponent.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSession.class/properties.json delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/README.md delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/class/userWithID.password..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/id..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/id.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/loggableManager.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/login..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/login.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/password..st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/password.st delete mode 100644 src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/properties.json delete mode 100644 src/Heimdall-Seaside.package/THeimdallComponent.trait/README.md delete mode 100644 src/Heimdall-Seaside.package/THeimdallComponent.trait/instance/popAllErrorMessages.st delete mode 100644 src/Heimdall-Seaside.package/THeimdallComponent.trait/instance/pushErrorMessage..st delete mode 100644 src/Heimdall-Seaside.package/THeimdallComponent.trait/properties.json delete mode 100644 src/Heimdall-Seaside.package/WAObject.extension/instance/translate..st delete mode 100644 src/Heimdall-Seaside.package/WAObject.extension/instance/translate.french..st delete mode 100644 src/Heimdall-Seaside.package/WAObject.extension/properties.json delete mode 100644 src/Heimdall-Seaside.package/monticello.meta/categories.st delete mode 100644 src/Heimdall-Seaside.package/monticello.meta/initializers.st delete mode 100644 src/Heimdall-Seaside.package/monticello.meta/package delete mode 100644 src/Heimdall-Seaside.package/properties.json rename src/{Heimdall-Seaside.package/HeimdallFileLibrary.class/instance/ukPng.st => Heimdall-Seaside/HeimdallFileLibrary.class.st} (55%) create mode 100644 src/Heimdall-Seaside/HeimdallLanguageSelectionComponent.class.st create mode 100644 src/Heimdall-Seaside/HeimdallLoginComponent.class.st create mode 100644 src/Heimdall-Seaside/HeimdallSession.class.st create mode 100644 src/Heimdall-Seaside/HeimdallSimpleLoggable.class.st create mode 100644 src/Heimdall-Seaside/THeimdallComponent.trait.st create mode 100644 src/Heimdall-Seaside/WAObject.extension.st create mode 100644 src/Heimdall-Seaside/package.st diff --git a/src/.filetree b/src/.filetree deleted file mode 100644 index 859128c..0000000 --- a/src/.filetree +++ /dev/null @@ -1,3 +0,0 @@ -{"packageExtension" : ".package", -"propertyFileExtension" : ".json", -"Metadata" : "false" } \ No newline at end of file diff --git a/src/.properties b/src/.properties new file mode 100644 index 0000000..ad0471d --- /dev/null +++ b/src/.properties @@ -0,0 +1,3 @@ +{ + #format : #tonel +} \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/.filetree b/src/BaselineOfHeimdall.package/.filetree deleted file mode 100644 index 57a6797..0000000 --- a/src/BaselineOfHeimdall.package/.filetree +++ /dev/null @@ -1,5 +0,0 @@ -{ - "separateMethodMetaAndSource" : false, - "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/README.md b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st deleted file mode 100644 index 633e704..0000000 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/baseline..st +++ /dev/null @@ -1,20 +0,0 @@ -baseline -baseline: spec - - spec - for: #common - do: [ - "Dependencies" - self seaside3: spec. - - "Packages" - spec - package: #'Heimdall-Core'; - package: #'Heimdall-Core-Tests' with: [ spec requires: #('Heimdall-Core') ]; - package: #'Heimdall-Seaside' with: [ spec requires: #('Heimdall-Core' 'Seaside3') ]. - - "Groups" - spec - group: 'minimal' with: #(#'Heimdall-Core'); - group: 'seaside' with: #(#'Heimdall-Seaside'); - group: 'tests' with: #(#'Heimdall-Core-Tests') ] \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/projectClass.st b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/projectClass.st deleted file mode 100644 index 319afc3..0000000 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/projectClass.st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -projectClass - ^ [ self class environment at: #MetacelloCypressBaselineProject ] - on: NotFound - do: [ super projectClass ] \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/seaside3..st b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/seaside3..st deleted file mode 100644 index 668108c..0000000 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/instance/seaside3..st +++ /dev/null @@ -1,7 +0,0 @@ -dependencies -seaside3: spec - spec - baseline: 'Seaside3' - with: [ spec - loads: #('Core'); - repository: 'github://SeasideSt/Seaside/repository' ] \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/properties.json b/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/properties.json deleted file mode 100644 index d1d03d0..0000000 --- a/src/BaselineOfHeimdall.package/BaselineOfHeimdall.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "", - "super" : "BaselineOf", - "category" : "BaselineOfHeimdall", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "BaselineOfHeimdall", - "type" : "normal" -} \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/monticello.meta/categories.st b/src/BaselineOfHeimdall.package/monticello.meta/categories.st deleted file mode 100644 index 54cf50c..0000000 --- a/src/BaselineOfHeimdall.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #BaselineOfHeimdall! diff --git a/src/BaselineOfHeimdall.package/monticello.meta/initializers.st b/src/BaselineOfHeimdall.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29..0000000 diff --git a/src/BaselineOfHeimdall.package/monticello.meta/package b/src/BaselineOfHeimdall.package/monticello.meta/package deleted file mode 100644 index 851d9d1..0000000 --- a/src/BaselineOfHeimdall.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'BaselineOfHeimdall') \ No newline at end of file diff --git a/src/BaselineOfHeimdall.package/properties.json b/src/BaselineOfHeimdall.package/properties.json deleted file mode 100644 index 6f31cf5..0000000 --- a/src/BaselineOfHeimdall.package/properties.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/src/BaselineOfHeimdall/BaselineOfHeimdall.class.st b/src/BaselineOfHeimdall/BaselineOfHeimdall.class.st new file mode 100644 index 0000000..1c5e54d --- /dev/null +++ b/src/BaselineOfHeimdall/BaselineOfHeimdall.class.st @@ -0,0 +1,43 @@ +Class { + #name : #BaselineOfHeimdall, + #superclass : #BaselineOf, + #category : 'BaselineOfHeimdall' +} + +{ #category : #baseline } +BaselineOfHeimdall >> baseline: spec [ + + spec + for: #common + do: [ + "Dependencies" + self seaside3: spec. + + "Packages" + spec + package: #'Heimdall-Core'; + package: #'Heimdall-Core-Tests' with: [ spec requires: #('Heimdall-Core') ]; + package: #'Heimdall-Seaside' with: [ spec requires: #('Heimdall-Core' 'Seaside3') ]. + + "Groups" + spec + group: 'minimal' with: #(#'Heimdall-Core'); + group: 'seaside' with: #(#'Heimdall-Seaside'); + group: 'tests' with: #(#'Heimdall-Core-Tests') ] +] + +{ #category : #accessing } +BaselineOfHeimdall >> projectClass [ + ^ [ self class environment at: #MetacelloCypressBaselineProject ] + on: NotFound + do: [ super projectClass ] +] + +{ #category : #dependencies } +BaselineOfHeimdall >> seaside3: spec [ + spec + baseline: 'Seaside3' + with: [ spec + loads: #('Core'); + repository: 'github://SeasideSt/Seaside/repository' ] +] diff --git a/src/BaselineOfHeimdall/package.st b/src/BaselineOfHeimdall/package.st new file mode 100644 index 0000000..26bbc00 --- /dev/null +++ b/src/BaselineOfHeimdall/package.st @@ -0,0 +1 @@ +Package { #name : #BaselineOfHeimdall } diff --git a/src/Heimdall-Core-Tests.package/.filetree b/src/Heimdall-Core-Tests.package/.filetree deleted file mode 100644 index 57a6797..0000000 --- a/src/Heimdall-Core-Tests.package/.filetree +++ /dev/null @@ -1,5 +0,0 @@ -{ - "separateMethodMetaAndSource" : false, - "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/README.md b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/README.md deleted file mode 100644 index 665966e..0000000 --- a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/README.md +++ /dev/null @@ -1 +0,0 @@ -A TranslateTextTest is a test class for testing the behavior of TranslateText \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEnglishText.st b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEnglishText.st deleted file mode 100644 index 78938df..0000000 --- a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEnglishText.st +++ /dev/null @@ -1,5 +0,0 @@ -tests -testEnglishText - | text | - text := 'English' french: 'French'. - self assert: text englishText equals: 'English' \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEquals.st b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEquals.st deleted file mode 100644 index 637889b..0000000 --- a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testEquals.st +++ /dev/null @@ -1,12 +0,0 @@ -tests -testEquals - | inst1 inst2 | - inst1 := 'English' french: 'French'. - inst2 := 'English' french: 'French'. - self assert: inst1 equals: inst2. - - inst2 := 'English2' french: 'French'. - self deny: inst1 equals: inst2. - - inst2 := 'English' french: 'French2'. - self deny: inst1 equals: inst2 \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testFrenchText.st b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testFrenchText.st deleted file mode 100644 index 6aa42c1..0000000 --- a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testFrenchText.st +++ /dev/null @@ -1,5 +0,0 @@ -tests -testFrenchText - | text | - text := 'English' french: 'French'. - self assert: text frenchText equals: 'French' \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testInto.st b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testInto.st deleted file mode 100644 index 3f7be9e..0000000 --- a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/instance/testInto.st +++ /dev/null @@ -1,6 +0,0 @@ -tests -testInto - | text | - text := 'English' french: 'French'. - self assert: (text into: #french) equals: 'French'. - self assert: (text into: #english) equals: 'English' \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/properties.json b/src/Heimdall-Core-Tests.package/TranslateTextTest.class/properties.json deleted file mode 100644 index b33a378..0000000 --- a/src/Heimdall-Core-Tests.package/TranslateTextTest.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "", - "super" : "TestCase", - "category" : "Heimdall-Core-Tests", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "TranslateTextTest", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/monticello.meta/categories.st b/src/Heimdall-Core-Tests.package/monticello.meta/categories.st deleted file mode 100644 index 26e5c6e..0000000 --- a/src/Heimdall-Core-Tests.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #'Heimdall-Core-Tests'! diff --git a/src/Heimdall-Core-Tests.package/monticello.meta/initializers.st b/src/Heimdall-Core-Tests.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29..0000000 diff --git a/src/Heimdall-Core-Tests.package/monticello.meta/package b/src/Heimdall-Core-Tests.package/monticello.meta/package deleted file mode 100644 index 1c98734..0000000 --- a/src/Heimdall-Core-Tests.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'Heimdall-Core-Tests') \ No newline at end of file diff --git a/src/Heimdall-Core-Tests.package/properties.json b/src/Heimdall-Core-Tests.package/properties.json deleted file mode 100644 index 6f31cf5..0000000 --- a/src/Heimdall-Core-Tests.package/properties.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/src/Heimdall-Core-Tests/TranslateTextTest.class.st b/src/Heimdall-Core-Tests/TranslateTextTest.class.st new file mode 100644 index 0000000..687f662 --- /dev/null +++ b/src/Heimdall-Core-Tests/TranslateTextTest.class.st @@ -0,0 +1,44 @@ +" +A TranslateTextTest is a test class for testing the behavior of TranslateText +" +Class { + #name : #TranslateTextTest, + #superclass : #TestCase, + #category : 'Heimdall-Core-Tests' +} + +{ #category : #tests } +TranslateTextTest >> testEnglishText [ + | text | + text := 'English' french: 'French'. + self assert: text englishText equals: 'English' +] + +{ #category : #tests } +TranslateTextTest >> testEquals [ + | inst1 inst2 | + inst1 := 'English' french: 'French'. + inst2 := 'English' french: 'French'. + self assert: inst1 equals: inst2. + + inst2 := 'English2' french: 'French'. + self deny: inst1 equals: inst2. + + inst2 := 'English' french: 'French2'. + self deny: inst1 equals: inst2 +] + +{ #category : #tests } +TranslateTextTest >> testFrenchText [ + | text | + text := 'English' french: 'French'. + self assert: text frenchText equals: 'French' +] + +{ #category : #tests } +TranslateTextTest >> testInto [ + | text | + text := 'English' french: 'French'. + self assert: (text into: #french) equals: 'French'. + self assert: (text into: #english) equals: 'English' +] diff --git a/src/Heimdall-Core-Tests/package.st b/src/Heimdall-Core-Tests/package.st new file mode 100644 index 0000000..8de2ca3 --- /dev/null +++ b/src/Heimdall-Core-Tests/package.st @@ -0,0 +1 @@ +Package { #name : #'Heimdall-Core-Tests' } diff --git a/src/Heimdall-Core.package/.filetree b/src/Heimdall-Core.package/.filetree deleted file mode 100644 index 57a6797..0000000 --- a/src/Heimdall-Core.package/.filetree +++ /dev/null @@ -1,5 +0,0 @@ -{ - "separateMethodMetaAndSource" : false, - "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMAdminGroup.class/README.md b/src/Heimdall-Core.package/HMAdminGroup.class/README.md deleted file mode 100644 index 495758a..0000000 --- a/src/Heimdall-Core.package/HMAdminGroup.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am a special group for admins, my users have all rights \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMAdminGroup.class/instance/isAllowedTo..st b/src/Heimdall-Core.package/HMAdminGroup.class/instance/isAllowedTo..st deleted file mode 100644 index 3bbf928..0000000 --- a/src/Heimdall-Core.package/HMAdminGroup.class/instance/isAllowedTo..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -isAllowedTo: aSymbol - ^ true \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMAdminGroup.class/properties.json b/src/Heimdall-Core.package/HMAdminGroup.class/properties.json deleted file mode 100644 index ba870b8..0000000 --- a/src/Heimdall-Core.package/HMAdminGroup.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "GuillaumeLarcheveque 4/13/2016 11:04", - "super" : "HMGroup", - "category" : "Heimdall-Core-util", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "HMAdminGroup", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/README.md b/src/Heimdall-Core.package/HMGroup.class/README.md deleted file mode 100644 index 96b8061..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am a group of users and i define their rights \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/class/named..st b/src/Heimdall-Core.package/HMGroup.class/class/named..st deleted file mode 100644 index 5ccf04d..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/class/named..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -named: aName - ^ self new - name: aName; - yourself \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/class/translatedKind.st b/src/Heimdall-Core.package/HMGroup.class/class/translatedKind.st deleted file mode 100644 index dc3cc8f..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/class/translatedKind.st +++ /dev/null @@ -1,3 +0,0 @@ -translation -translatedKind - ^ 'Group' french: 'Groupe' \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/addUser..st b/src/Heimdall-Core.package/HMGroup.class/instance/addUser..st deleted file mode 100644 index 6de3b4f..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/addUser..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -addUser: aSYNUserLoggable - self users add: aSYNUserLoggable . \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/initialize.st b/src/Heimdall-Core.package/HMGroup.class/instance/initialize.st deleted file mode 100644 index 9e3a065..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/initialize.st +++ /dev/null @@ -1,5 +0,0 @@ -initialization -initialize - super initialize. - self rights: OrderedCollection new. - self users: OrderedCollection new \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/name..st b/src/Heimdall-Core.package/HMGroup.class/instance/name..st deleted file mode 100644 index 5a27110..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/name..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -name: anObject - name := anObject \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/name.st b/src/Heimdall-Core.package/HMGroup.class/instance/name.st deleted file mode 100644 index 84fd401..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/name.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -name - ^ name \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/printOn..st b/src/Heimdall-Core.package/HMGroup.class/instance/printOn..st deleted file mode 100644 index c30e035..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/printOn..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -printOn: aStream - super printOn: aStream. - aStream << $(. - aStream << self name. - aStream << $) \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/removeUser..st b/src/Heimdall-Core.package/HMGroup.class/instance/removeUser..st deleted file mode 100644 index c21f4c3..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/removeUser..st +++ /dev/null @@ -1,3 +0,0 @@ -users -removeUser: anUser - self users remove: anUser. \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/rights..st b/src/Heimdall-Core.package/HMGroup.class/instance/rights..st deleted file mode 100644 index d803b29..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/rights..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -rights: anObject - rights := anObject \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/rights.st b/src/Heimdall-Core.package/HMGroup.class/instance/rights.st deleted file mode 100644 index 1a6d1f1..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/rights.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -rights - ^ rights \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/users..st b/src/Heimdall-Core.package/HMGroup.class/instance/users..st deleted file mode 100644 index 6f6baee..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/users..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -users: anObject - users := anObject \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/instance/users.st b/src/Heimdall-Core.package/HMGroup.class/instance/users.st deleted file mode 100644 index dd6474d..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/instance/users.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -users - ^ users \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMGroup.class/properties.json b/src/Heimdall-Core.package/HMGroup.class/properties.json deleted file mode 100644 index 128fe41..0000000 --- a/src/Heimdall-Core.package/HMGroup.class/properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "classtraitcomposition" : "TRightConstrained classTrait", - "classvars" : [ ], - "instvars" : [ - "users", - "rights", - "name" - ], - "name" : "HMGroup", - "commentStamp" : "", - "super" : "Object", - "traitcomposition" : "TRightConstrained", - "type" : "normal", - "classinstvars" : [ ], - "pools" : [ ], - "category" : "Heimdall-Core-util" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/README.md b/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/README.md deleted file mode 100644 index b425e90..0000000 --- a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am an exception when we look for an user that does not exist \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/class/signalWithName..st b/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/class/signalWithName..st deleted file mode 100644 index ba1a630..0000000 --- a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/class/signalWithName..st +++ /dev/null @@ -1,5 +0,0 @@ -signalling -signalWithName: aName - self new - name: aName; - signal \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/instance/name..st b/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/instance/name..st deleted file mode 100644 index 5a27110..0000000 --- a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/instance/name..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -name: anObject - name := anObject \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/instance/name.st b/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/instance/name.st deleted file mode 100644 index 22077c2..0000000 --- a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/instance/name.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -name - ^ name \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/properties.json b/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/properties.json deleted file mode 100644 index b209200..0000000 --- a/src/Heimdall-Core.package/HMNoUserWithThisNameException.class/properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "commentStamp" : "GuillaumeLarcheveque 4/14/2016 11:37", - "super" : "Error", - "category" : "Heimdall-Core-Exception", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "name" - ], - "name" : "HMNoUserWithThisNameException", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMWrongPasswordException.class/README.md b/src/Heimdall-Core.package/HMWrongPasswordException.class/README.md deleted file mode 100644 index 73e32d0..0000000 --- a/src/Heimdall-Core.package/HMWrongPasswordException.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am an exception sent when a user try to log with a wrong password \ No newline at end of file diff --git a/src/Heimdall-Core.package/HMWrongPasswordException.class/properties.json b/src/Heimdall-Core.package/HMWrongPasswordException.class/properties.json deleted file mode 100644 index b55c43c..0000000 --- a/src/Heimdall-Core.package/HMWrongPasswordException.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "GuillaumeLarcheveque 4/14/2016 11:39", - "super" : "Error", - "category" : "Heimdall-Core-Exception", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "HMWrongPasswordException", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/String.extension/instance/french..st b/src/Heimdall-Core.package/String.extension/instance/french..st deleted file mode 100644 index c50dfaf..0000000 --- a/src/Heimdall-Core.package/String.extension/instance/french..st +++ /dev/null @@ -1,3 +0,0 @@ -*Heimdall-Core -french: aFrenchTranslation - ^ TranslateText english: self french: aFrenchTranslation \ No newline at end of file diff --git a/src/Heimdall-Core.package/String.extension/properties.json b/src/Heimdall-Core.package/String.extension/properties.json deleted file mode 100644 index b20f2de..0000000 --- a/src/Heimdall-Core.package/String.extension/properties.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : "String" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/README.md b/src/Heimdall-Core.package/TLoggable.trait/README.md deleted file mode 100644 index d15a8e6..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/README.md +++ /dev/null @@ -1 +0,0 @@ -I am a trait for every object that is loggable (like a Client, a user...) \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/instance/hydePassword..st b/src/Heimdall-Core.package/TLoggable.trait/instance/hydePassword..st deleted file mode 100644 index 66dfce2..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/instance/hydePassword..st +++ /dev/null @@ -1,3 +0,0 @@ -security -hydePassword: aPassword - ^ SHA256 hashMessage: aPassword \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/instance/isLogged.st b/src/Heimdall-Core.package/TLoggable.trait/instance/isLogged.st deleted file mode 100644 index 6c2e57d..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/instance/isLogged.st +++ /dev/null @@ -1,3 +0,0 @@ -testing -isLogged - ^ self loggableManager isLogged: self \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/instance/loggableManager.st b/src/Heimdall-Core.package/TLoggable.trait/instance/loggableManager.st deleted file mode 100644 index c65bd6e..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/instance/loggableManager.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -loggableManager - ^ self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/instance/login..st b/src/Heimdall-Core.package/TLoggable.trait/instance/login..st deleted file mode 100644 index 33a0343..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/instance/login..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -login: aLogin - self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/instance/login.st b/src/Heimdall-Core.package/TLoggable.trait/instance/login.st deleted file mode 100644 index c0d4fe4..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/instance/login.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -login - ^ self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/instance/password..st b/src/Heimdall-Core.package/TLoggable.trait/instance/password..st deleted file mode 100644 index 4312c36..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/instance/password..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -password: aPassword - self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/instance/password.st b/src/Heimdall-Core.package/TLoggable.trait/instance/password.st deleted file mode 100644 index b4dc5c9..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/instance/password.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -password - ^ self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/instance/verifyPassword..st b/src/Heimdall-Core.package/TLoggable.trait/instance/verifyPassword..st deleted file mode 100644 index b22f6ad..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/instance/verifyPassword..st +++ /dev/null @@ -1,3 +0,0 @@ -testing -verifyPassword: aString - ^ (self hydePassword: aString) = self password. \ No newline at end of file diff --git a/src/Heimdall-Core.package/TLoggable.trait/properties.json b/src/Heimdall-Core.package/TLoggable.trait/properties.json deleted file mode 100644 index 98ba7ba..0000000 --- a/src/Heimdall-Core.package/TLoggable.trait/properties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name" : "TLoggable", - "commentStamp" : "GuillaumeLarcheveque 8/18/2015 17:21", - "category" : "Heimdall-Core-Traits" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/README.md b/src/Heimdall-Core.package/TRightConstrained.trait/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/instance/addRight..st b/src/Heimdall-Core.package/TRightConstrained.trait/instance/addRight..st deleted file mode 100644 index 39ea5ce..0000000 --- a/src/Heimdall-Core.package/TRightConstrained.trait/instance/addRight..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -addRight: aRight - ^ self rights add: aRight \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/instance/isAllowedTo..st b/src/Heimdall-Core.package/TRightConstrained.trait/instance/isAllowedTo..st deleted file mode 100644 index fbdf54b..0000000 --- a/src/Heimdall-Core.package/TRightConstrained.trait/instance/isAllowedTo..st +++ /dev/null @@ -1,3 +0,0 @@ -testing -isAllowedTo: aRight - ^ self possessRight: aRight \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/instance/possessRight..st b/src/Heimdall-Core.package/TRightConstrained.trait/instance/possessRight..st deleted file mode 100644 index c75f99d..0000000 --- a/src/Heimdall-Core.package/TRightConstrained.trait/instance/possessRight..st +++ /dev/null @@ -1,3 +0,0 @@ -testing -possessRight: aRight - ^ self rights includes: aRight. \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/instance/removeRight..st b/src/Heimdall-Core.package/TRightConstrained.trait/instance/removeRight..st deleted file mode 100644 index 38c8ff0..0000000 --- a/src/Heimdall-Core.package/TRightConstrained.trait/instance/removeRight..st +++ /dev/null @@ -1,3 +0,0 @@ -rights -removeRight: aRight - self rights remove: aRight \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/instance/rights..st b/src/Heimdall-Core.package/TRightConstrained.trait/instance/rights..st deleted file mode 100644 index db6233b..0000000 --- a/src/Heimdall-Core.package/TRightConstrained.trait/instance/rights..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -rights: aCollectionOfRights - self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/instance/rights.st b/src/Heimdall-Core.package/TRightConstrained.trait/instance/rights.st deleted file mode 100644 index e8a68df..0000000 --- a/src/Heimdall-Core.package/TRightConstrained.trait/instance/rights.st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -rights - self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/instance/toggleRight..st b/src/Heimdall-Core.package/TRightConstrained.trait/instance/toggleRight..st deleted file mode 100644 index 729b9a7..0000000 --- a/src/Heimdall-Core.package/TRightConstrained.trait/instance/toggleRight..st +++ /dev/null @@ -1,5 +0,0 @@ -rights -toggleRight: aRight - (self possessRight: aRight) - ifTrue: [ self removeRight: aRight ] - ifFalse: [ self addRight: aRight ] \ No newline at end of file diff --git a/src/Heimdall-Core.package/TRightConstrained.trait/properties.json b/src/Heimdall-Core.package/TRightConstrained.trait/properties.json deleted file mode 100644 index c8db3bf..0000000 --- a/src/Heimdall-Core.package/TRightConstrained.trait/properties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name" : "TRightConstrained", - "commentStamp" : "", - "category" : "Heimdall-Core-Traits" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/README.md b/src/Heimdall-Core.package/TUser.trait/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/src/Heimdall-Core.package/TUser.trait/instance/addToGroup..st b/src/Heimdall-Core.package/TUser.trait/instance/addToGroup..st deleted file mode 100644 index 7daf265..0000000 --- a/src/Heimdall-Core.package/TUser.trait/instance/addToGroup..st +++ /dev/null @@ -1,4 +0,0 @@ -group -addToGroup: aHMGroup - self groups add: aHMGroup. - aHMGroup addUser: self \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/instance/groups..st b/src/Heimdall-Core.package/TUser.trait/instance/groups..st deleted file mode 100644 index 85219a9..0000000 --- a/src/Heimdall-Core.package/TUser.trait/instance/groups..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -groups: aCollectionOfGroups - self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/instance/groups.st b/src/Heimdall-Core.package/TUser.trait/instance/groups.st deleted file mode 100644 index 32e3b77..0000000 --- a/src/Heimdall-Core.package/TUser.trait/instance/groups.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -groups - self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/instance/isAllowedTo..st b/src/Heimdall-Core.package/TUser.trait/instance/isAllowedTo..st deleted file mode 100644 index 5bb6f42..0000000 --- a/src/Heimdall-Core.package/TUser.trait/instance/isAllowedTo..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -isAllowedTo: aSymbol - ^ (self group isNotNil and: [ self group isAllowedTo: aSymbol ]) or: [ self rights includes: aSymbol ] \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/instance/removeFromGroup..st b/src/Heimdall-Core.package/TUser.trait/instance/removeFromGroup..st deleted file mode 100644 index 1628321..0000000 --- a/src/Heimdall-Core.package/TUser.trait/instance/removeFromGroup..st +++ /dev/null @@ -1,4 +0,0 @@ -group -removeFromGroup: aHMGroup - self groups remove: aHMGroup. - aHMGroup removeUser: self \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/instance/rights..st b/src/Heimdall-Core.package/TUser.trait/instance/rights..st deleted file mode 100644 index db6233b..0000000 --- a/src/Heimdall-Core.package/TUser.trait/instance/rights..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -rights: aCollectionOfRights - self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/instance/rights.st b/src/Heimdall-Core.package/TUser.trait/instance/rights.st deleted file mode 100644 index e8a68df..0000000 --- a/src/Heimdall-Core.package/TUser.trait/instance/rights.st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -rights - self explicitRequirement \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/instance/toggleGroup..st b/src/Heimdall-Core.package/TUser.trait/instance/toggleGroup..st deleted file mode 100644 index 4568bd6..0000000 --- a/src/Heimdall-Core.package/TUser.trait/instance/toggleGroup..st +++ /dev/null @@ -1,5 +0,0 @@ -groupAssignation -toggleGroup: aHMGroup - (self isPartOf: aHMGroup) - ifTrue: [ self removeFromGroup: aHMGroup ] - ifFalse: [ self addToGroup: aHMGroup ] \ No newline at end of file diff --git a/src/Heimdall-Core.package/TUser.trait/properties.json b/src/Heimdall-Core.package/TUser.trait/properties.json deleted file mode 100644 index 0695c24..0000000 --- a/src/Heimdall-Core.package/TUser.trait/properties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "commentStamp" : "", - "traitcomposition" : "TRightConstrained", - "classtraitcomposition" : "TRightConstrained classTrait", - "category" : "Heimdall-Core-Traits", - "name" : "TUser" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/README.md b/src/Heimdall-Core.package/TranslateText.class/README.md deleted file mode 100644 index f0f50b3..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/README.md +++ /dev/null @@ -1,3 +0,0 @@ -I am a text translated in different languages. - -All sessions object will be able to ask: "self translate: field" to get the translated text \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/class/english..st b/src/Heimdall-Core.package/TranslateText.class/class/english..st deleted file mode 100644 index 6ff7bbd..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/class/english..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -english: englishText - ^ self new englishText: englishText; yourself \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/class/english.french..st b/src/Heimdall-Core.package/TranslateText.class/class/english.french..st deleted file mode 100644 index b39d383..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/class/english.french..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -english: englishText french: frenchText - ^ self new englishText: englishText; frenchText: frenchText; yourself \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/^equals.st b/src/Heimdall-Core.package/TranslateText.class/instance/^equals.st deleted file mode 100644 index 80b92d9..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/^equals.st +++ /dev/null @@ -1,3 +0,0 @@ -comparing -= anObject - ^ self == anObject or: [ self englishText = anObject englishText and: [ self frenchText = anObject frenchText ] ] \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/englishText..st b/src/Heimdall-Core.package/TranslateText.class/instance/englishText..st deleted file mode 100644 index 58487dd..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/englishText..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -englishText: anEnglishText - self textsByLanguage at: #english put: anEnglishText asString \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/englishText.st b/src/Heimdall-Core.package/TranslateText.class/instance/englishText.st deleted file mode 100644 index 3fa4bcc..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/englishText.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -englishText - ^ self textsByLanguage at: #english \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/frenchText..st b/src/Heimdall-Core.package/TranslateText.class/instance/frenchText..st deleted file mode 100644 index 75b2650..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/frenchText..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -frenchText: aFrenchText - self textsByLanguage at: #french put: aFrenchText asString \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st b/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st deleted file mode 100644 index 6c76547..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/frenchText.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -frenchText - ^ self textsByLanguage at: #french \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/initialize.st b/src/Heimdall-Core.package/TranslateText.class/instance/initialize.st deleted file mode 100644 index 3f29185..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/initialize.st +++ /dev/null @@ -1,4 +0,0 @@ -initialization -initialize - super initialize. - self textsByLanguage: Dictionary new \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/into..st b/src/Heimdall-Core.package/TranslateText.class/instance/into..st deleted file mode 100644 index 5d8d45b..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/into..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -into: aLanguage - ^ self textInLanguage: aLanguage \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/printOn..st b/src/Heimdall-Core.package/TranslateText.class/instance/printOn..st deleted file mode 100644 index 39d1c42..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/printOn..st +++ /dev/null @@ -1,7 +0,0 @@ -printing -printOn: aStream - super printOn: aStream. - aStream - << $[; - << (self englishText truncateTo: 30); - << $] \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/putOn..st b/src/Heimdall-Core.package/TranslateText.class/instance/putOn..st deleted file mode 100644 index dd74bc5..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/putOn..st +++ /dev/null @@ -1,3 +0,0 @@ -streaming -putOn: aStream - aStream nextPutAll: self textsByLanguage anyOne \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/textInLanguage..st b/src/Heimdall-Core.package/TranslateText.class/instance/textInLanguage..st deleted file mode 100644 index 1d3f2e3..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/textInLanguage..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -textInLanguage: aLanguage - ^ self textsByLanguage at: aLanguage ifAbsent: [ self textsByLanguage anyOne ] \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/textsByLanguage..st b/src/Heimdall-Core.package/TranslateText.class/instance/textsByLanguage..st deleted file mode 100644 index 9327396..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/textsByLanguage..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -textsByLanguage: anObject - textsByLanguage := anObject \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/instance/textsByLanguage.st b/src/Heimdall-Core.package/TranslateText.class/instance/textsByLanguage.st deleted file mode 100644 index a5dc4e3..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/instance/textsByLanguage.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -textsByLanguage - ^ textsByLanguage \ No newline at end of file diff --git a/src/Heimdall-Core.package/TranslateText.class/properties.json b/src/Heimdall-Core.package/TranslateText.class/properties.json deleted file mode 100644 index 4e4d41c..0000000 --- a/src/Heimdall-Core.package/TranslateText.class/properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "commentStamp" : "GuillaumeLarcheveque 12/24/2015 11:10", - "super" : "Object", - "category" : "Heimdall-Core-util", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "textsByLanguage" - ], - "name" : "TranslateText", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Core.package/monticello.meta/categories.st b/src/Heimdall-Core.package/monticello.meta/categories.st deleted file mode 100644 index b17c358..0000000 --- a/src/Heimdall-Core.package/monticello.meta/categories.st +++ /dev/null @@ -1,4 +0,0 @@ -SystemOrganization addCategory: #'Heimdall-Core'! -SystemOrganization addCategory: 'Heimdall-Core-Exception'! -SystemOrganization addCategory: 'Heimdall-Core-Traits'! -SystemOrganization addCategory: 'Heimdall-Core-util'! diff --git a/src/Heimdall-Core.package/monticello.meta/initializers.st b/src/Heimdall-Core.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29..0000000 diff --git a/src/Heimdall-Core.package/monticello.meta/package b/src/Heimdall-Core.package/monticello.meta/package deleted file mode 100644 index 866e2b1..0000000 --- a/src/Heimdall-Core.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'Heimdall-Core') \ No newline at end of file diff --git a/src/Heimdall-Core.package/properties.json b/src/Heimdall-Core.package/properties.json deleted file mode 100644 index 6f31cf5..0000000 --- a/src/Heimdall-Core.package/properties.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/src/Heimdall-Core/HMAdminGroup.class.st b/src/Heimdall-Core/HMAdminGroup.class.st new file mode 100644 index 0000000..18e885c --- /dev/null +++ b/src/Heimdall-Core/HMAdminGroup.class.st @@ -0,0 +1,13 @@ +" +I am a special group for admins, my users have all rights +" +Class { + #name : #HMAdminGroup, + #superclass : #HMGroup, + #category : 'Heimdall-Core-util' +} + +{ #category : #'as yet unclassified' } +HMAdminGroup >> isAllowedTo: aSymbol [ + ^ true +] diff --git a/src/Heimdall-Core/HMGroup.class.st b/src/Heimdall-Core/HMGroup.class.st new file mode 100644 index 0000000..b3200d1 --- /dev/null +++ b/src/Heimdall-Core/HMGroup.class.st @@ -0,0 +1,82 @@ +" +I am a group of users and i define their rights +" +Class { + #name : #HMGroup, + #superclass : #Object, + #traits : 'TRightConstrained', + #classTraits : 'TRightConstrained classTrait', + #instVars : [ + 'users', + 'rights', + 'name' + ], + #category : 'Heimdall-Core-util' +} + +{ #category : #'as yet unclassified' } +HMGroup class >> named: aName [ + ^ self new + name: aName; + yourself +] + +{ #category : #translation } +HMGroup class >> translatedKind [ + ^ 'Group' french: 'Groupe' +] + +{ #category : #'as yet unclassified' } +HMGroup >> addUser: aSYNUserLoggable [ + self users add: aSYNUserLoggable . +] + +{ #category : #initialization } +HMGroup >> initialize [ + super initialize. + self rights: OrderedCollection new. + self users: OrderedCollection new +] + +{ #category : #accessing } +HMGroup >> name [ + ^ name +] + +{ #category : #accessing } +HMGroup >> name: anObject [ + name := anObject +] + +{ #category : #'as yet unclassified' } +HMGroup >> printOn: aStream [ + super printOn: aStream. + aStream << $(. + aStream << self name. + aStream << $) +] + +{ #category : #users } +HMGroup >> removeUser: anUser [ + self users remove: anUser. +] + +{ #category : #accessing } +HMGroup >> rights [ + ^ rights +] + +{ #category : #accessing } +HMGroup >> rights: anObject [ + rights := anObject +] + +{ #category : #accessing } +HMGroup >> users [ + ^ users +] + +{ #category : #accessing } +HMGroup >> users: anObject [ + users := anObject +] diff --git a/src/Heimdall-Core/HMNoUserWithThisNameException.class.st b/src/Heimdall-Core/HMNoUserWithThisNameException.class.st new file mode 100644 index 0000000..92ae324 --- /dev/null +++ b/src/Heimdall-Core/HMNoUserWithThisNameException.class.st @@ -0,0 +1,28 @@ +" +I am an exception when we look for an user that does not exist +" +Class { + #name : #HMNoUserWithThisNameException, + #superclass : #Error, + #instVars : [ + 'name' + ], + #category : 'Heimdall-Core-Exception' +} + +{ #category : #signalling } +HMNoUserWithThisNameException class >> signalWithName: aName [ + self new + name: aName; + signal +] + +{ #category : #accessing } +HMNoUserWithThisNameException >> name [ + ^ name +] + +{ #category : #accessing } +HMNoUserWithThisNameException >> name: anObject [ + name := anObject +] diff --git a/src/Heimdall-Core/HMWrongPasswordException.class.st b/src/Heimdall-Core/HMWrongPasswordException.class.st new file mode 100644 index 0000000..a1f438d --- /dev/null +++ b/src/Heimdall-Core/HMWrongPasswordException.class.st @@ -0,0 +1,8 @@ +" +I am an exception sent when a user try to log with a wrong password +" +Class { + #name : #HMWrongPasswordException, + #superclass : #Error, + #category : 'Heimdall-Core-Exception' +} diff --git a/src/Heimdall-Core/String.extension.st b/src/Heimdall-Core/String.extension.st new file mode 100644 index 0000000..84f43d4 --- /dev/null +++ b/src/Heimdall-Core/String.extension.st @@ -0,0 +1,6 @@ +Extension { #name : #String } + +{ #category : #'*Heimdall-Core' } +String >> french: aFrenchTranslation [ + ^ TranslateText english: self french: aFrenchTranslation +] diff --git a/src/Heimdall-Core/TLoggable.trait.st b/src/Heimdall-Core/TLoggable.trait.st new file mode 100644 index 0000000..f3cac71 --- /dev/null +++ b/src/Heimdall-Core/TLoggable.trait.st @@ -0,0 +1,47 @@ +" +I am a trait for every object that is loggable (like a Client, a user...) +" +Trait { + #name : #TLoggable, + #category : 'Heimdall-Core-Traits' +} + +{ #category : #security } +TLoggable >> hydePassword: aPassword [ + ^ SHA256 hashMessage: aPassword +] + +{ #category : #testing } +TLoggable >> isLogged [ + ^ self loggableManager isLogged: self +] + +{ #category : #accessing } +TLoggable >> loggableManager [ + ^ self explicitRequirement +] + +{ #category : #accessing } +TLoggable >> login [ + ^ self explicitRequirement +] + +{ #category : #accessing } +TLoggable >> login: aLogin [ + self explicitRequirement +] + +{ #category : #accessing } +TLoggable >> password [ + ^ self explicitRequirement +] + +{ #category : #accessing } +TLoggable >> password: aPassword [ + self explicitRequirement +] + +{ #category : #testing } +TLoggable >> verifyPassword: aString [ + ^ (self hydePassword: aString) = self password. +] diff --git a/src/Heimdall-Core/TRightConstrained.trait.st b/src/Heimdall-Core/TRightConstrained.trait.st new file mode 100644 index 0000000..287d398 --- /dev/null +++ b/src/Heimdall-Core/TRightConstrained.trait.st @@ -0,0 +1,41 @@ +Trait { + #name : #TRightConstrained, + #category : 'Heimdall-Core-Traits' +} + +{ #category : #accessing } +TRightConstrained >> addRight: aRight [ + ^ self rights add: aRight +] + +{ #category : #testing } +TRightConstrained >> isAllowedTo: aRight [ + ^ self possessRight: aRight +] + +{ #category : #testing } +TRightConstrained >> possessRight: aRight [ + ^ self rights includes: aRight. +] + +{ #category : #rights } +TRightConstrained >> removeRight: aRight [ + self rights remove: aRight +] + +{ #category : #'as yet unclassified' } +TRightConstrained >> rights [ + self explicitRequirement +] + +{ #category : #'as yet unclassified' } +TRightConstrained >> rights: aCollectionOfRights [ + self explicitRequirement +] + +{ #category : #rights } +TRightConstrained >> toggleRight: aRight [ + (self possessRight: aRight) + ifTrue: [ self removeRight: aRight ] + ifFalse: [ self addRight: aRight ] +] diff --git a/src/Heimdall-Core/TUser.trait.st b/src/Heimdall-Core/TUser.trait.st new file mode 100644 index 0000000..0a19ee0 --- /dev/null +++ b/src/Heimdall-Core/TUser.trait.st @@ -0,0 +1,50 @@ +Trait { + #name : #TUser, + #traits : 'TRightConstrained', + #classTraits : 'TRightConstrained classTrait', + #category : 'Heimdall-Core-Traits' +} + +{ #category : #group } +TUser >> addToGroup: aHMGroup [ + self groups add: aHMGroup. + aHMGroup addUser: self +] + +{ #category : #accessing } +TUser >> groups [ + self explicitRequirement +] + +{ #category : #accessing } +TUser >> groups: aCollectionOfGroups [ + self explicitRequirement +] + +{ #category : #'as yet unclassified' } +TUser >> isAllowedTo: aSymbol [ + ^ (self group isNotNil and: [ self group isAllowedTo: aSymbol ]) or: [ self rights includes: aSymbol ] +] + +{ #category : #group } +TUser >> removeFromGroup: aHMGroup [ + self groups remove: aHMGroup. + aHMGroup removeUser: self +] + +{ #category : #'as yet unclassified' } +TUser >> rights [ + self explicitRequirement +] + +{ #category : #'as yet unclassified' } +TUser >> rights: aCollectionOfRights [ + self explicitRequirement +] + +{ #category : #groupAssignation } +TUser >> toggleGroup: aHMGroup [ + (self isPartOf: aHMGroup) + ifTrue: [ self removeFromGroup: aHMGroup ] + ifFalse: [ self addToGroup: aHMGroup ] +] diff --git a/src/Heimdall-Core/TranslateText.class.st b/src/Heimdall-Core/TranslateText.class.st new file mode 100644 index 0000000..0e16677 --- /dev/null +++ b/src/Heimdall-Core/TranslateText.class.st @@ -0,0 +1,88 @@ +" +I am a text translated in different languages. + +All sessions object will be able to ask: ""self translate: field"" to get the translated text +" +Class { + #name : #TranslateText, + #superclass : #Object, + #instVars : [ + 'textsByLanguage' + ], + #category : 'Heimdall-Core-util' +} + +{ #category : #'as yet unclassified' } +TranslateText class >> english: englishText [ + ^ self new englishText: englishText; yourself +] + +{ #category : #'as yet unclassified' } +TranslateText class >> english: englishText french: frenchText [ + ^ self new englishText: englishText; frenchText: frenchText; yourself +] + +{ #category : #comparing } +TranslateText >> = anObject [ + ^ self == anObject or: [ self englishText = anObject englishText and: [ self frenchText = anObject frenchText ] ] +] + +{ #category : #accessing } +TranslateText >> englishText [ + ^ self textsByLanguage at: #english +] + +{ #category : #accessing } +TranslateText >> englishText: anEnglishText [ + self textsByLanguage at: #english put: anEnglishText asString +] + +{ #category : #accessing } +TranslateText >> frenchText [ + ^ self textsByLanguage at: #french +] + +{ #category : #accessing } +TranslateText >> frenchText: aFrenchText [ + self textsByLanguage at: #french put: aFrenchText asString +] + +{ #category : #initialization } +TranslateText >> initialize [ + super initialize. + self textsByLanguage: Dictionary new +] + +{ #category : #accessing } +TranslateText >> into: aLanguage [ + ^ self textInLanguage: aLanguage +] + +{ #category : #printing } +TranslateText >> printOn: aStream [ + super printOn: aStream. + aStream + << $[; + << (self englishText truncateTo: 30); + << $] +] + +{ #category : #streaming } +TranslateText >> putOn: aStream [ + aStream nextPutAll: self textsByLanguage anyOne +] + +{ #category : #accessing } +TranslateText >> textInLanguage: aLanguage [ + ^ self textsByLanguage at: aLanguage ifAbsent: [ self textsByLanguage anyOne ] +] + +{ #category : #accessing } +TranslateText >> textsByLanguage [ + ^ textsByLanguage +] + +{ #category : #accessing } +TranslateText >> textsByLanguage: anObject [ + textsByLanguage := anObject +] diff --git a/src/Heimdall-Core/package.st b/src/Heimdall-Core/package.st new file mode 100644 index 0000000..22c303f --- /dev/null +++ b/src/Heimdall-Core/package.st @@ -0,0 +1 @@ +Package { #name : #'Heimdall-Core' } diff --git a/src/Heimdall-Seaside.package/.filetree b/src/Heimdall-Seaside.package/.filetree deleted file mode 100644 index 57a6797..0000000 --- a/src/Heimdall-Seaside.package/.filetree +++ /dev/null @@ -1,5 +0,0 @@ -{ - "separateMethodMetaAndSource" : false, - "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/README.md b/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/README.md deleted file mode 100644 index f8050f0..0000000 --- a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am a FileLibrary that contains Heimdal's flags. \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/instance/frPng.st b/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/instance/frPng.st deleted file mode 100644 index ce2eaf4..0000000 --- a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/instance/frPng.st +++ /dev/null @@ -1,3 +0,0 @@ -uploaded -frPng - ^ #[137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 16 0 0 0 11 8 2 0 0 0 249 128 154 110 0 0 1 60 73 68 65 84 120 218 109 145 61 138 84 81 20 132 235 188 126 6 35 56 137 130 180 102 46 64 112 3 70 198 130 27 49 49 49 22 49 52 17 99 221 211 108 65 204 140 156 110 238 61 183 126 12 122 4 3 191 168 130 130 42 170 234 221 215 27 252 197 244 219 215 215 146 230 156 146 72 86 213 179 87 47 124 11 78 16 48 176 3 120 243 242 9 128 56 118 142 199 7 73 0 36 177 157 228 222 199 207 225 114 119 214 250 245 254 195 14 0 193 239 243 146 98 251 116 58 37 185 184 171 74 210 245 207 31 238 153 158 120 248 136 192 6 35 142 20 217 84 182 109 75 82 85 23 97 219 61 60 167 215 76 183 129 157 180 108 201 82 104 37 217 182 45 190 212 9 0 207 153 158 238 85 221 13 236 221 180 35 121 217 98 14 135 131 109 3 251 6 187 170 202 115 102 181 187 139 52 176 55 77 101 201 148 73 231 31 36 37 73 79 117 167 215 118 73 24 77 217 164 151 204 37 251 174 141 116 167 213 157 158 94 11 92 6 246 49 72 122 209 164 22 253 31 230 12 151 215 42 138 192 126 238 38 125 255 234 32 130 220 46 251 92 126 172 170 170 58 60 62 154 44 49 90 6 246 243 153 159 190 223 140 209 231 193 219 209 79 175 142 221 189 198 104 169 187 199 24 207 191 124 51 238 110 6 240 7 238 173 123 102 209 40 106 55 0 0 0 0 73 69 78 68 174 66 96 130] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/properties.json b/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/properties.json deleted file mode 100644 index c911d73..0000000 --- a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "CyrilFerlicot 2/1/2016 16:07", - "super" : "WAFileLibrary", - "category" : "Heimdall-Seaside", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "HeimdallFileLibrary", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/README.md b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/README.md deleted file mode 100644 index 68b425a..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am a simple component to render a french and an english flag. When you click on a flag, the language will change. \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderContentOn..st b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderContentOn..st deleted file mode 100644 index 7e09827..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderContentOn..st +++ /dev/null @@ -1,12 +0,0 @@ -rendering -renderContentOn: html - html div - class: 'languageComponent'; - with: [ - html anchor - callback: [ self session language: #french ]; - with: [ self renderFrenchFlagOn: html ]. - html space. - html anchor - callback: [ self session language: #english ]; - with: [ self renderEnglishFlagOn: html ] ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderEnglishFlagOn..st b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderEnglishFlagOn..st deleted file mode 100644 index d922c6a..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderEnglishFlagOn..st +++ /dev/null @@ -1,5 +0,0 @@ -rendering -renderEnglishFlagOn: html - ^ html image - class: 'en'; - resourceUrl: self urlOfEnFlag \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderFrenchFlagOn..st b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderFrenchFlagOn..st deleted file mode 100644 index a385bf4..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/renderFrenchFlagOn..st +++ /dev/null @@ -1,5 +0,0 @@ -rendering -renderFrenchFlagOn: html - ^ html image - class: 'fr'; - resourceUrl: self urlOfFrFlag \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/urlOfEnFlag.st b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/urlOfEnFlag.st deleted file mode 100644 index ab83f5e..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/urlOfEnFlag.st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -urlOfEnFlag - ^ (HeimdallFileLibrary urlOf: 'ukPng') asString \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/urlOfFrFlag.st b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/urlOfFrFlag.st deleted file mode 100644 index 775b649..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/instance/urlOfFrFlag.st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -urlOfFrFlag - ^ (HeimdallFileLibrary urlOf: 'frPng') asString \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/properties.json b/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/properties.json deleted file mode 100644 index 88d5505..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLanguageSelectionComponent.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "CyrilFerlicot 2/1/2016 16:07", - "super" : "WAComponent", - "category" : "Heimdall-Seaside", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "HeimdallLanguageSelectionComponent", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/README.md b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/README.md deleted file mode 100644 index 44fc95c..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am a standard login component \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/class/withLoggableManager..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/class/withLoggableManager..st deleted file mode 100644 index 181c594..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/class/withLoggableManager..st +++ /dev/null @@ -1,3 +0,0 @@ -instance-creation -withLoggableManager: aLoggableManager - ^ self withLoggableManager: aLoggableManager postAction: nil \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/class/withLoggableManager.postAction..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/class/withLoggableManager.postAction..st deleted file mode 100644 index 0651e41..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/class/withLoggableManager.postAction..st +++ /dev/null @@ -1,6 +0,0 @@ -instance-creation -withLoggableManager: aLoggableManager postAction: aBlock - ^ self new - loggableManager: aLoggableManager; - postLoginActionBlock: aBlock; - yourself \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/errorOnLogin..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/errorOnLogin..st deleted file mode 100644 index 1bcf9d0..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/errorOnLogin..st +++ /dev/null @@ -1,7 +0,0 @@ -hook -errorOnLogin: error - self - warning: - (self - translate: 'Wrong username or password.' - french: 'Mauvais pseudo utilisateur ou mot de passe') \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/initialize.st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/initialize.st deleted file mode 100644 index 4604d03..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/initialize.st +++ /dev/null @@ -1,4 +0,0 @@ -initialization -initialize - super initialize. - self loggableManager: HeimdallSimpleLoggable \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/loggableManager..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/loggableManager..st deleted file mode 100644 index 0a6b0d6..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/loggableManager..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -loggableManager: anObject - loggableManager := anObject \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/loggableManager.st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/loggableManager.st deleted file mode 100644 index 2c6d07d..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/loggableManager.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -loggableManager - ^ loggableManager \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/login.st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/login.st deleted file mode 100644 index 517dc56..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/login.st +++ /dev/null @@ -1,13 +0,0 @@ -accessing -login - | user | - [ - user := self loggableManager userWithID: userID password: password. - self session loggable: user. - user - ifNotNil: [ - userID := nil. - password := nil ]. - self postLoginActionOn: user ] - on: HMNoUserWithThisNameException , HMWrongPasswordException - do: [ :error | self errorOnLogin: error ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/messageIfNoWarning.st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/messageIfNoWarning.st deleted file mode 100644 index 67256bb..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/messageIfNoWarning.st +++ /dev/null @@ -1,10 +0,0 @@ -accessing -messageIfNoWarning - self session loggable notNil - ifTrue: [ ^ (self translate: 'Logged in as ' french: 'Connecté en tant que ') - , self session loggable login ]. - (userID isNil or: [ userID isEmpty ]) - ifTrue: [ ^ self - translate: 'Please enter User ID and Password' - french: 'Merci d''entrer votre pseudo d''utilisateur et votre mot de passe' ]. - ^ self translate: 'Login failed!' french: 'Echec de la connexion' \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionBlock..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionBlock..st deleted file mode 100644 index 26b7870..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionBlock..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -postLoginActionBlock: anObject - postLoginActionBlock := anObject \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionBlock.st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionBlock.st deleted file mode 100644 index 17364f6..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionBlock.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -postLoginActionBlock - ^ postLoginActionBlock \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionOn..st deleted file mode 100644 index c7d0072..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/postLoginActionOn..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -postLoginActionOn: user - self postLoginActionBlock ifNotNil: [ :bl | bl value: user ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderContentOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderContentOn..st deleted file mode 100644 index 1bd5e32..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderContentOn..st +++ /dev/null @@ -1,9 +0,0 @@ -rendering -renderContentOn: html - html div - class: 'heimdall'; - with: [ self session loggable - ifNil: [ self renderFormOn: html ] - ifNotNil: [ html - heading: (self translate: 'Welcome, ' french: 'Bienvenue ') , self session loggable login. - self renderLogoutAnchorOn: html ] ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderFormOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderFormOn..st deleted file mode 100644 index a1331f8..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderFormOn..st +++ /dev/null @@ -1,11 +0,0 @@ -rendering -renderFormOn: html - html form - class: 'loginForm'; - with: [ - self - renderUserOn: html; - renderPasswordOn: html; - renderWarningOn: html; - renderSubmitOn: html; - warning: nil ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderLogoutAnchorOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderLogoutAnchorOn..st deleted file mode 100644 index d481be9..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderLogoutAnchorOn..st +++ /dev/null @@ -1,5 +0,0 @@ -rendering -renderLogoutAnchorOn: html - html anchor - callback: [ self session disconnect ]; - with: (self translate: 'Logout ' french: 'Déconnexion') , self session loggable login \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderPasswordOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderPasswordOn..st deleted file mode 100644 index 59d8521..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderPasswordOn..st +++ /dev/null @@ -1,11 +0,0 @@ -rendering -renderPasswordOn: html - | htmlID | - html - div: [ html label - for: (htmlID := html nextId); - with: (self translate: 'Password:' french: 'Mot de passe:'). - html passwordInput - id: htmlID; - value: password; - callback: [ :value | password := value ] ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderSubmitOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderSubmitOn..st deleted file mode 100644 index 0254c3d..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderSubmitOn..st +++ /dev/null @@ -1,6 +0,0 @@ -fields -renderSubmitOn: html - html - div: [ html submitButton - callback: [ self login ]; - with: (self translate: 'Login' french: 'Connection') ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderUserOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderUserOn..st deleted file mode 100644 index ebd9677..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderUserOn..st +++ /dev/null @@ -1,12 +0,0 @@ -rendering -renderUserOn: html - | htmlID | - html - div: [ html label - for: (htmlID := html nextId); - with: (self translate: 'User:' french: 'Utilisateur'). - html textInput - id: htmlID; - value: userID; - callback: [ :value | userID := value ]; - script: 'document.getElementById(' , htmlID printString , ').focus()' ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderWarningOn..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderWarningOn..st deleted file mode 100644 index d317b08..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/renderWarningOn..st +++ /dev/null @@ -1,11 +0,0 @@ -rendering -renderWarningOn: html - self warning - ifNil: [ - html div - class: 'instruction'; - with: [ html span: self messageIfNoWarning ] ] - ifNotNil: [ :warn | - html div - class: #loginFailure; - with: warn ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/warning..st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/warning..st deleted file mode 100644 index 4cc5735..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/warning..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -warning: aString - warning := aString \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/warning.st b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/warning.st deleted file mode 100644 index d4f021d..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/instance/warning.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -warning - ^ warning \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/properties.json b/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/properties.json deleted file mode 100644 index a9c44a8..0000000 --- a/src/Heimdall-Seaside.package/HeimdallLoginComponent.class/properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "commentStamp" : "GuillaumeLarcheveque 8/20/2015 14:02", - "super" : "WAComponent", - "category" : "Heimdall-Seaside", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "userID", - "password", - "loggableManager", - "postLoginActionBlock", - "warning" - ], - "name" : "HeimdallLoginComponent", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/README.md b/src/Heimdall-Seaside.package/HeimdallSession.class/README.md deleted file mode 100644 index 743d588..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am a session that store a loggable object to ensure a Customer is logged for example \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/disconnect.st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/disconnect.st deleted file mode 100644 index e52ae27..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/disconnect.st +++ /dev/null @@ -1,3 +0,0 @@ -connection open/close -disconnect - self loggable: nil \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/errorMessages..st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/errorMessages..st deleted file mode 100644 index 5b0e76c..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/errorMessages..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -errorMessages: anObject - errorMessages := anObject \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/errorMessages.st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/errorMessages.st deleted file mode 100644 index 8e06aa6..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/errorMessages.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -errorMessages - ^ errorMessages \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/initialize.st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/initialize.st deleted file mode 100644 index b266f36..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/initialize.st +++ /dev/null @@ -1,4 +0,0 @@ -initialization -initialize - super initialize. - self errorMessages: Stack new \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/isLogged.st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/isLogged.st deleted file mode 100644 index ec970e1..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/isLogged.st +++ /dev/null @@ -1,3 +0,0 @@ -testing -isLogged - ^ self loggable isNotNil \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/language..st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/language..st deleted file mode 100644 index e8175fe..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/language..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -language: anObject - language := anObject \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/language.st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/language.st deleted file mode 100644 index d045f71..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/language.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -language - ^ language ifNil: [ #english ] \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/loggable..st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/loggable..st deleted file mode 100644 index 3df8263..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/loggable..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -loggable: anObject - loggable := anObject \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/loggable.st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/loggable.st deleted file mode 100644 index 3d5181d..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/loggable.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -loggable - ^ loggable \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/popAllErrorMessages.st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/popAllErrorMessages.st deleted file mode 100644 index 2fd6e7f..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/popAllErrorMessages.st +++ /dev/null @@ -1,6 +0,0 @@ -error-management -popAllErrorMessages - | messages | - messages := self errorMessages asOrderedCollection. - self errorMessages removeAll. - ^ messages \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/pushErrorMessage..st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/pushErrorMessage..st deleted file mode 100644 index 0a93e31..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/pushErrorMessage..st +++ /dev/null @@ -1,3 +0,0 @@ -error-management -pushErrorMessage: anErrorMessage - self errorMessages push: anErrorMessage \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/rootComponent..st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/rootComponent..st deleted file mode 100644 index 6729302..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/rootComponent..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -rootComponent: aSYNWebRoot - rootComponent := aSYNWebRoot \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/rootComponent.st b/src/Heimdall-Seaside.package/HeimdallSession.class/instance/rootComponent.st deleted file mode 100644 index 7e0b8b2..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/instance/rootComponent.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -rootComponent - ^ rootComponent \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSession.class/properties.json b/src/Heimdall-Seaside.package/HeimdallSession.class/properties.json deleted file mode 100644 index e2b30e3..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSession.class/properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "commentStamp" : "GuillaumeLarcheveque 8/18/2015 17:29", - "super" : "WASession", - "category" : "Heimdall-Seaside", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "loggable", - "language", - "rootComponent", - "errorMessages" - ], - "name" : "HeimdallSession", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/README.md b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/class/userWithID.password..st b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/class/userWithID.password..st deleted file mode 100644 index 3e39ccb..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/class/userWithID.password..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -userWithID: aUserId password: aUserPassword - ^ self new login: aUserId; password: aUserPassword; yourself \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/id..st b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/id..st deleted file mode 100644 index 5561e6d..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/id..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -id: anObject - id := anObject \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/id.st b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/id.st deleted file mode 100644 index 41241a3..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/id.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -id - ^ id \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/loggableManager.st b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/loggableManager.st deleted file mode 100644 index cd747ad..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/loggableManager.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -loggableManager - ^ self class \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/login..st b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/login..st deleted file mode 100644 index dd8aabb..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/login..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -login: anObject - login := anObject \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/login.st b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/login.st deleted file mode 100644 index 179c20a..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/login.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -login - ^ login \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/password..st b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/password..st deleted file mode 100644 index 4c9eab6..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/password..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -password: anObject - password := anObject \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/password.st b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/password.st deleted file mode 100644 index 494767e..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/instance/password.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -password - ^ password \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/properties.json b/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/properties.json deleted file mode 100644 index 80de8dc..0000000 --- a/src/Heimdall-Seaside.package/HeimdallSimpleLoggable.class/properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "classtraitcomposition" : "TLoggable classTrait", - "classvars" : [ ], - "instvars" : [ - "login", - "password", - "id" - ], - "name" : "HeimdallSimpleLoggable", - "commentStamp" : "", - "super" : "Object", - "traitcomposition" : "TLoggable", - "type" : "normal", - "classinstvars" : [ ], - "pools" : [ ], - "category" : "Heimdall-Seaside" -} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/THeimdallComponent.trait/README.md b/src/Heimdall-Seaside.package/THeimdallComponent.trait/README.md deleted file mode 100644 index 49bc409..0000000 --- a/src/Heimdall-Seaside.package/THeimdallComponent.trait/README.md +++ /dev/null @@ -1 +0,0 @@ -I am a trait to make a seaside component benefits from everything provided by HeimdallSession \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/THeimdallComponent.trait/instance/popAllErrorMessages.st b/src/Heimdall-Seaside.package/THeimdallComponent.trait/instance/popAllErrorMessages.st deleted file mode 100644 index 3f9d6bd..0000000 --- a/src/Heimdall-Seaside.package/THeimdallComponent.trait/instance/popAllErrorMessages.st +++ /dev/null @@ -1,3 +0,0 @@ -error-management -popAllErrorMessages - ^ self session popAllErrorMessages \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/THeimdallComponent.trait/instance/pushErrorMessage..st b/src/Heimdall-Seaside.package/THeimdallComponent.trait/instance/pushErrorMessage..st deleted file mode 100644 index d1c607e..0000000 --- a/src/Heimdall-Seaside.package/THeimdallComponent.trait/instance/pushErrorMessage..st +++ /dev/null @@ -1,3 +0,0 @@ -error-management -pushErrorMessage: anErrorMessage - self session pushErrorMessage: anErrorMessage \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/THeimdallComponent.trait/properties.json b/src/Heimdall-Seaside.package/THeimdallComponent.trait/properties.json deleted file mode 100644 index b9410d4..0000000 --- a/src/Heimdall-Seaside.package/THeimdallComponent.trait/properties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name" : "THeimdallComponent", - "commentStamp" : "", - "category" : "Heimdall-Seaside-Traits" -} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/WAObject.extension/instance/translate..st b/src/Heimdall-Seaside.package/WAObject.extension/instance/translate..st deleted file mode 100644 index 8a963ee..0000000 --- a/src/Heimdall-Seaside.package/WAObject.extension/instance/translate..st +++ /dev/null @@ -1,3 +0,0 @@ -*Heimdall-Seaside -translate: aTranslateText - ^ aTranslateText textInLanguage: ([self session language] on: WARequestContextNotFound do: [ #english ]) \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/WAObject.extension/instance/translate.french..st b/src/Heimdall-Seaside.package/WAObject.extension/instance/translate.french..st deleted file mode 100644 index 79e2034..0000000 --- a/src/Heimdall-Seaside.package/WAObject.extension/instance/translate.french..st +++ /dev/null @@ -1,3 +0,0 @@ -*Heimdall-Seaside -translate: anEnglishText french: aFrenchText - ^ self translate: (anEnglishText french: aFrenchText) \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/WAObject.extension/properties.json b/src/Heimdall-Seaside.package/WAObject.extension/properties.json deleted file mode 100644 index 32d1681..0000000 --- a/src/Heimdall-Seaside.package/WAObject.extension/properties.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : "WAObject" -} \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/monticello.meta/categories.st b/src/Heimdall-Seaside.package/monticello.meta/categories.st deleted file mode 100644 index b98b260..0000000 --- a/src/Heimdall-Seaside.package/monticello.meta/categories.st +++ /dev/null @@ -1,2 +0,0 @@ -SystemOrganization addCategory: #'Heimdall-Seaside'! -SystemOrganization addCategory: 'Heimdall-Seaside-Traits'! diff --git a/src/Heimdall-Seaside.package/monticello.meta/initializers.st b/src/Heimdall-Seaside.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29..0000000 diff --git a/src/Heimdall-Seaside.package/monticello.meta/package b/src/Heimdall-Seaside.package/monticello.meta/package deleted file mode 100644 index 9e3e2a0..0000000 --- a/src/Heimdall-Seaside.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'Heimdall-Seaside') \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/properties.json b/src/Heimdall-Seaside.package/properties.json deleted file mode 100644 index 6f31cf5..0000000 --- a/src/Heimdall-Seaside.package/properties.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/instance/ukPng.st b/src/Heimdall-Seaside/HeimdallFileLibrary.class.st similarity index 55% rename from src/Heimdall-Seaside.package/HeimdallFileLibrary.class/instance/ukPng.st rename to src/Heimdall-Seaside/HeimdallFileLibrary.class.st index 1d9faad..babcc0a 100644 --- a/src/Heimdall-Seaside.package/HeimdallFileLibrary.class/instance/ukPng.st +++ b/src/Heimdall-Seaside/HeimdallFileLibrary.class.st @@ -1,3 +1,18 @@ -uploaded -ukPng - ^ #[137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 16 0 0 0 11 8 2 0 0 0 249 128 154 110 0 0 2 2 73 68 65 84 120 218 5 193 91 72 83 97 0 192 241 255 119 92 171 86 148 135 69 154 70 162 118 129 164 135 40 168 145 16 209 205 17 69 62 68 153 69 9 21 66 18 72 32 244 16 150 150 17 93 158 82 41 67 232 193 34 232 134 179 11 185 46 98 185 160 50 203 181 40 166 165 89 153 138 174 93 206 206 206 182 239 235 247 19 53 181 237 238 130 113 188 30 229 222 221 17 152 37 149 90 177 204 145 127 167 78 232 206 224 134 202 79 129 136 66 110 47 74 164 91 47 205 40 63 220 208 165 83 115 170 125 228 175 148 70 76 250 63 200 68 242 199 111 25 53 164 124 247 90 126 233 141 196 228 224 79 41 13 83 62 184 41 195 33 159 95 174 223 214 166 161 52 5 111 131 14 145 155 39 58 218 243 28 241 104 92 136 254 62 241 45 24 54 68 190 35 34 142 87 11 215 198 166 167 179 227 6 68 165 134 0 64 240 102 88 103 203 102 188 143 179 50 162 12 12 96 142 229 100 132 57 89 67 195 153 43 221 206 208 63 44 11 192 230 214 122 114 181 213 11 237 83 40 24 81 20 45 231 66 61 253 65 250 2 188 122 79 213 49 6 191 86 205 139 49 215 82 206 5 118 46 218 148 239 37 37 110 62 6 144 48 56 196 216 47 38 198 9 69 48 13 70 255 240 188 140 164 137 105 145 74 113 100 207 36 216 68 193 18 242 22 227 208 65 225 114 145 153 73 197 1 34 17 76 147 153 118 174 183 96 24 152 73 18 22 69 133 250 139 46 155 71 223 153 47 179 134 19 217 2 138 11 67 212 215 209 241 132 53 43 153 59 157 187 207 40 43 229 90 243 209 91 217 209 184 89 146 97 191 202 86 77 42 133 2 40 94 52 193 233 90 78 212 78 38 236 24 38 241 84 207 164 147 198 86 246 238 107 220 228 87 86 52 157 78 129 165 33 65 81 188 52 172 124 157 234 236 249 238 145 57 182 105 74 29 44 85 229 59 178 117 117 123 40 75 222 247 88 62 239 141 74 147 116 18 146 54 84 250 251 195 166 64 91 139 86 81 125 110 255 61 166 210 235 118 205 95 219 233 5 46 247 174 82 163 159 155 137 29 114 248 39 30 121 114 0 92 255 1 114 180 254 203 142 46 91 60 0 0 0 0 73 69 78 68 174 66 96 130] \ No newline at end of file +" +I am a FileLibrary that contains Heimdal's flags. +" +Class { + #name : #HeimdallFileLibrary, + #superclass : #WAFileLibrary, + #category : 'Heimdall-Seaside' +} + +{ #category : #uploaded } +HeimdallFileLibrary >> frPng [ + ^ #[137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 16 0 0 0 11 8 2 0 0 0 249 128 154 110 0 0 1 60 73 68 65 84 120 218 109 145 61 138 84 81 20 132 235 188 126 6 35 56 137 130 180 102 46 64 112 3 70 198 130 27 49 49 49 22 49 52 17 99 221 211 108 65 204 140 156 110 238 61 183 126 12 122 4 3 191 168 130 130 42 170 234 221 215 27 252 197 244 219 215 215 146 230 156 146 72 86 213 179 87 47 124 11 78 16 48 176 3 120 243 242 9 128 56 118 142 199 7 73 0 36 177 157 228 222 199 207 225 114 119 214 250 245 254 195 14 0 193 239 243 146 98 251 116 58 37 185 184 171 74 210 245 207 31 238 153 158 120 248 136 192 6 35 142 20 217 84 182 109 75 82 85 23 97 219 61 60 167 215 76 183 129 157 180 108 201 82 104 37 217 182 45 190 212 9 0 207 153 158 238 85 221 13 236 221 180 35 121 217 98 14 135 131 109 3 251 6 187 170 202 115 102 181 187 139 52 176 55 77 101 201 148 73 231 31 36 37 73 79 117 167 215 118 73 24 77 217 164 151 204 37 251 174 141 116 167 213 157 158 94 11 92 6 246 49 72 122 209 164 22 253 31 230 12 151 215 42 138 192 126 238 38 125 255 234 32 130 220 46 251 92 126 172 170 170 58 60 62 154 44 49 90 6 246 243 153 159 190 223 140 209 231 193 219 209 79 175 142 221 189 198 104 169 187 199 24 207 191 124 51 238 110 6 240 7 238 173 123 102 209 40 106 55 0 0 0 0 73 69 78 68 174 66 96 130] +] + +{ #category : #uploaded } +HeimdallFileLibrary >> ukPng [ + ^ #[137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 16 0 0 0 11 8 2 0 0 0 249 128 154 110 0 0 2 2 73 68 65 84 120 218 5 193 91 72 83 97 0 192 241 255 119 92 171 86 148 135 69 154 70 162 118 129 164 135 40 168 145 16 209 205 17 69 62 68 153 69 9 21 66 18 72 32 244 16 150 150 17 93 158 82 41 67 232 193 34 232 134 179 11 185 46 98 185 160 50 203 181 40 166 165 89 153 138 174 93 206 206 206 182 239 235 247 19 53 181 237 238 130 113 188 30 229 222 221 17 152 37 149 90 177 204 145 127 167 78 232 206 224 134 202 79 129 136 66 110 47 74 164 91 47 205 40 63 220 208 165 83 115 170 125 228 175 148 70 76 250 63 200 68 242 199 111 25 53 164 124 247 90 126 233 141 196 228 224 79 41 13 83 62 184 41 195 33 159 95 174 223 214 166 161 52 5 111 131 14 145 155 39 58 218 243 28 241 104 92 136 254 62 241 45 24 54 68 190 35 34 142 87 11 215 198 166 167 179 227 6 68 165 134 0 64 240 102 88 103 203 102 188 143 179 50 162 12 12 96 142 229 100 132 57 89 67 195 153 43 221 206 208 63 44 11 192 230 214 122 114 181 213 11 237 83 40 24 81 20 45 231 66 61 253 65 250 2 188 122 79 213 49 6 191 86 205 139 49 215 82 206 5 118 46 218 148 239 37 37 110 62 6 144 48 56 196 216 47 38 198 9 69 48 13 70 255 240 188 140 164 137 105 145 74 113 100 207 36 216 68 193 18 242 22 227 208 65 225 114 145 153 73 197 1 34 17 76 147 153 118 174 183 96 24 152 73 18 22 69 133 250 139 46 155 71 223 153 47 179 134 19 217 2 138 11 67 212 215 209 241 132 53 43 153 59 157 187 207 40 43 229 90 243 209 91 217 209 184 89 146 97 191 202 86 77 42 133 2 40 94 52 193 233 90 78 212 78 38 236 24 38 241 84 207 164 147 198 86 246 238 107 220 228 87 86 52 157 78 129 165 33 65 81 188 52 172 124 157 234 236 249 238 145 57 182 105 74 29 44 85 229 59 178 117 117 123 40 75 222 247 88 62 239 141 74 147 116 18 146 54 84 250 251 195 166 64 91 139 86 81 125 110 255 61 166 210 235 118 205 95 219 233 5 46 247 174 82 163 159 155 137 29 114 248 39 30 121 114 0 92 255 1 114 180 254 203 142 46 91 60 0 0 0 0 73 69 78 68 174 66 96 130] +] diff --git a/src/Heimdall-Seaside/HeimdallLanguageSelectionComponent.class.st b/src/Heimdall-Seaside/HeimdallLanguageSelectionComponent.class.st new file mode 100644 index 0000000..92cfb1b --- /dev/null +++ b/src/Heimdall-Seaside/HeimdallLanguageSelectionComponent.class.st @@ -0,0 +1,46 @@ +" +I am a simple component to render a french and an english flag. When you click on a flag, the language will change. +" +Class { + #name : #HeimdallLanguageSelectionComponent, + #superclass : #WAComponent, + #category : 'Heimdall-Seaside' +} + +{ #category : #rendering } +HeimdallLanguageSelectionComponent >> renderContentOn: html [ + html div + class: 'languageComponent'; + with: [ + html anchor + callback: [ self session language: #french ]; + with: [ self renderFrenchFlagOn: html ]. + html space. + html anchor + callback: [ self session language: #english ]; + with: [ self renderEnglishFlagOn: html ] ] +] + +{ #category : #rendering } +HeimdallLanguageSelectionComponent >> renderEnglishFlagOn: html [ + ^ html image + class: 'en'; + resourceUrl: self urlOfEnFlag +] + +{ #category : #rendering } +HeimdallLanguageSelectionComponent >> renderFrenchFlagOn: html [ + ^ html image + class: 'fr'; + resourceUrl: self urlOfFrFlag +] + +{ #category : #'as yet unclassified' } +HeimdallLanguageSelectionComponent >> urlOfEnFlag [ + ^ (HeimdallFileLibrary urlOf: 'ukPng') asString +] + +{ #category : #'as yet unclassified' } +HeimdallLanguageSelectionComponent >> urlOfFrFlag [ + ^ (HeimdallFileLibrary urlOf: 'frPng') asString +] diff --git a/src/Heimdall-Seaside/HeimdallLoginComponent.class.st b/src/Heimdall-Seaside/HeimdallLoginComponent.class.st new file mode 100644 index 0000000..64441e3 --- /dev/null +++ b/src/Heimdall-Seaside/HeimdallLoginComponent.class.st @@ -0,0 +1,184 @@ +" +I am a standard login component +" +Class { + #name : #HeimdallLoginComponent, + #superclass : #WAComponent, + #instVars : [ + 'userID', + 'password', + 'loggableManager', + 'postLoginActionBlock', + 'warning' + ], + #category : 'Heimdall-Seaside' +} + +{ #category : #'instance-creation' } +HeimdallLoginComponent class >> withLoggableManager: aLoggableManager [ + ^ self withLoggableManager: aLoggableManager postAction: nil +] + +{ #category : #'instance-creation' } +HeimdallLoginComponent class >> withLoggableManager: aLoggableManager postAction: aBlock [ + ^ self new + loggableManager: aLoggableManager; + postLoginActionBlock: aBlock; + yourself +] + +{ #category : #hook } +HeimdallLoginComponent >> errorOnLogin: error [ + self + warning: + (self + translate: 'Wrong username or password.' + french: 'Mauvais pseudo utilisateur ou mot de passe') +] + +{ #category : #initialization } +HeimdallLoginComponent >> initialize [ + super initialize. + self loggableManager: HeimdallSimpleLoggable +] + +{ #category : #accessing } +HeimdallLoginComponent >> loggableManager [ + ^ loggableManager +] + +{ #category : #accessing } +HeimdallLoginComponent >> loggableManager: anObject [ + loggableManager := anObject +] + +{ #category : #accessing } +HeimdallLoginComponent >> login [ + | user | + [ + user := self loggableManager userWithID: userID password: password. + self session loggable: user. + user + ifNotNil: [ + userID := nil. + password := nil ]. + self postLoginActionOn: user ] + on: HMNoUserWithThisNameException , HMWrongPasswordException + do: [ :error | self errorOnLogin: error ] +] + +{ #category : #accessing } +HeimdallLoginComponent >> messageIfNoWarning [ + self session loggable notNil + ifTrue: [ ^ (self translate: 'Logged in as ' french: 'Connecté en tant que ') + , self session loggable login ]. + (userID isNil or: [ userID isEmpty ]) + ifTrue: [ ^ self + translate: 'Please enter User ID and Password' + french: 'Merci d''entrer votre pseudo d''utilisateur et votre mot de passe' ]. + ^ self translate: 'Login failed!' french: 'Echec de la connexion' +] + +{ #category : #accessing } +HeimdallLoginComponent >> postLoginActionBlock [ + ^ postLoginActionBlock +] + +{ #category : #accessing } +HeimdallLoginComponent >> postLoginActionBlock: anObject [ + postLoginActionBlock := anObject +] + +{ #category : #accessing } +HeimdallLoginComponent >> postLoginActionOn: user [ + self postLoginActionBlock ifNotNil: [ :bl | bl value: user ] +] + +{ #category : #rendering } +HeimdallLoginComponent >> renderContentOn: html [ + html div + class: 'heimdall'; + with: [ self session loggable + ifNil: [ self renderFormOn: html ] + ifNotNil: [ html + heading: (self translate: 'Welcome, ' french: 'Bienvenue ') , self session loggable login. + self renderLogoutAnchorOn: html ] ] +] + +{ #category : #rendering } +HeimdallLoginComponent >> renderFormOn: html [ + html form + class: 'loginForm'; + with: [ + self + renderUserOn: html; + renderPasswordOn: html; + renderWarningOn: html; + renderSubmitOn: html; + warning: nil ] +] + +{ #category : #rendering } +HeimdallLoginComponent >> renderLogoutAnchorOn: html [ + html anchor + callback: [ self session disconnect ]; + with: (self translate: 'Logout ' french: 'Déconnexion') , self session loggable login +] + +{ #category : #rendering } +HeimdallLoginComponent >> renderPasswordOn: html [ + | htmlID | + html + div: [ html label + for: (htmlID := html nextId); + with: (self translate: 'Password:' french: 'Mot de passe:'). + html passwordInput + id: htmlID; + value: password; + callback: [ :value | password := value ] ] +] + +{ #category : #fields } +HeimdallLoginComponent >> renderSubmitOn: html [ + html + div: [ html submitButton + callback: [ self login ]; + with: (self translate: 'Login' french: 'Connection') ] +] + +{ #category : #rendering } +HeimdallLoginComponent >> renderUserOn: html [ + | htmlID | + html + div: [ html label + for: (htmlID := html nextId); + with: (self translate: 'User:' french: 'Utilisateur'). + html textInput + id: htmlID; + value: userID; + callback: [ :value | userID := value ]; + script: 'document.getElementById(' , htmlID printString , ').focus()' ] +] + +{ #category : #rendering } +HeimdallLoginComponent >> renderWarningOn: html [ + self warning + ifNil: [ + html div + class: 'instruction'; + with: [ html span: self messageIfNoWarning ] ] + ifNotNil: [ :warn | + html div + class: #loginFailure; + with: warn ] +] + +{ #category : #accessing } +HeimdallLoginComponent >> warning [ + ^ warning +] + +{ #category : #accessing } +HeimdallLoginComponent >> warning: aString [ + warning := aString +] diff --git a/src/Heimdall-Seaside/HeimdallSession.class.st b/src/Heimdall-Seaside/HeimdallSession.class.st new file mode 100644 index 0000000..348124e --- /dev/null +++ b/src/Heimdall-Seaside/HeimdallSession.class.st @@ -0,0 +1,83 @@ +" +I am a session that store a loggable object to ensure a Customer is logged for example +" +Class { + #name : #HeimdallSession, + #superclass : #WASession, + #instVars : [ + 'loggable', + 'language', + 'rootComponent', + 'errorMessages' + ], + #category : 'Heimdall-Seaside' +} + +{ #category : #'connection open/close' } +HeimdallSession >> disconnect [ + self loggable: nil +] + +{ #category : #accessing } +HeimdallSession >> errorMessages [ + ^ errorMessages +] + +{ #category : #accessing } +HeimdallSession >> errorMessages: anObject [ + errorMessages := anObject +] + +{ #category : #initialization } +HeimdallSession >> initialize [ + super initialize. + self errorMessages: Stack new +] + +{ #category : #testing } +HeimdallSession >> isLogged [ + ^ self loggable isNotNil +] + +{ #category : #accessing } +HeimdallSession >> language [ + ^ language ifNil: [ #english ] +] + +{ #category : #accessing } +HeimdallSession >> language: anObject [ + language := anObject +] + +{ #category : #accessing } +HeimdallSession >> loggable [ + ^ loggable +] + +{ #category : #accessing } +HeimdallSession >> loggable: anObject [ + loggable := anObject +] + +{ #category : #'error-management' } +HeimdallSession >> popAllErrorMessages [ + | messages | + messages := self errorMessages asOrderedCollection. + self errorMessages removeAll. + ^ messages +] + +{ #category : #'error-management' } +HeimdallSession >> pushErrorMessage: anErrorMessage [ + self errorMessages push: anErrorMessage +] + +{ #category : #accessing } +HeimdallSession >> rootComponent [ + ^ rootComponent +] + +{ #category : #accessing } +HeimdallSession >> rootComponent: aSYNWebRoot [ + rootComponent := aSYNWebRoot +] diff --git a/src/Heimdall-Seaside/HeimdallSimpleLoggable.class.st b/src/Heimdall-Seaside/HeimdallSimpleLoggable.class.st new file mode 100644 index 0000000..db205c0 --- /dev/null +++ b/src/Heimdall-Seaside/HeimdallSimpleLoggable.class.st @@ -0,0 +1,52 @@ +Class { + #name : #HeimdallSimpleLoggable, + #superclass : #Object, + #traits : 'TLoggable', + #classTraits : 'TLoggable classTrait', + #instVars : [ + 'login', + 'password', + 'id' + ], + #category : 'Heimdall-Seaside' +} + +{ #category : #'as yet unclassified' } +HeimdallSimpleLoggable class >> userWithID: aUserId password: aUserPassword [ + ^ self new login: aUserId; password: aUserPassword; yourself +] + +{ #category : #accessing } +HeimdallSimpleLoggable >> id [ + ^ id +] + +{ #category : #accessing } +HeimdallSimpleLoggable >> id: anObject [ + id := anObject +] + +{ #category : #accessing } +HeimdallSimpleLoggable >> loggableManager [ + ^ self class +] + +{ #category : #accessing } +HeimdallSimpleLoggable >> login [ + ^ login +] + +{ #category : #accessing } +HeimdallSimpleLoggable >> login: anObject [ + login := anObject +] + +{ #category : #accessing } +HeimdallSimpleLoggable >> password [ + ^ password +] + +{ #category : #accessing } +HeimdallSimpleLoggable >> password: anObject [ + password := anObject +] diff --git a/src/Heimdall-Seaside/THeimdallComponent.trait.st b/src/Heimdall-Seaside/THeimdallComponent.trait.st new file mode 100644 index 0000000..51c7b00 --- /dev/null +++ b/src/Heimdall-Seaside/THeimdallComponent.trait.st @@ -0,0 +1,17 @@ +" +I am a trait to make a seaside component benefits from everything provided by HeimdallSession +" +Trait { + #name : #THeimdallComponent, + #category : 'Heimdall-Seaside-Traits' +} + +{ #category : #'error-management' } +THeimdallComponent >> popAllErrorMessages [ + ^ self session popAllErrorMessages +] + +{ #category : #'error-management' } +THeimdallComponent >> pushErrorMessage: anErrorMessage [ + self session pushErrorMessage: anErrorMessage +] diff --git a/src/Heimdall-Seaside/WAObject.extension.st b/src/Heimdall-Seaside/WAObject.extension.st new file mode 100644 index 0000000..6f41521 --- /dev/null +++ b/src/Heimdall-Seaside/WAObject.extension.st @@ -0,0 +1,11 @@ +Extension { #name : #WAObject } + +{ #category : #'*Heimdall-Seaside' } +WAObject >> translate: aTranslateText [ + ^ aTranslateText textInLanguage: ([self session language] on: WARequestContextNotFound do: [ #english ]) +] + +{ #category : #'*Heimdall-Seaside' } +WAObject >> translate: anEnglishText french: aFrenchText [ + ^ self translate: (anEnglishText french: aFrenchText) +] diff --git a/src/Heimdall-Seaside/package.st b/src/Heimdall-Seaside/package.st new file mode 100644 index 0000000..b0bcb39 --- /dev/null +++ b/src/Heimdall-Seaside/package.st @@ -0,0 +1 @@ +Package { #name : #'Heimdall-Seaside' } From 071c1eeff26867398cf15ecbca93dc098a0b43c7 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 13:37:31 +0200 Subject: [PATCH 6/9] Update CI --- .travis.yml | 12 ++++++++++-- appveyor.yml | 8 ++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec429bc..b7d03cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,13 @@ os: - osx smalltalk: - - Pharo-6.0 - - Pharo-5.0 \ No newline at end of file + - Pharo-7.0 + - Pharo-6.1 + - Pharo64-7.0 + - Pharo64-6.1 + +matrix: + fast_finish: true + allow_failures: + - smalltalk: Pharo-7.0 + - smalltalk: Pharo64-7.0 \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index b6a7a65..9ef2ce4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,8 +6,12 @@ environment: CYG_MIRROR: http://cygwin.mirror.constant.com SCI_RUN: /cygdrive/c/smalltalkCI-master/run.sh matrix: - - SMALLTALK: Pharo-6.0 - - SMALLTALK: Pharo-5.0 + - SMALLTALK: Pharo-7.0 + - SMALLTALK: Pharo-6.1 + +matrix: + allow_failures: + - SMALLTALK: Pharo-7.0 platform: - x86 From eb1ee34be873c657bcafeba56c3a3e4ec5471116 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 13:43:52 +0200 Subject: [PATCH 7/9] Improve equals. --- src/Heimdall-Core/TranslateText.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Heimdall-Core/TranslateText.class.st b/src/Heimdall-Core/TranslateText.class.st index 0e16677..adf02f0 100644 --- a/src/Heimdall-Core/TranslateText.class.st +++ b/src/Heimdall-Core/TranslateText.class.st @@ -24,7 +24,7 @@ TranslateText class >> english: englishText french: frenchText [ { #category : #comparing } TranslateText >> = anObject [ - ^ self == anObject or: [ self englishText = anObject englishText and: [ self frenchText = anObject frenchText ] ] + ^ self == anObject or: [ self textsByLanguage = anObject textsByLanguage ] ] { #category : #accessing } From ad082e94bdbb1fce554eca4b785967be11ff8822 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 13:49:46 +0200 Subject: [PATCH 8/9] #deny:equals: was introduced in Pharo 7. --- src/Heimdall-Core-Tests/TranslateTextTest.class.st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Heimdall-Core-Tests/TranslateTextTest.class.st b/src/Heimdall-Core-Tests/TranslateTextTest.class.st index 687f662..fa4ba78 100644 --- a/src/Heimdall-Core-Tests/TranslateTextTest.class.st +++ b/src/Heimdall-Core-Tests/TranslateTextTest.class.st @@ -22,10 +22,10 @@ TranslateTextTest >> testEquals [ self assert: inst1 equals: inst2. inst2 := 'English2' french: 'French'. - self deny: inst1 equals: inst2. + self deny: inst1 = inst2. inst2 := 'English' french: 'French2'. - self deny: inst1 equals: inst2 + self deny: inst1 = inst2 ] { #category : #tests } From d47875513191498d4e1579122550ba102097de3a Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 3 May 2018 14:04:24 +0200 Subject: [PATCH 9/9] Update README --- CONTRIBUTING.md | 31 +++++++++++++++++++++ README.md | 72 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..92c278a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,31 @@ +# Contribution + +This file is currently not complete but will be improve step by step. + +# Release management + +This project use semantic versionning to define the releases. This mean that each stable release of the project will get associate a version number of the form `vX.Y.Z`. + +- **X** define the major version number +- **Y** define the minor version number +- **Z** define the patch version number + +When a release contains only bug fixes, the patch number increase. When the release contains new features backward compatibles, the minor version increase. When the release contains breaking changes, the major version increase. + +Thus, it should be safe to depend on a fixed major version and moving minor version of this project. + +# Branch management + +This project use gitflow management. + +This project contains two main branches: +- **master** : This branch is a stable branch. Each version on this branch should be a stable release of Material Design Lite for Seaside, and idealy each commit modifying the source code of the project should be tagged with a version number. +- **development** : This branch contains the current development of this project. + +## New feature + +When a new feature will take some time to implement, this feature should be developed in a specific branch. Once done, it will be merged in development before the next release of Material Design Lite for Seaside. + +## Hot fix + +If a bug is found in a stable version and the correction is backward compatible, it should be corrected in an hotfix branch. Once the correction is finished the hotfix branch should be merged into master and development and a new bugfix release should be done. \ No newline at end of file diff --git a/README.md b/README.md index 26407d4..76cb20a 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,74 @@ # Heimdall -####Linux/OSX builds +#### Linux/OSX builds Master: [![Build Status](https://travis-ci.org/DuneSt/Heimdall.svg?branch=master)](https://travis-ci.org/DuneSt/Heimdall)| Development: [![Build Status](https://travis-ci.org/DuneSt/Heimdall.svg?branch=development)](https://travis-ci.org/DuneSt/Heimdall) -####Windows builds -Master: [![Build status](https://ci.appveyor.com/api/projects/status/bjheqaf3kvxfjk8w/branch/master?svg=true)](https://ci.appveyor.com/project/jecisc/heimdall/branch/master) | Latest commit: [![Build status](https://ci.appveyor.com/api/projects/status/bjheqaf3kvxfjk8w?svg=true)](https://ci.appveyor.com/project/jecisc/heimdall) +#### Windows builds +Master: [![Build status](https://ci.appveyor.com/api/projects/status/bjheqaf3kvxfjk8w/branch/master?svg=true)](https://ci.appveyor.com/project/jecisc/heimdall/branch/master) | Development: [![Build status](https://ci.appveyor.com/api/projects/status/bjheqaf3kvxfjk8w/branch/development?svg=true)](https://ci.appveyor.com/project/jecisc/heimdall/branch/development) +Heimdall is a login identification system directly usable for [Seaside](https://github.com/SeasideSt/Seaside). + +For now this is pretty exerimental. + +# Documentation + +## Version management + +This project use semantic versionning to define the releases. This mean that each stable release of the project will get associate a version number of the form `vX.Y.Z`. + +- **X** define the major version number +- **Y** define the minor version number +- **Z** define the patch version number + +When a release contains only bug fixes, the patch number increase. When the release contains new features backward compatibles, the minor version increase. When the release contains breaking changes, the major version increase. + +Thus, it should be safe to depend on a fixed major version and moving minor version of this project. + +## Install Heimdall + +To install Heimdall on your Pharo image you can just execute the following script: + +```Smalltalk + Metacello new + githubUser: 'DuneSt' project: 'Heimdall' commitish: 'v1.x.x' path: 'src'; + baseline: 'Heimdall'; + onWarningLog; + onUpgrade: [ :e | e useIncoming ]; + load +``` + +To add Heimdall to your baseline just add this: + +```Smalltalk + spec + baseline: 'Heimdall' + with: [ spec repository: 'github://DuneSt/Heimdall:v1.x.x/src' ] +``` + +Note that you can replace the v1.x.x tag by a branch as #master or #development or a tag as #v1.0.0, #v1.? or #v1.0.x or a commit SHA. + +## Getting started + +The first thing to do in order to use Heimdall is to add its `FileLibrary` to your Seaside application and use the Heimdall session. + +```Smalltalk + | app | + app := WAAdmin register: self asApplicationAt: 'myApplication'. + app preferenceAt: #sessionClass put: HeimdallSession. + app + addLibrary: HeimdallFileLibrary; + addLibrary: JQDeploymentLibrary +``` + +## Smalltalk versions compatibility + +| Heimdall version | Compatible Pharo versions | +|------------------ |--------------------------- | +| v1.0.0 | Pharo 61 | +| development | Pharo 61 | + +## Contact + +If you have any question or problem do not hesitate to open an issue or contact cyril (a) ferlicot.me or guillaume.larcheveque (a) gmail.com -Heimdall is a login identification system directly usable for seaside. -For now this is exerimental stuff and it will need a good cleaning. \ No newline at end of file