Working on layouts and directory structure

IDEAS

@@ -7,6 +7,7 @@
 * Views can be re-used
 
 * Conventions:
-  * View Name: NewmView_controllername_actionname_format
+  * View Name: NewmView_view_controllername_actionname_format
+  * Layout Name: NewmView_layout_controllername_format
 
 * Controllers that define additional view data fields need to override reset and set them to nil between requests.  But this needs to call [super reset] as well.

src/Makefile

@@ -1,3 +1,7 @@
 all:
-	find MyTestController -depth 1|xargs -n 1 ./buildview
+	find view layout -type f -name '*.nmv'|xargs -n 1 ./buildview
 	gcc -Wall *.m -framework Foundation
+
+clean:
+	grep -R "this file was autogenerated from" *.m|cut -d: -f 1|xargs rm
+	rm -f a.out

src/NMAbstractController.m

@@ -1,5 +1,7 @@
 // Copyright 2011 Jonathan Bartlett
 
+//FIXME - need different layouts for different formats?
+
 #import "NMAbstractController.h"
 
 @implementation NMAbstractController
@@ -15,6 +17,8 @@ @implementation NMAbstractController
 -(id) init {
 	self = [super init];
 	self.beforeFilters = [NSMutableArray arrayWithCapacity:10];
+	self.defaultLayout = [NMAbstractView layoutForControllerName:[self className] format:@"html"];
+	self.currentLayout = defaultLayout;
 
 	return self;
 }

src/NMAbstractView.h

@@ -7,6 +7,7 @@
 }
 
 +(NMAbstractView *) viewForControllerName:(NSString *)cname actionName:(NSString *)aname format:(NSString *)fmt;
++(NMAbstractView *) layoutForControllerName:(NSString *)cname format:(NSString *)fmt;
 
 -(void) reset;
 

src/NMAbstractView.m

@@ -2,9 +2,22 @@
 
 @implementation NMAbstractView
 
++(NMAbstractView *) layoutForControllerName:(NSString *)cname format:(NSString *)fmt {
+	NSString *viewClassName = [NSString stringWithFormat:@"NewmView_layout_%@_%@", cname, fmt];
+	Class viewClass = objc_getClass([viewClassName cStringUsingEncoding:NSUTF8StringEncoding]);
+	if(viewClass == nil) {
+		return nil;
+	}
+
+	NMAbstractView *v = [[viewClass alloc] init];
+	return v;
+}
 +(NMAbstractView *) viewForControllerName:(NSString *)cname actionName:(NSString *)aname format:(NSString *)fmt {
-	NSString *viewClassName = [NSString stringWithFormat:@"NewmView_%@_%@_%@", cname, aname, fmt];
+	NSString *viewClassName = [NSString stringWithFormat:@"NewmView_view_%@_%@_%@", cname, aname, fmt];
 	Class viewClass = objc_getClass([viewClassName cStringUsingEncoding:NSUTF8StringEncoding]);
+	if(viewClass == nil) {
+		return nil;
+	}
 	NMAbstractView *v = [[viewClass alloc] init];
 
 	return v;

src/NSData+Newm.h

@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+
+@interface NSData(Newm)
+-(NSString *)stringValue;
+@end

src/NSData+Newm.m

@@ -0,0 +1,7 @@
+#import "NSdata+Newm.h"
+
+@implementation NSData(Newm)
+-(NSString *)stringValue {
+	return [[[NSString alloc] initWithData:self encoding:NSUTF8StringEncoding] autorelease];
+}
+@end

src/NSString+Newm.m

@@ -22,4 +22,5 @@ -(NSString *) xmlDecode {
 -(BOOL) empty {
 	return [self isEqualToString:@""];
 }
+
 @end

src/Newm.h

@@ -2,6 +2,8 @@
 
 #import "NSString+Newm.h"
 #import "NSDictionary+Newm.h"
+#import "NSData+Newm.h"
+#import "NSMutableArray+Newm.h"
 #import "NMAbstractRequest.h"
 #import "NMAbstractController.h"
 #import "NMAbstractView.h"

src/NewmView_MyTestController_myActions2_html.m → src/NewmView_view_MyTestController_myAction2_html.m

@@ -1,11 +1,11 @@
 #import <Foundation/Foundation.h>
 #import "NMAbstractView.h"
 
-@interface NewmView_MyTestController_myAction2_html : NMAbstractView {
+@interface NewmView_view_MyTestController_myAction2_html : NMAbstractView {
 }
 @end
 
-@implementation NewmView_MyTestController_myAction2_html 
+@implementation NewmView_view_MyTestController_myAction2_html 
 -(NSData *)render:(NMAbstractController *)ctrl {
 	return [@"This is my Rendered View" dataUsingEncoding:NSUTF8StringEncoding];
 }

src/buildview

@@ -9,7 +9,12 @@ path_ary = path.split(/\//)
 fname = path_ary.pop
 fname_parts = fname.split(".")
 fname_type = fname_parts.pop
-cname = path_ary[0]
+cname = path_ary[1]
+if cname.nil?
+	cname = fname_parts[0]
+end
+puts cname
+puts path
 if(fname_type == "nmv")
 	fname_action = fname_parts[0]
 	fname_format = fname_parts[1]

src/layout/MyTestController.html.nmv

@@ -0,0 +1,5 @@
+HEADER
+
+<%= [controller.actionViewData stringValue] %>
+
+FOOTER