Merge pull request #4 from sebastianconcept/crud

Crud
sebastianconcept · Dec 26, 2023 · d22ae9b · d22ae9b
2 parents 9a7af69 + dcf3363
commit d22ae9b
Show file tree

Hide file tree

Showing 9 changed files with 349 additions and 20 deletions.
diff --git a/BaselineOfRide/BaselineOfRide.class.st b/BaselineOfRide/BaselineOfRide.class.st
@@ -68,6 +68,7 @@ BaselineOfRide >> setUpDependencies: spec [
 	self zinc: spec.
 	self mustache: spec.
 	self teapot: spec.
+	self singularizePluralize: spec.
 
 	"In Ride-Pharo we install some general extensions 
 	needed for Pharo, plus extensions for Zinc and Teapot."
@@ -81,13 +82,22 @@ BaselineOfRide >> setUpPackages: spec [
 	spec package: 'Ride' with: [ 
 		spec requires:
 			#( 'Mustache' 'ZincHTTPComponents' 'Teapot' 'JSON' 'Ride-Pharo'
-			   'Mapless' ) ].
+			   'Mapless' 'SingularizePluralize' ) ].
 
 	spec package: 'Ride-Tests' with: [ spec requires: #( 'Ride' ) ].
 	spec package: 'Ride-Examples' with: [ spec requires: #( 'Ride' ) ].
 	spec package: 'Ride-Tools' with: [ spec requires: #( 'Ride' ) ]
 ]
 
+{ #category : #dependencies }
+BaselineOfRide >> singularizePluralize: spec [
+
+	spec baseline: 'SingularizePluralize' with: [ 
+		spec
+			loads: #( 'SingularizePluralize' );
+			repository: 'github://pharo-contributions/SingularizePluralize:v1.1/src' ]
+]
+
 { #category : #dependencies }
 BaselineOfRide >> teapot: spec [
 

diff --git a/Ride/RideCRUDHelper.class.st b/Ride/RideCRUDHelper.class.st
@@ -21,7 +21,7 @@ RideCRUDHelper class >> createMethodFor: aSymbol [
 	self redirectTo: #{2}_url notice: ''{1} was successfully created.''.
 ' format: { 
 			  aSymbol.
-			  (self getPluralOf: aSymbol) }
+			  aSymbol asLowercase asPlural asSnakeCase }
 ]
 
 { #category : #accessing }
@@ -42,7 +42,7 @@ RideCRUDHelper class >> destroyMethodFor: aSymbol [
 				notice: ''{1} was successfully destroyed.'' ] ]	
 ' format: { 
 			  aSymbol.
-			  (self getPluralOf: aSymbol) }
+			  aSymbol asLowercase asPlural asSnakeCase }
 ]
 
 { #category : #accessing }
@@ -56,7 +56,7 @@ RideCRUDHelper class >> editMethodFor: aSymbol [
 		model := {1} findId: (self currentRequest uri segments reversed second) ]
 ' format: { 
 			  aSymbol.
-			  (self getPluralOf: aSymbol) }
+			  aSymbol asLowercase asPlural asSnakeCase }
 ]
 
 { #category : #accessing }
@@ -69,7 +69,7 @@ RideCRUDHelper class >> indexMethodFor: aSymbol [
 	model := {1} findAll
 ' format: { 
 			  aSymbol.
-			  (self getPluralOf: aSymbol) }
+			  aSymbol asLowercase asPlural asSnakeCase }
 ]
 
 { #category : #accessing }
@@ -82,7 +82,7 @@ RideCRUDHelper class >> newModelMethodFor: aSymbol [
 	model := {1} new
 ' format: { 
 			  aSymbol.
-			  (self getPluralOf: aSymbol) }
+			  aSymbol asLowercase asPlural asSnakeCase }
 ]
 
 { #category : #accessing }
@@ -96,7 +96,7 @@ RideCRUDHelper class >> showMethodFor: aSymbol [
 		model := {1} findId: (self currentRequest uri segments last) ]
 ' format: { 
 			  aSymbol.
-			  (self getPluralOf: aSymbol) }
+			  aSymbol asLowercase asPlural asSnakeCase }
 ]
 
 { #category : #accessing }
@@ -113,7 +113,7 @@ RideCRUDHelper class >> updateMethodFor: aSymbol [
 	self redirectTo: #{2}_url notice: ''{1} was successfully updated.''
 ' format: { 
 			  aSymbol.
-			  (self getPluralOf: aSymbol) }
+			  aSymbol asLowercase asPlural asSnakeCase }
 ]
 
 { #category : #actions }

diff --git a/Ride/RideCompositeHelper.class.st b/Ride/RideCompositeHelper.class.st
@@ -11,13 +11,6 @@ Class {
 	#category : #'Ride-Boilerplate'
 }
 
-{ #category : #'as yet unclassified' }
-RideCompositeHelper class >> getPluralOf: aSymbol [
-
-	self flag: #todo.
-	^ aSymbol asSnakeCase
-]
-
 { #category : #accessing }
 RideCompositeHelper >> controllerForModel: aSymbol [
 

diff --git a/Ride/RideMVCCRUDHelper.class.st b/Ride/RideMVCCRUDHelper.class.st
@@ -15,5 +15,14 @@ RideMVCCRUDHelper >> for: aSymbol [
 	self
 		addCRUDMethodsTo: (self controllerForModel: aSymbol)
 		for: aSymbol.
-	self mustacheTemplateFor: aSymbol
+
+	doer view mustache
+		js: js;
+		crudIndexFor: aSymbol;
+		crudModelFor: aSymbol;
+		crudShowFor: aSymbol;
+		crudNewModelFor: aSymbol;
+		crudEditFor: aSymbol;
+		crudFormFor: aSymbol;
+		yourself
 ]
diff --git a/Ride/RideMVPCRUDHelper.class.st b/Ride/RideMVPCRUDHelper.class.st
@@ -13,5 +13,13 @@ RideMVPCRUDHelper >> for: aSymbol [
 	super for: aSymbol.
 	doer presenter for: aSymbol.
 	self addCRUDMethodsTo: (self presenterForModel: aSymbol) for: aSymbol.
-	self mustacheTemplateFor: aSymbol
+	doer view mustache
+		js: js;
+		crudIndexFor: aSymbol;
+		crudModelFor: aSymbol;
+		crudShowFor: aSymbol;
+		crudNewModelFor: aSymbol;
+		crudEditFor: aSymbol;
+		crudFormFor: aSymbol;
+		yourself
 ]
diff --git a/Ride/RideMaplessModel.class.st b/Ride/RideMaplessModel.class.st
@@ -0,0 +1,14 @@
+"
+I'm the abstract class for Mapless based Ride models
+"
+Class {
+	#name : #RideMaplessModel,
+	#superclass : #Mapless,
+	#category : #'Ride-Models'
+}
+
+{ #category : #converting }
+RideMaplessModel >> asTemplateModel [
+
+	^ { (#name -> self class name) } asDictionary
+]
diff --git a/Ride/RideModel.class.st b/Ride/RideModel.class.st
@@ -3,14 +3,20 @@ I'm the abstract class of the models in Ride applications
 "
 Class {
 	#name : #RideModel,
-	#superclass : #Object,
+	#superclass : #Mapless,
 	#category : #'Ride-Models'
 }
 
 { #category : #querying }
 RideModel class >> findId: anId [
 
-	^ Ride repository find: self atId: anId
+	^ self getRepository find: self atId: anId
+]
+
+{ #category : #querying }
+RideModel class >> getRepository [
+
+	^ Ride service repository
 ]
 
 { #category : #converting }