diff --git a/cgi.d b/cgi.d index 242e4ec..9468dab 100644 --- a/cgi.d +++ b/cgi.d @@ -1,3 +1,4 @@ +// FIXME: if an exception is thrown, we shouldn't necessarily cache... /++ Provides a uniform server-side API for CGI, FastCGI, SCGI, and HTTP web applications. @@ -1581,6 +1582,26 @@ class Cgi { //RequestMethod _requestMethod; } +/// use this for testing or other isolated things +Cgi dummyCgi(Cgi.RequestMethod method = Cgi.RequestMethod.GET, string url = null, in ubyte[] data = null, void delegate(const(ubyte)[]) outputSink = null) { + // we want to ignore, not use stdout + if(outputSink is null) + outputSink = delegate void(const(ubyte)[]) { }; + + string[string] env; + env["REQUEST_METHOD"] = to!string(method); + env["CONTENT_LENGTH"] = to!string(data.length); + + auto cgi = new Cgi( + 5_000_000, + env, + { return data; }, + outputSink, + null); + + return cgi; +} + // should this be a separate module? Probably, but that's a hassle. @@ -2504,6 +2525,10 @@ long sysTimeToDTime(in SysTime sysTime) { return convert!("hnsecs", "msecs")(sysTime.stdTime - 621355968000000000L); } +long dateTimeToDTime(in DateTime dt) { + return sysTimeToDTime(cast(SysTime) dt); +} + long getUtcTime() { // renamed primarily to avoid conflict with std.date itself return sysTimeToDTime(Clock.currTime(UTC())); } diff --git a/color.d b/color.d index 7fe4634..95ce208 100644 --- a/color.d +++ b/color.d @@ -1,11 +1,9 @@ module arsd.color; -// NOTE: this is obsolete. use color.d instead. - -import std.stdio; import std.math; import std.conv; import std.algorithm; +import std.string : strip, split; struct Color { ubyte r; @@ -20,16 +18,28 @@ struct Color { this.a = cast(ubyte) alpha; } - static Color transparent() { - return Color(0, 0, 0, 0); - } + static Color transparent() { return Color(0, 0, 0, 0); } + static Color white() { return Color(255, 255, 255); } + static Color black() { return Color(0, 0, 0); } + static Color red() { return Color(255, 0, 0); } + static Color green() { return Color(0, 255, 0); } + static Color blue() { return Color(0, 0, 255); } + static Color yellow() { return Color(255, 255, 0); } + static Color teal() { return Color(0, 255, 255); } + static Color purple() { return Color(255, 0, 255); } - static Color white() { - return Color(255, 255, 255); + /* + ubyte[4] toRgbaArray() { + return [r,g,b,a]; } + */ - static Color black() { - return Color(0, 0, 0); + string toCssString() { + import std.string; + if(a == 255) + return format("#%02x%02x%02x", r, g, b); + else + return format("rgba(%d, %d, %d, %f)", r, g, b, cast(real)a / 255.0); } string toString() { @@ -39,6 +49,141 @@ struct Color { else return format("%02x%02x%02x%02x", r, g, b, a); } + + static Color fromNameString(string s) { + Color c; + foreach(member; __traits(allMembers, Color)) { + static if(__traits(compiles, c = __traits(getMember, Color, member))) { + if(s == member) + return __traits(getMember, Color, member); + } + } + throw new Exception("Unknown color " ~ s); + } + + static Color fromString(string s) { + s = s.strip(); + + Color c; + c.a = 255; + + // trying named colors via the static no-arg methods here + foreach(member; __traits(allMembers, Color)) { + static if(__traits(compiles, c = __traits(getMember, Color, member))) { + if(s == member) + return __traits(getMember, Color, member); + } + } + + // try various notations borrowed from CSS (though a little extended) + + // hsl(h,s,l,a) where h is degrees and s,l,a are 0 >= x <= 1.0 + if(s.startsWith("hsl(") || s.startsWith("hsla(")) { + assert(s[$-1] == ')'); + s = s[s.startsWith("hsl(") ? 4 : 5 .. $ - 1]; // the closing paren + + real[3] hsl; + ubyte a = 255; + + auto parts = s.split(","); + foreach(i, part; parts) { + if(i < 3) + hsl[i] = to!real(part.strip); + else + a = cast(ubyte) (to!real(part.strip) * 255); + } + + c = .fromHsl(hsl); + c.a = a; + + return c; + } + + // rgb(r,g,b,a) where r,g,b are 0-255 and a is 0-1.0 + if(s.startsWith("rgb(") || s.startsWith("rgba(")) { + assert(s[$-1] == ')'); + s = s[s.startsWith("rgb(") ? 4 : 5 .. $ - 1]; // the closing paren + + auto parts = s.split(","); + foreach(i, part; parts) { + // lol the loop-switch pattern + auto v = to!real(part.strip); + switch(i) { + case 0: // red + c.r = cast(ubyte) v; + break; + case 1: + c.g = cast(ubyte) v; + break; + case 2: + c.b = cast(ubyte) v; + break; + case 3: + c.a = cast(ubyte) (v * 255); + break; + default: // ignore + } + } + + return c; + } + + + + + // otherwise let's try it as a hex string, really loosely + + if(s.length && s[0] == '#') + s = s[1 .. $]; + + // not a built in... do it as a hex string + if(s.length >= 2) { + c.r = fromHexInternal(s[0 .. 2]); + s = s[2 .. $]; + } + if(s.length >= 2) { + c.g = fromHexInternal(s[0 .. 2]); + s = s[2 .. $]; + } + if(s.length >= 2) { + c.b = fromHexInternal(s[0 .. 2]); + s = s[2 .. $]; + } + if(s.length >= 2) { + c.a = fromHexInternal(s[0 .. 2]); + s = s[2 .. $]; + } + + return c; + } + + static Color fromHsl(real h, real s, real l) { + return .fromHsl(h, s, l); + } +} + + +private ubyte fromHexInternal(string s) { + import std.range; + int result = 0; + + int exp = 1; + //foreach(c; retro(s)) { // FIXME: retro doesn't work right in dtojs + foreach_reverse(c; s) { + if(c >= 'A' && c <= 'F') + result += exp * (c - 'A' + 10); + else if(c >= 'a' && c <= 'f') + result += exp * (c - 'a' + 10); + else if(c >= '0' && c <= '9') + result += exp * (c - '0'); + else + // throw new Exception("invalid hex character: " ~ cast(char) c); + return 0; + + exp *= 16; + } + + return cast(ubyte) result; } @@ -46,7 +191,7 @@ Color fromHsl(real[3] hsl) { return fromHsl(hsl[0], hsl[1], hsl[2]); } -Color fromHsl(real h, real s, real l) { +Color fromHsl(real h, real s, real l, real a = 255) { h = h % 360; real C = (1 - abs(2 * l - 1)) * s; @@ -95,7 +240,7 @@ Color fromHsl(real h, real s, real l) { cast(ubyte)(r * 255), cast(ubyte)(g * 255), cast(ubyte)(b * 255), - 255); + cast(ubyte)(a)); } real[3] toHsl(Color c, bool useWeightedLightness = false) { @@ -198,7 +343,7 @@ Color oppositeLightness(Color c) { /// Try to determine a text color - either white or black - based on the input Color makeTextColor(Color c) { auto hsl = toHsl(c, true); // give green a bonus for contrast - if(hsl[2] > 0.5) + if(hsl[2] > 0.71) return Color(0, 0, 0); else return Color(255, 255, 255); @@ -321,7 +466,8 @@ int fromHex(string s) { int result = 0; int exp = 1; - foreach(c; retro(s)) { + // foreach(c; retro(s)) { + foreach_reverse(c; s) { if(c >= 'A' && c <= 'F') result += exp * (c - 'A' + 10); else if(c >= 'a' && c <= 'f') @@ -356,3 +502,26 @@ Color colorFromString(string s) { return c; } + +/* +import browser.window; +import std.conv; +void main() { + import browser.document; + foreach(ele; document.querySelectorAll("input")) { + ele.addEventListener("change", { + auto h = to!real(document.querySelector("input[name=h]").value); + auto s = to!real(document.querySelector("input[name=s]").value); + auto l = to!real(document.querySelector("input[name=l]").value); + + Color c = Color.fromHsl(h, s, l); + + auto e = document.getElementById("example"); + e.style.backgroundColor = c.toCssString(); + + // JSElement __js_this; + // __js_this.style.backgroundColor = c.toCssString(); + }, false); + } +} +*/ diff --git a/database.d b/database.d index a487d20..5e44341 100644 --- a/database.d +++ b/database.d @@ -48,6 +48,14 @@ interface Database { } import std.stdio; +Ret queryOneColumn(Ret, T...)(Database db, string sql, T t) { + auto res = db.query(sql, t); + if(res.empty) + throw new Exception("no row in result"); + auto row = res.front; + return to!Ret(row[0]); +} + struct Query { ResultSet result; static Query opCall(T...)(Database db, string sql, T t) { diff --git a/dom.d b/dom.d index 16ceee2..10dbea5 100644 --- a/dom.d +++ b/dom.d @@ -20,6 +20,18 @@ */ module arsd.dom; +// FIXME: it would be kinda cool to have some support for internal DTDs +// and maybe XPath as well, to some extent +/* + we could do + meh this sux + + auto xpath = XPath(element); + + // get the first p + xpath.p[0].a["href"] +*/ + // public import arsd.domconvenience; // merged for now /* domconvenience follows { */ @@ -190,6 +202,13 @@ mixin template DomConvenienceFunctions() { return parentNode.insertAfter(this, e); } + Element addSibling(Element e) { + return parentNode.insertAfter(this, e); + } + + Element addChild(Element e) { + return this.appendChild(e); + } /// Convenience function to append text intermixed with other children. /// For example: div.addChildren("You can visit my website by ", new Link("mysite.com", "clicking here"), "."); @@ -207,7 +226,7 @@ mixin template DomConvenienceFunctions() { } ///. - Element addChild(string tagName, Element firstChild) + Element addChild(string tagName, Element firstChild, string info2 = null) in { assert(firstChild !is null); } @@ -220,13 +239,13 @@ mixin template DomConvenienceFunctions() { //assert(firstChild.parentDocument is this.parentDocument); } body { - auto e = Element.make(tagName); + auto e = Element.make(tagName, "", info2); e.appendChild(firstChild); this.appendChild(e); return e; } - Element addChild(string tagName, Html innerHtml) + Element addChild(string tagName, in Html innerHtml, string info2 = null) in { } out(ret) { @@ -235,7 +254,7 @@ mixin template DomConvenienceFunctions() { assert(ret.parentDocument is this.parentDocument); } body { - auto e = Element.make(tagName); + auto e = Element.make(tagName, "", info2); this.appendChild(e); e.innerHTML = innerHtml.source; return e; @@ -419,6 +438,10 @@ struct ElementCollection { elements = [e]; } + this(Element e, string selector) { + elements = e.querySelectorAll(selector); + } + this(Element[] e) { elements = e; } @@ -518,7 +541,10 @@ struct ElementStyle { string set(string name, string value) { if(name.length == 0) return value; - name = unCamelCase(name); + if(name == "cssFloat") + name = "float"; + else + name = unCamelCase(name); auto r = rules(); r[name] = value; @@ -536,7 +562,10 @@ struct ElementStyle { return value; } string get(string name) const { - name = unCamelCase(name); + if(name == "cssFloat") + name = "float"; + else + name = unCamelCase(name); auto r = rules(); if(name in r) return r[name]; @@ -829,7 +858,8 @@ class Element { return e; } - static Element make(string tagName, Html innerHtml, string childInfo2 = null) { + static Element make(string tagName, in Html innerHtml, string childInfo2 = null) { + // FIXME: childInfo2 is ignored when info1 is null auto m = Element.make(tagName, cast(string) null, childInfo2); m.innerHTML = innerHtml.source; return m; @@ -1172,6 +1202,16 @@ class Element { return getAttribute(name); } + /* + // this would be nice for convenience, but it broke the getter above. + @property void opDispatch(string name)(bool boolean) if(name != "popFront") { + if(boolean) + setAttribute(name, name); + else + removeAttribute(name); + } + */ + /** Returns the element's children. */ @@ -1904,6 +1944,59 @@ class Element { @property ElementStream tree() { return new ElementStream(this); } + + + // I moved these from Form because they are generally useful. + // Ideally, I'd put them in arsd.html and use UFCS, but that doesn't work with the opDispatch here. + /// Tags: HTML, HTML5 + Element addField(string label, string name, string type = "text", FormFieldOptions fieldOptions = FormFieldOptions.none) { + auto fs = this; + auto i = fs.addChild("label"); + i.addChild("span", label); + Element input; + if(type == "textarea") + input = i.addChild("textarea"). + setAttribute("name", name). + setAttribute("rows", "6"); + else + input = i.addChild("input"). + setAttribute("name", name). + setAttribute("type", type); + + // these are html 5 attributes; you'll have to implement fallbacks elsewhere. In Javascript or maybe I'll add a magic thing to html.d later. + fieldOptions.applyToElement(input); + return i; + } + + Element addField(string label, string name, FormFieldOptions fieldOptions) { + return addField(label, name, "text", fieldOptions); + } + + Element addField(string label, string name, string[string] options, FormFieldOptions fieldOptions = FormFieldOptions.none) { + auto fs = this; + auto i = fs.addChild("label"); + i.addChild("span", label); + auto sel = i.addChild("select").setAttribute("name", name); + + foreach(k, opt; options) + sel.addChild("option", opt, k); + + // FIXME: implement requirements somehow + + return i; + } + + Element addSubmitButton(string label = null) { + auto t = this; + auto holder = t.addChild("div"); + holder.addClass("submit-holder"); + auto i = holder.addChild("input"); + i.type = "submit"; + if(label.length) + i.value = label; + return holder; + } + } ///. @@ -2069,6 +2162,7 @@ dchar parseEntity(in dchar[] entity) { } import std.utf; +import std.stdio; /// This takes a string of raw HTML and decodes the entities into a nice D utf-8 string. /// By default, it uses loose mode - it will try to return a useful string from garbage input too. @@ -2098,7 +2192,11 @@ string htmlEntitiesDecode(string data, bool strict = false) { // if not strict, let's try to parse both. - a ~= buffer[0.. std.utf.encode(buffer, parseEntity(entityBeingTried))]; + if(entityBeingTried == "&&") + a ~= "&"; // double amp means keep the first one, still try to parse the next one + else + a ~= buffer[0.. std.utf.encode(buffer, parseEntity(entityBeingTried))]; + // tryingEntity is still true entityBeingTried = entityBeingTried[0 .. 1]; // keep the & entityAttemptIndex = 0; // restarting o this @@ -2106,6 +2204,14 @@ string htmlEntitiesDecode(string data, bool strict = false) { if(ch == ';') { tryingEntity = false; a ~= buffer[0.. std.utf.encode(buffer, parseEntity(entityBeingTried))]; + } else if(ch == ' ') { + // e.g. you & i + if(strict) + throw new Exception("unterminated entity at " ~ to!string(entityBeingTried)); + else { + tryingEntity = false; + a ~= to!(char[])(entityBeingTried); + } } else { if(entityAttemptIndex >= 9) { if(strict) @@ -2128,6 +2234,15 @@ string htmlEntitiesDecode(string data, bool strict = false) { } } + if(tryingEntity) { + if(strict) + throw new Exception("unterminated entity at " ~ to!string(entityBeingTried)); + + // otherwise, let's try to recover, at least so we don't drop any data + a ~= to!string(entityBeingTried); + // FIXME: what if we have "cool &"? should we try to parse it? + } + return cast(string) a; // assumeUnique is actually kinda slow, lol } @@ -2376,44 +2491,29 @@ class Form : Element { tagName = "form"; } - Element addField(string label, string name, string type = "text") { - auto fs = this.querySelector("fieldset div"); - if(fs is null) fs = this; - auto i = fs.addChild("label"); - i.addChild("span", label); - if(type == "textarea") - i.addChild("textarea"). - setAttribute("name", name). - setAttribute("rows", "6"); + override Element addField(string label, string name, string type = "text", FormFieldOptions fieldOptions = FormFieldOptions.none) { + auto t = this.querySelector("fieldset div"); + if(t is null) + return super.addField(label, name, type, fieldOptions); else - i.addChild("input"). - setAttribute("name", name). - setAttribute("type", type); - - return i; + return t.addField(label, name, type, fieldOptions); } - Element addField(string label, string name, string[string] options) { - auto fs = this.querySelector("fieldset div"); - if(fs is null) fs = this; - auto i = fs.addChild("label"); - i.addChild("span", label); - auto sel = i.addChild("select").setAttribute("name", name); - - foreach(k, opt; options) - sel.addChild("option", opt, k); - - return i; + override Element addField(string label, string name, FormFieldOptions fieldOptions) { + auto type = "text"; + auto t = this.querySelector("fieldset div"); + if(t is null) + return super.addField(label, name, type, fieldOptions); + else + return t.addField(label, name, type, fieldOptions); } - Element addSubmitButton(string label = null) { - auto holder = this.addChild("div"); - holder.addClass("submit-holder"); - auto i = holder.addChild("input"); - i.type = "submit"; - if(label.length) - i.value = label; - return holder; + override Element addField(string label, string name, string[string] options, FormFieldOptions fieldOptions = FormFieldOptions.none) { + auto t = this.querySelector("fieldset div"); + if(t is null) + return super.addField(label, name, options, fieldOptions); + else + return t.addField(label, name, options, fieldOptions); } // FIXME: doesn't handle arrays; multiple fields can have the same name @@ -2680,6 +2780,16 @@ class Table : Element { return appendRowInternal("td", "tbody", t); } + void addColumnClasses(string[] classes...) { + auto grid = getGrid(); + foreach(row; grid) + foreach(i, cl; classes) { + if(cl.length) + if(i < row.length) + row[i].addClass(cl); + } + } + private Element appendRowInternal(T...)(string innerType, string findType, T t) { Element row = Element.make("tr"); @@ -3293,6 +3403,8 @@ class Document : FileResource { pos += 7; // FIXME: major malfunction possible here auto cdataStart = pos; + + // cdata isn't allowed to nest, so this should be generally ok, as long as it is found auto cdataEnd = pos + data[pos .. $].indexOf("]]>"); pos = cdataEnd + 3; @@ -5076,6 +5188,59 @@ class Event { } } +struct FormFieldOptions { + // usable for any + + /// this is a regex pattern used to validate the field + string pattern; + /// must the field be filled in? Even with a regex, it can be submitted blank if this is false. + bool isRequired; + /// this is displayed as an example to the user + string placeholder; + + // usable for numeric ones + + + // convenience methods to quickly get some options + static FormFieldOptions none() { + FormFieldOptions f; + return f; + } + + static FormFieldOptions required() { + FormFieldOptions f; + f.isRequired = true; + return f; + } + + static FormFieldOptions regex(string pattern, bool required = false) { + FormFieldOptions f; + f.pattern = pattern; + f.isRequired = required; + return f; + } + + static FormFieldOptions fromElement(Element e) { + FormFieldOptions f; + if(e.hasAttribute("required")) + f.isRequired = true; + if(e.hasAttribute("pattern")) + f.pattern = e.pattern; + if(e.hasAttribute("placeholder")) + f.placeholder = e.placeholder; + return f; + } + + Element applyToElement(Element e) { + if(this.isRequired) + e.required = "required"; + if(this.pattern.length) + e.pattern = this.pattern; + if(this.placeholder.length) + e.placeholder = this.placeholder; + return e; + } +} /* Copyright: Adam D. Ruppe, 2010 - 2012 diff --git a/html.d b/html.d index b0d3734..eed508e 100644 --- a/html.d +++ b/html.d @@ -259,7 +259,6 @@ Element checkbox(string name, string value, string label, bool checked = false) return lbl; } - /++ Convenience function to create a small
to POST, but the creation function is more like a link than a DOM form. @@ -1286,6 +1285,41 @@ class CssRuleSet : CssPart { else { foreach(outerSelector; outer.selectors.length ? outer.selectors : [""]) foreach(innerSelector; selectors) { + /* + it would be great to do a top thing and a bottom, examples: + .awesome, .awesome\& { + .something img {} + } + + should give: + .awesome .something img, .awesome.something img { } + + And also + \&.cool { + .something img {} + } + + should give: + .something img.cool {} + + OR some such syntax. + + + The idea though is it will ONLY apply to end elements with that particular class. Why is this good? We might be able to isolate the css more for composited files. + + idk though. + */ + /+ + // FIXME: this implementation is useless, but the idea of allowing combinations at the top level rox. + if(outerSelector.length > 2 && outerSelector[$-2] == '\\' && outerSelector[$-1] == '&') { + // the outer one is an adder... so we always want to paste this on, and if the inner has it, collapse it + if(innerSelector.length > 2 && innerSelector[0] == '\\' && innerSelector[1] == '&') + levelOne.selectors ~= outerSelector[0 .. $-2] ~ innerSelector[2 .. $]; + else + levelOne.selectors ~= outerSelector[0 .. $-2] ~ innerSelector; + } else + +/ + // we want to have things like :hover, :before, etc apply without implying // a descendant. @@ -1295,6 +1329,9 @@ class CssRuleSet : CssPart { // But having this is too useful to ignore. if(innerSelector.length && innerSelector[0] == ':') levelOne.selectors ~= outerSelector ~ innerSelector; + // we also allow \&something to get them concatenated + else if(innerSelector.length > 2 && innerSelector[0] == '\\' && innerSelector[1] == '&') + levelOne.selectors ~= outerSelector ~ innerSelector[2 .. $].strip; else levelOne.selectors ~= outerSelector ~ " " ~ innerSelector; // otherwise, use some other operator... } @@ -2011,11 +2048,14 @@ Color readCssColor(string cssColor) { } else if(cssColor.startsWith("hsl")) { assert(0); // FIXME: implement } else + return Color.fromNameString(cssColor); + /* switch(cssColor) { default: // FIXME let's go ahead and try naked hex for compatibility with my gradient program assert(0, "Unknown color: " ~ cssColor); } + */ } /* diff --git a/image.d b/image.d index 3190ad0..8d9c870 100644 --- a/image.d +++ b/image.d @@ -19,13 +19,15 @@ module arsd.image; */ +import arsd.color; +/* struct Color { ubyte r; ubyte g; ubyte b; ubyte a = 255; } - +*/ interface Image { } diff --git a/mysql.d b/mysql.d index 33d41ed..1f53a70 100644 --- a/mysql.d +++ b/mysql.d @@ -689,6 +689,27 @@ string fromCstring(cstring c, int len = -1) { return ret; } + +// FIXME: this should work generically with all database types and them moved to database.d +Ret queryOneRow(Ret = Row, DB, T...)(DB db, string sql, T t) if( + (is(DB : Database)) + // && (is(Ret == Row) || is(Ret : DataObject))) + ) +{ + static if(is(Ret : DataObject) && is(DB == MySql)) { + auto res = db.queryDataObject!Ret(sql, t); + if(res.empty) + throw new Exception("result was empty"); + return res.front; + } else static if(is(Ret == Row)) { + auto res = db.query(sql, t); + if(res.empty) + throw new Exception("result was empty"); + return res.front; + } else static assert(0, "Unsupported single row query return value, " ~ Ret.stringof); +} + + /* void main() { auto mysql = new MySql("localhost", "uname", "password", "test"); diff --git a/oauth.d b/oauth.d index 83e6026..9dde561 100644 --- a/oauth.d +++ b/oauth.d @@ -92,7 +92,9 @@ Variant[string] fbGraph(string[] info, string id, bool useCache = false, long ma url = "http://graph.facebook.com" ~ id ~ c ~ "format=json"; - + // this makes pagination easier. the initial / is there because it is added above + if(id.indexOf("/http://") == 0 || id.indexOf("/https://") == 0) + url = id[1 ..$]; if(useCache) cacheFile = "/tmp/fbGraphCache-" ~ hashToString(SHA1(url)); @@ -425,6 +427,18 @@ string getApiKeyFromRequest(Cgi cgi) { throw new Exception("api key not present"); } +string getTokenFromRequest(Cgi cgi) { + enforce(isOAuthRequest(cgi)); + auto variables = split(cgi.authorization[6..$], ","); + + foreach(var; variables) + if(var.startsWith("oauth_token")) + return var["oauth_token".length + 3 .. $ - 1]; // trimming quotes too + return null; +} + +// FIXME check timestamp and maybe nonce too + bool isSignatureValid(Cgi cgi, string apiSecret, string tokenSecret) { enforce(isOAuthRequest(cgi)); auto variables = split(cgi.authorization[6..$], ","); @@ -588,6 +602,61 @@ Variant parseSignedRequest(in string req, string apisecret) { return jsonToVariant(json); } +string stripWhitespace(string w) { + return w.replace("\t", "").replace("\n", "").replace(" ", ""); +} + +string translateCodeToAccessToken(string code, string redirectUrl, string appId, string apiSecret) { + string res = curl(stripWhitespace("https://graph.facebook.com/oauth/access_token? + client_id="~appId~"&redirect_uri="~std.uri.encodeComponent(redirectUrl)~"& + client_secret="~apiSecret~"&code=" ~ std.uri.encodeComponent(code) + )); + + if(res.indexOf("access_token=") == -1) { + throw new Exception("Couldn't translate code to access token. [" ~ res ~ "]"); + } + + auto vars = decodeVariablesSingle(res); + return vars["access_token"]; +} + +/+ + +void updateFbGraphPermissions(string token) { + fbGraph([null, token], "/me/permissions", true, -1); // use the cache, but only read if it is in the future - basically, force a cache refresh + fbGraph([null, token], "/me/friends", true, -1); // do the same thing for friends.. +} + +auto fbGraphPermissions(string token) { + return fbGraph([null, token], "/me/permissions", true, 36); // use the cache +} + +enum FacebookPermissions { + user_likes, + friends_likes, + publish_stream, + publish_actions, + offline_access, + manage_pages, +} + +bool hasPermission(DataObject person, FacebookPermissions permission) { + version(live) {} else return true; // on dev, just skip this stuff + + if(person.facebook_access_token.length == 0) + return false; + try { + auto perms = getBasicDataFromVariant(fbGraphPermissions(person. facebook_access_token))[0]; + return (to!string(permission) in perms) ? true : false; + } catch(FacebookApiException e) { + return false; // the token doesn't work + } + + return false; +} + ++/ + /****************************************/ @@ -610,12 +679,9 @@ Variant jsonValueToVariant(JSONValue v) { case JSON_TYPE.STRING: ret = v.str; break; - // FIXME FIXME FIXME - version(live) {} else { case JSON_TYPE.UINTEGER: ret = v.uinteger; break; - } case JSON_TYPE.INTEGER: ret = v.integer; break; diff --git a/png.d b/png.d index 6b23886..1030741 100644 --- a/png.d +++ b/png.d @@ -492,12 +492,15 @@ PNGHeader getHeader(PNG* p) { return h; } +public import arsd.color; +/* struct Color { ubyte r; ubyte g; ubyte b; ubyte a; } +*/ /+ class Image { @@ -581,24 +584,28 @@ Color[] fetchPalette(PNG* p) { void replacePalette(PNG* p, Color[] colors) { auto palette = p.getChunk("PLTE"); - auto alpha = p.getChunk("tRNS"); + auto alpha = p.getChunkNullable("tRNS"); //import std.string; //assert(0, format("%s %s", colors.length, alpha.size)); //assert(colors.length == alpha.size); - alpha.size = colors.length; - alpha.payload.length = colors.length; // we make sure there's room for our simple method below + if(alpha) { + alpha.size = colors.length; + alpha.payload.length = colors.length; // we make sure there's room for our simple method below + } p.length = 0; // so write will recalculate for(int i = 0; i < colors.length; i++) { palette.payload[i*3+0] = colors[i].r; palette.payload[i*3+1] = colors[i].g; palette.payload[i*3+2] = colors[i].b; - alpha.payload[i] = colors[i].a; + if(alpha) + alpha.payload[i] = colors[i].a; } palette.checksum = crc("PLTE", palette.payload); - alpha.checksum = crc("tRNS", alpha.payload); + if(alpha) + alpha.checksum = crc("tRNS", alpha.payload); } uint update_crc(in uint crc, in ubyte[] buf){ diff --git a/postgres.d b/postgres.d index 6ee166e..a0070b0 100644 --- a/postgres.d +++ b/postgres.d @@ -43,7 +43,7 @@ class PostgreSql : Database { char* buffer = (new char[sqlData.length * 2 + 1]).ptr; ulong size = PQescapeString (buffer, sqlData.ptr, sqlData.length); - string ret = assumeUnique(buffer[0..size]); + string ret = assumeUnique(buffer[0.. cast(size_t) size]); return ret; } diff --git a/web.d b/web.d index ac2c379..2f0e694 100644 --- a/web.d +++ b/web.d @@ -327,11 +327,13 @@ class ApiProvider : WebDotDBaseType { checkCsrfToken(); } + bool _noCsrfChecks; // this is a hack to let you use the functions internally more easily + // gotta make sure this isn't callable externally! Oh lol that'd defeat the point... /// Gets the CSRF info (an associative array with key and token inside at least) from the session. /// Note that the actual token is generated by the Session class. protected string[string] _getCsrfInfo() { - if(session is null) + if(session is null || this._noCsrfChecks) return null; return decodeVariablesSingle(session.csrfToken); } @@ -544,6 +546,7 @@ class ApiProvider : WebDotDBaseType {
+ " ~ deqFoot ~ " "); if(this.reflection !is null) @@ -591,6 +594,18 @@ class ApiProvider : WebDotDBaseType { Document delegate(Throwable) _errorFunction; } +enum string deqFoot = " + +"; + /// Implement subclasses of this inside your main provider class to do a more object /// oriented site. class ApiObject : WebDotDBaseType { @@ -1147,6 +1162,8 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint hack2.session = hack1.session; } + bool returnedHoldsADocument = false; + try { if(fun is null) { auto d = instantiation._catchallEntry( @@ -1211,7 +1228,13 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint } realObject.cgi = cgi; - res = fun.dispatcher(cgi, realObject, want, format, secondaryFormat); + auto ret = fun.dispatcher(cgi, realObject, want, format, secondaryFormat); + if(ret.completed) { + envelopeFormat = "no-processing"; + goto do_nothing_else; + } + + res = ret.value; //if(cgi) // cgi.setResponseContentType("application/json"); @@ -1219,6 +1242,7 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint result.result = res; do_nothing_else: {} + } catch (Throwable e) { result.success = false; @@ -1279,6 +1303,7 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint if(document is null) goto gotnull; result.result.str = (document.toString()); + returnedHoldsADocument = true; } else { gotnull: if(!handleAllExceptions) { @@ -1347,6 +1372,14 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint cgi.setResponseStatus("403 Forbidden"); } break; + case "csv": + cgi.setResponseContentType("text/csv"); + cgi.header("Content-Disposition: attachment; filename=\"export.csv\""); + + if(result.result.type == JSON_TYPE.STRING) { + cgi.write(result.result.str, true); + } else assert(0); + break; case "none": cgi.setResponseContentType("text/plain"); @@ -1370,7 +1403,8 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint if(envelopeFormat != "html") { Document document; - if(result.success && fun !is null && fun.returnTypeIsDocument && returned.length) { + // this big condition means the returned holds a document too + if(returnedHoldsADocument || (result.success && fun !is null && fun.returnTypeIsDocument && returned.length)) { // probably not super efficient... document = new TemplatedDocument(returned); } else { @@ -1915,6 +1949,9 @@ JSONValue toJsonValue(T, R = ApiProvider)(T a, string formatToStringAs = null, R // FIXME: free function to emulate UFCS? // FIXME: should we special case something like struct Html? + } else static if(is(T : DateTime)) { + val.type = JSON_TYPE.STRING; + val.str = a.toISOExtString(); } else static if(is(T : Element)) { if(a is null) { val.type = JSON_TYPE.NULL; @@ -2154,7 +2191,7 @@ auto getMemberDelegate(alias ObjectType, string member)(ObjectType object) if(is WrapperFunction generateWrapper(alias ObjectType, string funName, alias f, R)(ReflectionInfo* reflection, R api) if(is(R: ApiProvider) && (is(ObjectType : WebDotDBaseType)) ) { - JSONValue wrapper(Cgi cgi, WebDotDBaseType object, in string[][string] sargs, in string format, in string secondaryFormat = null) { + WrapperReturn wrapper(Cgi cgi, WebDotDBaseType object, in string[][string] sargs, in string format, in string secondaryFormat = null) { JSONValue returnValue; returnValue.type = JSON_TYPE.STRING; @@ -2185,12 +2222,20 @@ WrapperFunction generateWrapper(alias ObjectType, string funName, alias f, R)(Re sargs[using][$-1] != "false" && sargs[using][$-1] != "False" && sargs[using][$-1] != "FALSE" && + sargs[using][$-1] != "no" && + sargs[using][$-1] != "off" && sargs[using][$-1] != "0" ) - args[i] = true; // FIXME: should try looking at the value - } - else + args[i] = true; + else args[i] = false; + } + else { + static if(parameterHasDefault!(f)(i)) { + args[i] = mixin(parameterDefaultOf!(f)(i)); + } else + args[i] = false; + } // FIXME: what if the default is true? } else static if(is(Unqual!(type) == Cgi.UploadedFile)) { @@ -2233,7 +2278,7 @@ WrapperFunction generateWrapper(alias ObjectType, string funName, alias f, R)(Re // find it in reflection ofInterest ~= reflection.functions[callingName]. - dispatcher(cgi, null, decodeVariables(callingArguments), "string", null).str; + dispatcher(cgi, null, decodeVariables(callingArguments), "string", null).value.str; } } @@ -2253,18 +2298,33 @@ WrapperFunction generateWrapper(alias ObjectType, string funName, alias f, R)(Re else instantiation(args); + WrapperReturn r; + static if(is(ReturnType!f : Element)) { - if(ret is null) - return returnValue; // HACK to handle null returns + if(ret is null) { + r.value = returnValue; + return r; // HACK to handle null returns + } // we need to make sure that it's not called again when _postProcess(Document) is called! // FIXME: is this right? if(cgi.request("envelopeFormat", "document") != "document") api._postProcessElement(ret); // need to post process the element here so it works in ajax modes. } + static if(is(ReturnType!f : FileResource) && !is(ReturnType!f : Document)) { + if(ret !is null && cgi !is null) { + cgi.setResponseContentType(ret.contentType()); + cgi.write(ret.getData(), true); + cgi.close(); + r.completed = true; + } + } + formatAs(ret, format, api, &returnValue, secondaryFormat); - return returnValue; + r.value = returnValue; + + return r; } return &wrapper; @@ -2313,10 +2373,18 @@ string formatAs(T, R)(T ret, string format, R api = null, JSONValue* returnValue *returnValue = toJsonValue!(typeof(ret), R)(ret, formatJsonToStringAs, api); break; case "table": + case "csv": auto document = new Document(""); static if(__traits(compiles, structToTable(document, ret))) { - retstr = structToTable(document, ret).toString(); + auto table = structToTable(document, ret); + if(format == "csv") { + retstr = tableToCsv(table); + } else if(format == "table") + retstr = table.toString(); + else assert(0); + + if(returnValue !is null) returnValue.str = retstr; break; @@ -2331,14 +2399,42 @@ string formatAs(T, R)(T ret, string format, R api = null, JSONValue* returnValue return retstr; } +string toCsv(string text) { + return `"`~text.replace(`"`, `""`)~`"`; +} + +string tableToCsv(Table table) { + string csv; + foreach(tr; table.querySelectorAll("tr")) { + if(csv.length) + csv ~= "\n"; + + bool outputted = false; + foreach(item; tr.querySelectorAll("td, th")) { + if(outputted) + csv ~= ","; + else + outputted = true; + + csv ~= toCsv(item.innerText); + } + } + + return csv; +} + private string emptyTag(string rootName) { return ("<" ~ rootName ~ ">"); } +struct WrapperReturn { + JSONValue value; + bool completed; +} /// The definition of the beastly wrapper function -alias JSONValue delegate(Cgi cgi, WebDotDBaseType, in string[][string] args, in string format, in string secondaryFormat = null) WrapperFunction; +alias WrapperReturn delegate(Cgi cgi, WebDotDBaseType, in string[][string] args, in string format, in string secondaryFormat = null) WrapperFunction; /// tries to take a URL name and turn it into a human natural name. so get rid of slashes, capitalize, etc. string urlToBeauty(string url) { @@ -2453,9 +2549,13 @@ struct CookieParams { /// But, you have to manually commit() the data back to a file. /// You might want to put this in a scope(exit) block or something like that. class Session { + static Session loadReadOnly(Cgi cgi, CookieParams cookieParams = CookieParams(), bool useFile = true) { + return new Session(cgi, cookieParams, useFile, true); + } + /// Loads the session if available, and creates one if not. /// May write a session id cookie to the passed cgi object. - this(Cgi cgi, CookieParams cookieParams = CookieParams(), bool useFile = true) { + this(Cgi cgi, CookieParams cookieParams = CookieParams(), bool useFile = true, bool readOnly = false) { // uncomment these two to render session useless (it has no backing) // but can be good for benchmarking the rest of your app //useFile = false; @@ -2465,6 +2565,8 @@ class Session { // assert(cgi.https); // you want this for best security, but I won't be an ass and require it. this.cookieParams = cookieParams; this.cgi = cgi; + this._readOnly = readOnly; + bool isNew = false; string token; if(cookieParams.name in cgi.cookies && cgi.cookies[cookieParams.name].length) @@ -2601,6 +2703,7 @@ class Session { } private void setOurCookie(string data) { + if(!_readOnly) cgi.setCookie(cookieParams.name, data, cookieParams.expiresIn, cookieParams.path, cookieParams.host, true, cookieParams.httpsOnly); } @@ -2641,6 +2744,8 @@ class Session { /// /// Odds are, invalidate() is what you really want. void clear() { + assert(!_readOnly); // or should I throw an exception or just silently ignore it??? + if(std.file.exists(getFilePath())) std.file.remove(getFilePath()); data = null; @@ -3682,6 +3787,8 @@ enum string javascriptBaseImpl = q{ // Info about the thing "_serverFunction":name, "_serverArguments":args, + "_moreArguments":{}, + "_methodOverride":null, // lower level implementation "_get":function(callback, onError, async) { @@ -3691,6 +3798,10 @@ enum string javascriptBaseImpl = q{ if(!args.format) args.format = "json"; args.envelopeFormat = "json"; + + for(i in this._moreArguments) + args[i] = this._moreArguments[i]; + return me._doRequest(me._apiBase + name, args, function(t, xml) { /* if(me._debugMode) { @@ -3774,7 +3885,7 @@ enum string javascriptBaseImpl = q{ return returnValue; // assert(0); // not reached - }, (name.indexOf("get") == 0) ? "GET" : "POST", async); // FIXME: hack: naming convention used to figure out method to use + }, this._methodOverride === null ? ((name.indexOf("get") == 0) ? "GET" : "POST") : this._methodOverride, async); // FIXME: hack: naming convention used to figure out method to use }, // should pop open the thing in HTML format @@ -3910,6 +4021,14 @@ enum string javascriptBaseImpl = q{ }, "useToFillForm":function(what) { this.get(me._fillForm(what)); + }, + "setValue":function(key, value) { + this._moreArguments[key] = value; + return this; + }, + "setMethod":function(method) { + this._methodOverride = method; + return this; } // runAsScript has been removed, use get(eval) instead // FIXME: might be nice to have an automatic popin function too