idk

cgi.d

@@ -229,6 +229,8 @@ class Cgi {
 	enum RequestMethod { GET, HEAD, POST, PUT, DELETE, // GET and POST are the ones that really work
 		// these are defined in the standard, but idk if they are useful for anything
 		OPTIONS, TRACE, CONNECT,
+		// These seem new, I have only recently seen them
+		PATCH, MERGE,
 		// this is an extension for when the method is not specified and you want to assume
 		CommandLine }
 

database.d

@@ -1285,3 +1285,150 @@ void main() {
 void typeinfoBugWorkaround() {
 	assert(0, to!string(typeid(immutable(char[])[immutable(char)[]])));
 }
+
+mixin template DatabaseOperations(string table) {
+	DataObject getAsDb(Database db) {
+		return objectToDataObject!(typeof(this))(this, db, table);
+	}
+
+	static typeof(this) fromRow(Row row) {
+		return rowToObject!(typeof(this))(row);
+	}
+
+	static typeof(this) fromId(Database db, long id) {
+		auto query = new SelectBuilder(db);
+		query.table = table;
+		query.fields ~= "*";
+		query.wheres ~= "id = ?0";
+		auto res = db.query(query.toString(), id);
+		if(res.empty)
+			throw new Exception("no such row");
+		return fromRow(res.front);
+	}
+
+}
+
+import std.traits, std.datetime;
+enum DbSave;
+enum DbNullable;
+alias AliasHelper(alias T) = T;
+
+T rowToObject(T)(Row row) {
+	import arsd.dom, arsd.cgi;
+
+	T t;
+	foreach(memberName; __traits(allMembers, T)) {
+		alias member = AliasHelper!(__traits(getMember, t, memberName));
+		foreach(attr; __traits(getAttributes, member)) {
+			static if(is(attr == DbSave)) {
+				static if(is(typeof(member) == enum))
+					__traits(getMember, t, memberName) = cast(typeof(member)) to!int(row[memberName]);
+				else static if(is(typeof(member) == bool)) {
+					__traits(getMember, t, memberName) = row[memberName][0] == 't';
+				} else static if(is(typeof(member) == Html)) {
+					__traits(getMember, t, memberName).source = row[memberName];
+				} else static if(is(typeof(member) == DateTime))
+					__traits(getMember, t, memberName) = cast(DateTime) dTimeToSysTime(to!long(row[memberName]));
+				else {
+					if(row[memberName].length)
+						__traits(getMember, t, memberName) = to!(typeof(member))(row[memberName]);
+					// otherwise, we'll leave it as .init - most likely null
+				}
+			}
+		}
+	}
+	return t;
+
+}
+
+DataObject objectToDataObject(T)(T t, Database db, string table) {
+	import arsd.dom, arsd.cgi;
+
+	DataObject obj = new DataObject(db, table);
+	foreach(memberName; __traits(allMembers, T)) {
+		alias member = AliasHelper!(__traits(getMember, t, memberName));
+		foreach(attr; __traits(getAttributes, member)) {
+			static if(is(attr == DbSave)) {
+				static if(is(typeof(member) == enum))
+					obj.opDispatch!memberName(cast(int) __traits(getMember, t, memberName));
+				else static if(is(typeof(member) == Html)) {
+					obj.opDispatch!memberName(__traits(getMember, t, memberName).source);
+				} else static if(is(typeof(member) == DateTime))
+					obj.opDispatch!memberName(dateTimeToDTime(__traits(getMember, t, memberName)));
+				else {
+					bool done;
+					foreach(attr2; __traits(getAttributes, member)) {
+						static if(is(attr2 == DbNullable)) {
+							if(__traits(getMember, t, memberName) == 0)
+								done = true;
+						}
+					}
+
+					if(!done)
+						obj.opDispatch!memberName(__traits(getMember, t, memberName));
+				}
+			}
+		}
+	}
+	return obj;
+}
+
+
+
+void fillData(T)(string delegate(string, string) setter, T obj, string name) {
+	fillData( (k, v) { setter(k, v); }, obj, name);
+}
+
+void fillData(T)(void delegate(string, string) setter, T obj, string name) {
+	import arsd.dom, arsd.cgi;
+
+	import std.traits;
+	static if(!isSomeString!T && isArray!T) {
+		// FIXME: indexing
+		foreach(o; obj)
+			fillData(setter, o, name);
+	} else static if(is(T == DateTime)) {
+		 fillData(setter, obj.toISOExtString(), name);
+	} else static if(is(T == Html)) {
+		 fillData(setter, obj.source, name);
+	} else static if(is(T == struct)) {
+		foreach(idx, memberName; __traits(allMembers, T)) {
+			alias member = AliasHelper!(__traits(getMember, obj, memberName));
+			static if(!is(typeof(member) == function))
+				fillData(setter, __traits(getMember, obj, memberName), name ~ "." ~ memberName);
+			else static if(is(typeof(member) == function)) {
+				static if(functionAttributes!member & FunctionAttribute.property) {
+					fillData(setter, __traits(getMember, obj, memberName)(), name ~ "." ~ memberName);
+				}
+			}
+		}
+	} else {
+		auto value = to!string(obj);
+		setter(name, value);
+	}
+}
+
+struct varchar(size_t max) {
+	private string payload;
+
+	this(string s, string file = __FILE__, size_t line = __LINE__) {
+		opAssign(s, file, line);
+	}
+
+	typeof(this) opAssign(string s, string file = __FILE__, size_t line = __LINE__) {
+		if(s.length > max)
+			throw new Exception(s ~ " :: too long", file, line);
+		payload = s;
+
+		return this;
+	}
+
+	string asString() {
+		return payload;
+
+	}
+	alias asString this;
+}
+
+
+

email.d

@@ -199,7 +199,7 @@ class EmailMessage {
 	}
 
 	void send(RelayInfo mailServer = RelayInfo("smtp://localhost")) {
-		auto smtp = new SMTP(mailServer.server);
+		auto smtp = SMTP(mailServer.server);
 
 		smtp.verifyHost = false;
 		smtp.verifyPeer = false;

html.d

@@ -660,7 +660,6 @@ void wrapTextNodes(Document document, TextWrapperWhitespaceBehavior whatToDoWith
 		final switch(whatToDoWithWhitespaceNodes) {
 			case TextWrapperWhitespaceBehavior.wrap:
 				break; // treat it like all other text
-			break;
 			case TextWrapperWhitespaceBehavior.stripOut:
 				// if it's actually whitespace...
 				if(tn.contents.strip().length == 0) {
@@ -672,7 +671,6 @@ void wrapTextNodes(Document document, TextWrapperWhitespaceBehavior whatToDoWith
 				// if it's actually whitespace...
 				if(tn.contents.strip().length == 0)
 					continue;
-			break;
 		}
 
 		tn.replaceWith(Element.make(ourTag, tn.contents));
@@ -1658,7 +1656,6 @@ class MacroExpander {
 
 		functions["test"] = delegate dstring(dstring[] args) {
 			assert(0, to!string(args.length) ~ " args: " ~ to!string(args));
-			return null;
 		};
 
 		functions["include"] = &include;
@@ -1878,7 +1875,6 @@ class MacroExpander {
 					// then see if there's a { argument too
 					checkForAllArguments = false;
 					goto moreArguments;
-				break;
 				case '{':
 					// find the match
 					int open;
@@ -1900,7 +1896,6 @@ class MacroExpander {
 					}
 
 					goto doReplacement;
-				break;
 				default:
 					goto doReplacement;
 			}

web.d

@@ -251,6 +251,9 @@ class WebDotDBaseType {
 	/// use this to look at exceptions and set up redirects and such. keep in mind it does NOT change the regular behavior
 	void exceptionExaminer(Throwable e) {}
 
+	// HACK: to enable breaking up the path somehow
+	int pathInfoStartingPoint() { return 0; }
+
 	/// Override this if you want to do something special to the document
 	/// You should probably call super._postProcess at some point since I
 	/// might add some default transformations here.
@@ -400,6 +403,7 @@ class ApiProvider : WebDotDBaseType {
 	/// Shorthand for ensurePost and checkCsrfToken. You should use this on non-indempotent 
 	/// functions. Override it if doing some custom checking.
 	void ensureGoodPost() {
+		if(_noCsrfChecks) return;
 		ensurePost();
 		checkCsrfToken();
 	}
@@ -1719,6 +1723,7 @@ mixin template CustomCgiFancyMain(CustomCgi, T, Args...) if(is(CustomCgi : Cgi))
 
 		// FIXME: won't work for multiple objects
 		T instantiation = new T();
+		instantiation.cgi = cgi;
 		auto reflection = prepareReflection!(T)(instantiation);
 
 		version(no_automatic_session) {}
@@ -1738,9 +1743,9 @@ mixin template CustomCgiFancyMain(CustomCgi, T, Args...) if(is(CustomCgi : Cgi))
 		}
 
 		version(webd_cookie_sessions)
-			run(cgi, instantiation, 0, true, session);
+			run(cgi, instantiation, instantiation.pathInfoStartingPoint, true, session);
 		else
-			run(cgi, instantiation);
+			run(cgi, instantiation, instantiation.pathInfoStartingPoint);
 
 /+
 		if(args.length > 1) {
@@ -2191,10 +2196,13 @@ JSONValue toJsonValue(T, R = ApiProvider)(T a, string formatToStringAs = null, R
 		val = valo;
 	} else static if(isArray!(T)) {
 		//val.type = JSON_TYPE.ARRAY;
-		val.array.length = a.length;
+		JSONValue[] arr;
+		arr.length = a.length;
 		foreach(i, v; a) {
-			val.array[i] = toJsonValue!(typeof(v), R)(v, formatToStringAs, api);
+			arr[i] = toJsonValue!(typeof(v), R)(v, formatToStringAs, api);
 		}
+
+		val.array = arr;
 	} else static if(is(T == struct)) { // also can do all members of a struct...
 		//val.type = JSON_TYPE.OBJECT;
 
@@ -3571,8 +3579,9 @@ struct TemplateFilters {
 			return replacement;
 	}
 
+	// {$count|plural singular plural}
 	string plural(string replacement, string[] args, in Element, string) {
-		return pluralHelper(args.length ? args[0] : null, replacement, args.length > 1 ? args[1] : null);
+		return pluralHelper(replacement, args.length ? args[0] : null, args.length > 1 ? args[1] : null);
 	}
 
 	string pluralHelper(string number, string word, string pluralWord = null) {