@@ -20,7 +20,8 @@ SpazImageURL.prototype.initAPIs = function() { return url; }, 'getImageUrl' : function(id) { - return null; + var url = 'http://twitpic.com/show/large/'+id; + return url; } }); @@ -32,7 +33,8 @@ SpazImageURL.prototype.initAPIs = function() { return url; }, 'getImageUrl' : function(id) { - return null; + var url = 'http://yfrog.com/'+id+':iphone'; + return url; } }); @@ -52,10 +54,10 @@ SpazImageURL.prototype.initAPIs = function() { this.addAPI('pikchur', { - 'url_regex' : /http:\/\/pikchur.com\/([a-zA-Z0-9]+)/gi, + 'url_regex' : /http:\/\/(?:pikchur\.com|pk\.gd)\/([a-zA-Z0-9]+)/gi, 'getThumbnailUrl' : function(id) { // http://img.pikchur.com/pic_GPT_t.jpg - var url = 'http://img.pikchur.com/pic_'+id+'_t.jpg'; + var url = 'http://img.pikchur.com/pic_'+id+'_m.jpg'; return url; }, 'getImageUrl' : function(id) { @@ -144,13 +146,16 @@ SpazImageURL.prototype.findServiceUrlsInString = function(str) { for (key in this.apis) { thisapi = this.getAPI(key); - + sch.dump(key); + sch.dump(thisapi.url_regex); while( (re_matches = thisapi.url_regex.exec(sch.trim(str))) != null) { + sch.dump(re_matches); matches[key] = re_matches; num_matches++; } } - + sch.dump('num_matches:'+num_matches); + sch.dump(matches); if (num_matches > 0) { return matches; } else { @@ -168,12 +173,16 @@ SpazImageURL.prototype.getThumbsForMatches = function(matches) { var x, service, api, thumburl, thumburls = {}, num_urls = 0; for (service in matches) { + sch.dump('SERVICE:'+service); api = this.getAPI(service); urls = matches[service]; // an array - + sch.dump("URLS:"+urls); thumburls[urls[0]] = api.getThumbnailUrl(urls[1]); num_urls++; } + + sch.dump('num_urls:'+num_urls); + sch.dump(thumburls); if (num_urls > 0) { return thumburls; @@ -197,4 +206,64 @@ SpazImageURL.prototype.getThumbsForUrls = function(str) { return null; } -}; \ No newline at end of file +}; + + + +/** + * find the image service URLs that work with our defined APIs in a given string + * @param {object} matches + * @return {object|null} fullurl:thumburl key:val pairs + */ +SpazImageURL.prototype.getImagesForMatches = function(matches) { + var x, service, api, imageurl, imageurls = {}, num_urls = 0; + + for (service in matches) { + sch.dump('SERVICE:'+service); + api = this.getAPI(service); + urls = matches[service]; // an array + sch.dump("URLS:"+urls); + imageurls[urls[0]] = api.getImageUrl(urls[1]); + num_urls++; + } + + sch.dump('num_urls:'+num_urls); + sch.dump(imageurls); + + if (num_urls > 0) { + return imageurls; + } else { + return null; + } +}; + + +/** + * given a string, this returns a set of key:val pairs of main url:image url + * for image hosting services for urls within the string + * @param {string} str + * @return {object|null} fullurl:imageurl key:val pairs + */ +SpazImageURL.prototype.getImagesForUrls = function(str) { + var matches = this.findServiceUrlsInString(str); + if (matches) { + return this.getImagesForMatches(matches); + } else { + return null; + } +}; + + +/** + * given a single image hosting service URL, this returns a URL to the image itself + * @param {string} url + * @return {string|null} + */ +SpazImageURL.prototype.getImageForUrl = function(url) { + var urls = this.getImagesForUrls(url); + if (urls) { + return urls[url]; + } else { + return null; + } +}; libs/spazimageurl.js @@ -26,6 +26,7 @@ var SPAZCORE_EXPANDABLE_DOMAINS = [ 'cli.gs', 'ff.im', 'is.gd', + 'j.mp', 'ow.ly', 'poprl.com', 'short.ie', libs/spazshorturl.js @@ -350,6 +350,12 @@ $(document).ready(function() { var expect = "<script src="../helpers/xml.js" type="text/javascript" charset="utf-8"></script>"; equals(result, expect); }); + test("escape_html", function() { + var input = "http://www.youtube.com/watch?v=tGsq9CFgP9E&feature=related"; + var result = sc.helpers.escape_html(input); + var expect = "http://www.youtube.com/watch?v=tGsq9CFgP9E&feature=related"; + equals(result, expect); + }); test("utf8.encode", missing); test("utf8.decode", missing); test("trim", function() { tests/helper_tests.js eb78754bbbdf0dba62c3e3d45440ae16d63de1a1 Ed Finkler funkatron@gmail.com http://github.com/funkatron/spazcore/commit/20847c2cbb4cbedaeedc14c7b628bbf4fdc6f74c 20847c2cbb4cbedaeedc14c7b628bbf4fdc6f74c 2009-09-23T15:09:22-07:00 2009-09-23T15:09:22-07:00 - added methods in spazimageurl to retrieve full-size URLs - added j.mp to short URL list in spazshorturl.js - added test for escape_html helper 9ede9e9ad8a2224df06e95847f4f64214945b43c Ed Finkler funkatron@gmail.com