").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r
-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);
\ No newline at end of file
diff --git a/lib/client/storage/dropbox/samples/checkbox.js/public/lib/less.js b/lib/client/storage/dropbox/samples/checkbox.js/public/lib/less.js
deleted file mode 100644
index 9b0fa6ba..00000000
--- a/lib/client/storage/dropbox/samples/checkbox.js/public/lib/less.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// LESS - Leaner CSS v1.3.3
-// http://lesscss.org
-//
-// Copyright (c) 2009-2013, Alexis Sellier
-// Licensed under the Apache 2.0 License.
-//
-(function(e,t){function n(t){return e.less[t.split("/")[1]]}function f(){r.env==="development"?(r.optimization=0,r.watchTimer=setInterval(function(){r.watchMode&&g(function(e,t,n,r,i){t&&S(t.toCSS(),r,i.lastModified)})},r.poll)):r.optimization=3}function m(){var e=document.getElementsByTagName("style");for(var t=0;t0&&(s.splice(o-1,2),o-=2)}return i.hostPart=r[1],i.directories=s,i.path=r[1]+s.join("/"),i.fileUrl=i.path+(r[4]||""),i.url=i.fileUrl+(r[5]||""),i}function w(t,n,i,s){var o=t.contents||{},u=t.files||{},a=b(t.href,e.location.href),f=a.url,c=l&&l.getItem(f),h=l&&l.getItem(f+":timestamp"),p={css:c,timestamp:h},d;r.relativeUrls?r.rootpath?t.entryPath?d=b(r.rootpath+y(a.path,t.entryPath)).path:d=r.rootpath:d=a.path:r.rootpath?d=r.rootpath:t.entryPath?d=t.entryPath:d=a.path,x(f,t.type,function(e,l){v+=e.replace(/@import .+?;/ig,"");if(!i&&p&&l&&(new Date(l)).valueOf()===(new Date(p.timestamp)).valueOf())S(p.css,t),n(null,null,e,t,{local:!0,remaining:s},f);else try{o[f]=e,(new r.Parser({optimization:r.optimization,paths:[a.path],entryPath:t.entryPath||a.path,mime:t.type,filename:f,rootpath:d,relativeUrls:t.relativeUrls,contents:o,files:u,dumpLineNumbers:r.dumpLineNumbers})).parse(e,function(r,i){if(r)return k(r,f);try{n(r,i,e,t,{local:!1,lastModified:l,remaining:s},f),N(document.getElementById("less-error-message:"+E(f)))}catch(r){k(r,f)}})}catch(c){k(c,f)}},function(e,t){throw new Error("Couldn't load "+t+" ("+e+")")})}function E(e){return e.replace(/^[a-z]+:\/\/?[^\/]+/,"").replace(/^\//,"").replace(/\.[a-zA-Z]+$/,"").replace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function S(e,t,n){var r,i=t.href||"",s="less:"+(t.title||E(i));if((r=document.getElementById(s))===null){r=document.createElement("style"),r.type="text/css",t.media&&(r.media=t.media),r.id=s;var o=t&&t.nextSibling||null;(o||document.getElementsByTagName("head")[0]).parentNode.insertBefore(r,o)}if(r.styleSheet)try{r.styleSheet.cssText=e}catch(u){throw new Error("Couldn't reassign styleSheet.cssText.")}else(function(e){r.childNodes.length>0?r.firstChild.nodeValue!==e.nodeValue&&r.replaceChild(e,r.firstChild):r.appendChild(e)})(document.createTextNode(e));if(n&&l){C("saving "+i+" to cache.");try{l.setItem(i,e),l.setItem(i+":timestamp",n)}catch(u){C("failed to save")}}}function x(e,t,n,i){function a(t,n,r){t.status>=200&&t.status<300?n(t.responseText,t.getResponseHeader("Last-Modified")):typeof r=="function"&&r(t.status,e)}var s=T(),u=o?r.fileAsync:r.async;typeof s.overrideMimeType=="function"&&s.overrideMimeType("text/css"),s.open("GET",e,u),s.setRequestHeader("Accept",t||"text/x-less, text/css; q=0.9, */*; q=0.5"),s.send(null),o&&!r.fileAsync?s.status===0||s.status>=200&&s.status<300?n(s.responseText):i(s.status,e):u?s.onreadystatechange=function(){s.readyState==4&&a(s,n,i)}:a(s,n,i)}function T(){if(e.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(t){return C("browser doesn't support AJAX."),null}}function N(e){return e&&e.parentNode.removeChild(e)}function C(e){r.env=="development"&&typeof console!="undefined"&&console.log("less: "+e)}function k(e,t){var n="less-error-message:"+E(t),i='{line} {content} "+(e.message||"There is an error in your .less file")+" "+'in '+l+" ";var c=function(e,t,n){e.extract[t]&&a.push(i.replace(/\{line\}/,parseInt(e.line)+(t-1)).replace(/\{class\}/,n).replace(/\{content\}/,e.extract[t]))};e.stack?u+="
"+""),s.innerHTML=u,S([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #dd6666;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.line {","color: #ff0000;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: #10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"),{title:"error-message"}),s.style.cssText=["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),r.env=="development"&&(o=setInterval(function(){document.body&&(document.getElementById(n)?document.body.replaceChild(s,document.getElementById(n)):document.body.insertBefore(s,document.body.firstChild),clearInterval(o))},10))}Array.isArray||(Array.isArray=function(e){return Object.prototype.toString.call(e)==="[object Array]"||e instanceof Array}),Array.prototype.forEach||(Array.prototype.forEach=function(e,t){var n=this.length>>>0;for(var r=0;r>>0,n=new Array(t),r=arguments[1];for(var i=0;i>>0,n=0;if(t===0&&arguments.length===1)throw new TypeError;if(arguments.length>=2)var r=arguments[1];else do{if(n in this){r=this[n++];break}if(++n>=t)throw new TypeError}while(!0);for(;n=t)return-1;n<0&&(n+=t);for(;nh&&(c[u]=c[u].slice(o-h),h=o)}function w(e){var t=e.charCodeAt(0);return t===32||t===10||t===9}function E(e){var t,n,r,i,a;if(e instanceof Function)return e.call(p.parsers);if(typeof e=="string")t=s.charAt(o)===e?e:null,r=1,b();else{b();if(!(t=e.exec(c[u])))return null;r=t[0].length}if(t)return S(r),typeof t=="string"?t:t.length===1?t[0]:t}function S(e){var t=o,n=u,r=o+c[u].length,i=o+=e;while(o=0&&t.charAt(n)!=="\n";n--)r++;return{line:typeof e=="number"?(t.slice(0,e).match(/\n/g)||"").length:null,column:r}}function L(e){return r.mode==="browser"||r.mode==="rhino"?e.filename:n("path").resolve(e.filename)}function A(e,t,n){return{lineNumber:k(e,t).line+1,fileName:L(n)}}function O(e,t){var n=C(e,t),r=k(e.index,n),i=r.line,s=r.column,o=n.split("\n");this.type=e.type||"Syntax",this.message=e.message,this.filename=e.filename||t.filename,this.index=e.index,this.line=typeof i=="number"?i+1:null,this.callLine=e.call&&k(e.call,n).line+1,this.callExtract=o[k(e.call,n).line],this.stack=e.stack,this.column=s,this.extract=[o[i-1],o[i],o[i+1]]}var s,o,u,a,f,l,c,h,p,d=this,t=t||{};t.contents||(t.contents={}),t.rootpath=t.rootpath||"",t.files||(t.files={});var v=function(){},m=this.imports={paths:t.paths||[],queue:[],files:t.files,contents:t.contents,mime:t.mime,error:null,push:function(e,n){var i=this;this.queue.push(e),r.Parser.importer(e,this.paths,function(t,r,s){i.queue.splice(i.queue.indexOf(e),1);var o=s in i.files;i.files[s]=r,t&&!i.error&&(i.error=t),n(t,r,o),i.queue.length===0&&v(i.error)},t)}};return this.env=t=t||{},this.optimization="optimization"in this.env?this.env.optimization:1,this.env.filename=this.env.filename||null,p={imports:m,parse:function(e,a){var f,d,m,g,y,b,w=[],S,x=null;o=u=h=l=0,s=e.replace(/\r\n/g,"\n"),s=s.replace(/^\uFEFF/,""),c=function(e){var n=0,r=/(?:@\{[\w-]+\}|[^"'`\{\}\/\(\)\\])+/g,i=/\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,o=/"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`]|\\.)*)`/g,u=0,a,f=e[0],l;for(var c=0,h,p;c0?"missing closing `}`":"missing opening `{`",filename:t.filename},t)),e.map(function(e){return e.join("")})}([[]]);if(x)return a(x,t);try{f=new i.Ruleset([],E(this.parsers.primary)),f.root=!0}catch(T){return a(new O(T,t))}f.toCSS=function(e){var s,o,u;return function(s,o){var u=[],a;s=s||{},typeof o=="object"&&!Array.isArray(o)&&(o=Object.keys(o).map(function(e){var t=o[e];return t instanceof i.Value||(t instanceof i.Expression||(t=new i.Expression([t])),t=new i.Value([t])),new i.Rule("@"+e,t,!1,0)}),u=[new i.Ruleset(null,o)]);try{var f=e.call(this,{frames:u}).toCSS([],{compress:s.compress||!1,dumpLineNumbers:t.dumpLineNumbers})}catch(l){throw new O(l,t)}if(a=p.imports.error)throw a instanceof O?a:new O(a,t);return s.yuicompress&&r.mode==="node"?n("ycssmin").cssmin(f):s.compress?f.replace(/(\s)+/g,"$1"):f}}(f.eval);if(o=0&&s.charAt(N)!=="\n";N--)C++;x={type:"Parse",message:"Syntax Error on line "+y,index:o,filename:t.filename,line:y,column:C,extract:[b[y-2],b[y-1],b[y]]}}this.imports.queue.length>0?v=function(e){e=x||e,e?a(e):a(null,f)}:a(x,f)},parsers:{primary:function(){var e,t=[];while((e=E(this.mixin.definition)||E(this.rule)||E(this.ruleset)||E(this.mixin.call)||E(this.comment)||E(this.directive))||E(/^[\s\n]+/)||E(/^;+/))e&&t.push(e);return t},comment:function(){var e;if(s.charAt(o)!=="/")return;if(s.charAt(o+1)==="/")return new i.Comment(E(/^\/\/.*/),!0);if(e=E(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new i.Comment(e)},entities:{quoted:function(){var e,t=o,n;s.charAt(t)==="~"&&(t++,n=!0);if(s.charAt(t)!=='"'&&s.charAt(t)!=="'")return;n&&E("~");if(e=E(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new i.Quoted(e[0],e[1]||e[2],n)},keyword:function(){var e;if(e=E(/^[_A-Za-z-][_A-Za-z0-9-]*/))return i.colors.hasOwnProperty(e)?new i.Color(i.colors[e].slice(1)):new i.Keyword(e)},call:function(){var e,n,r,s,a=o;if(!(e=/^([\w-]+|%|progid:[\w\.]+)\(/.exec(c[u])))return;e=e[1],n=e.toLowerCase();if(n==="url")return null;o+=e.length;if(n==="alpha"){s=E(this.alpha);if(typeof s!="undefined")return s}E("("),r=E(this.entities.arguments);if(!E(")"))return;if(e)return new i.Call(e,r,a,t.filename)},arguments:function(){var e=[],t;while(t=E(this.entities.assignment)||E(this.expression)){e.push(t);if(!E(","))break}return e},literal:function(){return E(this.entities.ratio)||E(this.entities.dimension)||E(this.entities.color)||E(this.entities.quoted)||E(this.entities.unicodeDescriptor)},assignment:function(){var e,t;if((e=E(/^\w+(?=\s?=)/i))&&E("=")&&(t=E(this.entity)))return new i.Assignment(e,t)},url:function(){var e;if(s.charAt(o)!=="u"||!E(/^url\(/))return;return e=E(this.entities.quoted)||E(this.entities.variable)||E(/^(?:(?:\\[\(\)'"])|[^\(\)'"])+/)||"",x(")"),new i.URL(e.value!=null||e instanceof i.Variable?e:new i.Anonymous(e),t.rootpath)},variable:function(){var e,n=o;if(s.charAt(o)==="@"&&(e=E(/^@@?[\w-]+/)))return new i.Variable(e,n,t.filename)},variableCurly:function(){var e,n,r=o;if(s.charAt(o)==="@"&&(n=E(/^@\{([\w-]+)\}/)))return new i.Variable("@"+n[1],r,t.filename)},color:function(){var e;if(s.charAt(o)==="#"&&(e=E(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/)))return new i.Color(e[1])},dimension:function(){var e,t=s.charCodeAt(o);if(t>57||t<43||t===47||t==44)return;if(e=E(/^([+-]?\d*\.?\d+)(px|%|em|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn|dpi|dpcm|dppx|rem|vw|vh|vmin|vm|ch)?/))return new i.Dimension(e[1],e[2])},ratio:function(){var e,t=s.charCodeAt(o);if(t>57||t<48)return;if(e=E(/^(\d+\/\d+)/))return new i.Ratio(e[1])},unicodeDescriptor:function(){var e;if(e=E(/^U\+[0-9a-fA-F?]+(\-[0-9a-fA-F?]+)?/))return new i.UnicodeDescriptor(e[0])},javascript:function(){var e,t=o,n;s.charAt(t)==="~"&&(t++,n=!0);if(s.charAt(t)!=="`")return;n&&E("~");if(e=E(/^`([^`]*)`/))return new i.JavaScript(e[1],o,n)}},variable:function(){var e;if(s.charAt(o)==="@"&&(e=E(/^(@[\w-]+)\s*:/)))return e[1]},shorthand:function(){var e,t;if(!N(/^[@\w.%-]+\/[@\w.-]+/))return;g();if((e=E(this.entity))&&E("/")&&(t=E(this.entity)))return new i.Shorthand(e,t);y()},mixin:{call:function(){var e=[],n,r,u=[],a=[],f,l,c,h,p,d,v,m=o,b=s.charAt(o),w,S,C=!1;if(b!=="."&&b!=="#")return;g();while(n=E(/^[#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/))e.push(new i.Element(r,n,o)),r=E(">");if(E("(")){p=[];while(c=E(this.expression)){h=null,S=c;if(c.value.length==1){var k=c.value[0];k instanceof i.Variable&&E(":")&&(p.length>0&&(d&&T("Cannot mix ; and , as delimiter types"),v=!0),S=x(this.expression),h=w=k.name)}p.push(S),a.push({name:h,value:S});if(E(","))continue;if(E(";")||d)v&&T("Cannot mix ; and , as delimiter types"),d=!0,p.length>1&&(S=new i.Value(p)),u.push({name:w,value:S}),w=null,p=[],v=!1}x(")")}f=d?u:a,E(this.important)&&(C=!0);if(e.length>0&&(E(";")||N("}")))return new i.mixin.Call(e,f,m,t.filename,C);y()},definition:function(){var e,t=[],n,r,u,a,f,c=!1;if(s.charAt(o)!=="."&&s.charAt(o)!=="#"||N(/^[^{]*\}/))return;g();if(n=E(/^([#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+)\s*\(/)){e=n[1];do{E(this.comment);if(s.charAt(o)==="."&&E(/^\.{3}/)){c=!0,t.push({variadic:!0});break}if(!(u=E(this.entities.variable)||E(this.entities.literal)||E(this.entities.keyword)))break;if(u instanceof i.Variable)if(E(":"))a=x(this.expression,"expected expression"),t.push({name:u.name,value:a});else{if(E(/^\.{3}/)){t.push({name:u.name,variadic:!0}),c=!0;break}t.push({name:u.name})}else t.push({value:u})}while(E(",")||E(";"));E(")")||(l=o,y()),E(this.comment),E(/^when/)&&(f=x(this.conditions,"expected condition")),r=E(this.block);if(r)return new i.mixin.Definition(e,t,r,f,c);y()}}},entity:function(){return E(this.entities.literal)||E(this.entities.variable)||E(this.entities.url)||E(this.entities.call)||E(this.entities.keyword)||E(this.entities.javascript)||E(this.comment)},end:function(){return E(";")||N("}")},alpha:function(){var e;if(!E(/^\(opacity=/i))return;if(e=E(/^\d+/)||E(this.entities.variable))return x(")"),new i.Alpha(e)},element:function(){var e,t,n,r;n=E(this.combinator),e=E(/^(?:\d+\.\d+|\d+)%/)||E(/^(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/)||E("*")||E("&")||E(this.attribute)||E(/^\([^()@]+\)/)||E(/^[\.#](?=@)/)||E(this.entities.variableCurly),e||E("(")&&(r=E(this.entities.variableCurly)||E(this.entities.variable)||E(this.selector))&&E(")")&&(e=new i.Paren(r));if(e)return new i.Element(n,e,o)},combinator:function(){var e,t=s.charAt(o);if(t===">"||t==="+"||t==="~"||t==="|"){o++;while(s.charAt(o).match(/\s/))o++;return new i.Combinator(t)}return s.charAt(o-1).match(/\s/)?new i.Combinator(" "):new i.Combinator(null)},selector:function(){var e,t,n=[],r,u;if(E("("))return e=E(this.entity),E(")")?new i.Selector([new i.Element("",e,o)]):null;while(t=E(this.element)){r=s.charAt(o),n.push(t);if(r==="{"||r==="}"||r===";"||r===","||r===")")break}if(n.length>0)return new i.Selector(n)},attribute:function(){var e="",t,n,r;if(!E("["))return;if(t=E(/^(?:[_A-Za-z0-9-]|\\.)+/)||E(this.entities.quoted))(r=E(/^[|~*$^]?=/))&&(n=E(this.entities.quoted)||E(/^[\w-]+/))?e=[t,r,n.toCSS?n.toCSS():n].join(""):e=t;if(!E("]"))return;if(e)return"["+e+"]"},block:function(){var e;if(E("{")&&(e=E(this.primary))&&E("}"))return e},ruleset:function(){var e=[],n,r,u,a;g(),t.dumpLineNumbers&&(a=A(o,s,t));while(n=E(this.selector)){e.push(n),E(this.comment);if(!E(","))break;E(this.comment)}if(e.length>0&&(r=E(this.block))){var f=new i.Ruleset(e,r,t.strictImports);return t.dumpLineNumbers&&(f.debugInfo=a),f}l=o,y()},rule:function(){var e,t,n=s.charAt(o),r,a;g();if(n==="."||n==="#"||n==="&")return;if(e=E(this.variable)||E(this.property)){e.charAt(0)!="@"&&(a=/^([^@+\/'"*`(;{}-]*);/.exec(c[u]))?(o+=a[0].length-1,t=new i.Anonymous(a[1])):e==="font"?t=E(this.font):t=E(this.value),r=E(this.important);if(t&&E(this.end))return new i.Rule(e,t,r,f);l=o,y()}},"import":function(){var e,n,r=o;g();var s=E(/^@import(?:-(once))?\s+/);if(s&&(e=E(this.entities.quoted)||E(this.entities.url))){n=E(this.mediaFeatures);if(E(";"))return new i.Import(e,m,n,s[1]==="once",r,t.rootpath)}y()},mediaFeature:function(){var e,t,n=[];do if(e=E(this.entities.keyword))n.push(e);else if(E("(")){t=E(this.property),e=E(this.entity);if(!E(")"))return null;if(t&&e)n.push(new i.Paren(new i.Rule(t,e,null,o,!0)));else{if(!e)return null;n.push(new i.Paren(e))}}while(e);if(n.length>0)return new i.Expression(n)},mediaFeatures:function(){var e,t=[];do if(e=E(this.mediaFeature)){t.push(e);if(!E(","))break}else if(e=E(this.entities.variable)){t.push(e);if(!E(","))break}while(e);return t.length>0?t:null},media:function(){var e,n,r,u;t.dumpLineNumbers&&(u=A(o,s,t));if(E(/^@media/)){e=E(this.mediaFeatures);if(n=E(this.block))return r=new i.Media(n,e),t.dumpLineNumbers&&(r.debugInfo=u),r}},directive:function(){var e,n,r,u,a,f,l,c,h,p;if(s.charAt(o)!=="@")return;if(n=E(this["import"])||E(this.media))return n;g(),e=E(/^@[a-z-]+/);if(!e)return;l=e,e.charAt(1)=="-"&&e.indexOf("-",2)>0&&(l="@"+e.slice(e.indexOf("-",2)+1));switch(l){case"@font-face":c=!0;break;case"@viewport":case"@top-left":case"@top-left-corner":case"@top-center":case"@top-right":case"@top-right-corner":case"@bottom-left":case"@bottom-left-corner":case"@bottom-center":case"@bottom-right":case"@bottom-right-corner":case"@left-top":case"@left-middle":case"@left-bottom":case"@right-top":case"@right-middle":case"@right-bottom":c=!0;break;case"@page":case"@document":case"@supports":case"@keyframes":c=!0,h=!0;break;case"@namespace":p=!0}h&&(e+=" "+(E(/^[^{]+/)||"").trim());if(c){if(r=E(this.block))return new i.Directive(e,r)}else if((n=p?E(this.expression):E(this.entity))&&E(";")){var d=new i.Directive(e,n);return t.dumpLineNumbers&&(d.debugInfo=A(o,s,t)),d}y()},font:function(){var e=[],t=[],n,r,s,o;while(o=E(this.shorthand)||E(this.entity))t.push(o);e.push(new i.Expression(t));if(E(","))while(o=E(this.expression)){e.push(o);if(!E(","))break}return new i.Value(e)},value:function(){var e,t=[],n;while(e=E(this.expression)){t.push(e);if(!E(","))break}if(t.length>0)return new i.Value(t)},important:function(){if(s.charAt(o)==="!")return E(/^! *important/)},sub:function(){var e;if(E("(")&&(e=E(this.expression))&&E(")"))return e},multiplication:function(){var e,t,n,r;if(e=E(this.operand)){while(!N(/^\/[*\/]/)&&(n=E("/")||E("*"))&&(t=E(this.operand)))r=new i.Operation(n,[r||e,t]);return r||e}},addition:function(){var e,t,n,r;if(e=E(this.multiplication)){while((n=E(/^[-+]\s+/)||!w(s.charAt(o-1))&&(E("+")||E("-")))&&(t=E(this.multiplication)))r=new i.Operation(n,[r||e,t]);return r||e}},conditions:function(){var e,t,n=o,r;if(e=E(this.condition)){while(E(",")&&(t=E(this.condition)))r=new i.Condition("or",r||e,t,n);return r||e}},condition:function(){var e,t,n,r,s=o,u=!1;E(/^not/)&&(u=!0),x("(");if(e=E(this.addition)||E(this.entities.keyword)||E(this.entities.quoted))return(r=E(/^(?:>=|=<|[<=>])/))?(t=E(this.addition)||E(this.entities.keyword)||E(this.entities.quoted))?n=new i.Condition(r,e,t,s,u):T("expected expression"):n=new i.Condition("=",e,new i.Keyword("true"),s,u),x(")"),E(/^and/)?new i.Condition("and",n,E(this.condition)):n},operand:function(){var e,t=s.charAt(o+1);s.charAt(o)==="-"&&(t==="@"||t==="(")&&(e=E("-"));var n=E(this.sub)||E(this.entities.dimension)||E(this.entities.color)||E(this.entities.variable)||E(this.entities.call);return e?new i.Operation("*",[new i.Dimension(-1),n]):n},expression:function(){var e,t,n=[],r;while(e=E(this.addition)||E(this.entity))n.push(e);if(n.length>0)return new i.Expression(n)},property:function(){var e;if(e=E(/^(\*?-?[_a-z0-9-]+)\s*:/))return e[1]}}}};if(r.mode==="browser"||r.mode==="rhino")r.Parser.importer=function(e,t,n,r){!/^([a-z-]+:)?\//.test(e)&&t.length>0&&(e=t[0]+e),w({href:e,title:e,type:r.mime,contents:r.contents,files:r.files,rootpath:r.rootpath,entryPath:r.entryPath,relativeUrls:r.relativeUrls},function(e,i,s,o,u,a){e&&typeof r.errback=="function"?r.errback.call(null,a,t,n,r):n.call(null,e,i,a)},!0)};(function(e){function t(t){return e.functions.hsla(t.h,t.s,t.l,t.a)}function n(t,n){return t instanceof e.Dimension&&t.unit=="%"?parseFloat(t.value*n/100):r(t)}function r(t){if(t instanceof e.Dimension)return parseFloat(t.unit=="%"?t.value/100:t.value);if(typeof t=="number")return t;throw{error:"RuntimeError",message:"color functions take numbers as parameters"}}function i(e){return Math.min(1,Math.max(0,e))}e.functions={rgb:function(e,t,n){return this.rgba(e,t,n,1)},rgba:function(t,i,s,o){var u=[t,i,s].map(function(e){return n(e,256)});return o=r(o),new e.Color(u,o)},hsl:function(e,t,n){return this.hsla(e,t,n,1)},hsla:function(e,t,n,i){function u(e){return e=e<0?e+1:e>1?e-1:e,e*6<1?o+(s-o)*e*6:e*2<1?s:e*3<2?o+(s-o)*(2/3-e)*6:o}e=r(e)%360/360,t=r(t),n=r(n),i=r(i);var s=n<=.5?n*(t+1):n+t-n*t,o=n*2-s;return this.rgba(u(e+1/3)*255,u(e)*255,u(e-1/3)*255,i)},hsv:function(e,t,n){return this.hsva(e,t,n,1)},hsva:function(e,t,n,i){e=r(e)%360/360*360,t=r(t),n=r(n),i=r(i);var s,o;s=Math.floor(e/60%6),o=e/60-s;var u=[n,n*(1-t),n*(1-o*t),n*(1-(1-o)*t)],a=[[0,3,1],[2,0,1],[1,0,3],[1,2,0],[3,1,0],[0,1,2]];return this.rgba(u[a[s][0]]*255,u[a[s][1]]*255,u[a[s][2]]*255,i)},hue:function(t){return new e.Dimension(Math.round(t.toHSL().h))},saturation:function(t){return new e.Dimension(Math.round(t.toHSL().s*100),"%")},lightness:function(t){return new e.Dimension(Math.round(t.toHSL().l*100),"%")},red:function(t){return new e.Dimension(t.rgb[0])},green:function(t){return new e.Dimension(t.rgb[1])},blue:function(t){return new e.Dimension(t.rgb[2])},alpha:function(t){return new e.Dimension(t.toHSL().a)},luma:function(t){return new e.Dimension(Math.round((.2126*(t.rgb[0]/255)+.7152*(t.rgb[1]/255)+.0722*(t.rgb[2]/255))*t.alpha*100),"%")},saturate:function(e,n){var r=e.toHSL();return r.s+=n.value/100,r.s=i(r.s),t(r)},desaturate:function(e,n){var r=e.toHSL();return r.s-=n.value/100,r.s=i(r.s),t(r)},lighten:function(e,n){var r=e.toHSL();return r.l+=n.value/100,r.l=i(r.l),t(r)},darken:function(e,n){var r=e.toHSL();return r.l-=n.value/100,r.l=i(r.l),t(r)},fadein:function(e,n){var r=e.toHSL();return r.a+=n.value/100,r.a=i(r.a),t(r)},fadeout:function(e,n){var r=e.toHSL();return r.a-=n.value/100,r.a=i(r.a),t(r)},fade:function(e,n){var r=e.toHSL();return r.a=n.value/100,r.a=i(r.a),t(r)},spin:function(e,n){var r=e.toHSL(),i=(r.h+n.value)%360;return r.h=i<0?360+i:i,t(r)},mix:function(t,n,r){r||(r=new e.Dimension(50));var i=r.value/100,s=i*2-1,o=t.toHSL().a-n.toHSL().a,u=((s*o==-1?s:(s+o)/(1+s*o))+1)/2,a=1-u,f=[t.rgb[0]*u+n.rgb[0]*a,t.rgb[1]*u+n.rgb[1]*a,t.rgb[2]*u+n.rgb[2]*a],l=t.alpha*i+n.alpha*(1-i);return new e.Color(f,l)},greyscale:function(t){return this.desaturate(t,new e.Dimension(100))},contrast:function(e,t,n,r){return e.rgb?(typeof n=="undefined"&&(n=this.rgba(255,255,255,1)),typeof t=="undefined"&&(t=this.rgba(0,0,0,1)),typeof r=="undefined"?r=.43:r=r.value,(.2126*(e.rgb[0]/255)+.7152*(e.rgb[1]/255)+.0722*(e.rgb[2]/255))*e.alpha255?255:e<0?0:e).toString(16),e.length===1?"0"+e:e}).join("")},operate:function(t,n){var r=[];n instanceof e.Color||(n=n.toColor());for(var i=0;i<3;i++)r[i]=e.operate(t,this.rgb[i],n.rgb[i]);return new e.Color(r,this.alpha+n.alpha)},toHSL:function(){var e=this.rgb[0]/255,t=this.rgb[1]/255,n=this.rgb[2]/255,r=this.alpha,i=Math.max(e,t,n),s=Math.min(e,t,n),o,u,a=(i+s)/2,f=i-s;if(i===s)o=u=0;else{u=a>.5?f/(2-i-s):f/(i+s);switch(i){case e:o=(t-n)/f+(t255?255:e<0?0:e).toString(16),e.length===1?"0"+e:e}).join("")},compare:function(e){return e.rgb?e.rgb[0]===this.rgb[0]&&e.rgb[1]===this.rgb[1]&&e.rgb[2]===this.rgb[2]&&e.alpha===this.alpha?0:-1:-1}}}(n("../tree")),function(e){e.Comment=function(e,t){this.value=e,this.silent=!!t},e.Comment.prototype={toCSS:function(e){return e.compress?"":this.value},eval:function(){return this}}}(n("../tree")),function(e){e.Condition=function(e,t,n,r,i){this.op=e.trim(),this.lvalue=t,this.rvalue=n,this.index=r,this.negate=i},e.Condition.prototype.eval=function(e){var t=this.lvalue.eval(e),n=this.rvalue.eval(e),r=this.index,i,i=function(e){switch(e){case"and":return t&&n;case"or":return t||n;default:if(t.compare)i=t.compare(n);else{if(!n.compare)throw{type:"Type",message:"Unable to perform comparison",index:r};i=n.compare(t)}switch(i){case-1:return e==="<"||e==="=<";case 0:return e==="="||e===">="||e==="=<";case 1:return e===">"||e===">="}}}(this.op);return this.negate?!i:i}}(n("../tree")),function(e){e.Dimension=function(e,t){this.value=parseFloat(e),this.unit=t||null},e.Dimension.prototype={eval:function(){return this},toColor:function(){return new e.Color([this.value,this.value,this.value])},toCSS:function(){var e=this.value+this.unit;return e},operate:function(t,n){return new e.Dimension(e.operate(t,this.value,n.value),this.unit||n.unit)},compare:function(t){return t instanceof e.Dimension?t.value>this.value?-1:t.value":e.compress?">":" > ","|":e.compress?"|":" | "}[this.value]}}(n("../tree")),function(e){e.Expression=function(e){this.value=e},e.Expression.prototype={eval:function(t){return this.value.length>1?new e.Expression(this.value.map(function(e){return e.eval(t)})):this.value.length===1?this.value[0].eval(t):this},toCSS:function(e){return this.value.map(function(t){return t.toCSS?t.toCSS(e):""}).join(" ")}}}(n("../tree")),function(e){e.Import=function(t,n,r,i,s,o){var u=this;this.once=i,this.index=s,this._path=t,this.features=r&&new e.Value(r),this.rootpath=o,t instanceof e.Quoted?this.path=/(\.[a-z]*$)|([\?;].*)$/.test(t.value)?t.value:t.value+".less":this.path=t.value.value||t.value,this.css=/css([\?;].*)?$/.test(this.path),this.css||n.push(this.path,function(t,n,r){t&&(t.index=s),r&&u.once&&(u.skip=r),u.root=n||new e.Ruleset([],[])})},e.Import.prototype={toCSS:function(e){var t=this.features?" "+this.features.toCSS(e):"";return this.css?(typeof this._path.value=="string"&&!/^(?:[a-z-]+:|\/)/.test(this._path.value)&&(this._path.value=this.rootpath+this._path.value),"@import "+this._path.toCSS()+t+";\n"):""},eval:function(t){var n,r=this.features&&this.features.eval(t);return this.skip?[]:this.css?this:(n=new e.Ruleset([],this.root.rules.slice(0)),n.evalImports(t),this.features?new e.Media(n.rules,this.features.value):n.rules)}}}(n("../tree")),function(e){e.JavaScript=function(e,t,n){this.escaped=n,this.expression=e,this.index=t},e.JavaScript.prototype={eval:function(t){var n,r=this,i={},s=this.expression.replace(/@\{([\w-]+)\}/g,function(n,i){return e.jsify((new e.Variable("@"+i,r.index)).eval(t))});try{s=new Function("return ("+s+")")}catch(o){throw{message:"JavaScript evaluation error: `"+s+"`",index:this.index}}for(var u in t.frames[0].variables())i[u.slice(1)]={value:t.frames[0].variables()[u].value,toJS:function(){return this.value.eval(t).toCSS()}};try{n=s.call(i)}catch(o){throw{message:"JavaScript evaluation error: '"+o.name+": "+o.message+"'",index:this.index}}return typeof n=="string"?new e.Quoted('"'+n+'"',n,this.escaped,this.index):Array.isArray(n)?new e.Anonymous(n.join(", ")):new e.Anonymous(n)}}}(n("../tree")),function(e){e.Keyword=function(e){this.value=e},e.Keyword.prototype={eval:function(){return this},toCSS:function(){return this.value},compare:function(t){return t instanceof e.Keyword?t.value===this.value?0:1:-1}},e.True=new e.Keyword("true"),e.False=new e.Keyword("false")}(n("../tree")),function(e){e.Media=function(t,n){var r=this.emptySelectors();this.features=new e.Value(n),this.ruleset=new e.Ruleset(r,t),this.ruleset.allowImports=!0},e.Media.prototype={toCSS:function(e,t){var n=this.features.toCSS(t);return this.ruleset.root=e.length===0||e[0].multiMedia,"@media "+n+(t.compress?"{":" {\n ")+this.ruleset.toCSS(e,t).trim().replace(/\n/g,"\n ")+(t.compress?"}":"\n}\n")},eval:function(t){t.mediaBlocks||(t.mediaBlocks=[],t.mediaPath=[]);var n=new e.Media([],[]);return this.debugInfo&&(this.ruleset.debugInfo=this.debugInfo,n.debugInfo=this.debugInfo),n.features=this.features.eval(t),t.mediaPath.push(n),t.mediaBlocks.push(n),t.frames.unshift(this.ruleset),n.ruleset=this.ruleset.eval(t),t.frames.shift(),t.mediaPath.pop(),t.mediaPath.length===0?n.evalTop(t):n.evalNested(t)},variable:function(t){return e.Ruleset.prototype.variable.call(this.ruleset,t)},find:function(){return e.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return e.Ruleset.prototype.rulesets.apply(this.ruleset)},emptySelectors:function(){var t=new e.Element("","&",0);return[new e.Selector([t])]},evalTop:function(t){var n=this;if(t.mediaBlocks.length>1){var r=this.emptySelectors();n=new e.Ruleset(r,t.mediaBlocks),n.multiMedia=!0}return delete t.mediaBlocks,delete t.mediaPath,n},evalNested:function(t){var n,r,i=t.mediaPath.concat([this]);for(n=0;n0;n--)t.splice(n,0,new e.Anonymous("and"));return new e.Expression(t)})),new e.Ruleset([],[])},permute:function(e){if(e.length===0)return[];if(e.length===1)return e[0];var t=[],n=this.permute(e.slice(1));for(var r=0;r0){c=!0;for(a=0;athis.params.length)return!1;if(this.required>0&&n>this.params.length)return!1}r=Math.min(n,this.arity);for(var s=0;si.selectors[o].elements.length?Array.prototype.push.apply(r,i.find(new e.Selector(t.elements.slice(1)),n)):r.push(i);break}}),this._lookups[o]=r)},toCSS:function(t,n){var r=[],i=[],s=[],o=[],u=[],a,f,l;this.root||this.joinSelectors(u,t,this.selectors);for(var c=0;c0){f=e.debugInfo(n,this),a=u.map(function(e){return e.map(function(e){return e.toCSS(n)}).join("").trim()}).join(n.compress?",":",\n");for(var c=i.length-1;c>=0;c--)s.indexOf(i[c])===-1&&s.unshift(i[c]);i=s,r.push(f+a+(n.compress?"{":" {\n ")+i.join(n.compress?"":"\n ")+(n.compress?"}":"\n}\n"))}return r.push(o),r.join("")+(n.compress?"\n":"")},joinSelectors:function(e,t,n){for(var r=0;r0)for(i=0;i0&&this.mergeElementsOnToSelectors(g,a);for(s=0;s0&&(l[0].elements=l[0].elements.slice(0),l[0].elements.push(new e.Element(f.combinator,"",0))),y.push(l);else for(o=0;o0?(h=l.slice(0),m=h.pop(),d=new e.Selector(m.elements.slice(0)),v=!1):d=new e.Selector([]),c.length>1&&(p=p.concat(c.slice(1))),c.length>0&&(v=!1,d.elements.push(new e.Element(f.combinator,c[0].elements[0].value,0)),d.elements=d.elements.concat(c[0].elements.slice(1))),v||h.push(d),h=h.concat(p),y.push(h)}a=y,g=[]}}g.length>0&&this.mergeElementsOnToSelectors(g,a);for(i=0;i0?i[i.length-1]=new e.Selector(i[i.length-1].elements.concat(t)):i.push(new e.Selector(t))}}}(n("../tree")),function(e){e.Selector=function(e){this.elements=e},e.Selector.prototype.match=function(e){var t=this.elements,n=t.length,r,i,s,o;r=e.elements.slice(e.elements.length&&e.elements[0].value==="&"?1:0),i=r.length,s=Math.min(n,i);if(i===0||n1?"["+e.value.map(function(e){return e.toCSS(!1)}).join(", ")+"]":e.toCSS(!1)}}(n("./tree"));var o=/^(file|chrome(-extension)?|resource|qrc|app):/.test(location.protocol);r.env=r.env||(location.hostname=="127.0.0.1"||location.hostname=="0.0.0.0"||location.hostname=="localhost"||location.port.length>0||o?"development":"production"),r.async=r.async||!1,r.fileAsync=r.fileAsync||!1,r.poll=r.poll||(o?1e3:1500);if(r.functions)for(var u in r.functions)r.tree.functions[u]=r.functions[u];var a=/!dumpLineNumbers:(comments|mediaquery|all)/.exec(location.hash);a&&(r.dumpLineNumbers=a[1]),r.watch=function(){return r.watchMode||(r.env="development",f()),this.watchMode=!0},r.unwatch=function(){return clearInterval(r.watchTimer),this.watchMode=!1},/!watch/.test(location.hash)&&r.watch();var l=null;if(r.env!="development")try{l=typeof e.localStorage=="undefined"?null:e.localStorage}catch(c){}var h=document.getElementsByTagName("link"),p=/^text\/(x-)?less$/;r.sheets=[];for(var d=0;d
- @client = new DropboxClient options
-
- # NOTE: this is not yet implemented.
diff --git a/lib/client/storage/dropbox/src/api_error.coffee b/lib/client/storage/dropbox/src/api_error.coffee
deleted file mode 100644
index 26217b6d..00000000
--- a/lib/client/storage/dropbox/src/api_error.coffee
+++ /dev/null
@@ -1,59 +0,0 @@
-# Information about a failed call to the Dropbox API.
-class Dropbox.ApiError
- # @property {Number} the HTTP error code (e.g., 403)
- status: undefined
-
- # @property {String} the HTTP method of the failed request (e.g., 'GET')
- method: undefined
-
- # @property {String} the URL of the failed request
- url: undefined
-
- # @property {?String} the body of the HTTP error response; can be null if
- # the error was caused by a network failure or by a security issue
- responseText: undefined
-
- # @property {?Object} the result of parsing the JSON in the HTTP error
- # response; can be null if the API server didn't return JSON, or if the
- # HTTP response body is unavailable
- response: undefined
-
- # Wraps a failed XHR call to the Dropbox API.
- #
- # @param {String} method the HTTP verb of the API request (e.g., 'GET')
- # @param {String} url the URL of the API request
- # @param {XMLHttpRequest} xhr the XMLHttpRequest instance of the failed
- # request
- constructor: (xhr, @method, @url) ->
- @status = xhr.status
- if xhr.responseType
- try
- text = xhr.response or xhr.responseText
- catch e
- try
- text = xhr.responseText
- catch e
- text = null
- else
- try
- text = xhr.responseText
- catch e
- text = null
-
- if text
- try
- @responseText = text.toString()
- @response = JSON.parse text
- catch e
- @response = null
- else
- @responseText = '(no response)'
- @response = null
-
- # Used when the error is printed out by developers.
- toString: ->
- "Dropbox API error #{@status} from #{@method} #{@url} :: #{@responseText}"
-
- # Used by some testing frameworks.
- inspect: ->
- @toString()
diff --git a/lib/client/storage/dropbox/src/base64.coffee b/lib/client/storage/dropbox/src/base64.coffee
deleted file mode 100644
index fa165d3a..00000000
--- a/lib/client/storage/dropbox/src/base64.coffee
+++ /dev/null
@@ -1,72 +0,0 @@
-# node.js implementation of atob and btoa
-
-if window?
- if window.atob and window.btoa
- atob = (string) -> window.atob string
- btoa = (base64) -> window.btoa base64
- else
- # IE < 10 doesn't implement the standard atob / btoa functions.
- base64Digits =
- 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
-
- btoaNibble = (accumulator, bytes, result) ->
- limit = 3 - bytes
- accumulator <<= limit * 8
- i = 3
- while i >= limit
- result.push base64Digits.charAt((accumulator >> (i * 6)) & 0x3F)
- i -= 1
- i = bytes
- while i < 3
- result.push '='
- i += 1
- null
- atobNibble = (accumulator, digits, result) ->
- limit = 4 - digits
- accumulator <<= limit * 6
- i = 2
- while i >= limit
- result.push String.fromCharCode((accumulator >> (8 * i)) & 0xFF)
- i -= 1
- null
-
- btoa = (string) ->
- result = []
- accumulator = 0
- bytes = 0
- for i in [0...string.length]
- accumulator = (accumulator << 8) | string.charCodeAt(i)
- bytes += 1
- if bytes is 3
- btoaNibble accumulator, bytes, result
- accumulator = bytes = 0
-
- if bytes > 0
- btoaNibble accumulator, bytes, result
- result.join ''
-
- atob = (base64) ->
- result = []
- accumulator = 0
- digits = 0
- for i in [0...base64.length]
- digit = base64.charAt i
- break if digit is '='
- accumulator = (accumulator << 6) | base64Digits.indexOf(digit)
- digits += 1
- if digits is 4
- atobNibble accumulator, digits, result
- accumulator = digits = 0
-
- if digits > 0
- atobNibble accumulator, digits, result
- result.join ''
-
-else
- # NOTE: the npm packages atob and btoa don't do base64-encoding correctly.
- atob = (arg) ->
- buffer = new Buffer arg, 'base64'
- (String.fromCharCode(buffer[i]) for i in [0...buffer.length]).join ''
- btoa = (arg) ->
- buffer = new Buffer(arg.charCodeAt(i) for i in [0...arg.length])
- buffer.toString 'base64'
diff --git a/lib/client/storage/dropbox/src/client.coffee b/lib/client/storage/dropbox/src/client.coffee
deleted file mode 100644
index abbd3810..00000000
--- a/lib/client/storage/dropbox/src/client.coffee
+++ /dev/null
@@ -1,1270 +0,0 @@
-# Represents a user accessing the application.
-class Dropbox.Client
- # Dropbox client representing an application.
- #
- # For an optimal user experience, applications should use a single client for
- # all Dropbox interactions.
- #
- # @param {Object} options the application type and API key
- # @option options {Boolean} sandbox true for applications that request
- # sandbox access (access to a single folder exclusive to the app)
- # @option options {String} key the Dropbox application's key; browser-side
- # applications should use Dropbox.encodeKey to obtain an encoded
- # key string, and pass it as the key option
- # @option options {String} secret the Dropbox application's secret;
- # browser-side applications should not use the secret option; instead,
- # they should pass the result of Dropbox.encodeKey as the key option
- # @option options {String} token if set, the user's access token
- # @option options {String} tokenSecret if set, the secret for the user's
- # access token
- # @option options {String} uid if set, the user's Dropbox UID
- # @option options {Number} authState if set, indicates that the token and
- # tokenSecret are in an intermediate state in the authentication process;
- # this option should never be set by hand, however it may be returned by
- # calls to credentials()
- constructor: (options) ->
- @sandbox = options.sandbox or false
- @apiServer = options.server or @defaultApiServer()
- @authServer = options.authServer or @defaultAuthServer()
- @fileServer = options.fileServer or @defaultFileServer()
- @downloadServer = options.downloadServer or @defaultDownloadServer()
-
- @onXhr = new Dropbox.EventSource cancelable: true
- @onError = new Dropbox.EventSource
- @onAuthStateChange = new Dropbox.EventSource
-
- @oauth = new Dropbox.Oauth options
- @driver = null
- @filter = null
- @uid = null
- @authState = null
- @authError = null
- @_credentials = null
- @setCredentials options
-
- @setupUrls()
-
- # Plugs in the OAuth / application integration code.
- #
- # @param {DropboxAuthDriver} driver provides the integration between the
- # application and the Dropbox OAuth flow; most applications should be
- # able to use instances of Dropbox.Driver.Redirect, Dropbox.Driver.Popup,
- # or Dropbox.Driver.NodeServer
- # @return {Dropbox.Client} this, for easy call chaining
- authDriver: (driver) ->
- @driver = driver
- @
-
- # @property {Dropbox.EventSource} cancelable event fired every
- # time when a network request to the Dropbox API server is about to be
- # sent; if the event is canceled by returning a falsey value from a
- # listener, the network request is silently discarded; whenever possible,
- # listeners should restrict themselves to using the xhr property of the
- # Dropbox.Xhr instance passed to them; everything else in the Dropbox.Xhr
- # API is in flux
- onXhr: null
-
- # @property {Dropbox.EventSource} non-cancelable event
- # fired every time when a network request to the Dropbox API server results
- # in an error
- onError: null
-
- # @property {Dropbox.EventSource} non-cancelable event fired
- # every time the authState property changes; this can be used to update UI
- # state
- onAuthStateChange: null
-
- # The authenticated user's Dropbx user ID.
- #
- # This user ID is guaranteed to be consistent across API calls from the same
- # application (not across applications, though).
- #
- # @return {?String} a short ID that identifies the user, or null if no user
- # is authenticated
- dropboxUid: ->
- @uid
-
- # Get the client's OAuth credentials.
- #
- # @param {?Object} the result of a prior call to credentials()
- # @return {Object} a plain object whose properties can be passed to the
- # Dropbox.Client constructor to reuse this client's login credentials
- credentials: () ->
- @computeCredentials() unless @_credentials
- @_credentials
-
- # Authenticates the app's user to Dropbox' API server.
- #
- # @param {function(?Dropbox.ApiError, ?Dropbox.Client)} callback called when
- # the authentication completes; if successful, the second parameter is
- # this client and the first parameter is null
- # @return {Dropbox.Client} this, for easy call chaining
- authenticate: (callback) ->
- oldAuthState = null
-
- unless @driver or @authState is DropboxClient.DONE
- throw new Error "Call authDriver to set an authentication driver"
-
- # Advances the authentication FSM by one step.
- _fsmStep = =>
- if oldAuthState isnt @authState
- if oldAuthState isnt null
- @onAuthStateChange.dispatch @
- oldAuthState = @authState
- if @driver and @driver.onAuthStateChange
- return @driver.onAuthStateChange(@, _fsmStep)
-
- switch @authState
- when DropboxClient.RESET # No user credentials -> request token.
- @requestToken (error, data) =>
- if error
- @authError = error
- @authState = DropboxClient.ERROR
- else
- token = data.oauth_token
- tokenSecret = data.oauth_token_secret
- @oauth.setToken token, tokenSecret
- @authState = DropboxClient.REQUEST
- @_credentials = null
- _fsmStep()
-
- when DropboxClient.REQUEST # Have request token, get it authorized.
- authUrl = @authorizeUrl @oauth.token
- @driver.doAuthorize authUrl, @oauth.token, @oauth.tokenSecret, =>
- @authState = DropboxClient.AUTHORIZED
- @_credentials = null
- _fsmStep()
-
- when DropboxClient.AUTHORIZED
- # Request token authorized, switch it for an access token.
- @getAccessToken (error, data) =>
- if error
- @authError = error
- @authState = DropboxClient.ERROR
- else
- @oauth.setToken data.oauth_token, data.oauth_token_secret
- @uid = data.uid
- @authState = DropboxClient.DONE
- @_credentials = null
- _fsmStep()
-
- when DropboxClient.DONE # We have an access token.
- callback null, @
-
- when DropboxClient.SIGNED_OFF # The user signed off, restart the flow.
- # The authState change makes reset() not trigger onAuthStateChange.
- @authState = DropboxClient.RESET
- @reset()
- _fsmStep()
-
- when DropboxClient.ERROR # An error occurred during authentication.
- callback @authError
-
- _fsmStep() # Start up the state machine.
- @
-
- # @return {Boolean} true if this client is authenticated, false otherwise
- isAuthenticated: ->
- @authState is DropboxClient.DONE
-
- # Revokes the user's Dropbox credentials.
- #
- # This should be called when the user explictly signs off from your
- # application, to meet the users' expectation that after they sign off, their
- # access tokens will be persisted on the machine.
- #
- # @param {function(?Dropbox.ApiError)} callback called when
- # the authentication completes; if successful, the error parameter is
- # null
- # @return {XMLHttpRequest} the XHR object used for this API call
- signOut: (callback) ->
- xhr = new Dropbox.Xhr 'POST', @urls.signOut
- xhr.signWithOauth @oauth
- @dispatchXhr xhr, (error) =>
- return callback(error) if error
-
- # The authState change makes reset() not trigger onAuthStateChange.
- @authState = DropboxClient.RESET
- @reset()
- @authState = DropboxClient.SIGNED_OFF
- @onAuthStateChange.dispatch @
- if @driver.onAuthStateChange
- @driver.onAuthStateChange @, ->
- callback error
- else
- callback error
-
- # Alias for signOut.
- signOff: (callback) ->
- @signOut callback
-
- # Retrieves information about the logged in user.
- #
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {Boolean} httpCache if true, the API request will be set to
- # allow HTTP caching to work; by default, requests are set up to avoid
- # CORS preflights; setting this option can make sense when making the same
- # request repeatedly (polling?)
- # @param {function(?Dropbox.ApiError, ?Dropbox.UserInfo, ?Object)} callback
- # called with the result of the /account/info HTTP request; if the call
- # succeeds, the second parameter is a Dropbox.UserInfo instance, the
- # third parameter is the parsed JSON data behind the Dropbox.UserInfo
- # instance, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- getUserInfo: (options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- httpCache = false
- if options and options.httpCache
- httpCache = true
-
- xhr = new Dropbox.Xhr 'GET', @urls.accountInfo
- xhr.signWithOauth @oauth, httpCache
- @dispatchXhr xhr, (error, userData) ->
- callback error, Dropbox.UserInfo.parse(userData), userData
-
- # Retrieves the contents of a file stored in Dropbox.
- #
- # Some options are silently ignored in Internet Explorer 9 and below, due to
- # insufficient support in its proprietary XDomainRequest replacement for XHR.
- # Currently, the options are: arrayBuffer, blob, length, start.
- #
- # @param {String} path the path of the file to be read, relative to the
- # user's Dropbox or to the application's folder
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {String} versionTag the tag string for the desired version
- # of the file contents; the most recent version is retrieved by default
- # @option options {String} rev alias for "versionTag" that matches the HTTP
- # API
- # @option options {Boolean} arrayBuffer if true, the file's contents will be
- # passed to the callback in an ArrayBuffer; this is the recommended method
- # of reading non-UTF8 data such as images, as it is well supported across
- # modern browsers; requires XHR Level 2 support, which is not available in
- # IE <= 9
- # @option options {Boolean} blob if true, the file's contents will be
- # passed to the callback in a Blob; this is a good method of reading
- # non-UTF8 data, such as images; requires XHR Level 2 support, which is not
- # available in IE <= 9
- # @option options {Boolean} binary if true, the file will be retrieved as a
- # binary string; the default is an UTF-8 encoded string; this relies on
- # hacks and should not be used if the environment supports XHR Level 2 API
- # @option options {Number} length the number of bytes to be retrieved from
- # the file; if the start option is not present, the last "length" bytes
- # will be read (after issue #30 is closed); by default, the entire file is
- # read
- # @option options {Number} start the 0-based offset of the first byte to be
- # retrieved; if the length option is not present, the bytes between
- # "start" and the file's end will be read; by default, the entire
- # file is read
- # @option options {Boolean} httpCache if true, the API request will be set to
- # allow HTTP caching to work; by default, requests are set up to avoid
- # CORS preflights; setting this option can make sense when making the same
- # request repeatedly (polling?)
- # @param {function(?Dropbox.ApiError, ?String, ?Dropbox.Stat)} callback
- # called with the result of the /files (GET) HTTP request; the second
- # parameter is the contents of the file, the third parameter is a
- # Dropbox.Stat instance describing the file, and the first parameter is
- # null
- # @return {XMLHttpRequest} the XHR object used for this API call
- readFile: (path, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- params = {}
- responseType = null
- rangeHeader = null
- httpCache = false
- if options
- if options.versionTag
- params.rev = options.versionTag
- else if options.rev
- params.rev = options.rev
-
- if options.arrayBuffer
- responseType = 'arraybuffer'
- else if options.blob
- responseType = 'blob'
- else if options.binary
- responseType = 'b' # See the Dropbox.Xhr.request2 docs
-
- if options.length
- if options.start?
- rangeStart = options.start
- rangeEnd = options.start + options.length - 1
- else
- rangeStart = ''
- rangeEnd = options.length
- rangeHeader = "bytes=#{rangeStart}-#{rangeEnd}"
- else if options.start?
- rangeHeader = "bytes=#{options.start}-"
-
- httpCache = true if options.httpCache
-
- xhr = new Dropbox.Xhr 'GET', "#{@urls.getFile}/#{@urlEncodePath(path)}"
- xhr.setParams(params).signWithOauth(@oauth, httpCache)
- xhr.setResponseType(responseType)
- xhr.setHeader 'Range', rangeHeader if rangeHeader
- @dispatchXhr xhr, (error, data, metadata) ->
- callback error, data, Dropbox.Stat.parse(metadata)
-
- # Store a file into a user's Dropbox.
- #
- # @param {String} path the path of the file to be created, relative to the
- # user's Dropbox or to the application's folder
- # @param {String, ArrayBuffer, ArrayBufferView, Blob, File} data the contents
- # written to the file; if a File is passed, its name is ignored
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {String} lastVersionTag the identifier string for the
- # version of the file's contents that was last read by this program, used
- # for conflict resolution; for best results, use the versionTag attribute
- # value from the Dropbox.Stat instance provided by readFile
- # @option options {String} parentRev alias for "lastVersionTag" that matches
- # the HTTP API
- # @option options {Boolean} noOverwrite if set, the write will not overwrite
- # a file with the same name that already exsits; instead the contents
- # will be written to a similarly named file (e.g. "notes (1).txt"
- # instead of "notes.txt")
- # @param {function(?Dropbox.ApiError, ?Dropbox.Stat)} callback called with
- # the result of the /files (POST) HTTP request; the second paramter is a
- # Dropbox.Stat instance describing the newly created file, and the first
- # parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- writeFile: (path, data, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- useForm = Dropbox.Xhr.canSendForms and typeof data is 'object'
- if useForm
- @writeFileUsingForm path, data, options, callback
- else
- @writeFileUsingPut path, data, options, callback
-
- # writeFile implementation that uses the POST /files API.
- #
- # @private
- # This method is more demanding in terms of CPU and browser support, but does
- # not require CORS preflight, so it always completes in 1 HTTP request.
- writeFileUsingForm: (path, data, options, callback) ->
- # Break down the path into a file/folder name and the containing folder.
- slashIndex = path.lastIndexOf '/'
- if slashIndex is -1
- fileName = path
- path = ''
- else
- fileName = path.substring slashIndex
- path = path.substring 0, slashIndex
-
- params = { file: fileName }
- if options
- if options.noOverwrite
- params.overwrite = 'false'
- if options.lastVersionTag
- params.parent_rev = options.lastVersionTag
- else if options.parentRev or options.parent_rev
- params.parent_rev = options.parentRev or options.parent_rev
- # TODO: locale support would edit the params here
-
- xhr = new Dropbox.Xhr 'POST', "#{@urls.postFile}/#{@urlEncodePath(path)}"
- xhr.setParams(params).signWithOauth(@oauth).setFileField('file', fileName,
- data, 'application/octet-stream')
-
- # NOTE: the Dropbox API docs ask us to replace the 'file' parameter after
- # signing the request; the hack below works as intended
- delete params.file
-
- @dispatchXhr xhr, (error, metadata) ->
- callback error, Dropbox.Stat.parse(metadata)
-
- # writeFile implementation that uses the /files_put API.
- #
- # @private
- # This method is less demanding on CPU, and makes fewer assumptions about
- # browser support, but it takes 2 HTTP requests for binary files, because it
- # needs CORS preflight.
- writeFileUsingPut: (path, data, options, callback) ->
- params = {}
- if options
- if options.noOverwrite
- params.overwrite = 'false'
- if options.lastVersionTag
- params.parent_rev = options.lastVersionTag
- else if options.parentRev or options.parent_rev
- params.parent_rev = options.parentRev or options.parent_rev
- # TODO: locale support would edit the params here
- xhr = new Dropbox.Xhr 'POST', "#{@urls.putFile}/#{@urlEncodePath(path)}"
- xhr.setBody(data).setParams(params).signWithOauth(@oauth)
- @dispatchXhr xhr, (error, metadata) ->
- callback error, Dropbox.Stat.parse(metadata)
-
- # Atomic step in a resumable file upload.
- #
- # @param {String, ArrayBuffer, ArrayBufferView, Blob, File} data the file
- # contents fragment to be uploaded; if a File is passed, its name is
- # ignored
- # @param {?Dropbox.UploadCursor} cursor the cursor that tracks the state of
- # the resumable file upload; the cursor information will not be updated
- # when the API call completes
- # @param {function(?Dropbox.ApiError, ?Dropbox.UploadCursor)} callback called
- # with the result of the /chunked_upload HTTP request; the second paramter
- # is a Dropbox.UploadCursor instance describing the progress of the upload
- # operation, and the first parameter is null if things go well
- # @return {XMLHttpRequest} the XHR object used for this API call
- resumableUploadStep: (data, cursor, callback) ->
- if cursor
- params = { offset: cursor.offset }
- params.upload_id = cursor.tag if cursor.tag
- else
- params = { offset: 0 }
-
- xhr = new Dropbox.Xhr 'POST', @urls.chunkedUpload
- xhr.setBody(data).setParams(params).signWithOauth(@oauth)
- @dispatchXhr xhr, (error, cursor) ->
- if error and error.status is 400 and
- error.response.upload_id and error.response.offset
- callback null, Dropbox.UploadCursor.parse(error.response)
- else
- callback error, Dropbox.UploadCursor.parse(cursor)
-
- # Finishes a resumable file upload.
- #
- # @param {String} path the path of the file to be created, relative to the
- # user's Dropbox or to the application's folder
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {String} lastVersionTag the identifier string for the
- # version of the file's contents that was last read by this program, used
- # for conflict resolution; for best results, use the versionTag attribute
- # value from the Dropbox.Stat instance provided by readFile
- # @option options {String} parentRev alias for "lastVersionTag" that matches
- # the HTTP API
- # @option options {Boolean} noOverwrite if set, the write will not overwrite
- # a file with the same name that already exsits; instead the contents
- # will be written to a similarly named file (e.g. "notes (1).txt"
- # instead of "notes.txt")
- # @param {function(?Dropbox.ApiError, ?Dropbox.Stat)} callback called with
- # the result of the /files (POST) HTTP request; the second paramter is a
- # Dropbox.Stat instance describing the newly created file, and the first
- # parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- resumableUploadFinish: (path, cursor, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- params = { upload_id: cursor.tag }
-
- if options
- if options.lastVersionTag
- params.parent_rev = options.lastVersionTag
- else if options.parentRev or options.parent_rev
- params.parent_rev = options.parentRev or options.parent_rev
- if options.noOverwrite
- params.autorename = true
-
- # TODO: locale support would edit the params here
- xhr = new Dropbox.Xhr 'POST',
- "#{@urls.commitChunkedUpload}/#{@urlEncodePath(path)}"
- xhr.setParams(params).signWithOauth(@oauth)
- @dispatchXhr xhr, (error, metadata) ->
- callback error, Dropbox.Stat.parse(metadata)
-
- # Reads the metadata of a file or folder in a user's Dropbox.
- #
- # @param {String} path the path to the file or folder whose metadata will be
- # read, relative to the user's Dropbox or to the application's folder
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {Number} version if set, the call will return the metadata
- # for the given revision of the file / folder; the latest version is used
- # by default
- # @option options {Boolean} removed if set to true, the results will include
- # files and folders that were deleted from the user's Dropbox
- # @option options {Boolean} deleted alias for "removed" that matches the HTTP
- # API; using this alias is not recommended, because it may cause confusion
- # with JavaScript's delete operation
- # @option options {Boolean, Number} readDir only meaningful when stat-ing
- # folders; if this is set, the API call will also retrieve the folder's
- # contents, which is passed into the callback's third parameter; if this
- # is a number, it specifies the maximum number of files and folders that
- # should be returned; the default limit is 10,000 items; if the limit is
- # exceeded, the call will fail with an error
- # @option options {String} versionTag used for saving bandwidth when getting
- # a folder's contents; if this value is specified and it matches the
- # folder's contents, the call will fail with a 304 (Contents not changed)
- # error code; a folder's version identifier can be obtained from the
- # versionTag attribute of a Dropbox.Stat instance describing it
- # @option options {Boolean} httpCache if true, the API request will be set to
- # allow HTTP caching to work; by default, requests are set up to avoid
- # CORS preflights; setting this option can make sense when making the same
- # request repeatedly (polling?)
- # @param {function(?Dropbox.ApiError, ?Dropbox.Stat, ?Array)}
- # callback called with the result of the /metadata HTTP request; if the
- # call succeeds, the second parameter is a Dropbox.Stat instance
- # describing the file / folder, and the first parameter is null;
- # if the readDir option is true and the call succeeds, the third
- # parameter is an array of Dropbox.Stat instances describing the folder's
- # entries
- # @return {XMLHttpRequest} the XHR object used for this API call
- stat: (path, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- params = {}
- httpCache = false
- if options
- if options.version?
- params.rev = options.version
- if options.removed or options.deleted
- params.include_deleted = 'true'
- if options.readDir
- params.list = 'true'
- if options.readDir isnt true
- params.file_limit = options.readDir.toString()
- if options.cacheHash
- params.hash = options.cacheHash
- if options.httpCache
- httpCache = true
- params.include_deleted ||= 'false'
- params.list ||= 'false'
- # TODO: locale support would edit the params here
- xhr = new Dropbox.Xhr 'GET', "#{@urls.metadata}/#{@urlEncodePath(path)}"
- xhr.setParams(params).signWithOauth @oauth, httpCache
- @dispatchXhr xhr, (error, metadata) ->
- stat = Dropbox.Stat.parse metadata
- if metadata?.contents
- entries = (Dropbox.Stat.parse(entry) for entry in metadata.contents)
- else
- entries = undefined
- callback error, stat, entries
-
- # Lists the files and folders inside a folder in a user's Dropbox.
- #
- # @param {String} path the path to the folder whose contents will be
- # retrieved, relative to the user's Dropbox or to the application's
- # folder
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {Boolean} removed if set to true, the results will include
- # files and folders that were deleted from the user's Dropbox
- # @option options {Boolean} deleted alias for "removed" that matches the HTTP
- # API; using this alias is not recommended, because it may cause confusion
- # with JavaScript's delete operation
- # @option options {Boolean, Number} limit the maximum number of files and
- # folders that should be returned; the default limit is 10,000 items; if
- # the limit is exceeded, the call will fail with an error
- # @option options {String} versionTag used for saving bandwidth; if this
- # option is specified, and its value matches the folder's version tag,
- # the call will fail with a 304 (Contents not changed) error code
- # instead of returning the contents; a folder's version identifier can be
- # obtained from the versionTag attribute of a Dropbox.Stat instance
- # describing it
- # @option options {Boolean} httpCache if true, the API request will be set to
- # allow HTTP caching to work; by default, requests are set up to avoid
- # CORS preflights; setting this option can make sense when making the same
- # request repeatedly (polling?)
- # @param {function(?Dropbox.ApiError, ?Array, ?Dropbox.Stat,
- # ?Array)} callback called with the result of the /metadata
- # HTTP request; if the call succeeds, the second parameter is an array
- # containing the names of the files and folders in the given folder, the
- # third parameter is a Dropbox.Stat instance describing the folder, the
- # fourth parameter is an array of Dropbox.Stat instances describing the
- # folder's entries, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- readdir: (path, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- statOptions = { readDir: true }
- if options
- if options.limit?
- statOptions.readDir = options.limit
- if options.versionTag
- statOptions.versionTag = options.versionTag
- if options.removed or options.deleted
- statOptions.removed = options.removed or options.deleted
- if options.httpCache
- statOptions.httpCache = options.httpCache
- @stat path, statOptions, (error, stat, entry_stats) ->
- if entry_stats
- entries = (entry_stat.name for entry_stat in entry_stats)
- else
- entries = null
- callback error, entries, stat, entry_stats
-
- # Alias for "stat" that matches the HTTP API.
- metadata: (path, options, callback) ->
- @stat path, options, callback
-
- # Creates a publicly readable URL to a file or folder in the user's Dropbox.
- #
- # @param {String} path the path to the file or folder that will be linked to;
- # the path is relative to the user's Dropbox or to the application's
- # folder
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {Boolean} download if set, the URL will be a direct
- # download URL, instead of the usual Dropbox preview URLs; direct
- # download URLs are short-lived (currently 4 hours), whereas regular URLs
- # virtually have no expiration date (currently set to 2030); no direct
- # download URLs can be generated for directories
- # @option options {Boolean} downloadHack if set, a long-living download URL
- # will be generated by asking for a preview URL and using the officially
- # documented hack at https://www.dropbox.com/help/201 to turn the preview
- # URL into a download URL
- # @option options {Boolean} long if set, the URL will not be shortened using
- # Dropbox's shortner; the download and downloadHack options imply long
- # @option options {Boolean} longUrl synonym for long; makes life easy for
- # RhinoJS users
- # @param {function(?Dropbox.ApiError, ?Dropbox.PublicUrl)} callback called
- # with the result of the /shares or /media HTTP request; if the call
- # succeeds, the second parameter is a Dropbox.PublicUrl instance, and the
- # first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- makeUrl: (path, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- # NOTE: cannot use options.long; normally, the CoffeeScript compiler
- # escapes keywords for us; although long isn't really a keyword, the
- # Rhino VM thinks it is; this hack can be removed when the bug below
- # is fixed:
- # https://github.com/mozilla/rhino/issues/93
- if options and (options['long'] or options.longUrl or options.downloadHack)
- params = { short_url: 'false' }
- else
- params = {}
-
- path = @urlEncodePath path
- url = "#{@urls.shares}/#{path}"
- isDirect = false
- useDownloadHack = false
- if options
- if options.downloadHack
- isDirect = true
- useDownloadHack = true
- else if options.download
- isDirect = true
- url = "#{@urls.media}/#{path}"
-
- # TODO: locale support would edit the params here
- xhr = new Dropbox.Xhr('POST', url).setParams(params).signWithOauth(@oauth)
- @dispatchXhr xhr, (error, urlData) ->
- if useDownloadHack and urlData and urlData.url
- urlData.url = urlData.url.replace(@authServer, @downloadServer)
- callback error, Dropbox.PublicUrl.parse(urlData, isDirect)
-
- # Retrieves the revision history of a file in a user's Dropbox.
- #
- # @param {String} path the path to the file whose revision history will be
- # retrieved, relative to the user's Dropbox or to the application's
- # folder
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {Number} limit if specified, the call will return at most
- # this many versions
- # @option options {Boolean} httpCache if true, the API request will be set to
- # allow HTTP caching to work; by default, requests are set up to avoid
- # CORS preflights; setting this option can make sense when making the same
- # request repeatedly (polling?)
- # @param {function(?Dropbox.ApiError, ?Array)} callback called
- # with the result of the /revisions HTTP request; if the call succeeds,
- # the second parameter is an array with one Dropbox.Stat instance per
- # file version, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- history: (path, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- params = {}
- httpCache = false
- if options
- if options.limit?
- params.rev_limit = options.limit
- if options.httpCache
- httpCache = true
-
- xhr = new Dropbox.Xhr 'GET', "#{@urls.revisions}/#{@urlEncodePath(path)}"
- xhr.setParams(params).signWithOauth @oauth, httpCache
- @dispatchXhr xhr, (error, versions) ->
- if versions
- stats = (Dropbox.Stat.parse(metadata) for metadata in versions)
- else
- stats = undefined
- callback error, stats
-
- # Alias for "history" that matches the HTTP API.
- revisions: (path, options, callback) ->
- @history path, options, callback
-
- # Computes a URL that generates a thumbnail for a file in the user's Dropbox.
- #
- # @param {String} path the path to the file whose thumbnail image URL will be
- # computed, relative to the user's Dropbox or to the application's
- # folder
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {Boolean} png if true, the thumbnail's image will be a PNG
- # file; the default thumbnail format is JPEG
- # @option options {String} format value that gets passed directly to the API;
- # this is intended for newly added formats that the API may not support;
- # use options such as "png" when applicable
- # @option options {String} sizeCode specifies the image's dimensions; this
- # gets passed directly to the API; currently, the following values are
- # supported: 'small' (32x32), 'medium' (64x64), 'large' (128x128),
- # 's' (64x64), 'm' (128x128), 'l' (640x480), 'xl' (1024x768); the default
- # value is "small"
- # @return {String} a URL to an image that can be used as the thumbnail for
- # the given file
- thumbnailUrl: (path, options) ->
- xhr = @thumbnailXhr path, options
- xhr.paramsToUrl().url
-
- # Retrieves the image data of a thumbnail for a file in the user's Dropbox.
- #
- # This method is intended to be used with low-level painting APIs. Whenever
- # possible, it is easier to place the result of thumbnailUrl in a DOM
- # element, and rely on the browser to fetch the file.
- #
- # @param {String} path the path to the file whose thumbnail image URL will be
- # computed, relative to the user's Dropbox or to the application's
- # folder
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {Boolean} png if true, the thumbnail's image will be a PNG
- # file; the default thumbnail format is JPEG
- # @option options {String} format value that gets passed directly to the API;
- # this is intended for newly added formats that the API may not support;
- # use options such as "png" when applicable
- # @option options {String} sizeCode specifies the image's dimensions; this
- # gets passed directly to the API; currently, the following values are
- # supported: 'small' (32x32), 'medium' (64x64), 'large' (128x128),
- # 's' (64x64), 'm' (128x128), 'l' (640x480), 'xl' (1024x768); the default
- # value is "small"
- # @option options {Boolean} blob if true, the file will be retrieved as a
- # Blob, instead of a String; this requires XHR Level 2 support, which is
- # not available in IE <= 9
- # @param {function(?Dropbox.ApiError, ?Object, ?Dropbox.Stat)} callback
- # called with the result of the /thumbnails HTTP request; if the call
- # succeeds, the second parameter is the image data as a String or Blob,
- # the third parameter is a Dropbox.Stat instance describing the
- # thumbnailed file, and the first argument is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- readThumbnail: (path, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- responseType = 'b'
- if options
- responseType = 'blob' if options.blob
-
- xhr = @thumbnailXhr path, options
- xhr.setResponseType responseType
- @dispatchXhr xhr, (error, data, metadata) ->
- callback error, data, Dropbox.Stat.parse(metadata)
-
- # Sets up an XHR for reading a thumbnail for a file in the user's Dropbox.
- #
- # @see Dropbox.Client#thumbnailUrl
- # @return {Dropbox.Xhr} an XHR request configured for fetching the thumbnail
- thumbnailXhr: (path, options) ->
- params = {}
- if options
- if options.format
- params.format = options.format
- else if options.png
- params.format = 'png'
- if options.size
- # Can we do something nicer here?
- params.size = options.size
-
- xhr = new Dropbox.Xhr 'GET', "#{@urls.thumbnails}/#{@urlEncodePath(path)}"
- xhr.setParams(params).signWithOauth(@oauth)
-
- # Reverts a file's contents to a previous version.
- #
- # This is an atomic, bandwidth-optimized equivalent of reading the file
- # contents at the given file version (readFile), and then using it to
- # overwrite the file (writeFile).
- #
- # @param {String} path the path to the file whose contents will be reverted
- # to a previous version, relative to the user's Dropbox or to the
- # application's folder
- # @param {String} versionTag the tag of the version that the file will be
- # reverted to; maps to the "rev" parameter in the HTTP API
- # @param {function(?Dropbox.ApiError, ?Dropbox.Stat)} callback called with
- # the result of the /restore HTTP request; if the call succeeds, the
- # second parameter is a Dropbox.Stat instance describing the file after
- # the revert operation, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- revertFile: (path, versionTag, callback) ->
- xhr = new Dropbox.Xhr 'POST', "#{@urls.restore}/#{@urlEncodePath(path)}"
- xhr.setParams(rev: versionTag).signWithOauth @oauth
- @dispatchXhr xhr, (error, metadata) ->
- callback error, Dropbox.Stat.parse(metadata)
-
- # Alias for "revertFile" that matches the HTTP API.
- restore: (path, versionTag, callback) ->
- @revertFile path, versionTag, callback
-
- # Finds files / folders whose name match a pattern, in the user's Dropbox.
- #
- # @param {String} path the path to the file whose contents will be reverted
- # to a previous version, relative to the user's Dropbox or to the
- # application's folder
- # @param {String} namePattern the string that file / folder names must
- # contain in order to match the search criteria;
- # @param {?Object} options the advanced settings below; for the default
- # settings, skip the argument or pass null
- # @option options {Number} limit if specified, the call will return at most
- # this many versions
- # @option options {Boolean} removed if set to true, the results will include
- # files and folders that were deleted from the user's Dropbox; the default
- # limit is the maximum value of 1,000
- # @option options {Boolean} deleted alias for "removed" that matches the HTTP
- # API; using this alias is not recommended, because it may cause confusion
- # with JavaScript's delete operation
- # @option options {Boolean} httpCache if true, the API request will be set to
- # allow HTTP caching to work; by default, requests are set up to avoid
- # CORS preflights; setting this option can make sense when making the same
- # request repeatedly (polling?)
- # @param {function(?Dropbox.ApiError, ?Array)} callback called
- # with the result of the /search HTTP request; if the call succeeds, the
- # second parameter is an array with one Dropbox.Stat instance per search
- # result, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- findByName: (path, namePattern, options, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- params = { query: namePattern }
- httpCache = false
- if options
- if options.limit?
- params.file_limit = options.limit
- if options.removed or options.deleted
- params.include_deleted = true
- if options.httpCache
- httpCache = true
-
- xhr = new Dropbox.Xhr 'GET', "#{@urls.search}/#{@urlEncodePath(path)}"
- xhr.setParams(params).signWithOauth @oauth, httpCache
- @dispatchXhr xhr, (error, results) ->
- if results
- stats = (Dropbox.Stat.parse(metadata) for metadata in results)
- else
- stats = undefined
- callback error, stats
-
- # Alias for "findByName" that matches the HTTP API.
- search: (path, namePattern, options, callback) ->
- @findByName path, namePattern, options, callback
-
- # Creates a reference used to copy a file to another user's Dropbox.
- #
- # @param {String} path the path to the file whose contents will be
- # referenced, relative to the uesr's Dropbox or to the application's
- # folder
- # @param {function(?Dropbox.ApiError, ?Dropbox.CopyReference)} callback
- # called with the result of the /copy_ref HTTP request; if the call
- # succeeds, the second parameter is a Dropbox.CopyReference instance, and
- # the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- makeCopyReference: (path, callback) ->
- xhr = new Dropbox.Xhr 'GET', "#{@urls.copyRef}/#{@urlEncodePath(path)}"
- xhr.signWithOauth @oauth
- @dispatchXhr xhr, (error, refData) ->
- callback error, Dropbox.CopyReference.parse(refData)
-
- # Alias for "makeCopyReference" that matches the HTTP API.
- copyRef: (path, callback) ->
- @makeCopyReference path, callback
-
- # Fetches a list of changes in the user's Dropbox since the last call.
- #
- # This method is intended to make full sync implementations easier and more
- # performant. Each call returns a cursor that can be used in a future call
- # to obtain all the changes that happened in the user's Dropbox (or
- # application directory) between the two calls.
- #
- # @param {Dropbox.PulledChanges, String} cursor the result of a previous
- # call to pullChanges, or a string containing a tag representing the
- # Dropbox state that is used as the baseline for the change list; this
- # should either be the Dropbox.PulledChanges obtained from a previous call
- # to pullChanges, the return value of Dropbox.PulledChanges#cursor, or null
- # / ommitted on the first call to pullChanges
- # @param {function(?Dropbox.ApiError, ?Dropbox.PulledChanges)} callback
- # called with the result of the /delta HTTP request; if the call
- # succeeds, the second parameter is a Dropbox.PulledChanges describing
- # the changes to the user's Dropbox since the pullChanges call that
- # produced the given cursor, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- pullChanges: (cursor, callback) ->
- if (not callback) and (typeof cursor is 'function')
- callback = cursor
- cursor = null
-
- if cursor
- if cursor.cursorTag
- params = { cursor: cursor.cursorTag }
- else
- params = { cursor: cursor }
- else
- params = {}
-
- xhr = new Dropbox.Xhr 'POST', @urls.delta
- xhr.setParams(params).signWithOauth @oauth
- @dispatchXhr xhr, (error, deltaInfo) ->
- callback error, Dropbox.PulledChanges.parse(deltaInfo)
-
- # Alias for "pullChanges" that matches the HTTP API.
- delta: (cursor, callback) ->
- @pullChanges cursor, callback
-
- # Creates a folder in a user's Dropbox.
- #
- # @param {String} path the path of the folder that will be created, relative
- # to the user's Dropbox or to the application's folder
- # @param {function(?Dropbox.ApiError, ?Dropbox.Stat)} callback called with
- # the result of the /fileops/create_folder HTTP request; if the call
- # succeeds, the second parameter is a Dropbox.Stat instance describing
- # the newly created folder, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- mkdir: (path, callback) ->
- xhr = new Dropbox.Xhr 'POST', @urls.fileopsCreateFolder
- xhr.setParams(root: @fileRoot, path: @normalizePath(path)).
- signWithOauth(@oauth)
- @dispatchXhr xhr, (error, metadata) ->
- callback error, Dropbox.Stat.parse(metadata)
-
- # Removes a file or diretory from a user's Dropbox.
- #
- # @param {String} path the path of the file to be read, relative to the
- # user's Dropbox or to the application's folder
- # @param {function(?Dropbox.ApiError, ?Dropbox.Stat)} callback called with
- # the result of the /fileops/delete HTTP request; if the call succeeds,
- # the second parameter is a Dropbox.Stat instance describing the removed
- # file or folder, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- remove: (path, callback) ->
- xhr = new Dropbox.Xhr 'POST', @urls.fileopsDelete
- xhr.setParams(root: @fileRoot, path: @normalizePath(path)).
- signWithOauth(@oauth)
- @dispatchXhr xhr, (error, metadata) ->
- callback error, Dropbox.Stat.parse(metadata)
-
- # node.js-friendly alias for "remove".
- unlink: (path, callback) ->
- @remove path, callback
-
- # Alias for "remove" that matches the HTTP API.
- delete: (path, callback) ->
- @remove path, callback
-
- # Copies a file or folder in the user's Dropbox.
- #
- # This method's "from" parameter can be either a path or a copy reference
- # obtained by a previous call to makeCopyRef. The method uses a crude
- # heuristic to interpret the "from" string -- if it doesn't contain any
- # slash (/) or dot (.) character, it is assumed to be a copy reference. The
- # easiest way to work with it is to prepend "/" to every path passed to the
- # method. The method will process paths that start with multiple /s
- # correctly.
- #
- # @param {String, Dropbox.CopyReference} from the path of the file or folder
- # that will be copied, or a Dropbox.CopyReference instance obtained by
- # calling makeCopyRef or Dropbox.CopyReference.parse; if this is a path, it
- # is relative to the user's Dropbox or to the application's folder
- # @param {String} toPath the path that the file or folder will have after the
- # method call; the path is relative to the user's Dropbox or to the
- # application folder
- # @param {function(?Dropbox.ApiError, ?Dropbox.Stat)} callback called with
- # the result of the /fileops/copy HTTP request; if the call succeeds, the
- # second parameter is a Dropbox.Stat instance describing the file or folder
- # created by the copy operation, and the first parameter is null
- # @return {XMLHttpRequest} the XHR object used for this API call
- copy: (from, toPath, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- params = { root: @fileRoot, to_path: @normalizePath(toPath) }
- if from instanceof Dropbox.CopyReference
- params.from_copy_ref = from.tag
- else
- params.from_path = @normalizePath from
- # TODO: locale support would edit the params here
-
- xhr = new Dropbox.Xhr 'POST', @urls.fileopsCopy
- xhr.setParams(params).signWithOauth @oauth
- @dispatchXhr xhr, (error, metadata) ->
- callback error, Dropbox.Stat.parse(metadata)
-
- # Moves a file or folder to a different location in a user's Dropbox.
- #
- # @param {String} fromPath the path of the file or folder that will be moved,
- # relative to the user's Dropbox or to the application's folder
- # @param {String} toPath the path that the file or folder will have after
- # the method call; the path is relative to the user's Dropbox or to the
- # application's folder
- # @param {function(?Dropbox.ApiError, ?Dropbox.Stat)} callback called with
- # the result of the /fileops/move HTTP request; if the call succeeds, the
- # second parameter is a Dropbox.Stat instance describing the moved
- # file or folder at its new location, and the first parameter is
- # null
- # @return {XMLHttpRequest} the XHR object used for this API call
- move: (fromPath, toPath, callback) ->
- if (not callback) and (typeof options is 'function')
- callback = options
- options = null
-
- xhr = new Dropbox.Xhr 'POST', @urls.fileopsMove
- xhr.setParams(
- root: @fileRoot, from_path: @normalizePath(fromPath),
- to_path: @normalizePath(toPath)).signWithOauth @oauth
- @dispatchXhr xhr, (error, metadata) ->
- callback error, Dropbox.Stat.parse(metadata)
-
- # Removes all login information.
- #
- # @return {Dropbox.Client} this, for easy call chaining
- reset: ->
- @uid = null
- @oauth.setToken null, ''
- oldAuthState = @authState
- @authState = DropboxClient.RESET
- if oldAuthState isnt @authState
- @onAuthStateChange.dispatch @
- @authError = null
- @_credentials = null
- @
-
- # Change the client's OAuth credentials.
- #
- # @param {?Object} the result of a prior call to credentials()
- # @return {Dropbox.Client} this, for easy call chaining
- setCredentials: (credentials) ->
- oldAuthState = @authState
- @oauth.reset credentials
- @uid = credentials.uid or null
- if credentials.authState
- @authState = credentials.authState
- else
- if credentials.token
- @authState = DropboxClient.DONE
- else
- @authState = DropboxClient.RESET
- @authError = null
- @_credentials = null
- if oldAuthState isnt @authState
- @onAuthStateChange.dispatch @
- @
-
- # @return {String} a string that uniquely identifies the Dropbox application
- # of this client
- appHash: ->
- @oauth.appHash()
-
- # Computes the URLs of all the Dropbox API calls.
- #
- # @private
- # This is called by the constructor, and used by the other methods. It should
- # not be used directly.
- setupUrls: ->
- @fileRoot = if @sandbox then 'sandbox' else 'dropbox'
-
- @urls =
- # Authentication.
- requestToken: "#{@apiServer}/1/oauth/request_token"
- authorize: "#{@authServer}/1/oauth/authorize"
- accessToken: "#{@apiServer}/1/oauth/access_token"
- signOut: "#{@apiServer}/1/unlink_access_token"
-
- # Accounts.
- accountInfo: "#{@apiServer}/1/account/info"
-
- # Files and metadata.
- getFile: "#{@fileServer}/1/files/#{@fileRoot}"
- postFile: "#{@fileServer}/1/files/#{@fileRoot}"
- putFile: "#{@fileServer}/1/files_put/#{@fileRoot}"
- metadata: "#{@apiServer}/1/metadata/#{@fileRoot}"
- delta: "#{@apiServer}/1/delta"
- revisions: "#{@apiServer}/1/revisions/#{@fileRoot}"
- restore: "#{@apiServer}/1/restore/#{@fileRoot}"
- search: "#{@apiServer}/1/search/#{@fileRoot}"
- shares: "#{@apiServer}/1/shares/#{@fileRoot}"
- media: "#{@apiServer}/1/media/#{@fileRoot}"
- copyRef: "#{@apiServer}/1/copy_ref/#{@fileRoot}"
- thumbnails: "#{@fileServer}/1/thumbnails/#{@fileRoot}"
- chunkedUpload: "#{@fileServer}/1/chunked_upload"
- commitChunkedUpload:
- "#{@fileServer}/1/commit_chunked_upload/#{@fileRoot}"
-
- # File operations.
- fileopsCopy: "#{@apiServer}/1/fileops/copy"
- fileopsCreateFolder: "#{@apiServer}/1/fileops/create_folder"
- fileopsDelete: "#{@apiServer}/1/fileops/delete"
- fileopsMove: "#{@apiServer}/1/fileops/move"
-
- # @property {Number} the client's progress in the authentication process;
- # Dropbox.Client#isAuthenticated should be called instead whenever
- # possible; this attribute was intended to be used by OAuth drivers
- authState: null
-
- # authState value for a client that experienced an authentication error
- @ERROR: 0
-
- # authState value for a properly initialized client with no user credentials
- @RESET: 1
-
- # authState value for a client with a request token that must be authorized
- @REQUEST: 2
-
- # authState value for a client whose request token was authorized
- @AUTHORIZED: 3
-
- # authState value for a client that has an access token
- @DONE: 4
-
- # authState value for a client that voluntarily invalidated its access token
- @SIGNED_OFF: 5
-
- # Normalizes a Dropobx path and encodes it for inclusion in a request URL.
- #
- # @private
- # This is called internally by the other client functions, and should not be
- # used outside the {Dropbox.Client} class.
- urlEncodePath: (path) ->
- Dropbox.Xhr.urlEncodeValue(@normalizePath(path)).replace /%2F/gi, '/'
-
- # Normalizes a Dropbox path for API requests.
- #
- # @private
- # This is an internal method. It is used by all the client methods that take
- # paths as arguments.
- #
- # @param {String} path a path
- normalizePath: (path) ->
- if path.substring(0, 1) is '/'
- i = 1
- while path.substring(i, i + 1) is '/'
- i += 1
- path.substring i
- else
- path
-
- # Generates an OAuth request token.
- #
- # @private
- # This a low-level method called by authorize. Users should call authorize.
- #
- # @param {function(error, data)} callback called with the result of the
- # /oauth/request_token HTTP request
- requestToken: (callback) ->
- xhr = new Dropbox.Xhr('POST', @urls.requestToken).signWithOauth(@oauth)
- @dispatchXhr xhr, callback
-
- # The URL for /oauth/authorize, embedding the user's token.
- #
- # @private
- # This a low-level method called by authorize. Users should call authorize.
- #
- # @param {String} token the oauth_token obtained from an /oauth/request_token
- # call
- # @return {String} the URL that the user's browser should be redirected to in
- # order to perform an /oauth/authorize request
- authorizeUrl: (token) ->
- params = { oauth_token: token, oauth_callback: @driver.url() }
- "#{@urls.authorize}?" + Dropbox.Xhr.urlEncode(params)
-
- # Exchanges an OAuth request token with an access token.
- #
- # @private
- # This a low-level method called by authorize. Users should call authorize.
- #
- # @param {function(error, data)} callback called with the result of the
- # /oauth/access_token HTTP request
- getAccessToken: (callback) ->
- xhr = new Dropbox.Xhr('POST', @urls.accessToken).signWithOauth(@oauth)
- @dispatchXhr xhr, callback
-
- # Prepares and sends an XHR to the Dropbox API server.
- #
- # @private
- # This is a low-level method called by other client methods.
- #
- # @param {Dropbox.Xhr} xhr wrapper for the XHR to be sent
- # @param {function(?Dropbox.ApiError, ?Object)} callback called with the
- # outcome of the XHR
- # @return {XMLHttpRequest} the native XHR object used to make the request
- dispatchXhr: (xhr, callback) ->
- xhr.setCallback callback
- xhr.onError = @onError
- xhr.prepare()
- nativeXhr = xhr.xhr
- if @onXhr.dispatch xhr
- xhr.send()
- nativeXhr
-
- # @private
- # @return {String} the URL to the default value for the "server" option
- defaultApiServer: ->
- 'https://api.dropbox.com'
-
- # @private
- # @return {String} the URL to the default value for the "authServer" option
- defaultAuthServer: ->
- @apiServer.replace 'api.', 'www.'
-
- # @private
- # @return {String} the URL to the default value for the "fileServer" option
- defaultFileServer: ->
- @apiServer.replace 'api.', 'api-content.'
-
- # @private
- # @return {String} the URL to the default value for the "downloadServer"
- # option
- defaultDownloadServer: ->
- @apiServer.replace 'api.', 'dl.'
-
- # Computes the cached value returned by credentials.
- #
- # @private
- # @see Dropbox.Client#computeCredentials
- computeCredentials: ->
- value =
- key: @oauth.key
- sandbox: @sandbox
- value.secret = @oauth.secret if @oauth.secret
- if @oauth.token
- value.token = @oauth.token
- value.tokenSecret = @oauth.tokenSecret
- value.uid = @uid if @uid
- if @authState isnt DropboxClient.ERROR and
- @authState isnt DropboxClient.RESET and
- @authState isnt DropboxClient.DONE and
- @authState isnt DropboxClient.SIGNED_OFF
- value.authState = @authState
- if @apiServer isnt @defaultApiServer()
- value.server = @apiServer
- if @authServer isnt @defaultAuthServer()
- value.authServer = @authServer
- if @fileServer isnt @defaultFileServer()
- value.fileServer = @fileServer
- if @downloadServer isnt @defaultDownloadServer()
- value.downloadServer = @downloadServer
- @_credentials = value
-
-DropboxClient = Dropbox.Client
diff --git a/lib/client/storage/dropbox/src/drivers-browser.coffee b/lib/client/storage/dropbox/src/drivers-browser.coffee
deleted file mode 100644
index 13306168..00000000
--- a/lib/client/storage/dropbox/src/drivers-browser.coffee
+++ /dev/null
@@ -1,342 +0,0 @@
-# Base class for drivers that run in the browser.
-#
-# Inheriting from this class makes a driver use HTML5 localStorage to preserve
-# OAuth tokens across page reloads.
-class Dropbox.Drivers.BrowserBase
- # Sets up the OAuth driver.
- #
- # Subclasses should pass the options object they receive to the superclass
- # constructor.
- #
- # @param {?Object} options the advanced settings below
- # @option options {Boolean} rememberUser if true, the user's OAuth tokens are
- # saved in localStorage; if you use this, you MUST provide a UI item that
- # calls signOut() on Dropbox.Client, to let the user "log out" of the
- # application
- # @option options {String} scope embedded in the localStorage key that holds
- # the authentication data; useful for having multiple OAuth tokens in a
- # single application
- constructor: (options) ->
- @rememberUser = options?.rememberUser or false
- @scope = options?.scope or 'default'
- @storageKey = null
-
- # The magic happens here.
- onAuthStateChange: (client, callback) ->
- @setStorageKey client
-
- switch client.authState
- when DropboxClient.RESET
- @loadCredentials (credentials) =>
- return callback() unless credentials
-
- if credentials.authState # Incomplete authentication.
- client.setCredentials credentials
- return callback()
-
- # There is an old access token. Only use it if the app supports
- # logout.
- unless @rememberUser
- @forgetCredentials()
- return callback()
-
- # Verify that the old access token still works.
- client.setCredentials credentials
- client.getUserInfo (error) =>
- if error
- client.reset()
- @forgetCredentials callback
- else
- callback()
- when DropboxClient.REQUEST
- @storeCredentials client.credentials(), callback
- when DropboxClient.DONE
- if @rememberUser
- return @storeCredentials(client.credentials(), callback)
- @forgetCredentials callback
- when DropboxClient.SIGNED_OFF
- @forgetCredentials callback
- when DropboxClient.ERROR
- @forgetCredentials callback
- else
- callback()
- @
-
- # Computes the @storageKey used by loadCredentials and forgetCredentials.
- #
- # @private
- # This is called by onAuthStateChange.
- #
- # @param {Dropbox.Client} client the client instance that is running the
- # authorization process
- # @return {Dropbox.Driver} this, for easy call chaining
- setStorageKey: (client) ->
- # NOTE: the storage key is dependent on the app hash so that multiple apps
- # hosted off the same server don't step on eachother's toes
- @storageKey = "dropbox-auth:#{@scope}:#{client.appHash()}"
- @
-
- # Stores a Dropbox.Client's credentials to localStorage.
- #
- # @private
- # onAuthStateChange calls this method during the authentication flow.
- #
- # @param {Object} credentials the result of a Drobpox.Client#credentials call
- # @param {function()} callback called when the storing operation is complete
- # @return {Dropbox.Drivers.BrowserBase} this, for easy call chaining
- storeCredentials: (credentials, callback) ->
- localStorage.setItem @storageKey, JSON.stringify(credentials)
- callback()
- @
-
- # Retrieves a token and secret from localStorage.
- #
- # @private
- # onAuthStateChange calls this method during the authentication flow.
- #
- # @param {function(?Object)} callback supplied with the credentials object
- # stored by a previous call to
- # Dropbox.Drivers.BrowserBase#storeCredentials; null if no credentials were
- # stored, or if the previously stored credentials were deleted
- # @return {Dropbox.Drivers.BrowserBase} this, for easy call chaining
- loadCredentials: (callback) ->
- jsonString = localStorage.getItem @storageKey
- unless jsonString
- callback null
- return @
-
- try
- callback JSON.parse(jsonString)
- catch e
- # Parse errors.
- callback null
- @
-
- # Deletes information previously stored by a call to storeCredentials.
- #
- # @private
- # onAuthStateChange calls this method during the authentication flow.
- #
- # @param {function()} callback called after the credentials are deleted
- # @return {Dropbox.Drivers.BrowserBase} this, for easy call chaining
- forgetCredentials: (callback) ->
- localStorage.removeItem @storageKey
- callback()
- @
-
- # Wrapper for window.location, for testing purposes.
- #
- # @return {String} the current page's URL
- @currentLocation: ->
- window.location.href
-
-# OAuth driver that uses a redirect and localStorage to complete the flow.
-class Dropbox.Drivers.Redirect extends Dropbox.Drivers.BrowserBase
- # Sets up the redirect-based OAuth driver.
- #
- # @param {?Object} options the advanced settings below
- # @option options {Boolean} useQuery if true, the page will receive OAuth
- # data as query parameters; by default, the page receives OAuth data in
- # the fragment part of the URL (the string following the #,
- # available as document.location.hash), to avoid confusing the server
- # generating the page
- # @option options {Boolean} rememberUser if true, the user's OAuth tokens are
- # saved in localStorage; if you use this, you MUST provide a UI item that
- # calls signOut() on Dropbox.Client, to let the user "log out" of the
- # application
- # @option options {String} scope embedded in the localStorage key that holds
- # the authentication data; useful for having multiple OAuth tokens in a
- # single application
- constructor: (options) ->
- super options
- @useQuery = options?.useQuery or false
- @receiverUrl = @computeUrl options
- @tokenRe = new RegExp "(#|\\?|&)oauth_token=([^&#]+)(&|#|$)"
-
- # Forwards the authentication process from REQUEST to AUTHORIZED on redirect.
- onAuthStateChange: (client, callback) ->
- superCall = do => => super client, callback
- @setStorageKey client
- if client.authState is DropboxClient.RESET
- @loadCredentials (credentials) =>
- if credentials and credentials.authState # Incomplete authentication.
- if credentials.token is @locationToken() and
- credentials.authState is DropboxClient.REQUEST
- # locationToken matched, so the redirect happened
- credentials.authState = DropboxClient.AUTHORIZED
- return @storeCredentials credentials, superCall
- else
- # The authentication process broke down, start over.
- return @forgetCredentials superCall
- superCall()
- else
- superCall()
-
- # URL of the current page, since the user will be sent right back.
- url: ->
- @receiverUrl
-
- # Redirects to the authorize page.
- doAuthorize: (authUrl) ->
- window.location.assign authUrl
-
- # Pre-computes the return value of url.
- computeUrl: ->
- querySuffix = "_dropboxjs_scope=#{encodeURIComponent @scope}"
- location = Dropbox.Drivers.BrowserBase.currentLocation()
- if location.indexOf('#') is -1
- fragment = null
- else
- locationPair = location.split '#', 2
- location = locationPair[0]
- fragment = locationPair[1]
- if @useQuery
- if location.indexOf('?') is -1
- location += "?#{querySuffix}" # No query string in the URL.
- else
- location += "&#{querySuffix}" # The URL already has a query string.
- else
- fragment = "?#{querySuffix}"
-
- if fragment
- location + '#' + fragment
- else
- location
-
- # Figures out if the user completed the OAuth flow based on the current URL.
- #
- # @return {?String} the OAuth token that the user just authorized, or null if
- # the user accessed this directly, without having authorized a token
- locationToken: ->
- location = Dropbox.Drivers.BrowserBase.currentLocation()
-
- # Check for the scope.
- scopePattern = "_dropboxjs_scope=#{encodeURIComponent @scope}&"
- return null if location.indexOf?(scopePattern) is -1
-
- # Extract the token.
- match = @tokenRe.exec location
- if match then decodeURIComponent(match[2]) else null
-
-# OAuth driver that uses a popup window and postMessage to complete the flow.
-class Dropbox.Drivers.Popup extends Dropbox.Drivers.BrowserBase
- # Sets up a popup-based OAuth driver.
- #
- # @param {?Object} options one of the settings below; leave out the argument
- # to use the current location for redirecting
- # @option options {Boolean} rememberUser if true, the user's OAuth tokens are
- # saved in localStorage; if you use this, you MUST provide a UI item that
- # calls signOut() on Dropbox.Client, to let the user "log out" of the
- # application
- # @option options {String} scope embedded in the localStorage key that holds
- # the authentication data; useful for having multiple OAuth tokens in a
- # single application
- # @option options {String} receiverUrl URL to the page that receives the
- # /authorize redirect and performs the postMessage
- # @option options {Boolean} noFragment if true, the receiverUrl will be used
- # as given; by default, a hash "#" is appended to URLs that don't have
- # one, so the OAuth token is received as a URL fragment and does not hit
- # the file server
- # @option options {String} receiverFile the URL to the receiver page will be
- # computed by replacing the file name (everything after the last /) of
- # the current location with this parameter's value
- constructor: (options) ->
- super options
- @receiverUrl = @computeUrl options
- @tokenRe = new RegExp "(#|\\?|&)oauth_token=([^&#]+)(&|#|$)"
-
- # Removes credentials stuck in the REQUEST stage.
- onAuthStateChange: (client, callback) ->
- superCall = do => => super client, callback
- @setStorageKey client
- if client.authState is DropboxClient.RESET
- @loadCredentials (credentials) =>
- if credentials and credentials.authState # Incomplete authentication.
- # The authentication process broke down, start over.
- return @forgetCredentials superCall
- superCall()
- else
- superCall()
-
- # Shows the authorization URL in a pop-up, waits for it to send a message.
- doAuthorize: (authUrl, token, tokenSecret, callback) ->
- @listenForMessage token, callback
- @openWindow authUrl
-
- # URL of the redirect receiver page, which posts a message back to this page.
- url: ->
- @receiverUrl
-
- # Pre-computes the return value of url.
- computeUrl: (options) ->
- if options
- if options.receiverUrl
- if options.noFragment or options.receiverUrl.indexOf('#') isnt -1
- return options.receiverUrl
- else
- return options.receiverUrl + '#'
- else if options.receiverFile
- fragments = Dropbox.Drivers.BrowserBase.currentLocation().split '/'
- fragments[fragments.length - 1] = options.receiverFile
- if options.noFragment
- return fragments.join('/')
- else
- return fragments.join('/') + '#'
- Dropbox.Drivers.BrowserBase.currentLocation()
-
- # Creates a popup window.
- #
- # @param {String} url the URL that will be loaded in the popup window
- # @return {?DOMRef} reference to the opened window, or null if the call
- # failed
- openWindow: (url) ->
- window.open url, '_dropboxOauthSigninWindow', @popupWindowSpec(980, 700)
-
- # Spec string for window.open to create a nice popup.
- #
- # @param {Number} popupWidth the desired width of the popup window
- # @param {Number} popupHeight the desired height of the popup window
- # @return {String} spec string for the popup window
- popupWindowSpec: (popupWidth, popupHeight) ->
- # Metrics for the current browser window.
- x0 = window.screenX ? window.screenLeft
- y0 = window.screenY ? window.screenTop
- width = window.outerWidth ? document.documentElement.clientWidth
- height = window.outerHeight ? document.documentElement.clientHeight
-
- # Computed popup window metrics.
- popupLeft = Math.round x0 + (width - popupWidth) / 2
- popupTop = Math.round y0 + (height - popupHeight) / 2.5
- popupLeft = x0 if popupLeft < x0
- popupTop = y0 if popupTop < y0
-
- # The specification string.
- "width=#{popupWidth},height=#{popupHeight}," +
- "left=#{popupLeft},top=#{popupTop}" +
- 'dialog=yes,dependent=yes,scrollbars=yes,location=yes'
-
- # Listens for a postMessage from a previously opened popup window.
- #
- # @param {String} token the token string that must be received from the popup
- # window
- # @param {function()} called when the received message matches the token
- listenForMessage: (token, callback) ->
- listener = (event) =>
- match = @tokenRe.exec event.data.toString()
- if match and decodeURIComponent(match[2]) is token
- window.removeEventListener 'message', listener
- callback()
- window.addEventListener 'message', listener, false
-
- # Communicates with the driver from the OAuth receiver page.
- @oauthReceiver: ->
- window.addEventListener 'load', ->
- opener = window.opener
- if window.parent isnt window.top
- opener or= window.parent
- if opener
- try
- opener.postMessage window.location.href, '*'
- catch e
- # IE 9 doesn't support opener.postMessage for popup windows.
- window.close()
diff --git a/lib/client/storage/dropbox/src/drivers-chrome.coffee b/lib/client/storage/dropbox/src/drivers-chrome.coffee
deleted file mode 100644
index 2ead8094..00000000
--- a/lib/client/storage/dropbox/src/drivers-chrome.coffee
+++ /dev/null
@@ -1,202 +0,0 @@
-DropboxChromeOnMessage = null
-DropboxChromeSendMessage = null
-
-if chrome?
- # v2 manifest APIs.
- if chrome.runtime
- if chrome.runtime.onMessage
- DropboxChromeOnMessage = chrome.runtime.onMessage
- if chrome.runtime.sendMessage
- DropboxChromeSendMessage = (m) -> chrome.runtime.sendMessage m
-
- # v1 manifest APIs.
- if chrome.extension
- if chrome.extension.onMessage
- DropboxChromeOnMessage or= chrome.extension.onMessage
- if chrome.extension.sendMessage
- DropboxChromeSendMessage or= (m) -> chrome.extension.sendMessage m
-
- # Apps that use the v2 manifest don't get messenging in Chrome 25.
- unless DropboxChromeOnMessage
- do ->
- pageHack = (page) ->
- if page.Dropbox
- Dropbox.Drivers.Chrome::onMessage =
- page.Dropbox.Drivers.Chrome.onMessage
- Dropbox.Drivers.Chrome::sendMessage =
- page.Dropbox.Drivers.Chrome.sendMessage
- else
- page.Dropbox = Dropbox
- Dropbox.Drivers.Chrome::onMessage = new Dropbox.EventSource
- Dropbox.Drivers.Chrome::sendMessage =
- (m) -> Dropbox.Drivers.Chrome::onMessage.dispatch m
-
- if chrome.extension and chrome.extension.getBackgroundPage
- if page = chrome.extension.getBackgroundPage()
- return pageHack(page)
-
- if chrome.runtime and chrome.runtime.getBackgroundPage
- return chrome.runtime.getBackgroundPage (page) -> pageHack page
-
-# OAuth driver specialized for Chrome apps and extensions.
-class Dropbox.Drivers.Chrome
- # @property {Chrome.Event<>, Dropbox.EventSource<>} fires non-cancelable
- # events when Dropbox.Drivers.Chrome#sendMessage is called
- onMessage: DropboxChromeOnMessage
-
- # Sends a message across the Chrome extension / application.
- #
- # When a message is sent, the listeners registered to
- #
- # @param {Object} message the message to be sent
- sendMessage: DropboxChromeSendMessage
-
- # Expans an URL relative to the Chrome extension / application root.
- #
- # @param {String} url a resource URL relative to the extension root
- # @return {String} the absolute resource URL
- expandUrl: (url) ->
- if chrome.runtime and chrome.runtime.getURL
- return chrome.runtime.getURL(url)
- if chrome.extension and chrome.extension.getURL
- return chrome.extension.getURL(url)
- url
-
- # @param {?Object} options the settings below
- # @option {String} receiverPath the path of page that receives the /authorize
- # redirect and performs the postMessage; the path should be relative to the
- # extension folder; by default, is 'chrome_oauth_receiver.html'
- constructor: (options) ->
- receiverPath = (options and options.receiverPath) or
- 'chrome_oauth_receiver.html'
- @receiverUrl = @expandUrl receiverPath
- @tokenRe = new RegExp "(#|\\?|&)oauth_token=([^&#]+)(&|#|$)"
- scope = (options and options.scope) or 'default'
- @storageKey = "dropbox_js_#{scope}_credentials"
-
- # Saves token information when appropriate.
- onAuthStateChange: (client, callback) ->
- switch client.authState
- when Dropbox.Client.RESET
- @loadCredentials (credentials) =>
- if credentials
- if credentials.authState
- # Stuck authentication process, reset.
- return @forgetCredentials(callback)
- client.setCredentials credentials
- callback()
- when Dropbox.Client.DONE
- @storeCredentials client.credentials(), callback
- when Dropbox.Client.SIGNED_OFF
- @forgetCredentials callback
- when Dropbox.Client.ERROR
- @forgetCredentials callback
- else
- callback()
-
- # Shows the authorization URL in a pop-up, waits for it to send a message.
- doAuthorize: (authUrl, token, tokenSecret, callback) ->
- window = handle: null
- @listenForMessage token, window, callback
- @openWindow authUrl, (handle) -> window.handle = handle
-
- # Creates a popup window.
- #
- # @param {String} url the URL that will be loaded in the popup window
- # @param {function(Object)} callback called with a handle that can be passed
- # to Dropbox.Driver.Chrome#closeWindow
- # @return {Dropbox.Driver.Chrome} this
- openWindow: (url, callback) ->
- if chrome.tabs and chrome.tabs.create
- chrome.tabs.create url: url, active: true, pinned: false, (tab) ->
- callback tab
- return @
- if chrome.app and chrome.app.window and chrome.app.window.create
- chrome.app.window.create url, frame: 'none', id: 'dropbox-auth',
- (window) -> callback window
- return @
- @
-
- # Closes a window that was previously opened with openWindow.
- #
- # @param {Object} handle the object passed to an openWindow callback
- closeWindow: (handle) ->
- if chrome.tabs and chrome.tabs.remove and handle.id
- chrome.tabs.remove handle.id
- return @
- if chrome.app and chrome.app.window and handle.close
- handle.close()
- return @
- @
-
- # URL of the redirect receiver page that messages the app / extension.
- url: ->
- @receiverUrl
-
- # Listens for a postMessage from a previously opened tab.
- #
- # @param {String} token the token string that must be received from the tab
- # @param {Object} window a JavaScript object whose "handle" property is a
- # window handle passed to the callback of a
- # Dropbox.Driver.Chrome#openWindow call
- # @param {function()} called when the received message matches the token
- listenForMessage: (token, window, callback) ->
- listener = (message, sender) =>
- # Reject messages not coming from the OAuth receiver window.
- if sender and sender.tab
- unless sender.tab.url.substring(0, @receiverUrl.length) is @receiverUrl
- return
-
- match = @tokenRe.exec message.dropbox_oauth_receiver_href or ''
- if match and decodeURIComponent(match[2]) is token
- @closeWindow window.handle if window.handle
- @onMessage.removeListener listener
- callback()
- @onMessage.addListener listener
-
- # Stores a Dropbox.Client's credentials to local storage.
- #
- # @private
- # onAuthStateChange calls this method during the authentication flow.
- #
- # @param {Object} credentials the result of a Drobpox.Client#credentials call
- # @param {function()} callback called when the storing operation is complete
- # @return {Dropbox.Drivers.BrowserBase} this, for easy call chaining
- storeCredentials: (credentials, callback) ->
- items= {}
- items[@storageKey] = credentials
- chrome.storage.local.set items, callback
- @
-
- # Retrieves a token and secret from localStorage.
- #
- # @private
- # onAuthStateChange calls this method during the authentication flow.
- #
- # @param {function(?Object)} callback supplied with the credentials object
- # stored by a previous call to
- # Dropbox.Drivers.BrowserBase#storeCredentials; null if no credentials were
- # stored, or if the previously stored credentials were deleted
- # @return {Dropbox.Drivers.BrowserBase} this, for easy call chaining
- loadCredentials: (callback) ->
- chrome.storage.local.get @storageKey, (items) =>
- callback items[@storageKey] or null
- @
-
- # Deletes information previously stored by a call to storeCredentials.
- #
- # @private
- # onAuthStateChange calls this method during the authentication flow.
- #
- # @param {function()} callback called after the credentials are deleted
- # @return {Dropbox.Drivers.BrowserBase} this, for easy call chaining
- forgetCredentials: (callback) ->
- chrome.storage.local.remove @storageKey, callback
- @
-
- # Communicates with the driver from the OAuth receiver page.
- @oauthReceiver: ->
- window.addEventListener 'load', ->
- driver = new Dropbox.Drivers.Chrome()
- driver.sendMessage dropbox_oauth_receiver_href: window.location.href
- window.close() if window.close
diff --git a/lib/client/storage/dropbox/src/drivers-node.coffee b/lib/client/storage/dropbox/src/drivers-node.coffee
deleted file mode 100644
index acba25af..00000000
--- a/lib/client/storage/dropbox/src/drivers-node.coffee
+++ /dev/null
@@ -1,87 +0,0 @@
-# OAuth driver that redirects the browser to a node app to complete the flow.
-#
-# This is useful for testing node.js libraries and applications.
-class Dropbox.Drivers.NodeServer
- # Starts up the node app that intercepts the browser redirect.
- #
- # @param {?Object} options one or more of the options below
- # @option options {Number} port the number of the TCP port that will receive
- # HTTP requests
- # @param {String} faviconFile the path to a file that will be served at
- # /favicon.ico
- constructor: (options) ->
- @port = options?.port or 8912
- @faviconFile = options?.favicon or null
- # Calling require in the constructor because this doesn't work in browsers.
- @fs = require 'fs'
- @http = require 'http'
- @open = require 'open'
-
- @callbacks = {}
- @urlRe = new RegExp "^/oauth_callback\\?"
- @tokenRe = new RegExp "(\\?|&)oauth_token=([^&]+)(&|$)"
- @createApp()
-
- # URL to the node.js OAuth callback handler.
- url: ->
- "http://localhost:#{@port}/oauth_callback"
-
- # Opens the token
- doAuthorize: (authUrl, token, tokenSecret, callback) ->
- @callbacks[token] = callback
- @openBrowser authUrl
-
- # Opens the given URL in a browser.
- openBrowser: (url) ->
- unless url.match /^https?:\/\//
- throw new Error("Not a http/https URL: #{url}")
- @open url
-
- # Creates and starts up an HTTP server that will intercept the redirect.
- createApp: ->
- @app = @http.createServer (request, response) =>
- @doRequest request, response
- @app.listen @port
-
- # Shuts down the HTTP server.
- #
- # The driver will become unusable after this call.
- closeServer: ->
- @app.close()
-
- # Reads out an /authorize callback.
- doRequest: (request, response) ->
- if @urlRe.exec request.url
- match = @tokenRe.exec request.url
- if match
- token = decodeURIComponent match[2]
- if @callbacks[token]
- @callbacks[token]()
- delete @callbacks[token]
- data = ''
- request.on 'data', (dataFragment) -> data += dataFragment
- request.on 'end', =>
- if @faviconFile and (request.url is '/favicon.ico')
- @sendFavicon response
- else
- @closeBrowser response
-
- # Renders a response that will close the browser window used for OAuth.
- closeBrowser: (response) ->
- closeHtml = """
-
-
- Please close this window.
- """
- response.writeHead(200,
- {'Content-Length': closeHtml.length, 'Content-Type': 'text/html' })
- response.write closeHtml
- response.end
-
- # Renders the favicon file.
- sendFavicon: (response) ->
- @fs.readFile @faviconFile, (error, data) ->
- response.writeHead(200,
- { 'Content-Length': data.length, 'Content-Type': 'image/x-icon' })
- response.write data
- response.end
diff --git a/lib/client/storage/dropbox/src/drivers.coffee b/lib/client/storage/dropbox/src/drivers.coffee
deleted file mode 100644
index de555551..00000000
--- a/lib/client/storage/dropbox/src/drivers.coffee
+++ /dev/null
@@ -1,59 +0,0 @@
-# Documentation for the interface to a Dropbox OAuth driver.
-class Dropbox.AuthDriver
- # The callback URL that should be supplied to the OAuth /authorize call.
- #
- # The driver must be able to intercept redirects to the returned URL, in
- # order to know when a user has completed the authorization flow.
- #
- # @return {String} an absolute URL
- url: ->
- 'https://some.url'
-
- # Redirects users to /authorize and waits for them to complete the flow.
- #
- # This method is called when the OAuth process reaches the REQUEST state,
- # meaning the client has a request token that must be authorized by the user.
- #
- # @param {String} authUrl the URL that users should be sent to in order to
- # authorize the application's token; this points to a Web page on
- # Dropbox' servers
- # @param {String} token the OAuth token that the user is authorizing; this
- # will be provided by the Dropbox servers as a query parameter when the
- # user is redirected to the URL returned by the driver's url() method
- # @param {String} tokenSecret the secret associated with the given OAuth
- # token; the driver may store this together with the token
- # @param {function()} callback called when users have completed the
- # authorization flow; the driver should call this when Dropbox redirects
- # users to the URL returned by the url() method, and the 'token' query
- # parameter matches the value of the token parameter
- doAuthorize: (authUrl, token, tokenSecret, callback) ->
- callback 'oauth-token'
-
- # Called when there is some progress in the OAuth process.
- #
- # The OAuth process goes through the following states:
- #
- # * Dropbox.Client.RESET - the client has no OAuth token, and is about to
- # ask for a request token
- # * Dropbox.Client.REQUEST - the client has a request OAuth token, and the
- # user must go to an URL on the Dropbox servers to authorize the token
- # * Dropbox.Client.AUTHORIZED - the client has a request OAuth token that
- # was authorized by the user, and is about to exchange it for an access
- # token
- # * Dropbox.Client.DONE - the client has an access OAuth token that can be
- # used for all API calls; the OAuth process is complete, and the callback
- # passed to authorize is about to be called
- # * Dropbox.Client.SIGNED_OFF - the client's Dropbox.Client#signOut() was
- # called, and the client's OAuth token was invalidated
- # * Dropbox.Client.ERROR - the client encounered an error during the OAuth
- # process; the callback passed to authorize is about to be called with the
- # error information
- #
- # @param {Dropbox.Client} client the client performing the OAuth process
- # @param {function()} callback called when onAuthStateChange acknowledges the
- # state change
- onAuthStateChange: (client, callback) ->
- callback()
-
-# Namespace for authentication drivers.
-Dropbox.Drivers = {}
diff --git a/lib/client/storage/dropbox/src/event_source.coffee b/lib/client/storage/dropbox/src/event_source.coffee
deleted file mode 100644
index b87a3d3c..00000000
--- a/lib/client/storage/dropbox/src/event_source.coffee
+++ /dev/null
@@ -1,71 +0,0 @@
-# Event dispatch following a publisher-subscriber (PubSub) model.
-class Dropbox.EventSource
- # Sets up an event source (publisher).
- #
- # @param {?Object} options one or more of the options below
- # @option options {Boolean} cancelable if true,
- constructor: (options) ->
- @_cancelable = options and options.cancelable
- @_listeners = []
-
- # Registers a listener (subscriber) to events coming from this source.
- #
- # This is a simplified version of the addEventListener DOM API. Listeners
- # must be functions, and they can be removed by calling removeListener.
- #
- # This method is idempotent, so a function will not be added to the list of
- # listeners if was previously added.
- #
- # @param {function(Object)} listener called every time an event is fired; if
- # the event is cancelable, the function can return false to cancel the
- # event, or any other value to allow it to propagate; the return value is
- # ignored for non-cancelable events
- # @return {Dropbox.EventSource} this, for easy call chaining
- addListener: (listener) ->
- unless typeof listener is 'function'
- throw new TypeError 'Invalid listener type; expected function'
- unless listener in @_listeners
- @_listeners.push listener
- @
-
- # Un-registers a listener (subscriber) previously added by addListener.
- #
- # This is a simplified version of the removeEventListener DOM API. The
- # listener must be exactly the same object supplied to addListener.
- #
- # This method is idempotent, so it will fail silently if the given listener
- # is not registered as a subscriber.
- #
- # @param {function(Object)} listener function that was previously passed in
- # an addListener call
- # @return {Dropbox.EventSource} this, for easy call chaining
- removeListener: (listener) ->
- if @_listeners.indexOf
- # IE9+
- index = @_listeners.indexOf listener
- @_listeners.splice index, 1 if index isnt -1
- else
- # IE8 doesn't implement Array#indexOf in ES5.
- for subscriber, i in @_listeners
- if subscriber is listener
- @_listeners.splice i, 1
- break
- @
-
-
- # Informs the listeners (subscribers) that an event occurred.
- #
- # Event sources configured for non-cancelable events call all listeners in an
- # unspecified order. Sources configured for cancelable events stop calling
- # listeners as soon as one listener returns false value.
- #
- # @param {Object} event passed to all the registered listeners
- # @return {Boolean} sources of cancelable events return false if the event
- # was canceled and true otherwise; sources of non-cancelable events always
- # return true
- dispatch: (event) ->
- for listener in @_listeners
- returnValue = listener event
- if @_cancelable and returnValue is false
- return false
- true
diff --git a/lib/client/storage/dropbox/src/hmac.coffee b/lib/client/storage/dropbox/src/hmac.coffee
deleted file mode 100644
index b26be463..00000000
--- a/lib/client/storage/dropbox/src/hmac.coffee
+++ /dev/null
@@ -1,180 +0,0 @@
-# HMAC-SHA1 implementation heavily inspired from
-# http://pajhome.org.uk/crypt/md5/sha1.js
-
-# Base64-encoded HMAC-SHA1.
-#
-# @param {String} string the ASCII string to be signed
-# @param {String} key the HMAC key
-# @return {String} a base64-encoded HMAC of the given string and key
-base64HmacSha1 = (string, key) ->
- arrayToBase64 hmacSha1(stringToArray(string), stringToArray(key),
- string.length, key.length)
-
-# Base64-encoded SHA1.
-#
-# @param {String} string the ASCII string to be hashed
-# @return {String} a base64-encoded SHA1 hash of the given string
-base64Sha1 = (string) ->
- arrayToBase64 sha1(stringToArray(string), string.length)
-
-# SHA1 and HMAC-SHA1 versions that use the node.js builtin crypto.
-unless window?
- crypto = require 'crypto'
- base64HmacSha1 = (string, key) ->
- hmac = crypto.createHmac 'sha1', key
- hmac.update string
- hmac.digest 'base64'
- base64Sha1 = (string) ->
- hash = crypto.createHash 'sha1'
- hash.update string
- hash.digest 'base64'
-
-# HMAC-SHA1 implementation.
-#
-# @param {Array} string the HMAC input, as an array of 32-bit numbers
-# @param {Array} key the HMAC input, as an array of 32-bit numbers
-# @param {Number} length the length of the HMAC input, in bytes
-# @return {Array} the HMAC output, as an array of 32-bit numbers
-hmacSha1 = (string, key, length, keyLength) ->
- if key.length > 16
- key = sha1 key, keyLength
-
- ipad = (key[i] ^ 0x36363636 for i in [0...16])
- opad = (key[i] ^ 0x5C5C5C5C for i in [0...16])
-
- hash1 = sha1 ipad.concat(string), 64 + length
- sha1 opad.concat(hash1), 64 + 20
-
-# SHA1 implementation.
-#
-# @param {Array} string the SHA1 input, as an array of 32-bit numbers; the
-# computation trashes the array
-# @param {Number} length the number of bytes in the SHA1 input; used in the
-# SHA1 padding algorithm
-# @return {Array} the SHA1 output, as an array of 32-bit numbers
-sha1 = (string, length) ->
- string[length >> 2] |= 1 << (31 - ((length & 0x03) << 3))
- string[(((length + 8) >> 6) << 4) + 15] = length << 3
-
- state = Array 80
- a = 1732584193 # 0x67452301
- b = -271733879 # 0xefcdab89
- c = -1732584194 # 0x98badcfe
- d = 271733878 # 0x10325476
- e = -1009589776 # 0xc3d2e1f0
-
- i = 0
- limit = string.length
- # Uncomment the line below to debug packing.
- # console.log string.map(xxx)
- while i < limit
- a0 = a
- b0 = b
- c0 = c
- d0 = d
- e0 = e
-
- for j in [0...80]
- if j < 16
- state[j] = string[i + j]
- else
- state[j] = rotateLeft32 state[j - 3] ^ state[j - 8] ^ state[j - 14] ^
- state[j - 16], 1
- if j < 20
- ft = (b & c) | ((~b) & d)
- kt = 1518500249 # 0x5a827999
- else if j < 40
- ft = b ^ c ^ d
- kt = 1859775393 # 0x6ed9eba1
- else if j < 60
- ft = (b & c) | (b & d) | (c & d)
- kt = -1894007588 # 0x8f1bbcdc
- else
- ft = b ^ c ^ d
- kt = -899497514 # 0xca62c1d6
- t = add32 add32(rotateLeft32(a, 5), ft), add32(add32(e, state[j]), kt)
- e = d
- d = c
- c = rotateLeft32 b, 30
- b = a
- a = t
- # Uncomment the line below to debug block computation.
- # console.log [xxx(a), xxx(b), xxx(c), xxx(d), xxx(e)]
- a = add32 a, a0
- b = add32 b, b0
- c = add32 c, c0
- d = add32 d, d0
- e = add32 e, e0
- i += 16
- # Uncomment the line below to see the input to the base64 encoder.
- # console.log [xxx(a), xxx(b), xxx(c), xxx(d), xxx(e)]
- [a, b, c, d, e]
-
-###
-# Uncomment the definition below for debugging.
-#
-# Returns the hexadecimal representation of a 32-bit number.
-xxx = (n) ->
- if n < 0
- n = (1 << 30) * 4 + n
- n.toString 16
-###
-
-# Rotates a 32-bit word.
-#
-# @param {Number} value the 32-bit number to be rotated
-# @param {Number} count the number of bits (0..31) to rotate by
-# @return {Number} the rotated value
-rotateLeft32 = (value, count) ->
- (value << count) | (value >>> (32 - count))
-
-# 32-bit unsigned addition.
-#
-# @param {Number} a, b the 32-bit numbers to be added modulo 2^32
-# @return {Number} the 32-bit representation of a + b
-add32 = (a, b) ->
- low = (a & 0xFFFF) + (b & 0xFFFF)
- high = (a >> 16) + (b >> 16) + (low >> 16)
- (high << 16) | (low & 0xFFFF)
-
-# Converts a 32-bit number array into a base64-encoded string.
-#
-# @param {Array} an array of big-endian 32-bit numbers
-# @return {String} base64 encoding of the given array of numbers
-arrayToBase64 = (array) ->
- string = ""
- i = 0
- limit = array.length * 4
- while i < limit
- i2 = i
- trit = ((array[i2 >> 2] >> ((3 - (i2 & 3)) << 3)) & 0xFF) << 16
- i2 += 1
- trit |= ((array[i2 >> 2] >> ((3 - (i2 & 3)) << 3)) & 0xFF) << 8
- i2 += 1
- trit |= (array[i2 >> 2] >> ((3 - (i2 & 3)) << 3)) & 0xFF
-
- string += _base64Digits[(trit >> 18) & 0x3F]
- string += _base64Digits[(trit >> 12) & 0x3F]
- i += 1
- if i >= limit
- string += '='
- else
- string += _base64Digits[(trit >> 6) & 0x3F]
- i += 1
- if i >= limit
- string += '='
- else
- string += _base64Digits[trit & 0x3F]
- i += 1
- string
-
-_base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-# Converts an ASCII string into array of 32-bit numbers.
-stringToArray = (string) ->
- array = []
- mask = 0xFF
- for i in [0...string.length]
- array[i >> 2] |= (string.charCodeAt(i) & mask) << ((3 - (i & 3)) << 3)
- array
-
diff --git a/lib/client/storage/dropbox/src/oauth.coffee b/lib/client/storage/dropbox/src/oauth.coffee
deleted file mode 100644
index 823f90a5..00000000
--- a/lib/client/storage/dropbox/src/oauth.coffee
+++ /dev/null
@@ -1,162 +0,0 @@
-# Stripped-down OAuth implementation that works with the Dropbox API server.
-class Dropbox.Oauth
- # Creates an Oauth instance that manages an application's keys and token.
- #
- # @param {Object} options the following properties
- # @option options {String} key the Dropbox application's key (consumer key,
- # in OAuth vocabulary); browser-side applications should use
- # Dropbox.encodeKey to obtain an encoded key string, and pass it as the
- # key option
- # @option options {String} secret the Dropbox application's secret (consumer
- # secret, in OAuth vocabulary); browser-side applications should not use
- # the secret option; instead, they should pass the result of
- # Dropbox.encodeKey as the key option
- constructor: (options) ->
- @key = @k = null
- @secret = @s = null
- @token = null
- @tokenSecret = null
- @_appHash = null
- @reset options
-
- # Creates an Oauth instance that manages an application's keys and token.
- #
- # @see Dropbox.Oauth#constructor for options
- reset: (options) ->
- if options.secret
- @k = @key = options.key
- @s = @secret = options.secret
- @_appHash = null
- else if options.key
- @key = options.key
- @secret = null
- secret = atob dropboxEncodeKey(@key).split('|', 2)[1]
- [k, s] = secret.split '?', 2
- @k = decodeURIComponent k
- @s = decodeURIComponent s
- @_appHash = null
- else
- unless @k
- throw new Error('No API key supplied')
-
- if options.token
- @setToken options.token, options.tokenSecret
- else
- @setToken null, ''
-
- # Sets the OAuth token to be used for future requests.
- setToken: (token, tokenSecret) ->
- if token and (not tokenSecret)
- throw new Error('No secret supplied with the user token')
-
- @token = token
- @tokenSecret = tokenSecret || ''
-
- # This is part of signing, but it's set here so it can be cached.
- @hmacKey = Dropbox.Xhr.urlEncodeValue(@s) + '&' +
- Dropbox.Xhr.urlEncodeValue(tokenSecret)
- null
-
- # Computes the value of the Authorization HTTP header.
- #
- # This method mutates the params object, and removes all the OAuth-related
- # parameters from it.
- #
- # @param {String} method the HTTP method used to make the request ('GET',
- # 'POST', etc)
- # @param {String} url the HTTP URL (e.g. "http://www.example.com/photos")
- # that receives the request
- # @param {Object} params an associative array (hash) containing the HTTP
- # request parameters; the parameters should include the oauth_
- # parameters generated by calling {Dropbox.Oauth#boilerplateParams}
- # @return {String} the value to be used for the Authorization HTTP header
- authHeader: (method, url, params) ->
- @addAuthParams method, url, params
-
- # Collect all the OAuth parameters.
- oauth_params = []
- for param, value of params
- if param.substring(0, 6) == 'oauth_'
- oauth_params.push param
- oauth_params.sort()
-
- # Remove the parameters from the params hash and add them to the header.
- header = []
- for param in oauth_params
- header.push Dropbox.Xhr.urlEncodeValue(param) + '="' +
- Dropbox.Xhr.urlEncodeValue(params[param]) + '"'
- delete params[param]
-
- # NOTE: the space after the comma is optional in the OAuth spec, so we'll
- # skip it to save some bandwidth
- 'OAuth ' + header.join(',')
-
- # Generates OAuth-required HTTP parameters.
- #
- # This method mutates the params object, and adds the OAuth-related
- # parameters to it.
- #
- # @param {String} method the HTTP method used to make the request ('GET',
- # 'POST', etc)
- # @param {String} url the HTTP URL (e.g. "http://www.example.com/photos")
- # that receives the request
- # @param {Object} params an associative array (hash) containing the HTTP
- # request parameters; the parameters should include the oauth_
- # parameters generated by calling {Dropbox.Oauth#boilerplateParams}
- # @return {String} the value to be used for the Authorization HTTP header
- addAuthParams: (method, url, params) ->
- # Augment params with OAuth parameters.
- @boilerplateParams params
- params.oauth_signature = @signature method, url, params
- params
-
- # Adds boilerplate OAuth parameters to a request's parameter list.
- #
- # This should be called right before signing a request, to maximize the
- # chances that the OAuth timestamp will be fresh.
- #
- # @param {Object} params an associative array (hash) containing the
- # parameters for an OAuth request; the boilerplate parameters will be
- # added to this hash
- # @return {Object} params
- boilerplateParams: (params) ->
- params.oauth_consumer_key = @k
- params.oauth_nonce = @nonce()
- params.oauth_signature_method = 'HMAC-SHA1'
- params.oauth_token = @token if @token
- params.oauth_timestamp = Math.floor(Date.now() / 1000)
- params.oauth_version = '1.0'
- params
-
- # Generates a nonce for an OAuth request.
- #
- # @return {String} the nonce to be used as the oauth_nonce parameter
- nonce: ->
- Date.now().toString(36) + Math.random().toString(36)
-
- # Computes the signature for an OAuth request.
- #
- # @param {String} method the HTTP method used to make the request ('GET',
- # 'POST', etc)
- # @param {String} url the HTTP URL (e.g. "http://www.example.com/photos")
- # that receives the request
- # @param {Object} params an associative array (hash) containing the HTTP
- # request parameters; the parameters should include the oauth_
- # parameters generated by calling {Dropbox.Oauth#boilerplateParams}
- # @return {String} the signature, ready to be used as the oauth_signature
- # OAuth parameter
- signature: (method, url, params) ->
- string = method.toUpperCase() + '&' + Dropbox.Xhr.urlEncodeValue(url) +
- '&' + Dropbox.Xhr.urlEncodeValue(Dropbox.Xhr.urlEncode(params))
- base64HmacSha1 string, @hmacKey
-
- # @return {String} a string that uniquely identifies the OAuth application
- appHash: ->
- return @_appHash if @_appHash
- @_appHash = base64Sha1(@k).replace(/\=/g, '')
-
-
-# Polyfill for Internet Explorer 8.
-unless Date.now?
- Date.now = () ->
- (new Date()).getTime()
diff --git a/lib/client/storage/dropbox/src/prod.coffee b/lib/client/storage/dropbox/src/prod.coffee
deleted file mode 100644
index 3cc177b9..00000000
--- a/lib/client/storage/dropbox/src/prod.coffee
+++ /dev/null
@@ -1,36 +0,0 @@
-# Necessary bits to get a browser-side app in production.
-
-# Packs up a key and secret into a string, to bring script kiddies some pain.
-#
-# @param {String} key the application's API key
-# @param {String} secret the application's API secret
-# @return {String} encoded key string that can be passed as the key option to
-# the Dropbox.Client constructor
-dropboxEncodeKey = (key, secret) ->
- if secret
- secret = [encodeURIComponent(key), encodeURIComponent(secret)].join('?')
- key = for i in [0...(key.length / 2)]
- ((key.charCodeAt(i * 2) & 15) * 16) + (key.charCodeAt(i * 2 + 1) & 15)
- else
- [key, secret] = key.split '|', 2
- key = atob key
- key = (key.charCodeAt(i) for i in [0...key.length])
- secret = atob secret
-
- s = [0...256]
- y = 0
- for x in [0...256]
- y = (y + s[i] + key[x % key.length]) % 256
- [s[x], s[y]] = [s[y], s[x]]
-
- x = y = 0
- result = for z in [0...secret.length]
- x = (x + 1) % 256
- y = (y + s[x]) % 256
- [s[x], s[y]] = [s[y], s[x]]
- k = s[(s[x] + s[y]) % 256]
- String.fromCharCode((k ^ secret.charCodeAt(z)) % 256)
-
- key = (String.fromCharCode(key[i]) for i in [0...key.length])
- [btoa(key.join('')), btoa(result.join(''))].join '|'
-
diff --git a/lib/client/storage/dropbox/src/pulled_changes.coffee b/lib/client/storage/dropbox/src/pulled_changes.coffee
deleted file mode 100644
index 6bf7ebcd..00000000
--- a/lib/client/storage/dropbox/src/pulled_changes.coffee
+++ /dev/null
@@ -1,106 +0,0 @@
-# Wraps the result of pullChanges, describing the changes in a user's Dropbox.
-class Dropbox.PulledChanges
- # Creates a new Dropbox.PulledChanges instance from a /delta API call result.
- #
- # @param {?Object} deltaInfo the parsed JSON of a /delta API call result
- # @return {?Dropbox.PulledChanges} a Dropbox.PulledChanges instance wrapping
- # the given information; if the parameter does not look like parsed JSON,
- # it is returned as is
- @parse: (deltaInfo) ->
- if deltaInfo and typeof deltaInfo is 'object'
- new Dropbox.PulledChanges deltaInfo
- else
- deltaInfo
-
- # @property {Boolean} if true, the application should reset its copy of the
- # user's Dropbox before applying the changes described by this instance
- blankSlate: undefined
-
- # @property {String} encodes a cursor in the list of changes to a user's
- # Dropbox; a pullChanges call returns some changes at the cursor, and then
- # advance the cursor to account for the returned changes; the new cursor is
- # returned by pullChanges, and meant to be used by a subsequent pullChanges
- # call
- cursorTag: undefined
-
- # @property {Array an array with one entry for each
- # change to the user's Dropbox returned by a pullChanges call.
- changes: undefined
-
- # @property {Boolean} if true, the pullChanges call returned a subset of the
- # available changes, and the application should repeat the call
- # immediately to get more changes
- shouldPullAgain: undefined
-
- # @property {Boolean} if true, the API call will not have any more changes
- # available in the nearby future, so the application should wait for at
- # least 5 miuntes before issuing another pullChanges request
- shouldBackOff: undefined
-
- # Serializable representation of the pull cursor inside this object.
- #
- # @return {String} an ASCII string that can be passed to pullChanges instead
- # of this PulledChanges instance
- cursor: -> @cursorTag
-
- # Creates a new Dropbox.PulledChanges instance from a /delta API call result.
- #
- # @private
- # This constructor is used by Dropbox.PulledChanges, and should not be called
- # directly.
- #
- # @param {Object} deltaInfo the parsed JSON of a /delta API call result
- constructor: (deltaInfo) ->
- @blankSlate = deltaInfo.reset or false
- @cursorTag = deltaInfo.cursor
- @shouldPullAgain = deltaInfo.has_more
- @shouldBackOff = not @shouldPullAgain
- if deltaInfo.cursor and deltaInfo.cursor.length
- @changes = (Dropbox.PullChange.parse entry for entry in deltaInfo.entries)
- else
- @changes = []
-
-# Wraps a single change in a pullChanges result.
-class Dropbox.PullChange
- # Creates a Dropbox.PullChange instance wrapping an entry in a /delta result.
- #
- # @param {?Object} entry the parsed JSON of a single entry in a /delta API
- # call result
- # @return {?Dropbox.PullChange} a Dropbox.PullChange instance wrapping the
- # given entry of a /delta API call; if the parameter does not look like
- # parsed JSON, it is returned as is
- @parse: (entry) ->
- if entry and typeof entry is 'object'
- new Dropbox.PullChange entry
- else
- entry
-
- # @property {String} the path of the changed file or folder
- path: undefined
-
- # @property {Boolean} if true, this change is a deletion of the file or folder
- # at the change's path; if a folder is deleted, all its contents (files
- # and sub-folders) were also be deleted; pullChanges might not return
- # separate changes expressing for the files or sub-folders
- wasRemoved: undefined
-
- # @property {?Dropbox.Stat} a Stat instance containing updated information for
- # the file or folder; this is null if the change is a deletion
- stat: undefined
-
- # Creates a Dropbox.PullChange instance wrapping an entry in a /delta result.
- #
- # @private
- # This constructor is used by Dropbox.PullChange.parse, and should not be
- # called directly.
- #
- # @param {Object} entry the parsed JSON of a single entry in a /delta API
- # call result
- constructor: (entry) ->
- @path = entry[0]
- @stat = Dropbox.Stat.parse entry[1]
- if @stat
- @wasRemoved = false
- else
- @stat = null
- @wasRemoved = true
diff --git a/lib/client/storage/dropbox/src/references.coffee b/lib/client/storage/dropbox/src/references.coffee
deleted file mode 100644
index d7602c5f..00000000
--- a/lib/client/storage/dropbox/src/references.coffee
+++ /dev/null
@@ -1,119 +0,0 @@
-# Wraps an URL to a Dropbox file or folder that can be publicly shared.
-class Dropbox.PublicUrl
- # Creates a PublicUrl instance from a raw API response.
- #
- # @param {?Object, ?String} urlData the parsed JSON describing a public URL
- # @param {?Boolean} isDirect true if this is a direct download link, false if
- # is a file / folder preview link
- # @return {?Dropbox.PublicUrl} a PublicUrl instance wrapping the given public
- # link info; parameters that don't look like parsed JSON are returned as
- # they are
- @parse: (urlData, isDirect) ->
- if urlData and typeof urlData is 'object'
- new Dropbox.PublicUrl urlData, isDirect
- else
- urlData
-
- # @property {String} the public URL
- url: null
-
- # @property {Date} after this time, the URL is not usable
- expiresAt: null
-
- # @property {Boolean} true if this is a direct download URL, false for URLs to
- # preview pages in the Dropbox web app; folders do not have direct link
- #
- isDirect: null
-
- # @property {Boolean} true if this is URL points to a file's preview page in
- # Dropbox, false for direct links
- isPreview: null
-
- # JSON representation of this file / folder's metadata
- #
- # @return {Object} conforms to the JSON restrictions; can be passed to
- # Dropbox.PublicUrl#parse to obtain an identical PublicUrl instance
- json: ->
- # HACK: this can break if the Dropbox API ever decides to use 'direct' in
- # its link info
- @_json ||= url: @url, expires: @expiresAt.toString(), direct: @isDirect
-
- # Creates a PublicUrl instance from a raw API response.
- #
- # @private
- # This constructor is used by Dropbox.PublicUrl.parse, and should not be
- # called directly.
- #
- # @param {?Object} urlData the parsed JSON describing a public URL
- # @param {Boolean} isDirect true if this is a direct download link, false if
- # is a file / folder preview link
- constructor: (urlData, isDirect) ->
- @url = urlData.url
- @expiresAt = new Date Date.parse(urlData.expires)
-
- if isDirect is true
- @isDirect = true
- else if isDirect is false
- @isDirect = false
- else
- # HACK: this can break if the Dropbox API ever decides to use 'direct' in
- # its link info; unfortunately, there's no elegant way to guess
- # between direct download URLs and preview URLs
- if 'direct' of urlData
- @isDirect = urlData.direct
- else
- @isDirect = Date.now() - @expiresAt <= 86400000 # 1 day
- @isPreview = !@isDirect
-
- # The JSON representation is created on-demand, to avoid unnecessary object
- # creation.
- # We can't use the original JSON object because we add a 'direct' field.
- @_json = null
-
-# Reference to a file that can be used to make a copy across users' Dropboxes.
-class Dropbox.CopyReference
- # Creates a CopyReference instance from a raw reference or API response.
- #
- # @param {?Object, ?String} refData the parsed JSON describing a copy
- # reference, or the reference string
- @parse: (refData) ->
- if refData and (typeof refData is 'object' or typeof refData is 'string')
- new Dropbox.CopyReference refData
- else
- refData
-
- # @property {String} the raw reference, for use with Dropbox APIs
- tag: null
-
- # @property {Date} deadline for using the reference in a copy operation
- expiresAt: null
-
- # JSON representation of this file / folder's metadata
- #
- # @return {Object} conforms to the JSON restrictions; can be passed to
- # Dropbox.CopyReference#parse to obtain an identical CopyReference instance
- json: ->
- # NOTE: the assignment only occurs if the CopyReference was built around a
- # string; CopyReferences parsed from API responses hold onto the
- # original JSON
- @_json ||= copy_ref: @tag, expires: @expiresAt.toString()
-
- # Creates a CopyReference instance from a raw reference or API response.
- #
- # @private
- # This constructor is used by Dropbox.CopyReference.parse, and should not be
- # called directly.
- #
- # @param {Object, String} refData the parsed JSON describing a copy
- # reference, or the reference string
- constructor: (refData) ->
- if typeof refData is 'object'
- @tag = refData.copy_ref
- @expiresAt = new Date Date.parse(refData.expires)
- @_json = refData
- else
- @tag = refData
- @expiresAt = new Date Math.ceil(Date.now() / 1000) * 1000
- # The JSON representation is created on-demand, to avoid unnecessary
- # object creation.
- @_json = null
diff --git a/lib/client/storage/dropbox/src/stat.coffee b/lib/client/storage/dropbox/src/stat.coffee
deleted file mode 100644
index ea3db318..00000000
--- a/lib/client/storage/dropbox/src/stat.coffee
+++ /dev/null
@@ -1,135 +0,0 @@
-# The result of stat-ing a file or directory in a user's Dropbox.
-class Dropbox.Stat
- # Creates a Stat instance from a raw "metadata" response.
- #
- # @param {?Object} metadata the result of parsing JSON API responses that are
- # called "metadata" in the API documentation
- # @return {?Dropbox.Stat} a Stat instance wrapping the given API response;
- # parameters that aren't parsed JSON objects are returned as they are
- @parse: (metadata) ->
- if metadata and typeof metadata is 'object'
- new Dropbox.Stat metadata
- else
- metadata
-
- # @property {String} the path of this file or folder, relative to the user's
- # Dropbox or to the application's folder
- path: null
-
- # @property {String} the name of this file or folder
- name: null
-
- # @property {Boolean} if true, the file or folder's path is relative to the
- # application's folder; otherwise, the path is relative to the user's
- # Dropbox
- inAppFolder: null
-
- # @property {Boolean} if true, this Stat instance describes a folder
- isFolder: null
-
- # @property {Boolean} if true, this Stat instance describes a file
- isFile: null
-
- # @property {Boolean} if true, the file or folder described by this Stat
- # instance was from the user's Dropbox, and was obtained by an API call
- # that returns deleted items
- isRemoved: null
-
- # @property {String} name of an icon in Dropbox's icon library that most
- # accurately represents this file or folder
- #
- # See the Dropbox API documentation to obtain the Dropbox icon library.
- # https://www.dropbox.com/developers/reference/api#metadata
- typeIcon: null
-
- # @property {String} an identifier for the contents of the described file or
- # directories; this can used to be restored a file's contents to a
- # previous version, or to save bandwidth by not retrieving the same
- # folder contents twice
- versionTag: null
-
- # @property {String} a guess of the MIME type representing the file or
- # folder's contents
- mimeType: null
-
- # @property {Number} the size of the file, in bytes; null for folders
- size: null
-
- # @property {String} the size of the file, in a human-readable format, such
- # as "225.4KB"; the format of this string is influenced by the API client's
- # locale
- humanSize: null
-
- # @property {Boolean} if false, the URL generated by thumbnailUrl does not
- # point to a valid image, and should not be used
- hasThumbnail: null
-
- # @property {Date} the file or folder's last modification time
- modifiedAt: null
-
- # @property {?Date} the file or folder's last modification time, as reported
- # by the Dropbox client that uploaded the file; this time should not be
- # trusted, but can be used for UI (display, sorting); null if the server
- # does not report any time
- clientModifiedAt: null
-
- # JSON representation of this file / folder's metadata
- #
- # @return {Object} conforms to the JSON restrictions; can be passed to
- # Dropbox.Stat#parse to obtain an identical Stat instance
- json: ->
- @_json
-
- # Creates a Stat instance from a raw "metadata" response.
- #
- # @private
- # This constructor is used by Dropbox.Stat.parse, and should not be called
- # directly.
- #
- # @param {Object} metadata the result of parsing JSON API responses that are
- # called "metadata" in the API documentation
- constructor: (metadata) ->
- @_json = metadata
- @path = metadata.path
- # Ensure there is a trailing /, to make path processing reliable.
- @path = '/' + @path if @path.substring(0, 1) isnt '/'
- # Strip any trailing /, to make path joining predictable.
- lastIndex = @path.length - 1
- if lastIndex >= 0 and @path.substring(lastIndex) is '/'
- @path = @path.substring 0, lastIndex
-
- nameSlash = @path.lastIndexOf '/'
- @name = @path.substring nameSlash + 1
-
- @isFolder = metadata.is_dir || false
- @isFile = !@isFolder
- @isRemoved = metadata.is_deleted || false
- @typeIcon = metadata.icon
- if metadata.modified?.length
- @modifiedAt = new Date Date.parse(metadata.modified)
- else
- @modifiedAt = null
- if metadata.client_mtime?.length
- @clientModifiedAt = new Date Date.parse(metadata.client_mtime)
- else
- @clientModifiedAt = null
-
- switch metadata.root
- when 'dropbox'
- @inAppFolder = false
- when 'app_folder'
- @inAppFolder = true
- else
- # New "root" value that we're not aware of.
- @inAppFolder = null
-
- @size = metadata.bytes or 0
- @humanSize = metadata.size or ''
- @hasThumbnail = metadata.thumb_exists or false
-
- if @isFolder
- @versionTag = metadata.hash
- @mimeType = metadata.mime_type || 'inode/directory'
- else
- @versionTag = metadata.rev
- @mimeType = metadata.mime_type || 'application/octet-stream'
diff --git a/lib/client/storage/dropbox/src/upload_cursor.coffee b/lib/client/storage/dropbox/src/upload_cursor.coffee
deleted file mode 100644
index 5e660102..00000000
--- a/lib/client/storage/dropbox/src/upload_cursor.coffee
+++ /dev/null
@@ -1,59 +0,0 @@
-# Tracks the progress of a resumable upload.
-class Dropbox.UploadCursor
- # Creates an UploadCursor instance from an API response.
- #
- # @param {?Object, ?String} cursorData the parsed JSON describing the status
- # of a partial upload, or the upload ID string
- @parse: (cursorData) ->
- if cursorData and (typeof cursorData is 'object' or
- typeof cursorData is 'string')
- new Dropbox.UploadCursor cursorData
- else
- cursorData
-
- # @property {String} the server-generated ID for this upload
- tag: null
-
- # @property {Number} number of bytes that have already been uploaded
- offset: null
-
- # @property {Date} deadline for finishing the upload
- expiresAt: null
-
- # JSON representation of this cursor.
- #
- # @return {Object} conforms to the JSON restrictions; can be passed to
- # Dropbox.UploadCursor#parse to obtain an identical UploadCursor instance
- json: ->
- # NOTE: the assignment only occurs if
- @_json ||= upload_id: @tag, offset: @offset, expires: @expiresAt.toString()
-
- # Creates an UploadCursor instance from a raw reference or API response.
- #
- # This constructor should only be called directly to obtain a cursor for a
- # new file upload. Dropbox.UploadCursor#parse should be called instead
- #
- # @param {?Object, ?String} cursorData the parsed JSON describing a copy
- # reference, or the reference string
- constructor: (cursorData) ->
- @replace cursorData
-
- # Replaces the current
- #
- # @private Called by Dropbox.Client#resumableUploadStep.
- #
- # @param {?Object, ?String} cursorData the parsed JSON describing a copy
- # reference, or the reference string
- # @return {Dropbox.UploadCursor} this
- replace: (cursorData) ->
- if typeof cursorData is 'object'
- @tag = cursorData.upload_id or null
- @offset = cursorData.offset or 0
- @expiresAt = new Date(Date.parse(cursorData.expires) or Date.now())
- @_json = cursorData
- else
- @tag = cursorData or null
- @offset = 0
- @expiresAt = new Date Math.floor(Date.now() / 1000) * 1000
- @_json = null
- @
diff --git a/lib/client/storage/dropbox/src/user_info.coffee b/lib/client/storage/dropbox/src/user_info.coffee
deleted file mode 100644
index ba6dbea2..00000000
--- a/lib/client/storage/dropbox/src/user_info.coffee
+++ /dev/null
@@ -1,88 +0,0 @@
-# Information about a Dropbox user.
-class Dropbox.UserInfo
- # Creates a UserInfo instance from a raw API response.
- #
- # @param {?Object} userInfo the result of parsing a JSON API response that
- # describes a user
- # @return {Dropbox.UserInfo} a UserInfo instance wrapping the given API
- # response; parameters that aren't parsed JSON objects are returned as
- # the are
- @parse: (userInfo) ->
- if userInfo and typeof userInfo is 'object'
- new Dropbox.UserInfo userInfo
- else
- userInfo
-
- # @property {String} the user's name, in a form that is fit for display
- name: null
-
- # @property {?String} the user's email; this is not in the official API
- # documentation, so it might not be supported
- email: null
-
- # @property {?String} two-letter country code, or null if unavailable
- countryCode: null
-
- # @property {String} unique ID for the user; this ID matches the unique ID
- # returned by the authentication process
- uid: null
-
- # @property {String} the user's referral link; the user might benefit if
- # others use the link to sign up for Dropbox
- referralUrl: null
-
- # Specific to applications whose access type is "public app folder".
- #
- # @property {String} prefix for URLs to the application's files
- publicAppUrl: null
-
- # @property {Number} the maximum amount of bytes that the user can store
- quota: null
-
- # @property {Number} the number of bytes taken up by the user's data
- usedQuota: null
-
- # @property {Number} the number of bytes taken up by the user's data that is
- # not shared with other users
- privateBytes: null
-
- # @property {Number} the number of bytes taken up by the user's data that is
- # shared with other users
- sharedBytes: null
-
- # JSON representation of this user's information.
- #
- # @return {Object} conforms to the JSON restrictions; can be passed to
- # Dropbox.UserInfo#parse to obtain an identical UserInfo instance
- json: ->
- @_json
-
- # Creates a UserInfo instance from a raw API response.
- #
- # @private
- # This constructor is used by Dropbox.UserInfo.parse, and should not be
- # called directly.
- #
- # @param {Object} userInfo the result of parsing a JSON API response that
- # describes a user
- constructor: (userInfo) ->
- @_json = userInfo
- @name = userInfo.display_name
- @email = userInfo.email
- @countryCode = userInfo.country or null
- @uid = userInfo.uid.toString()
- if userInfo.public_app_url
- @publicAppUrl = userInfo.public_app_url
- lastIndex = @publicAppUrl.length - 1
- # Strip any trailing /, to make path joining predictable.
- if lastIndex >= 0 and @publicAppUrl.substring(lastIndex) is '/'
- @publicAppUrl = @publicAppUrl.substring 0, lastIndex
- else
- @publicAppUrl = null
-
- @referralUrl = userInfo.referral_link
- @quota = userInfo.quota_info.quota
- @privateBytes = userInfo.quota_info.normal or 0
- @sharedBytes = userInfo.quota_info.shared or 0
- @usedQuota = @privateBytes + @sharedBytes
-
diff --git a/lib/client/storage/dropbox/src/xhr.coffee b/lib/client/storage/dropbox/src/xhr.coffee
deleted file mode 100644
index 63051828..00000000
--- a/lib/client/storage/dropbox/src/xhr.coffee
+++ /dev/null
@@ -1,505 +0,0 @@
-if window?
- if window.XDomainRequest and not ('withCredentials' of new XMLHttpRequest())
- DropboxXhrRequest = window.XDomainRequest
- DropboxXhrIeMode = true
- # IE's XDR doesn't allow setting requests' Content-Type to anything other
- # than text/plain, so it can't send _any_ forms.
- DropboxXhrCanSendForms = false
- else
- DropboxXhrRequest = window.XMLHttpRequest
- DropboxXhrIeMode = false
- # Firefox doesn't support adding named files to FormData.
- # https://bugzilla.mozilla.org/show_bug.cgi?id=690659
- DropboxXhrCanSendForms =
- window.navigator.userAgent.indexOf('Firefox') is -1
- DropboxXhrDoesPreflight = true
-else
- # Node.js needs an adapter for the XHR API.
- DropboxXhrRequest = require('xmlhttprequest').XMLHttpRequest
- DropboxXhrIeMode = false
- # Node.js doesn't have FormData. We wouldn't want to bother putting together
- # upload forms in node.js anyway, because it doesn't do CORS preflight
- # checks, so we can use PUT requests without a performance hit.
- DropboxXhrCanSendForms = false
- # Node.js is a server so it doesn't do annoying browser checks.
- DropboxXhrDoesPreflight = false
-
-# ArrayBufferView isn't available in the global namespce.
-#
-# Using the hack suggested in
-# https://code.google.com/p/chromium/issues/detail?id=60449
-if typeof Uint8Array is 'undefined'
- DropboxXhrArrayBufferView = null
- DropboxXhrSendArrayBufferView = false
-else
- if Object.getPrototypeOf
- DropboxXhrArrayBufferView = Object.getPrototypeOf(
- Object.getPrototypeOf(new Uint8Array(0))).constructor
- else if Object.__proto__
- DropboxXhrArrayBufferView =
- (new Uint8Array(0)).__proto__.__proto__.constructor
-
- # Browsers that haven't implemented XHR#send(ArrayBufferView) also don't
- # have a real ArrayBufferView prototype. (Safari, Firefox)
- DropboxXhrSendArrayBufferView = DropboxXhrArrayBufferView isnt Object
-
-# Dispatches low-level AJAX calls (XMLHttpRequests).
-class Dropbox.Xhr
- # The object used to perform AJAX requests (XMLHttpRequest).
- @Request = DropboxXhrRequest
- # Set to true when using the XDomainRequest API.
- @ieXdr = DropboxXhrIeMode
- # Set to true if the platform has proper support for FormData.
- @canSendForms = DropboxXhrCanSendForms
- # Set to true if the platform performs CORS preflight checks.
- @doesPreflight = DropboxXhrDoesPreflight
- # Superclass for all ArrayBufferView objects.
- @ArrayBufferView = DropboxXhrArrayBufferView
- # Set to true if we think we can send ArrayBufferView objects via XHR.
- @sendArrayBufferView = DropboxXhrSendArrayBufferView
-
-
- # Sets up an AJAX request.
- #
- # @param {String} method the HTTP method used to make the request ('GET',
- # 'POST', 'PUT', etc.)
- # @param {String} baseUrl the URL that receives the request; this URL might
- # be modified, e.g. by appending parameters for GET requests
- constructor: (@method, baseUrl) ->
- @isGet = @method is 'GET'
- @url = baseUrl
- @headers = {}
- @params = null
- @body = null
- @preflight = not (@isGet or (@method is 'POST'))
- @signed = false
- @responseType = null
- @callback = null
- @xhr = null
- @onError = null
-
- # @property {?XMLHttpRequest} the raw XMLHttpRequest object used to make the
- # request; null until Dropbox.Xhr#prepare is called
- xhr: null
-
- # @property {?Dropbox.EventSource} if the XHR fails and
- # this property is set, the Dropbox.ApiError instance that will be passed
- # to the callback will be dispatched through the Dropbox.EventSource; the
- # EventSource should be configured for non-cancelable events
- onError: null
-
- # Sets the parameters (form field values) that will be sent with the request.
- #
- # @param {?Object} params an associative array (hash) containing the HTTP
- # request parameters
- # @return {Dropbox.Xhr} this, for easy call chaining
- setParams: (params) ->
- if @signed
- throw new Error 'setParams called after addOauthParams or addOauthHeader'
- if @params
- throw new Error 'setParams cannot be called twice'
- @params = params
- @
-
- # Sets the function called when the XHR completes.
- #
- # This function can also be set when calling Dropbox.Xhr#send.
- #
- # @param {function(?Dropbox.ApiError, ?Object, ?Object)} callback called when
- # the XHR completes; if an error occurs, the first parameter will be a
- # Dropbox.ApiError instance; otherwise, the second parameter will be an
- # instance of the required response type (e.g., String, Blob), and the
- # third parameter will be the JSON-parsed 'x-dropbox-metadata' header
- # @return {Dropbox.Xhr} this, for easy call chaining
- setCallback: (@callback) ->
- @
-
- # Ammends the request parameters to include an OAuth signature.
- #
- # The OAuth signature will become invalid if the parameters are changed after
- # the signing process.
- #
- # This method automatically decides the best way to add the OAuth signature
- # to the current request. Modifying the request in any way (e.g., by adding
- # headers) might result in a valid signature that is applied in a sub-optimal
- # fashion. For best results, call this right before Dropbox.Xhr#prepare.
- #
- # @param {Dropbox.Oauth} oauth OAuth instance whose key and secret will be
- # used to sign the request
- # @param {Boolean} cacheFriendly if true, the signing process choice will be
- # biased towards allowing the HTTP cache to work; by default, the choice
- # attempts to avoid the CORS preflight request whenever possible
- # @return {Dropbox.Xhr} this, for easy call chaining
- signWithOauth: (oauth, cacheFriendly) ->
- if Dropbox.Xhr.ieXdr
- @addOauthParams oauth
- else if @preflight or !Dropbox.Xhr.doesPreflight
- @addOauthHeader oauth
- else
- if @isGet and cacheFriendly
- @addOauthHeader oauth
- else
- @addOauthParams oauth
-
- # Ammends the request parameters to include an OAuth signature.
- #
- # The OAuth signature will become invalid if the parameters are changed after
- # the signing process.
- #
- # @param {Dropbox.Oauth} oauth OAuth instance whose key and secret will be
- # used to sign the request
- # @return {Dropbox.Xhr} this, for easy call chaining
- addOauthParams: (oauth) ->
- if @signed
- throw new Error 'Request already has an OAuth signature'
-
- @params or= {}
- oauth.addAuthParams @method, @url, @params
- @signed = true
- @
-
- # Adds an Authorize header containing an OAuth signature.
- #
- # The OAuth signature will become invalid if the parameters are changed after
- # the signing process.
- #
- # @param {Dropbox.Oauth} oauth OAuth instance whose key and secret will be
- # used to sign the request
- # @return {Dropbox.Xhr} this, for easy call chaining
- addOauthHeader: (oauth) ->
- if @signed
- throw new Error 'Request already has an OAuth signature'
-
- @params or= {}
- @signed = true
- @setHeader 'Authorization', oauth.authHeader(@method, @url, @params)
-
- # Sets the body (piece of data) that will be sent with the request.
- #
- # @param {String, Blob, ArrayBuffer} body the body to be sent in a request;
- # GET requests cannot have a body
- # @return {Dropbox.Xhr} this, for easy call chaining
- setBody: (body) ->
- if @isGet
- throw new Error 'setBody cannot be called on GET requests'
- if @body isnt null
- throw new Error 'Request already has a body'
-
- if typeof body is 'string'
- # Content-Type will be set automatically.
- else if (typeof FormData isnt 'undefined') and (body instanceof FormData)
- # Content-Type will be set automatically.
- else
- @headers['Content-Type'] = 'application/octet-stream'
- @preflight = true
-
- @body = body
- @
-
- # Sends off an AJAX request and requests a custom response type.
- #
- # This method requires XHR Level 2 support, which is not available in IE
- # versions <= 9. If these browsers must be supported, it is recommended to
- # check whether window.Blob is truthy.
- #
- # @param {String} responseType the value that will be assigned to the XHR's
- # responseType property
- # @return {Dropbox.Xhr} this, for easy call chaining
- setResponseType: (@responseType) ->
- @
-
- # Sets the value of a custom HTTP header.
- #
- # Custom HTTP headers require a CORS preflight in browsers, so requests that
- # use them will take more time to complete, especially on high-latency mobile
- # connections.
- #
- # @param {String} headerName the name of the HTTP header
- # @param {String} value the value that the header will be set to
- # @return {Dropbox.Xhr} this, for easy call chaining
- setHeader: (headerName, value) ->
- if @headers[headerName]
- oldValue = @headers[headerName]
- throw new Error "HTTP header #{headerName} already set to #{oldValue}"
- if headerName is 'Content-Type'
- throw new Error 'Content-Type is automatically computed based on setBody'
- @preflight = true
- @headers[headerName] = value
- @
-
- # Simulates having an
-
diff --git a/lib/client/storage/dropbox/test/app_icon/hazard128.png b/lib/client/storage/dropbox/test/app_icon/hazard128.png
deleted file mode 100644
index 92e78693..00000000
Binary files a/lib/client/storage/dropbox/test/app_icon/hazard128.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/app_icon/hazard16.png b/lib/client/storage/dropbox/test/app_icon/hazard16.png
deleted file mode 100644
index 847d67dc..00000000
Binary files a/lib/client/storage/dropbox/test/app_icon/hazard16.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/app_icon/hazard64.png b/lib/client/storage/dropbox/test/app_icon/hazard64.png
deleted file mode 100644
index afdd91e7..00000000
Binary files a/lib/client/storage/dropbox/test/app_icon/hazard64.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/app_icon/radiation.svg b/lib/client/storage/dropbox/test/app_icon/radiation.svg
deleted file mode 100644
index f21963e2..00000000
--- a/lib/client/storage/dropbox/test/app_icon/radiation.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
diff --git a/lib/client/storage/dropbox/test/app_icon/radiation128.png b/lib/client/storage/dropbox/test/app_icon/radiation128.png
deleted file mode 100644
index eefcc148..00000000
Binary files a/lib/client/storage/dropbox/test/app_icon/radiation128.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/app_icon/radiation16.png b/lib/client/storage/dropbox/test/app_icon/radiation16.png
deleted file mode 100644
index 4626e76c..00000000
Binary files a/lib/client/storage/dropbox/test/app_icon/radiation16.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/app_icon/radiation64.png b/lib/client/storage/dropbox/test/app_icon/radiation64.png
deleted file mode 100644
index 8abe6bc4..00000000
Binary files a/lib/client/storage/dropbox/test/app_icon/radiation64.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/binary/dropbox.png b/lib/client/storage/dropbox/test/binary/dropbox.png
deleted file mode 100644
index 1442d90c..00000000
Binary files a/lib/client/storage/dropbox/test/binary/dropbox.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/chrome_app/images/icon.svg b/lib/client/storage/dropbox/test/chrome_app/images/icon.svg
deleted file mode 100644
index b074aab1..00000000
--- a/lib/client/storage/dropbox/test/chrome_app/images/icon.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
diff --git a/lib/client/storage/dropbox/test/chrome_app/images/icon128.png b/lib/client/storage/dropbox/test/chrome_app/images/icon128.png
deleted file mode 100644
index 82d61dbc..00000000
Binary files a/lib/client/storage/dropbox/test/chrome_app/images/icon128.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/chrome_app/images/icon16.png b/lib/client/storage/dropbox/test/chrome_app/images/icon16.png
deleted file mode 100644
index 86c7e8b7..00000000
Binary files a/lib/client/storage/dropbox/test/chrome_app/images/icon16.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/chrome_app/images/icon48.png b/lib/client/storage/dropbox/test/chrome_app/images/icon48.png
deleted file mode 100644
index 529cf14f..00000000
Binary files a/lib/client/storage/dropbox/test/chrome_app/images/icon48.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/chrome_app/manifests/app_v1.json b/lib/client/storage/dropbox/test/chrome_app/manifests/app_v1.json
deleted file mode 100644
index 5e369ae0..00000000
--- a/lib/client/storage/dropbox/test/chrome_app/manifests/app_v1.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "dropbox.js Test Suite",
- "version": "1.0",
- "manifest_version": 2,
- "description": "Test suite for Chrome applications and extensions.",
- "icons": {
- "16": "images/icon16.png",
- "48": "images/icon48.png",
- "128": "images/icon128.png"
- },
- "permissions": [
- "storage",
- "unlimitedStorage"
- ],
- "app": {
- "launch": {
- "local_path": "test/html/browser_test.html"
- }
- }
-}
diff --git a/lib/client/storage/dropbox/test/chrome_app/manifests/app_v2.json b/lib/client/storage/dropbox/test/chrome_app/manifests/app_v2.json
deleted file mode 100644
index a41b4611..00000000
--- a/lib/client/storage/dropbox/test/chrome_app/manifests/app_v2.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "name": "dropbox.js Test Suite",
- "version": "1.0",
- "manifest_version": 2,
- "description": "Test suite for Chrome applications and extensions.",
- "icons": {
- "16": "images/icon16.png",
- "48": "images/icon48.png",
- "128": "images/icon128.png"
- },
- "permissions": [
- "storage",
- "unlimitedStorage"
- ],
- "app": {
- "background": {
- "scripts": [
- "test/js/chrome_app_background.js"
- ]
- }
- }
-}
diff --git a/lib/client/storage/dropbox/test/chrome_extension/README.md b/lib/client/storage/dropbox/test/chrome_extension/README.md
deleted file mode 100644
index 34c15033..00000000
--- a/lib/client/storage/dropbox/test/chrome_extension/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# dropbox.js Test Automator
-
-This is a Google Chrome extension that fully automates the dropbox.js test
-suite. Read the
-[dropbox.js development guide](https://github.com/dropbox/dropbox-js/tree/master/doc)
-to learn how the extension fits into the testing process.
-
-You're welcome to reuse the code to automate the testing of your own
-application's integration with Dropbox.
-
diff --git a/lib/client/storage/dropbox/test/chrome_extension/background.coffee b/lib/client/storage/dropbox/test/chrome_extension/background.coffee
deleted file mode 100644
index b29393ba..00000000
--- a/lib/client/storage/dropbox/test/chrome_extension/background.coffee
+++ /dev/null
@@ -1,84 +0,0 @@
-# Background script orchestrating the dropbox.js testing automation.
-
-class Automator
- constructor: ->
- @wired = false
- chrome.storage.sync.get 'enabled', (values) =>
- @lifeSwitch values.enabled is 'true'
-
- # Activates or deactivates the extension.
- # @param {Boolean} enabled if true, the extension's functionality is enabled
- lifeSwitch: (enabled) ->
- if enabled
- chrome.browserAction.setIcon
- path:
- 19: 'images/action_on19.png'
- 38: 'images/action_on38.png'
- chrome.browserAction.setTitle title: '(on) dropbox.js Test Automator'
- @wire()
- else
- chrome.browserAction.setIcon
- path:
- 19: 'images/action_off19.png',
- 38: 'images/action_off38.png'
- chrome.browserAction.setTitle title: '(off) dropbox.js Test Automator'
- @unwire()
-
- # Checks if Dropbox's authorization dialog should be auto-clicked.
- # @param {String} url the URL of the Dropbox authorization dialog
- # @return {Boolean} true if the "Authorize" button should be auto-clicked
- shouldAutomateAuth: (url) ->
- return false unless @wired
- !!(/(\?|&)oauth_callback=https?%3A%2F%2Flocalhost%3A891[12]%2F/.exec(url))
-
- # Checks if an OAuth receiver window should be auto-closed.
- # @param {String} url the URL of the OAuth receiver window
- # @return {Boolean} true if the "Authorize" button should be auto-clicked
- shouldAutomateClose: (url) ->
- return false unless @wired
- !!(/^https?:\/\/localhost:8912\/oauth_callback\?/.exec(url))
-
- # Sets up all the features that make dropbox.js testing easier.
- wire: ->
- return if @wired
- chrome.contentSettings.popups.set(
- primaryPattern: 'http://localhost:8911/*', setting: 'allow')
- @wired = true
- @
-
- # Disables the features that automate dropbox.js testing.
- unwire: ->
- return unless @wired
- chrome.contentSettings.popups.clear({})
- @wired = false
- @
-
-# Global Automator instance.
-automator = new Automator()
-
-# Current extension id, used to validate incoming messages.
-extensionId = chrome.i18n.getMessage "@@extension_id"
-
-# Communicates with content scripts.
-chrome.extension.onMessage.addListener (message, sender, sendResponse) ->
- return unless sender.id is extensionId
- switch message.type
- when 'auth'
- sendResponse automate: automator.shouldAutomateAuth(message.url)
- when 'close'
- if automator.shouldAutomateClose(message.url) and sender.tab
- chrome.tabs.remove sender.tab.id
-
-# Listen to pref changes and activate / deactivate the extension.
-chrome.storage.onChanged.addListener (changes, namespace) ->
- return unless namespace is 'sync'
- for name, change of changes
- continue unless name is 'enabled'
- automator.lifeSwitch change.newValue is 'true'
-
-# The browser action item flips the switch that activates the extension.
-chrome.browserAction.onClicked.addListener ->
- chrome.storage.sync.get 'enabled', (values) ->
- enabled = values.enabled is 'true'
- chrome.storage.sync.set enabled: (!enabled).toString()
-
diff --git a/lib/client/storage/dropbox/test/chrome_extension/content_auth.coffee b/lib/client/storage/dropbox/test/chrome_extension/content_auth.coffee
deleted file mode 100644
index 1fb6ca89..00000000
--- a/lib/client/storage/dropbox/test/chrome_extension/content_auth.coffee
+++ /dev/null
@@ -1,18 +0,0 @@
-# Content script for Dropbox authorization pages.
-
-message = type: 'auth', url: window.location.href
-chrome.extension.sendMessage message, (response) ->
- return unless response.automate
-
- button = document.querySelector('[name=allow_access]') or
- document.querySelector '.freshbutton-blue'
- event = document.createEvent 'MouseEvents'
-
- clientX = button.clientWidth / 2
- clientY = button.clientHeight / 2
- screenX = window.screenX + button.offsetLeft + clientX
- screenY = window.screenY + button.offsetTop + clientY
- event.initMouseEvent 'click', true, true, window, 1,
- screenX, screenY, clientX, clientY, false, false, false, false, 0, null
- button.dispatchEvent event
-
diff --git a/lib/client/storage/dropbox/test/chrome_extension/content_close.coffee b/lib/client/storage/dropbox/test/chrome_extension/content_close.coffee
deleted file mode 100644
index 0ca6febd..00000000
--- a/lib/client/storage/dropbox/test/chrome_extension/content_close.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-# Content script for Dropbox OAuth receiver pages.
-
-message = type: 'close', url: window.location.href
-chrome.extension.sendMessage message
diff --git a/lib/client/storage/dropbox/test/chrome_extension/images/action_off19.png b/lib/client/storage/dropbox/test/chrome_extension/images/action_off19.png
deleted file mode 100644
index 734c470d..00000000
Binary files a/lib/client/storage/dropbox/test/chrome_extension/images/action_off19.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/chrome_extension/images/action_off38.png b/lib/client/storage/dropbox/test/chrome_extension/images/action_off38.png
deleted file mode 100644
index c6e96cd1..00000000
Binary files a/lib/client/storage/dropbox/test/chrome_extension/images/action_off38.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/chrome_extension/images/action_on19.png b/lib/client/storage/dropbox/test/chrome_extension/images/action_on19.png
deleted file mode 100644
index 290b36b6..00000000
Binary files a/lib/client/storage/dropbox/test/chrome_extension/images/action_on19.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/chrome_extension/images/action_on38.png b/lib/client/storage/dropbox/test/chrome_extension/images/action_on38.png
deleted file mode 100644
index 86dfb268..00000000
Binary files a/lib/client/storage/dropbox/test/chrome_extension/images/action_on38.png and /dev/null differ
diff --git a/lib/client/storage/dropbox/test/chrome_extension/images/icon.svg b/lib/client/storage/dropbox/test/chrome_extension/images/icon.svg
deleted file mode 100644
index 4a99e835..00000000
--- a/lib/client/storage/dropbox/test/chrome_extension/images/icon.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-image/svg+xml dropbox.js browser tests
-
-
-
diff --git a/lib/client/storage/dropbox/test/html/chrome_oauth_receiver.html b/lib/client/storage/dropbox/test/html/chrome_oauth_receiver.html
deleted file mode 100644
index 0f0db938..00000000
--- a/lib/client/storage/dropbox/test/html/chrome_oauth_receiver.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
- Dropbox sign-in successful
-
- Please close this window.
-
-
diff --git a/lib/client/storage/dropbox/test/html/oauth_receiver.html b/lib/client/storage/dropbox/test/html/oauth_receiver.html
deleted file mode 100644
index 54a70562..00000000
--- a/lib/client/storage/dropbox/test/html/oauth_receiver.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
- Dropbox sign-in successful
-
- Please close this window.
-
-
diff --git a/lib/client/storage/dropbox/test/html/redirect_driver_test.html b/lib/client/storage/dropbox/test/html/redirect_driver_test.html
deleted file mode 100644
index 8e5e2410..00000000
--- a/lib/client/storage/dropbox/test/html/redirect_driver_test.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
- Please close this window.
-
-
diff --git a/lib/client/storage/dropbox/test/src/base64_test.coffee b/lib/client/storage/dropbox/test/src/base64_test.coffee
deleted file mode 100644
index 975169f2..00000000
--- a/lib/client/storage/dropbox/test/src/base64_test.coffee
+++ /dev/null
@@ -1,11 +0,0 @@
-describe 'Dropbox.atob', ->
- it 'decodes an ASCII string', ->
- expect(Dropbox.atob('YTFiMmMz')).to.equal 'a1b2c3'
- it 'decodes a non-ASCII character', ->
- expect(Dropbox.atob('/A==')).to.equal String.fromCharCode(252)
-
-describe 'Dropbox.btoa', ->
- it 'encodes an ASCII string', ->
- expect(Dropbox.btoa('a1b2c3')).to.equal 'YTFiMmMz'
- it 'encodes a non-ASCII character', ->
- expect(Dropbox.btoa(String.fromCharCode(252))).to.equal '/A=='
diff --git a/lib/client/storage/dropbox/test/src/browser_mocha_runner.coffee b/lib/client/storage/dropbox/test/src/browser_mocha_runner.coffee
deleted file mode 100644
index e538dce8..00000000
--- a/lib/client/storage/dropbox/test/src/browser_mocha_runner.coffee
+++ /dev/null
@@ -1,9 +0,0 @@
-window.addEventListener 'load', ->
- runner = mocha.run ->
- failures = runner.failures || 0
- total = runner.total || 0
- image = new Image()
- image.src = "/diediedie?failed=#{failures}&total=#{total}";
- image.onload = ->
- null
-
diff --git a/lib/client/storage/dropbox/test/src/browser_mocha_setup.coffee b/lib/client/storage/dropbox/test/src/browser_mocha_setup.coffee
deleted file mode 100644
index 70a2f3b7..00000000
--- a/lib/client/storage/dropbox/test/src/browser_mocha_setup.coffee
+++ /dev/null
@@ -1 +0,0 @@
-mocha.setup ui: 'bdd', slow: 150, timeout: 10000
diff --git a/lib/client/storage/dropbox/test/src/chrome_app_background.coffee b/lib/client/storage/dropbox/test/src/chrome_app_background.coffee
deleted file mode 100644
index 634d0199..00000000
--- a/lib/client/storage/dropbox/test/src/chrome_app_background.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-chrome.app.runtime.onLaunched.addListener ->
- chrome.app.window.create 'test/html/browser_test.html',
- type: 'shell', frame: 'chrome', id: 'test_suite'
diff --git a/lib/client/storage/dropbox/test/src/chrome_oauth_receiver.coffee b/lib/client/storage/dropbox/test/src/chrome_oauth_receiver.coffee
deleted file mode 100644
index de601b08..00000000
--- a/lib/client/storage/dropbox/test/src/chrome_oauth_receiver.coffee
+++ /dev/null
@@ -1 +0,0 @@
-Dropbox.Drivers.Chrome.oauthReceiver()
diff --git a/lib/client/storage/dropbox/test/src/client_test.coffee b/lib/client/storage/dropbox/test/src/client_test.coffee
deleted file mode 100644
index 47d57185..00000000
--- a/lib/client/storage/dropbox/test/src/client_test.coffee
+++ /dev/null
@@ -1,1492 +0,0 @@
-buildClientTests = (clientKeys) ->
- # Creates the global client.
- setupClient = (test, done) ->
- # Should only be used for fixture teardown.
- test.__client = new Dropbox.Client clientKeys
- done()
-
- # Creates the test directory.
- setupDirectory = (test, done) ->
- # True if running on node.js
- test.node_js = module? and module?.exports? and require?
-
- # All test data should go here.
- test.testFolder = '/js tests.' + Math.random().toString(36)
- test.__client.mkdir test.testFolder, (error, stat) ->
- expect(error).to.equal null
- done()
-
- # Creates the binary image file in the test directory.
- setupImageFile = (test, done) ->
- test.imageFile = "#{test.testFolder}/test-binary-image.png"
- test.imageFileData = testImageBytes
-
- setupImageFileUsingArrayBuffer test, (success) ->
- if success
- return done()
- setupImageFileUsingBlob test, (success) ->
- if success
- return done()
- setupImageFileUsingString test, done
-
- # Standard-compliant browsers write via XHR#send(ArrayBufferView).
- setupImageFileUsingArrayBuffer = (test, done) ->
- if Uint8Array? and (not test.node_js)
- testImageServerOn()
- xhr = new Dropbox.Xhr 'GET', testImageUrl
- xhr.setResponseType('arraybuffer').prepare().send (error, buffer) =>
- testImageServerOff()
- expect(error).to.equal null
- test.__client.writeFile test.imageFile, buffer, (error, stat) ->
- expect(error).to.equal null
- # Some browsers will send the '[object Uint8Array]' string instead of
- # the ArrayBufferView.
- if stat.size is buffer.byteLength
- test.imageFileTag = stat.versionTag
- done true
- else
- done false
- else
- done false
-
- # Fallback to XHR#send(Blob).
- setupImageFileUsingBlob = (test, done) ->
- if Blob? and (not test.node_js)
- testImageServerOn()
- xhr = new Dropbox.Xhr 'GET', testImageUrl
- xhr.setResponseType('arraybuffer').prepare().send (error, buffer) =>
- testImageServerOff()
- expect(error).to.equal null
- blob = new Blob [buffer], type: 'image/png'
- test.__client.writeFile test.imageFile, blob, (error, stat) ->
- expect(error).to.equal null
- if stat.size is blob.size
- test.imageFileTag = stat.versionTag
- done true
- else
- done false
- else
- done false
-
- # Last resort: send a string that will get crushed by encoding errors.
- setupImageFileUsingString = (test, done) ->
- test.__client.writeFile(test.imageFile, test.imageFileData,
- { binary: true },
- (error, stat) ->
- expect(error).to.equal null
- test.imageFileTag = stat.versionTag
- done()
- )
-
- # Creates the plaintext file in the test directory.
- setupTextFile = (test, done) ->
- test.textFile = "#{test.testFolder}/test-file.txt"
- test.textFileData = "Plaintext test file #{Math.random().toString(36)}.\n"
- test.__client.writeFile(test.textFile, test.textFileData,
- (error, stat) ->
- expect(error).to.equal null
- test.textFileTag = stat.versionTag
- done()
- )
-
- # Global (expensive) fixtures.
- before (done) ->
- @timeout 10 * 1000
- setupClient this, =>
- setupDirectory this, =>
- setupImageFile this, =>
- setupTextFile this, ->
- done()
-
- # Teardown for global fixtures.
- after (done) ->
- @__client.remove @testFolder, (error, stat) =>
- @test.error(new Error(error)) if error
- done()
-
- # Per-test (cheap) fixtures.
- beforeEach ->
- @client = new Dropbox.Client clientKeys
-
- describe 'URLs for custom API server', ->
- it 'computes the other URLs correctly', ->
- client = new Dropbox.Client
- key: clientKeys.key,
- secret: clientKeys.secret,
- server: 'https://api.sandbox.dropbox-proxy.com'
-
- expect(client.apiServer).to.equal(
- 'https://api.sandbox.dropbox-proxy.com')
- expect(client.authServer).to.equal(
- 'https://www.sandbox.dropbox-proxy.com')
- expect(client.fileServer).to.equal(
- 'https://api-content.sandbox.dropbox-proxy.com')
-
- describe '#normalizePath', ->
- it "doesn't touch relative paths", ->
- expect(@client.normalizePath('aa/b/cc/dd')).to.equal 'aa/b/cc/dd'
-
- it 'removes the leading / from absolute paths', ->
- expect(@client.normalizePath('/aaa/b/cc/dd')).to.equal 'aaa/b/cc/dd'
-
- it 'removes multiple leading /s from absolute paths', ->
- expect(@client.normalizePath('///aa/b/ccc/dd')).to.equal 'aa/b/ccc/dd'
-
- describe '#urlEncodePath', ->
- it 'encodes each segment separately', ->
- expect(@client.urlEncodePath('a b+c/d?e"f/g&h')).to.
- equal "a%20b%2Bc/d%3Fe%22f/g%26h"
- it 'normalizes paths', ->
- expect(@client.urlEncodePath('///a b+c/g&h')).to.
- equal "a%20b%2Bc/g%26h"
-
- describe '#dropboxUid', ->
- it 'matches the uid in the credentials', ->
- expect(@client.dropboxUid()).to.equal clientKeys.uid
-
- describe '#getUserInfo', ->
- it 'returns reasonable information', (done) ->
- @client.getUserInfo (error, userInfo, rawUserInfo) ->
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
- expect(userInfo.uid).to.equal clientKeys.uid
- expect(rawUserInfo).not.to.be.instanceOf Dropbox.UserInfo
- expect(rawUserInfo).to.have.property 'uid'
- done()
-
- describe 'with httpCache', ->
- beforeEach ->
- @xhr = null
- @client.onXhr.addListener (xhr) =>
- @xhr = xhr
-
- it 'uses Authorization headers', (done) ->
- @client.getUserInfo httpCache: true, (error, userInfo, rawUserInfo) =>
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers
- expect(@xhr.url).to.contain 'oauth_nonce'
- else
- expect(@xhr.headers).to.have.key 'Authorization'
-
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
- expect(userInfo.uid).to.equal clientKeys.uid
- expect(rawUserInfo).not.to.be.instanceOf Dropbox.UserInfo
- expect(rawUserInfo).to.have.property 'uid'
- done()
-
- describe '#mkdir', ->
- afterEach (done) ->
- return done() unless @newFolder
- @client.remove @newFolder, (error, stat) -> done()
-
- it 'creates a folder in the test folder', (done) ->
- @newFolder = "#{@testFolder}/test'folder"
- @client.mkdir @newFolder, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFolder
- expect(stat.isFolder).to.equal true
- @client.stat @newFolder, (error, stat) =>
- expect(error).to.equal null
- expect(stat.isFolder).to.equal true
- done()
-
- describe '#readFile', ->
- it 'reads a text file', (done) ->
- @client.readFile @textFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'reads the beginning of a text file', (done) ->
- return done() if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
-
- @client.readFile @textFile, start: 0, length: 10, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData.substring(0, 10)
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'reads the middle of a text file', (done) ->
- return done() if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
-
- @client.readFile @textFile, start: 8, length: 10, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData.substring(8, 18)
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'reads the end of a text file via the start: option', (done) ->
- return done() if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
-
- @client.readFile @textFile, start: 10, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData.substring(10)
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'reads the end of a text file via the length: option', (done) ->
- return done() if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
-
- @client.readFile @textFile, length: 10, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.
- equal @textFileData.substring(@textFileData.length - 10)
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'reads a binary file into a string', (done) ->
- @client.readFile @imageFile, binary: true, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @imageFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @imageFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'reads a binary file into a Blob', (done) ->
- return done() unless Blob?
- @client.readFile @imageFile, blob: true, (error, blob, stat) =>
- expect(error).to.equal null
- expect(blob).to.be.instanceOf Blob
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @imageFile
- expect(stat.isFile).to.equal true
- reader = new FileReader
- reader.onloadend = =>
- return unless reader.readyState == FileReader.DONE
- buffer = reader.result
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
- reader.readAsArrayBuffer blob
-
- it 'reads a binary file into an ArrayBuffer', (done) ->
- return done() unless ArrayBuffer?
- @client.readFile @imageFile, arrayBuffer: true, (error, buffer, stat) =>
- expect(error).to.equal null
- expect(buffer).to.be.instanceOf ArrayBuffer
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @imageFile
- expect(stat.isFile).to.equal true
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
-
- describe 'with an onXhr listener', ->
- beforeEach ->
- @listenerXhr = null
- @callbackCalled = false
-
- it 'calls the listener with a Dropbox.Xhr argument', (done) ->
- @client.onXhr.addListener (xhr) =>
- expect(xhr).to.be.instanceOf Dropbox.Xhr
- @listenerXhr = xhr
- true
-
- @client.readFile @textFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- done() if @listenerXhr
-
- it 'calls the listener before firing the XHR', (done) ->
- @client.onXhr.addListener (xhr) =>
- unless Dropbox.Xhr.ieXdr # IE's XHR doesn't have readyState
- expect(xhr.xhr.readyState).to.equal 1
- expect(@callbackCalled).to.equal false
- @listenerXhr = xhr
- true
-
- @client.readFile @textFile, (error, data, stat) =>
- @callbackCalled = true
- expect(@listenerXhr).to.be.instanceOf Dropbox.Xhr
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- done() if @listenerXhr
-
- it 'does not send the XHR if the listener cancels the event', (done) ->
- @client.onXhr.addListener (xhr) =>
- expect(@callbackCalled).to.equal false
- @listenerXhr = xhr
- # NOTE: if the client calls send(), a DOM error will fail the test
- xhr.send()
- false
-
- @client.readFile @textFile, (error, data, stat) =>
- @callbackCalled = true
- expect(@listenerXhr).to.be.instanceOf Dropbox.Xhr
- done() if @listenerXhr
-
- describe 'with httpCache', ->
- beforeEach ->
- @xhr = null
- @client.onXhr.addListener (xhr) =>
- @xhr = xhr
-
- it 'reads a text file using Authorization headers', (done) ->
- @client.readFile @textFile, httpCache: true, (error, data, stat) =>
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers
- expect(@xhr.url).to.contain 'oauth_nonce'
- else
- expect(@xhr.headers).to.have.key 'Authorization'
-
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.isFile).to.equal true
- done()
-
- describe '#writeFile', ->
- afterEach (done) ->
- return done() unless @newFile
- @client.remove @newFile, (error, stat) -> done()
-
- it 'writes a new text file', (done) ->
- @newFile = "#{@testFolder}/another text file.txt"
- @newFileData = "Another plaintext file #{Math.random().toString(36)}."
- @client.writeFile @newFile, @newFileData, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- @client.readFile @newFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @newFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'writes a new empty file', (done) ->
- @newFile = "#{@testFolder}/another text file.txt"
- @newFileData = ''
- @client.writeFile @newFile, @newFileData, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- @client.readFile @newFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @newFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'writes a Blob to a binary file', (done) ->
- return done() unless Blob? and ArrayBuffer?
- @newFile = "#{@testFolder}/test image from blob.png"
- newBuffer = new ArrayBuffer @imageFileData.length
- newBytes = new Uint8Array newBuffer
- for i in [0...@imageFileData.length]
- newBytes[i] = @imageFileData.charCodeAt i
- @newBlob = new Blob [newBytes], type: 'image/png'
- if @newBlob.size isnt newBuffer.byteLength
- @newBlob = new Blob [newBuffer], type: 'image/png'
- @client.writeFile @newFile, @newBlob, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
-
- @client.readFile @newFile, arrayBuffer: true,
- (error, buffer, stat) =>
- expect(error).to.equal null
- expect(buffer).to.be.instanceOf ArrayBuffer
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
-
- it 'writes a File to a binary file', (done) ->
- return done() unless File? and Blob? and ArrayBuffer?
- @newFile = "#{@testFolder}/test image from blob.png"
- newBuffer = new ArrayBuffer @imageFileData.length
- newBytes = new Uint8Array newBuffer
- for i in [0...@imageFileData.length]
- newBytes[i] = @imageFileData.charCodeAt i
- newBlob = new Blob [newBytes], type: 'image/png'
-
- # Called when we have a File wrapping newBlob.
- actualTestCase = (file) =>
- @newFileObject = file
- @client.writeFile @newFile, @newFileObject, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
-
- @client.readFile @newFile, arrayBuffer: true,
- (error, buffer, stat) =>
- expect(error).to.equal null
- expect(buffer).to.be.instanceOf ArrayBuffer
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
-
- # TODO(pwnall): use lighter method of constructing a File, when available
- # http://crbug.com/164933
- return done() if typeof webkitRequestFileSystem is 'undefined'
- webkitRequestFileSystem window.TEMPORARY, 1024 * 1024, (fileSystem) ->
- # NOTE: the File name is different from the uploaded file name, to
- # catch bugs such as http://crbug.com/165095
- fileSystem.root.getFile 'test image file.png',
- create: true, exclusive: false, (fileEntry) ->
- fileEntry.createWriter (fileWriter) ->
- fileWriter.onwriteend = ->
- fileEntry.file (file) ->
- actualTestCase file
- fileWriter.write newBlob
-
- it 'writes an ArrayBuffer to a binary file', (done) ->
- return done() unless ArrayBuffer?
- @newFile = "#{@testFolder}/test image from arraybuffer.png"
- @newBuffer = new ArrayBuffer @imageFileData.length
- newBytes = new Uint8Array @newBuffer
- for i in [0...@imageFileData.length]
- newBytes[i] = @imageFileData.charCodeAt i
- @client.writeFile @newFile, @newBuffer, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
-
- @client.readFile @newFile, arrayBuffer: true,
- (error, buffer, stat) =>
- expect(error).to.equal null
- expect(buffer).to.be.instanceOf ArrayBuffer
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
-
- it 'writes an ArrayBufferView to a binary file', (done) ->
- return done() unless ArrayBuffer?
- @newFile = "#{@testFolder}/test image from arraybufferview.png"
- @newBytes = new Uint8Array @imageFileData.length
- for i in [0...@imageFileData.length]
- @newBytes[i] = @imageFileData.charCodeAt i
- @client.writeFile @newFile, @newBytes, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
-
- @client.readFile @newFile, arrayBuffer: true,
- (error, buffer, stat) =>
- expect(error).to.equal null
- expect(buffer).to.be.instanceOf ArrayBuffer
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
-
- describe '#resumableUploadStep + #resumableUploadFinish', ->
- beforeEach ->
- if ArrayBuffer? # IE9 and below doesn't have ArrayBuffer
- @length1 = Math.ceil @imageFileData.length / 3
- @length2 = @imageFileData.length - @length1
- @buffer1 = new ArrayBuffer @length1
-
- @view1 = new Uint8Array @buffer1
- for i in [0...@length1]
- @view1[i] = @imageFileData.charCodeAt i
- @buffer2 = new ArrayBuffer @length2
- @view2 = new Uint8Array @buffer2
- for i in [0...@length2]
- @view2[i] = @imageFileData.charCodeAt @length1 + i
-
- if Blob? # node.js and IE9 and below don't have Blob
- @blob1 = new Blob [@view1], type: 'image/png'
- if @blob1.size isnt @buffer1.byteLength
- @blob1 = new Blob [@buffer1], type: 'image/png'
- @blob2 = new Blob [@view2], type: 'image/png'
- if @blob2.size isnt @buffer2.byteLength
- @blob2 = new Blob [@buffer2], type: 'image/png'
-
- afterEach (done) ->
- @timeout 20 * 1000 # This sequence is slow on the current API server.
- return done() unless @newFile
- @client.remove @newFile, (error, stat) -> done()
-
- it 'writes a text file in two stages', (done) ->
- @timeout 20 * 1000 # This sequence is slow on the current API server.
-
- @newFile = "#{@testFolder}/test resumable upload.txt"
- line1 = "This is the first fragment\n"
- line2 = "This is the second fragment\n"
- @client.resumableUploadStep line1, null, (error, cursor1) =>
- expect(error).to.equal null
- expect(cursor1).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor1.offset).to.equal line1.length
- @client.resumableUploadStep line2, cursor1, (error, cursor2) =>
- expect(error).to.equal null
- expect(cursor2).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor2.offset).to.equal line1.length + line2.length
- expect(cursor2.tag).to.equal cursor1.tag
- @client.resumableUploadFinish @newFile, cursor2, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- @client.readFile @newFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal line1 + line2
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'writes a binary file using two ArrayBuffers', (done) ->
- return done() unless @buffer1
- @timeout 20 * 1000 # This sequence is slow on the current API server.
-
- @newFile = "#{@testFolder}/test resumable arraybuffer upload.png"
- @client.resumableUploadStep @buffer1, null, (error, cursor1) =>
- expect(error).to.equal null
- expect(cursor1).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor1.offset).to.equal @length1
- @client.resumableUploadStep @buffer2, cursor1, (error, cursor2) =>
- expect(error).to.equal null
- expect(cursor2).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor2.offset).to.equal @length1 + @length2
- expect(cursor2.tag).to.equal cursor1.tag
- @client.resumableUploadFinish @newFile, cursor2, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- @client.readFile @newFile, arrayBuffer: true,
- (error, buffer, stat) =>
- expect(error).to.equal null
- expect(buffer).to.be.instanceOf ArrayBuffer
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
-
- it 'writes a binary file using two ArrayBufferViews', (done) ->
- return done() unless @view1
- @timeout 20 * 1000 # This sequence is slow on the current API server.
-
- @newFile = "#{@testFolder}/test resumable arraybuffer upload.png"
- @client.resumableUploadStep @buffer1, null, (error, cursor1) =>
- expect(error).to.equal null
- expect(cursor1).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor1.offset).to.equal @length1
- @client.resumableUploadStep @buffer2, cursor1, (error, cursor2) =>
- expect(error).to.equal null
- expect(cursor2).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor2.offset).to.equal @length1 + @length2
- expect(cursor2.tag).to.equal cursor1.tag
- @client.resumableUploadFinish @newFile, cursor2, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- @client.readFile @newFile, arrayBuffer: true,
- (error, buffer, stat) =>
- expect(error).to.equal null
- expect(buffer).to.be.instanceOf ArrayBuffer
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
-
-
- it 'writes a binary file using two Blobs', (done) ->
- return done() unless @blob1
- @timeout 20 * 1000 # This sequence is slow on the current API server.
-
- @newFile = "#{@testFolder}/test resumable blob upload.png"
- @client.resumableUploadStep @blob1, null, (error, cursor1) =>
- expect(error).to.equal null
- expect(cursor1).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor1.offset).to.equal @length1
- @client.resumableUploadStep @blob2, cursor1, (error, cursor2) =>
- expect(error).to.equal null
- expect(cursor2).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor2.offset).to.equal @length1 + @length2
- expect(cursor2.tag).to.equal cursor1.tag
- @client.resumableUploadFinish @newFile, cursor2, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- @client.readFile @newFile, arrayBuffer: true,
- (error, buffer, stat) =>
- expect(error).to.equal null
- expect(buffer).to.be.instanceOf ArrayBuffer
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal @imageFileData
- done()
-
- it 'recovers from out-of-sync correctly', (done) ->
- # IE's XDR doesn't return anything on errors, so we can't do recovery.
- return done() if Dropbox.Xhr.ieXdr
- @timeout 20 * 1000 # This sequence is slow on the current API server.
-
- @newFile = "#{@testFolder}/test resumable upload out of sync.txt"
- line1 = "This is the first fragment\n"
- line2 = "This is the second fragment\n"
- @client.resumableUploadStep line1, null, (error, cursor1) =>
- expect(error).to.equal null
- expect(cursor1).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor1.offset).to.equal line1.length
- cursor1.offset += 10
- @client.resumableUploadStep line2, cursor1, (error, cursor2) =>
- expect(error).to.equal null
- expect(cursor2).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor2.offset).to.equal line1.length
- expect(cursor2.tag).to.equal cursor1.tag
- @client.resumableUploadStep line2, cursor2, (error, cursor3) =>
- expect(error).to.equal null
- expect(cursor3).to.be.instanceOf Dropbox.UploadCursor
- expect(cursor3.offset).to.equal line1.length + line2.length
- expect(cursor3.tag).to.equal cursor1.tag
- @client.resumableUploadFinish @newFile, cursor3, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- @client.readFile @newFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal line1 + line2
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'reports errors correctly', (done) ->
- @newFile = "#{@testFolder}/test resumable upload error.txt"
- badCursor = new Dropbox.UploadCursor 'trollcursor'
- badCursor.offset = 42
- @client.resumableUploadStep @textFileData, badCursor, (error, cursor) =>
- expect(cursor).to.equal undefined
- expect(error).to.be.instanceOf Dropbox.ApiError
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do status codes.
- expect(error.status).to.equal 404
- done()
-
- describe '#stat', ->
- it 'retrieves a Stat for a file', (done) ->
- @client.stat @textFile, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.isFile).to.equal true
- expect(stat.versionTag).to.equal @textFileTag
- expect(stat.size).to.equal @textFileData.length
- if clientKeys.sandbox
- expect(stat.inAppFolder).to.equal true
- else
- expect(stat.inAppFolder).to.equal false
- done()
-
- it 'retrieves a Stat for a folder', (done) ->
- @client.stat @testFolder, (error, stat, entries) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @testFolder
- expect(stat.isFolder).to.equal true
- expect(stat.size).to.equal 0
- if clientKeys.sandbox
- expect(stat.inAppFolder).to.equal true
- else
- expect(stat.inAppFolder).to.equal false
- expect(entries).to.equal undefined
- done()
-
- it 'retrieves a Stat and entries for a folder', (done) ->
- @client.stat @testFolder, { readDir: true }, (error, stat, entries) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @testFolder
- expect(stat.isFolder).to.equal true
- expect(entries).to.be.ok
- expect(entries).to.have.length 2
- expect(entries[0]).to.be.instanceOf Dropbox.Stat
- expect(entries[0].path).not.to.equal @testFolder
- expect(entries[0].path).to.have.string @testFolder
- done()
-
- it 'fails cleanly for a non-existing path', (done) ->
- listenerError = null
- @client.onError.addListener (error) -> listenerError = error
-
- @client.stat @testFolder + '/should_404.txt', (error, stat, entries) =>
- expect(stat).to.equal undefined
- expect(entries).to.equal.null
- expect(error).to.be.instanceOf Dropbox.ApiError
- expect(listenerError).to.equal error
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do status codes.
- expect(error).to.have.property 'status'
- expect(error.status).to.equal 404
- done()
-
- describe 'with httpCache', ->
- beforeEach ->
- @xhr = null
- @client.onXhr.addListener (xhr) =>
- @xhr = xhr
-
- it 'retrieves a Stat for a file using Authorization headers', (done) ->
- @client.stat @textFile, httpCache: true, (error, stat) =>
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers
- expect(@xhr.url).to.contain 'oauth_nonce'
- else
- expect(@xhr.headers).to.have.key 'Authorization'
-
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.isFile).to.equal true
- expect(stat.versionTag).to.equal @textFileTag
- expect(stat.size).to.equal @textFileData.length
- if clientKeys.sandbox
- expect(stat.inAppFolder).to.equal true
- else
- expect(stat.inAppFolder).to.equal false
- done()
-
- describe '#readdir', ->
- it 'retrieves a Stat and entries for a folder', (done) ->
- @client.readdir @testFolder, (error, entries, dir_stat, entry_stats) =>
- expect(error).to.equal null
- expect(entries).to.be.ok
- expect(entries).to.have.length 2
- expect(entries[0]).to.be.a 'string'
- expect(entries[0]).not.to.have.string '/'
- expect(entries[0]).to.match /^(test-binary-image.png)|(test-file.txt)$/
- expect(dir_stat).to.be.instanceOf Dropbox.Stat
- expect(dir_stat.path).to.equal @testFolder
- expect(dir_stat.isFolder).to.equal true
- expect(entry_stats).to.be.ok
- expect(entry_stats).to.have.length 2
- expect(entry_stats[0]).to.be.instanceOf Dropbox.Stat
- expect(entry_stats[0].path).not.to.equal @testFolder
- expect(entry_stats[0].path).to.have.string @testFolder
- done()
-
- describe 'with httpCache', ->
- beforeEach ->
- @xhr = null
- @client.onXhr.addListener (xhr) =>
- @xhr = xhr
-
- it 'retrieves a folder Stat and entries using Authorization', (done) ->
- @client.readdir @testFolder, httpCache: true,
- (error, entries, dir_stat, entry_stats) =>
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers
- expect(@xhr.url).to.contain 'oauth_nonce'
- else
- expect(@xhr.headers).to.have.key 'Authorization'
-
- expect(error).to.equal null
- expect(entries).to.be.ok
- expect(entries).to.have.length 2
- expect(entries[0]).to.be.a 'string'
- expect(entries[0]).not.to.have.string '/'
- expect(entries[0]).to.match(
- /^(test-binary-image.png)|(test-file.txt)$/)
- expect(dir_stat).to.be.instanceOf Dropbox.Stat
- expect(dir_stat.path).to.equal @testFolder
- expect(dir_stat.isFolder).to.equal true
- expect(entry_stats).to.be.ok
- expect(entry_stats).to.have.length 2
- expect(entry_stats[0]).to.be.instanceOf Dropbox.Stat
- expect(entry_stats[0].path).not.to.equal @testFolder
- expect(entry_stats[0].path).to.have.string @testFolder
- done()
-
- describe '#history', ->
- it 'gets a list of revisions', (done) ->
- @client.history @textFile, (error, versions) =>
- expect(error).to.equal null
- expect(versions).to.have.length 1
- expect(versions[0]).to.be.instanceOf Dropbox.Stat
- expect(versions[0].path).to.equal @textFile
- expect(versions[0].size).to.equal @textFileData.length
- expect(versions[0].versionTag).to.equal @textFileTag
- done()
-
- it 'returns 40x if the limit is set to 0', (done) ->
- listenerError = null
- @client.onError.addListener (error) -> listenerError = error
-
- @client.history @textFile, limit: 0, (error, versions) =>
- expect(error).to.be.instanceOf Dropbox.ApiError
- expect(listenerError).to.equal error
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do status codes.
- expect(error.status).to.be.within 400, 499
- expect(versions).not.to.be.ok
- done()
-
- describe 'with httpCache', ->
- beforeEach ->
- @xhr = null
- @client.onXhr.addListener (xhr) =>
- @xhr = xhr
-
- it 'gets a list of revisions using Authorization headers', (done) ->
- @client.history @textFile, httpCache: true, (error, versions) =>
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers
- expect(@xhr.url).to.contain 'oauth_nonce'
- else
- expect(@xhr.headers).to.have.key 'Authorization'
-
- expect(error).to.equal null
- expect(versions).to.have.length 1
- expect(versions[0]).to.be.instanceOf Dropbox.Stat
- expect(versions[0].path).to.equal @textFile
- expect(versions[0].size).to.equal @textFileData.length
- expect(versions[0].versionTag).to.equal @textFileTag
- done()
-
- describe '#copy', ->
- afterEach (done) ->
- return done() unless @newFile
- @client.remove @newFile, (error, stat) -> done()
-
- it 'copies a file given by path', (done) ->
- @timeout 12 * 1000 # This sequence is slow on the current API server.
-
- @newFile = "#{@testFolder}/copy of test-file.txt"
- @client.copy @textFile, @newFile, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- @client.readFile @newFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- @client.readFile @textFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @textFile
- expect(stat.versionTag).to.equal @textFileTag
- done()
-
- describe '#makeCopyReference', ->
- afterEach (done) ->
- return done() unless @newFile
- @client.remove @newFile, (error, stat) -> done()
-
- it 'creates a Dropbox.CopyReference that copies the file', (done) ->
- @timeout 12 * 1000 # This sequence is slow on the current API server.
- @newFile = "#{@testFolder}/ref copy of test-file.txt"
-
- @client.makeCopyReference @textFile, (error, copyRef) =>
- expect(error).to.equal null
- expect(copyRef).to.be.instanceOf Dropbox.CopyReference
- @client.copy copyRef, @newFile, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isFile).to.equal true
- @client.readFile @newFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- done()
-
- describe '#move', ->
- beforeEach (done) ->
- @timeout 10 * 1000 # This sequence is slow on the current API server.
- @moveFrom = "#{@testFolder}/move source of test-file.txt"
- @client.copy @textFile, @moveFrom, (error, stat) ->
- expect(error).to.equal null
- done()
-
- afterEach (done) ->
- @client.remove @moveFrom, (error, stat) =>
- return done() unless @moveTo
- @client.remove @moveTo, (error, stat) -> done()
-
- it 'moves a file', (done) ->
- @timeout 15 * 1000 # This sequence is slow on the current API server.
- @moveTo = "#{@testFolder}/moved test-file.txt"
- @client.move @moveFrom, @moveTo, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @moveTo
- expect(stat.isFile).to.equal true
- @client.readFile @moveTo, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @moveTo
- @client.readFile @moveFrom, (error, data, stat) ->
- expect(error).to.be.ok
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do status codes.
- expect(error).to.have.property 'status'
- expect(error.status).to.equal 404
- expect(data).to.equal undefined
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.equal undefined
- done()
-
- describe '#remove', ->
- beforeEach (done) ->
- @newFolder = "#{@testFolder}/folder delete test"
- @client.mkdir @newFolder, (error, stat) =>
- expect(error).to.equal null
- done()
-
- afterEach (done) ->
- return done() unless @newFolder
- @client.remove @newFolder, (error, stat) -> done()
-
- it 'deletes a folder', (done) ->
- @client.remove @newFolder, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFolder
- @client.stat @newFolder, { removed: true }, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.isRemoved).to.equal true
- done()
-
- it 'deletes a folder when called as unlink', (done) ->
- @client.unlink @newFolder, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFolder
- @client.stat @newFolder, { removed: true }, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.isRemoved).to.equal true
- done()
-
- describe '#revertFile', ->
- describe 'on a removed file', ->
- beforeEach (done) ->
- @timeout 12 * 1000 # This sequence seems to be quite slow.
-
- @newFile = "#{@testFolder}/file revert test.txt"
- @client.copy @textFile, @newFile, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- @versionTag = stat.versionTag
- @client.remove @newFile, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- done()
-
- afterEach (done) ->
- return done() unless @newFile
- @client.remove @newFile, (error, stat) -> done()
-
- it 'reverts the file to a previous version', (done) ->
- @timeout 12 * 1000 # This sequence seems to be quite slow.
-
- @client.revertFile @newFile, @versionTag, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isRemoved).to.equal false
- @client.readFile @newFile, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @newFile
- expect(stat.isRemoved).to.equal false
- done()
-
- describe '#findByName', ->
- it 'locates the test folder given a partial name', (done) ->
- namePattern = @testFolder.substring 5
- @client.search '/', namePattern, (error, matches) =>
- expect(error).to.equal null
- expect(matches).to.have.length 1
- expect(matches[0]).to.be.instanceOf Dropbox.Stat
- expect(matches[0].path).to.equal @testFolder
- expect(matches[0].isFolder).to.equal true
- done()
-
- it 'lists the test folder files given the "test" pattern', (done) ->
- @client.search @testFolder, 'test', (error, matches) =>
- expect(error).to.equal null
- expect(matches).to.have.length 2
- done()
-
- it 'only lists one match when given limit 1', (done) ->
- @client.search @testFolder, 'test', limit: 1, (error, matches) =>
- expect(error).to.equal null
- expect(matches).to.have.length 1
- done()
-
- describe 'with httpCache', ->
- beforeEach ->
- @xhr = null
- @client.onXhr.addListener (xhr) =>
- @xhr = xhr
-
- it 'locates the test folder using Authorize headers', (done) ->
- namePattern = @testFolder.substring 5
- @client.search '/', namePattern, httpCache: true, (error, matches) =>
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers
- expect(@xhr.url).to.contain 'oauth_nonce'
- else
- expect(@xhr.headers).to.have.key 'Authorization'
-
- expect(error).to.equal null
- expect(matches).to.have.length 1
- expect(matches[0]).to.be.instanceOf Dropbox.Stat
- expect(matches[0].path).to.equal @testFolder
- expect(matches[0].isFolder).to.equal true
- done()
-
- describe '#makeUrl', ->
- describe 'for a short Web URL', ->
- it 'returns a shortened Dropbox URL', (done) ->
- @client.makeUrl @textFile, (error, publicUrl) ->
- expect(error).to.equal null
- expect(publicUrl).to.be.instanceOf Dropbox.PublicUrl
- expect(publicUrl.isDirect).to.equal false
- expect(publicUrl.url).to.contain '//db.tt/'
- done()
-
- describe 'for a Web URL created with long: true', ->
- it 'returns an URL to a preview page', (done) ->
- @client.makeUrl @textFile, { long: true }, (error, publicUrl) =>
- expect(error).to.equal null
- expect(publicUrl).to.be.instanceOf Dropbox.PublicUrl
- expect(publicUrl.isDirect).to.equal false
- expect(publicUrl.url).not.to.contain '//db.tt/'
-
- # The cont/ents server does not return CORS headers.
- return done() unless @nodejs
- Dropbox.Xhr.request 'GET', publicUrl.url, {}, null, (error, data) ->
- expect(error).to.equal null
- expect(data).to.contain ''
- done()
-
- describe 'for a Web URL created with longUrl: true', ->
- it 'returns an URL to a preview page', (done) ->
- @client.makeUrl @textFile, { longUrl: true }, (error, publicUrl) =>
- expect(error).to.equal null
- expect(publicUrl).to.be.instanceOf Dropbox.PublicUrl
- expect(publicUrl.isDirect).to.equal false
- expect(publicUrl.url).not.to.contain '//db.tt/'
- done()
-
- describe 'for a direct download URL', ->
- it 'gets a direct download URL', (done) ->
- @client.makeUrl @textFile, { download: true }, (error, publicUrl) =>
- expect(error).to.equal null
- expect(publicUrl).to.be.instanceOf Dropbox.PublicUrl
- expect(publicUrl.isDirect).to.equal true
- expect(publicUrl.url).not.to.contain '//db.tt/'
-
- # The contents server does not return CORS headers.
- return done() unless @nodejs
- Dropbox.Xhr.request 'GET', publicUrl.url, {}, null, (error, data) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- done()
-
- describe 'for a direct download URL created with downloadHack: true', ->
- it 'gets a direct long-lived download URL', (done) ->
- @client.makeUrl @textFile, { downloadHack: true }, (error, publicUrl) =>
- expect(error).to.equal null
- expect(publicUrl).to.be.instanceOf Dropbox.PublicUrl
- expect(publicUrl.isDirect).to.equal true
- expect(publicUrl.url).not.to.contain '//db.tt/'
- expect(publicUrl.expiresAt - Date.now()).to.be.above 86400000
-
- # The download server does not return CORS headers.
- return done() unless @nodejs
- Dropbox.Xhr.request 'GET', publicUrl.url, {}, null, (error, data) =>
- expect(error).to.equal null
- expect(data).to.equal @textFileData
- done()
-
- describe '#pullChanges', ->
- beforeEach ->
- # Pulling an entire Dropbox can take a lot of time, so we need fancy
- # logic here.
- @timeoutValue = 60 * 1000
- @timeout @timeoutValue
-
- afterEach (done) ->
- @timeoutValue += 10 * 1000
- @timeout @timeoutValue
- return done() unless @newFile
- @client.remove @newFile, (error, stat) -> done()
-
- it 'gets a cursor, then it gets relevant changes', (done) ->
- @timeout @timeoutValue
-
- @client.pullChanges (error, changes) =>
- expect(error).to.equal null
- expect(changes).to.be.instanceOf Dropbox.PulledChanges
- expect(changes.blankSlate).to.equal true
-
- # Calls pullChanges until it's done listing the user's Dropbox.
- drainEntries = (client, callback) =>
- return callback() unless changes.shouldPullAgain
- @timeoutValue += 10 * 1000 # 10 extra seconds per call
- @timeout @timeoutValue
- client.pullChanges changes, (error, _changes) ->
- expect(error).to.equal null
- changes = _changes
- drainEntries client, callback
- drainEntries @client, =>
-
- @newFile = "#{@testFolder}/delta-test.txt"
- newFileData = "This file is used to test the pullChanges method.\n"
- @client.writeFile @newFile, newFileData, (error, stat) =>
- expect(error).to.equal null
- expect(stat).to.have.property 'path'
- expect(stat.path).to.equal @newFile
-
- @client.pullChanges changes, (error, changes) =>
- expect(error).to.equal null
- expect(changes).to.be.instanceof Dropbox.PulledChanges
- expect(changes.blankSlate).to.equal false
- expect(changes.changes).to.have.length.greaterThan 0
- change = changes.changes[changes.changes.length - 1]
- expect(change).to.be.instanceOf Dropbox.PullChange
- expect(change.path).to.equal @newFile
- expect(change.wasRemoved).to.equal false
- expect(change.stat.path).to.equal @newFile
- done()
-
- describe '#thumbnailUrl', ->
- it 'produces an URL that contains the file name', ->
- url = @client.thumbnailUrl @imageFile, { png: true, size: 'medium' }
- expect(url).to.contain 'tests' # Fragment of the file name.
- expect(url).to.contain 'png'
- expect(url).to.contain 'medium'
-
- describe '#readThumbnail', ->
- it 'reads the image into a string', (done) ->
- @timeout 12 * 1000 # Thumbnail generation is slow.
- @client.readThumbnail @imageFile, { png: true }, (error, data, stat) =>
- expect(error).to.equal null
- expect(data).to.be.a 'string'
- expect(data).to.contain 'PNG'
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @imageFile
- expect(stat.isFile).to.equal true
- done()
-
- it 'reads the image into a Blob', (done) ->
- return done() unless Blob?
- @timeout 12 * 1000 # Thumbnail generation is slow.
- options = { png: true, blob: true }
- @client.readThumbnail @imageFile, options, (error, blob, stat) =>
- expect(error).to.equal null
- expect(blob).to.be.instanceOf Blob
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do headers.
- expect(stat).to.be.instanceOf Dropbox.Stat
- expect(stat.path).to.equal @imageFile
- expect(stat.isFile).to.equal true
- reader = new FileReader
- reader.onloadend = =>
- return unless reader.readyState == FileReader.DONE
- buffer = reader.result
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.contain 'PNG'
- done()
- reader.readAsArrayBuffer blob
-
- describe '#reset', ->
- beforeEach ->
- @authStates = []
- @client.onAuthStateChange.addListener (client) =>
- @authStates.push client.authState
- @client.reset()
-
- it 'gets the client into the RESET state', ->
- expect(@client.authState).to.equal Dropbox.Client.RESET
-
- it 'removes token and uid information', ->
- credentials = @client.credentials()
- expect(credentials).not.to.have.property 'token'
- expect(credentials).not.to.have.property 'tokenSecret'
- expect(credentials).not.to.have.property 'uid'
-
- it 'triggers onAuthStateChange', ->
- expect(@authStates).to.deep.equal [Dropbox.Client.RESET]
-
- it 'does not trigger onAuthState if already reset', ->
- @authStates = []
- @client.reset()
- expect(@authStates).to.deep.equal []
-
- describe '#credentials', ->
- it 'contains all the expected keys when DONE', ->
- credentials = @client.credentials()
- expect(credentials).to.have.property 'key'
- expect(credentials).to.have.property 'sandbox'
- expect(credentials).to.have.property 'token'
- expect(credentials).to.have.property 'tokenSecret'
- expect(credentials).to.have.property 'uid'
-
- it 'does not return an authState when DONE', ->
- credentials = @client.credentials()
- expect(credentials).not.to.have.property 'authState'
- expect(credentials).not.to.have.property 'secret'
-
- it 'contains all the expected keys when RESET', ->
- @client.reset()
- credentials = @client.credentials()
- expect(credentials).to.have.property 'key'
- expect(credentials).to.have.property 'sandbox'
-
- it 'does not return an authState when RESET', ->
- @client.reset()
- credentials = @client.credentials()
- expect(credentials).not.to.have.property 'authState'
- expect(credentials).not.to.have.property 'secret'
-
- describe 'for a client with raw keys', ->
- beforeEach ->
- @client.setCredentials(
- key: 'dpf43f3p2l4k3l03', secret: 'kd94hf93k423kf44',
- token: 'user-token', tokenSecret: 'user-secret', uid: '1234567')
-
- it 'contains all the expected keys when DONE', ->
- credentials = @client.credentials()
- expect(credentials).to.have.property 'key'
- expect(credentials).to.have.property 'secret'
- expect(credentials).to.have.property 'token'
- expect(credentials).to.have.property 'tokenSecret'
- expect(credentials).to.have.property 'uid'
-
- it 'contains all the expected keys when RESET', ->
- @client.reset()
- credentials = @client.credentials()
- expect(credentials).to.have.property 'key'
- expect(credentials).to.have.property 'sandbox'
- expect(credentials).to.have.property 'secret'
-
-
- describe '#setCredentials', ->
- it 'gets the client into the RESET state', ->
- @client.setCredentials key: 'app-key', secret: 'app-secret'
- expect(@client.authState).to.equal Dropbox.Client.RESET
- credentials = @client.credentials()
- expect(credentials.key).to.equal 'app-key'
- expect(credentials.secret).to.equal 'app-secret'
-
- it 'gets the client into the REQUEST state', ->
- @client.setCredentials(
- key: 'app-key', secret: 'app-secret', token: 'user-token',
- tokenSecret: 'user-secret', authState: Dropbox.Client.REQUEST)
- expect(@client.authState).to.equal Dropbox.Client.REQUEST
- credentials = @client.credentials()
- expect(credentials.key).to.equal 'app-key'
- expect(credentials.secret).to.equal 'app-secret'
- expect(credentials.token).to.equal 'user-token'
- expect(credentials.tokenSecret).to.equal 'user-secret'
-
- it 'gets the client into the DONE state', ->
- @client.setCredentials(
- key: 'app-key', secret: 'app-secret', token: 'user-token',
- tokenSecret: 'user-secret', uid: '3141592')
- expect(@client.authState).to.equal Dropbox.Client.DONE
- credentials = @client.credentials()
- expect(credentials.key).to.equal 'app-key'
- expect(credentials.secret).to.equal 'app-secret'
- expect(credentials.token).to.equal 'user-token'
- expect(credentials.tokenSecret).to.equal 'user-secret'
- expect(credentials.uid).to.equal '3141592'
-
- beforeEach ->
- @authStates = []
- @client.onAuthStateChange.addListener (client) =>
- @authStates.push client.authState
-
- it 'triggers onAuthStateChange when switching from DONE to RESET', ->
- @client.setCredentials key: 'app-key', secret: 'app-secret'
- expect(@authStates).to.deep.equal [Dropbox.Client.RESET]
-
- it 'does not trigger onAuthStateChange when not switching', ->
- @client.setCredentials key: 'app-key', secret: 'app-secret'
- @authStates = []
- @client.setCredentials key: 'app-key', secret: 'app-secret'
- expect(@authStates).to.deep.equal []
-
- describe '#appHash', ->
- it 'is consistent', ->
- client = new Dropbox.Client clientKeys
- expect(client.appHash()).to.equal @client.appHash()
-
- it 'is a non-trivial string', ->
- expect(@client.appHash()).to.be.a 'string'
- expect(@client.appHash().length).to.be.greaterThan 4
-
- describe '#isAuthenticated', ->
- it 'is true for a client with full tokens', ->
- expect(@client.isAuthenticated()).to.equal true
-
- it 'is false for a freshly reset client', ->
- @client.reset()
- expect(@client.isAuthenticated()).to.equal false
-
- describe '#authenticate', ->
- it 'fails to move from RESET without an OAuth driver', ->
- @client.reset()
- @client.authDriver null
- expect(=> @client.authenticate(->
- expect('authentication completed').to.equal false
- )).to.throw(Error, /authDriver/)
-
- it 'completes without an OAuth driver if already in DONE', (done) ->
- @client.authDriver null
- @client.authenticate (error, client) =>
- expect(error).to.equal null
- expect(client).to.equal @client
- done()
-
-describe 'Dropbox.Client', ->
- describe 'with full Dropbox access', ->
- buildClientTests testFullDropboxKeys
-
- describe 'with Folder access', ->
- buildClientTests testKeys
-
- describe '#authenticate + #signOut', ->
- # NOTE: we're not duplicating this test in the full Dropbox acess suite,
- # because it's annoying to the tester
- it 'completes the authenticate flow', (done) ->
- @timeout 45 * 1000 # Time-consuming because the user must click.
- @client.reset()
- @client.authDriver authDriver
- authStateChanges = ['authorize']
- @client.onAuthStateChange.addListener (client) ->
- authStateChanges.push client.authState
- @client.authenticate (error, client) =>
- expect(error).to.equal null
- expect(client).to.equal @client
- expect(client.authState).to.equal Dropbox.Client.DONE
- expect(client.isAuthenticated()).to.equal true
- expect(authStateChanges).to.deep.equal(['authorize',
- Dropbox.Client.REQUEST, Dropbox.Client.AUTHORIZED,
- Dropbox.Client.DONE])
- # Verify that we can do API calls.
- client.getUserInfo (error, userInfo) ->
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
- invalidCredentials = client.credentials()
- authStateChanges = ['signOff']
- client.signOut (error) ->
- expect(error).to.equal null
- expect(client.authState).to.equal Dropbox.Client.SIGNED_OFF
- expect(client.isAuthenticated()).to.equal false
- expect(authStateChanges).to.deep.equal(['signOff',
- Dropbox.Client.SIGNED_OFF])
- # Verify that we can't use the old token in API calls.
- invalidClient = new Dropbox.Client invalidCredentials
- invalidClient.getUserInfo (error, userInfo) ->
- expect(error).to.be.ok
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do error codes.
- expect(error.status).to.equal 401
- # Verify that the same client can be used for a 2nd signin.
- authStateChanges = ['authorize2']
- client.authenticate (error, client) ->
- expect(error).to.equal null
- expect(client.authState).to.equal Dropbox.Client.DONE
- expect(client.isAuthenticated()).to.equal true
- expect(authStateChanges).to.deep.equal(['authorize2',
- Dropbox.Client.RESET, Dropbox.Client.REQUEST,
- Dropbox.Client.AUTHORIZED, Dropbox.Client.DONE])
- # Verify that we can do API calls after the 2nd signin.
- client.getUserInfo (error, userInfo) ->
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
- done()
-
-
- describe '#appHash', ->
- it 'depends on the app key', ->
- client = new Dropbox.Client testFullDropboxKeys
- expect(client.appHash()).not.to.equal @client.appHash()
-
- describe '#constructor', ->
- it 'raises an Error if initialized without an API key / secret', ->
- expect(-> new Dropbox.Client(token: '123', tokenSecret: '456')).to.
- throw(Error, /no api key/i)
-
diff --git a/lib/client/storage/dropbox/test/src/drivers_test.coffee b/lib/client/storage/dropbox/test/src/drivers_test.coffee
deleted file mode 100644
index d35e8485..00000000
--- a/lib/client/storage/dropbox/test/src/drivers_test.coffee
+++ /dev/null
@@ -1,446 +0,0 @@
-describe 'Dropbox.Drivers.BrowserBase', ->
- beforeEach ->
- @node_js = module? and module?.exports? and require?
- @chrome_app = chrome? and (chrome.extension or chrome.app)
- @client = new Dropbox.Client testKeys
-
- describe 'with rememberUser: false', ->
- beforeEach (done) ->
- return done() if @node_js or @chrome_app
- @driver = new Dropbox.Drivers.BrowserBase
- @driver.setStorageKey @client
- @driver.forgetCredentials done
-
- afterEach (done) ->
- return done() if @node_js or @chrome_app
- @driver.forgetCredentials done
-
- describe '#loadCredentials', ->
- it 'produces the credentials passed to storeCredentials', (done) ->
- return done() if @node_js or @chrome_app
- goldCredentials = @client.credentials()
- @driver.storeCredentials goldCredentials, =>
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.deep.equal goldCredentials
- done()
-
- it 'produces null after forgetCredentials was called', (done) ->
- return done() if @node_js or @chrome_app
- @driver.storeCredentials @client.credentials(), =>
- @driver.forgetCredentials =>
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.equal null
- done()
-
- it 'produces null if a different scope is provided', (done) ->
- return done() if @node_js or @chrome_app
- @driver.setStorageKey @client
- @driver.storeCredentials @client.credentials(), =>
- @driver.forgetCredentials =>
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.equal null
- done()
-
-
-describe 'Dropbox.Drivers.Redirect', ->
- describe '#url', ->
- beforeEach ->
- @stub = sinon.stub Dropbox.Drivers.BrowserBase, 'currentLocation'
- afterEach ->
- @stub.restore()
-
- it 'adds a query string to a static URL', ->
- @stub.returns 'http://test/file'
- driver = new Dropbox.Drivers.Redirect useQuery: true
- expect(driver.url()).to.
- equal 'http://test/file?_dropboxjs_scope=default'
-
- it 'adds a fragment to a static URL', ->
- @stub.returns 'http://test/file'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.url()).to.
- equal 'http://test/file#?_dropboxjs_scope=default'
-
- it 'adds a query param to a URL with a query string', ->
- @stub.returns 'http://test/file?a=true'
- driver = new Dropbox.Drivers.Redirect useQuery: true
- expect(driver.url()).to.
- equal 'http://test/file?a=true&_dropboxjs_scope=default'
-
- it 'adds a fragment to a URL with a query string', ->
- @stub.returns 'http://test/file?a=true'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.url()).to.
- equal 'http://test/file?a=true#?_dropboxjs_scope=default'
-
- it 'adds a query string to a static URL with a fragment', ->
- @stub.returns 'http://test/file#frag'
- driver = new Dropbox.Drivers.Redirect useQuery: true
- expect(driver.url()).to.
- equal 'http://test/file?_dropboxjs_scope=default#frag'
-
- it 'replaces the fragment in a static URL with a fragment', ->
- @stub.returns 'http://test/file#frag'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.url()).to.
- equal 'http://test/file#?_dropboxjs_scope=default'
-
- it 'adds a query param to a URL with a query string and fragment', ->
- @stub.returns 'http://test/file?a=true#frag'
- driver = new Dropbox.Drivers.Redirect useQuery: true
- expect(driver.url()).to.
- equal 'http://test/file?a=true&_dropboxjs_scope=default#frag'
-
- it 'replaces the fragment in a URL with a query string and fragment', ->
- @stub.returns 'http://test/file?a=true#frag'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.url()).to.
- equal 'http://test/file?a=true#?_dropboxjs_scope=default'
-
- it 'obeys the scope option', ->
- @stub.returns 'http://test/file'
- driver = new Dropbox.Drivers.Redirect(
- scope: 'not default', useQuery: true)
- expect(driver.url()).to.
- equal 'http://test/file?_dropboxjs_scope=not%20default'
-
- it 'obeys the scope option when adding a fragment', ->
- @stub.returns 'http://test/file'
- driver = new Dropbox.Drivers.Redirect scope: 'not default'
- expect(driver.url()).to.
- equal 'http://test/file#?_dropboxjs_scope=not%20default'
-
- describe '#locationToken', ->
- beforeEach ->
- @stub = sinon.stub Dropbox.Drivers.BrowserBase, 'currentLocation'
- afterEach ->
- @stub.restore()
-
- it 'returns null if the location does not contain the arg', ->
- @stub.returns 'http://test/file?_dropboxjs_scope=default& ' +
- 'another_token=ab%20cd&oauth_tok=en'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.locationToken()).to.equal null
-
- it 'returns null if the location fragment does not contain the arg', ->
- @stub.returns 'http://test/file#?_dropboxjs_scope=default& ' +
- 'another_token=ab%20cd&oauth_tok=en'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.locationToken()).to.equal null
-
- it "extracts the token successfully with default scope", ->
- @stub.returns 'http://test/file?_dropboxjs_scope=default&' +
- 'oauth_token=ab%20cd&other_param=true'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.locationToken()).to.equal 'ab cd'
-
- it "extracts the token successfully with set scope", ->
- @stub.returns 'http://test/file?_dropboxjs_scope=not%20default&' +
- 'oauth_token=ab%20cd'
- driver = new Dropbox.Drivers.Redirect scope: 'not default'
- expect(driver.locationToken()).to.equal 'ab cd'
-
- it "extracts the token from fragment with default scope", ->
- @stub.returns 'http://test/file#?_dropboxjs_scope=default&' +
- 'oauth_token=ab%20cd&other_param=true'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.locationToken()).to.equal 'ab cd'
-
- it "extracts the token from fragment with set scope", ->
- @stub.returns 'http://test/file#?_dropboxjs_scope=not%20default&' +
- 'oauth_token=ab%20cd'
- driver = new Dropbox.Drivers.Redirect scope: 'not default'
- expect(driver.locationToken()).to.equal 'ab cd'
-
- it "returns null if the location scope doesn't match", ->
- @stub.returns 'http://test/file?_dropboxjs_scope=defaultx&oauth_token=ab'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.locationToken()).to.equal null
-
- it "returns null if the location fragment scope doesn't match", ->
- @stub.returns 'http://test/file#?_dropboxjs_scope=defaultx&oauth_token=a'
- driver = new Dropbox.Drivers.Redirect
- expect(driver.locationToken()).to.equal null
-
- describe '#loadCredentials', ->
- beforeEach ->
- @node_js = module? and module.exports? and require?
- @chrome_app = chrome? and (chrome.extension or chrome.app?.runtime)
- return if @node_js or @chrome_app
- @client = new Dropbox.Client testKeys
- @driver = new Dropbox.Drivers.Redirect scope: 'some_scope'
- @driver.setStorageKey @client
-
- it 'produces the credentials passed to storeCredentials', (done) ->
- return done() if @node_js or @chrome_app
- goldCredentials = @client.credentials()
- @driver.storeCredentials goldCredentials, =>
- @driver = new Dropbox.Drivers.Redirect scope: 'some_scope'
- @driver.setStorageKey @client
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.deep.equal goldCredentials
- done()
-
- it 'produces null after forgetCredentials was called', (done) ->
- return done() if @node_js or @chrome_app
- @driver.storeCredentials @client.credentials(), =>
- @driver.forgetCredentials =>
- @driver = new Dropbox.Drivers.Redirect scope: 'some_scope'
- @driver.setStorageKey @client
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.equal null
- done()
-
- it 'produces null if a different scope is provided', (done) ->
- return done() if @node_js or @chrome_app
- @driver.setStorageKey @client
- @driver.storeCredentials @client.credentials(), =>
- @driver = new Dropbox.Drivers.Redirect scope: 'other_scope'
- @driver.setStorageKey @client
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.equal null
- done()
-
- describe 'integration', ->
- beforeEach ->
- @node_js = module? and module.exports? and require?
- @chrome_app = chrome? and (chrome.extension or chrome.app?.runtime)
-
- it 'should work', (done) ->
- return done() if @node_js or @chrome_app
- @timeout 30 * 1000 # Time-consuming because the user must click.
-
- listener = (event) ->
- expect(event.data).to.match(/^\[.*\]$/)
- [error, credentials] = JSON.parse event.data
- expect(error).to.equal null
- expect(credentials).to.have.property 'uid'
- expect(credentials.uid).to.be.a 'string'
- window.removeEventListener 'message', listener
- done()
-
- window.addEventListener 'message', listener
- (new Dropbox.Drivers.Popup()).openWindow(
- '/test/html/redirect_driver_test.html')
-
-describe 'Dropbox.Drivers.Popup', ->
- describe '#url', ->
- beforeEach ->
- @stub = sinon.stub Dropbox.Drivers.BrowserBase, 'currentLocation'
- @stub.returns 'http://test:123/a/path/file.htmx'
-
- afterEach ->
- @stub.restore()
-
- it 'reflects the current page when there are no options', ->
- driver = new Dropbox.Drivers.Popup
- expect(driver.url()).to.equal 'http://test:123/a/path/file.htmx'
-
- it 'replaces the current file correctly', ->
- driver = new Dropbox.Drivers.Popup receiverFile: 'another.file'
- expect(driver.url()).to.equal 'http://test:123/a/path/another.file#'
-
- it 'replaces the current file without a fragment correctly', ->
- driver = new Dropbox.Drivers.Popup
- receiverFile: 'another.file', noFragment: true
- expect(driver.url()).to.equal 'http://test:123/a/path/another.file'
-
- it 'replaces an entire URL without a fragment correctly', ->
- driver = new Dropbox.Drivers.Popup
- receiverUrl: 'https://something.com/filez'
- expect(driver.url()).to.equal 'https://something.com/filez#'
-
- it 'replaces an entire URL with a fragment correctly', ->
- driver = new Dropbox.Drivers.Popup
- receiverUrl: 'https://something.com/filez#frag'
- expect(driver.url()).to.equal 'https://something.com/filez#frag'
-
- it 'replaces an entire URL without a fragment and useQuery correctly', ->
- driver = new Dropbox.Drivers.Popup
- receiverUrl: 'https://something.com/filez', noFragment: true
- expect(driver.url()).to.equal 'https://something.com/filez'
-
- describe '#loadCredentials', ->
- beforeEach ->
- @node_js = module? and module.exports? and require?
- @chrome_app = chrome? and (chrome.extension or chrome.app?.runtime)
- return if @node_js or @chrome_app
- @client = new Dropbox.Client testKeys
- @driver = new Dropbox.Drivers.Popup scope: 'some_scope'
- @driver.setStorageKey @client
-
- it 'produces the credentials passed to storeCredentials', (done) ->
- return done() if @node_js or @chrome_app
- goldCredentials = @client.credentials()
- @driver.storeCredentials goldCredentials, =>
- @driver = new Dropbox.Drivers.Popup scope: 'some_scope'
- @driver.setStorageKey @client
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.deep.equal goldCredentials
- done()
-
- it 'produces null after forgetCredentials was called', (done) ->
- return done() if @node_js or @chrome_app
- @driver.storeCredentials @client.credentials(), =>
- @driver.forgetCredentials =>
- @driver = new Dropbox.Drivers.Popup scope: 'some_scope'
- @driver.setStorageKey @client
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.equal null
- done()
-
- it 'produces null if a different scope is provided', (done) ->
- return done() if @node_js or @chrome_app
- @driver.setStorageKey @client
- @driver.storeCredentials @client.credentials(), =>
- @driver = new Dropbox.Drivers.Popup scope: 'other_scope'
- @driver.setStorageKey @client
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.equal null
- done()
-
- describe 'integration', ->
- beforeEach ->
- @node_js = module? and module.exports? and require?
- @chrome_app = chrome? and (chrome.extension or chrome.app?.runtime)
-
- it 'should work with a query string', (done) ->
- return done() if @node_js or @chrome_app
- @timeout 45 * 1000 # Time-consuming because the user must click.
-
- client = new Dropbox.Client testKeys
- client.reset()
- authDriver = new Dropbox.Drivers.Popup
- receiverFile: 'oauth_receiver.html', noFragment: true,
- scope: 'popup-integration', rememberUser: false
- client.authDriver authDriver
- client.authenticate (error, client) =>
- expect(error).to.equal null
- expect(client.authState).to.equal Dropbox.Client.DONE
- # Verify that we can do API calls.
- client.getUserInfo (error, userInfo) ->
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
-
- # Follow-up authenticate() should restart the process.
- client.reset()
- authDriver.doAuthorize = (authUrl, token, tokenSecret, callback) ->
- client.reset()
- done()
- client.authenticate ->
- assert false, 'The second authenticate() should not complete.'
-
- it 'should work with a URL fragment and rememberUser: true', (done) ->
- return done() if @node_js or @chrome_app
- @timeout 45 * 1000 # Time-consuming because the user must click.
-
- client = new Dropbox.Client testKeys
- client.reset()
- authDriver = new Dropbox.Drivers.Popup
- receiverFile: 'oauth_receiver.html', noFragment: false,
- scope: 'popup-integration', rememberUser: true
- client.authDriver authDriver
- authDriver.setStorageKey client
- authDriver.forgetCredentials ->
- client.authenticate (error, client) ->
- expect(error).to.equal null
- expect(client.authState).to.equal Dropbox.Client.DONE
- # Verify that we can do API calls.
- client.getUserInfo (error, userInfo) ->
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
-
- # Follow-up authenticate() should use stored credentials.
- client.reset()
- authDriver.doAuthorize = (authUrl, token, tokenSecret, callback) ->
- assert false,
- 'Stored credentials not used in second authenticate()'
- client.authenticate (error, client) ->
- # Verify that we can do API calls.
- client.getUserInfo (error, userInfo) ->
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
- done()
-
-describe 'Dropbox.Drivers.Chrome', ->
- beforeEach ->
- @chrome_app = chrome? and (chrome.extension or chrome.app?.runtime)
- @client = new Dropbox.Client testKeys
-
- describe '#url', ->
- beforeEach ->
- return unless @chrome_app
- @path = 'test/html/redirect_driver_test.html'
- @driver = new Dropbox.Drivers.Chrome receiverPath: @path
-
- it 'produces a chrome-extension:// url', ->
- return unless @chrome_app
- expect(@driver.url()).to.match(/^chrome-extension:\/\//)
-
- it 'produces an URL ending in redirectPath', ->
- return unless @chrome_app
- url = @driver.url()
- expect(url.substring(url.length - @path.length)).to.equal @path
-
- describe '#loadCredentials', ->
- beforeEach ->
- return unless @chrome_app
- @client = new Dropbox.Client testKeys
- @driver = new Dropbox.Drivers.Chrome scope: 'some_scope'
-
- it 'produces the credentials passed to storeCredentials', (done) ->
- return done() unless @chrome_app
- goldCredentials = @client.credentials()
- @driver.storeCredentials goldCredentials, =>
- @driver = new Dropbox.Drivers.Chrome scope: 'some_scope'
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.deep.equal goldCredentials
- done()
-
- it 'produces null after forgetCredentials was called', (done) ->
- return done() unless @chrome_app
- @driver.storeCredentials @client.credentials(), =>
- @driver.forgetCredentials =>
- @driver = new Dropbox.Drivers.Chrome scope: 'some_scope'
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.equal null
- done()
-
- it 'produces null if a different scope is provided', (done) ->
- return done() unless @chrome_app
- @driver.storeCredentials @client.credentials(), =>
- @driver = new Dropbox.Drivers.Chrome scope: 'other_scope'
- @driver.loadCredentials (credentials) ->
- expect(credentials).to.equal null
- done()
-
- describe 'integration', ->
- it 'should work', (done) ->
- return done() unless @chrome_app
- @timeout 45 * 1000 # Time-consuming because the user must click.
-
- client = new Dropbox.Client testKeys
- client.reset()
- authDriver = new Dropbox.Drivers.Chrome(
- receiverPath: 'test/html/chrome_oauth_receiver.html',
- scope: 'chrome_integration')
- client.authDriver authDriver
- authDriver.forgetCredentials ->
- client.authenticate (error, client) ->
- expect(error).to.equal null
- expect(client.authState).to.equal Dropbox.Client.DONE
- # Verify that we can do API calls.
- client.getUserInfo (error, userInfo) ->
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
- # Follow-up authenticate() should use stored credentials.
- client.reset()
- authDriver.doAuthorize = (authUrl, token, tokenSecret, callback) ->
- assert false,
- 'Stored credentials not used in second authenticate()'
- client.authenticate (error, client) ->
- # Verify that we can do API calls.
- client.getUserInfo (error, userInfo) ->
- expect(error).to.equal null
- expect(userInfo).to.be.instanceOf Dropbox.UserInfo
- done()
diff --git a/lib/client/storage/dropbox/test/src/event_source_test.coffee b/lib/client/storage/dropbox/test/src/event_source_test.coffee
deleted file mode 100644
index e7440b0f..00000000
--- a/lib/client/storage/dropbox/test/src/event_source_test.coffee
+++ /dev/null
@@ -1,144 +0,0 @@
-describe 'Dropbox.EventSource', ->
- beforeEach ->
- @source = new Dropbox.EventSource
- @cancelable = new Dropbox.EventSource cancelable: true
-
- # 3 listeners, 1 and 2 are already hooked up
- @event1 = null
- @return1 = true
- @listener1 = (event) =>
- @event1 = event
- @return1
- @source.addListener @listener1
- @cancelable.addListener @listener1
- @event2 = null
- @return2 = false
- @listener2 = (event) =>
- @event2 = event
- @return2
- @source.addListener @listener2
- @cancelable.addListener @listener2
- @event3 = null
- @return3 = true
- @listener3 = (event) =>
- @event3 = event
- @return3
-
- describe '#addListener', ->
- it 'adds a new listener', ->
- @source.addListener @listener3
- expect(@source._listeners).to.deep.
- equal [@listener1, @listener2, @listener3]
-
- it 'does not add an existing listener', ->
- @source.addListener @listener2
- expect(@source._listeners).to.deep.equal [@listener1, @listener2]
-
- it 'is idempotent', ->
- @source.addListener @listener3
- @source.addListener @listener3
- expect(@source._listeners).to.deep.
- equal [@listener1, @listener2, @listener3]
-
- it 'refuses to add non-functions', ->
- expect(=> @source.addListener 42).to.throw(TypeError, /listener type/)
-
- describe '#removeListener', ->
- it 'does nothing for a non-existing listener', ->
- @source.removeListener @listener3
- expect(@source._listeners).to.deep.equal [@listener1, @listener2]
-
- it 'removes a listener at the end of the queue', ->
- @source.removeListener @listener2
- expect(@source._listeners).to.deep.equal [@listener1]
-
- it 'removes a listener at the beginning of the queue', ->
- @source.removeListener @listener1
- expect(@source._listeners).to.deep.equal [@listener2]
-
- it 'removes a listener at the middle of the queue', ->
- @source.addListener @listener3
- @source.removeListener @listener2
- expect(@source._listeners).to.deep.equal [@listener1, @listener3]
-
- it 'removes all the listeners', ->
- @source.removeListener @listener1
- @source.removeListener @listener2
- expect(@source._listeners).to.deep.equal []
-
- describe 'without ES5 Array#indexOf', ->
- beforeEach ->
- @source._listeners.indexOf = null
-
- afterEach ->
- delete @source._listeners.indexOf
-
- assertArraysEqual = (array1, array2) ->
- expect(array1.length).to.equal(array2.length)
- for i in [0...array1.length]
- expect(array1[i]).to.equal(array2[i])
-
- it 'does nothing for a non-existing listener', ->
- @source.removeListener @listener3
- assertArraysEqual @source._listeners, [@listener1, @listener2]
-
- it 'removes a listener at the end of the queue', ->
- @source.removeListener @listener2
- assertArraysEqual @source._listeners, [@listener1]
-
- it 'removes a listener at the beginning of the queue', ->
- @source.removeListener @listener1
- assertArraysEqual @source._listeners, [@listener2]
-
- it 'removes a listener at the middle of the queue', ->
- @source.addListener @listener3
- @source.removeListener @listener2
- assertArraysEqual @source._listeners, [@listener1, @listener3]
-
- it 'removes all the listeners', ->
- @source.removeListener @listener1
- @source.removeListener @listener2
- assertArraysEqual @source._listeners, []
-
- describe '#dispatch', ->
- beforeEach ->
- @event = { answer: 42 }
-
- it 'passes event to all listeners', ->
- @source.dispatch @event
- expect(@event1).to.equal @event
- expect(@event2).to.equal @event
- expect(@event3).to.equal null
-
- describe 'on non-cancelable events', ->
- beforeEach ->
- @source.addListener @listener3
- @returnValue = @source.dispatch @event
-
- it 'calls all the listeners', ->
- expect(@event1).to.equal @event
- expect(@event2).to.equal @event
- expect(@event3).to.equal @event
-
- it 'ignores the listener return values', ->
- expect(@returnValue).to.equal true
-
- describe 'on cancelable events', ->
- beforeEach ->
- @cancelable.addListener @listener3
- @returnValue = @cancelable.dispatch @event
-
- it 'stops calling listeners after cancelation', ->
- expect(@event1).to.equal @event
- expect(@event2).to.equal @event
- expect(@event3).to.equal null
-
- it 'reports cancelation', ->
- expect(@returnValue).to.equal false
-
- it 'calls all listeners if no cancelation occurs', ->
- @return2 = true
- @returnValue = @cancelable.dispatch @event
-
- expect(@returnValue).to.equal true
- expect(@event3).to.equal @event
diff --git a/lib/client/storage/dropbox/test/src/helper.coffee b/lib/client/storage/dropbox/test/src/helper.coffee
deleted file mode 100644
index 2b42b86a..00000000
--- a/lib/client/storage/dropbox/test/src/helper.coffee
+++ /dev/null
@@ -1,55 +0,0 @@
-if global? and require? and module?
- # Node.JS
- exports = global
-
- exports.Dropbox = require '../../lib/dropbox'
- exports.chai = require 'chai'
- exports.sinon = require 'sinon'
- exports.sinonChai = require 'sinon-chai'
-
- exports.authDriver = new Dropbox.Drivers.NodeServer port: 8912
-
- TokenStash = require './token_stash.js'
- (new TokenStash()).get (credentials) ->
- exports.testKeys = credentials
- (new TokenStash(fullDropbox: true)).get (credentials) ->
- exports.testFullDropboxKeys = credentials
-
- testIconPath = './test/binary/dropbox.png'
- fs = require 'fs'
- buffer = fs.readFileSync testIconPath
- bytes = []
- for i in [0...buffer.length]
- bytes.push String.fromCharCode(buffer.readUInt8(i))
- exports.testImageBytes = bytes.join ''
- exports.testImageUrl = 'http://localhost:8913/favicon.ico'
- imageServer = null
- exports.testImageServerOn = ->
- imageServer =
- new Dropbox.Drivers.NodeServer port: 8913, favicon: testIconPath
- exports.testImageServerOff = ->
- imageServer.closeServer()
- imageServer = null
-else
- if chrome? and chrome.runtime
- # Chrome app
- exports = window
- exports.authDriver = new Dropbox.Drivers.Chrome(
- receiverPath: 'test/html/chrome_oauth_receiver.html',
- scope: 'helper-chrome')
- # Hack-implement "rememberUser: false" in the Chrome driver.
- exports.authDriver.storeCredentials = (credentials, callback) -> callback()
- exports.authDriver.loadCredentials = (callback) -> callback null
- else
- # Browser
- exports = window
- exports.authDriver = new Dropbox.Drivers.Popup(
- receiverFile: 'oauth_receiver.html', scope: 'helper-popup')
-
- exports.testImageUrl = '/test/binary/dropbox.png'
- exports.testImageServerOn = -> null
- exports.testImageServerOff = -> null
-
-# Shared setup.
-exports.assert = exports.chai.assert
-exports.expect = exports.chai.expect
diff --git a/lib/client/storage/dropbox/test/src/hmac_test.coffee b/lib/client/storage/dropbox/test/src/hmac_test.coffee
deleted file mode 100644
index b8fbafce..00000000
--- a/lib/client/storage/dropbox/test/src/hmac_test.coffee
+++ /dev/null
@@ -1,22 +0,0 @@
-describe 'Dropbox.hmac', ->
- it 'works for an empty message with an empty key', ->
- expect(Dropbox.hmac('', '')).to.equal '+9sdGxiqbAgyS31ktx+3Y3BpDh0='
-
- it 'works for the non-empty Wikipedia example', ->
- expect(Dropbox.hmac('The quick brown fox jumps over the lazy dog', 'key')).
- to.equal '3nybhbi3iqa8ino29wqQcBydtNk='
-
- it 'works for the Oauth example', ->
- key = 'kd94hf93k423kf44&pfkkdhi9sl3r4s00'
- string = 'GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal'
- expect(Dropbox.hmac(string, key)).to.equal 'tR3+Ty81lMeYAr/Fid0kMTYa/WM='
-
-describe 'Dropbox.sha1', ->
- it 'works for an empty message', ->
- expect(Dropbox.sha1('')).to.equal '2jmj7l5rSw0yVb/vlWAYkK/YBwk='
- it 'works for the FIPS-180 Appendix A sample', ->
- expect(Dropbox.sha1('abc')).to.equal 'qZk+NkcGgWq6PiVxeFDCbJzQ2J0='
- it 'works for the FIPS-180 Appendix B sample', ->
- string = 'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'
- expect(Dropbox.sha1(string)).to.equal 'hJg+RBw70m66rkqh+VEp5eVGcPE='
-
diff --git a/lib/client/storage/dropbox/test/src/oauth_test.coffee b/lib/client/storage/dropbox/test/src/oauth_test.coffee
deleted file mode 100644
index 25dbc562..00000000
--- a/lib/client/storage/dropbox/test/src/oauth_test.coffee
+++ /dev/null
@@ -1,124 +0,0 @@
-describe 'Dropbox.Oauth', ->
- beforeEach ->
- @oauth = new Dropbox.Oauth
- key: 'dpf43f3p2l4k3l03',
- secret: 'kd94hf93k423kf44'
- @oauth.setToken 'nnch734d00sl2jdk', 'pfkkdhi9sl3r4s00'
-
- # The example in OAuth 1.0a Appendix A.
- @request =
- method: 'GET',
- url: 'http://photos.example.net/photos'
- params:
- file: 'vacation.jpg',
- size: 'original'
- @dateStub = sinon.stub Date, 'now'
- @dateStub.returns 1191242096999
-
- afterEach ->
- @dateStub.restore()
-
- describe '#boilerplateParams', ->
- it 'issues unique nonces', ->
- nonces = {}
- for i in [1..100]
- nonce = @oauth.boilerplateParams({}).oauth_nonce
- expect(nonces).not.to.have.property nonce
- nonces[nonce] = true
-
- it 'fills all the arguments', ->
- params = @oauth.boilerplateParams(@request.params)
- properties = ['oauth_consumer_key', 'oauth_nonce',
- 'oauth_signature_method', 'oauth_timestamp',
- 'oauth_version']
- for property in properties
- expect(params).to.have.property property
-
- describe '#signature', ->
- it 'works for the OAuth 1.0a example', ->
- @nonceStub = sinon.stub @oauth, 'nonce'
- @nonceStub.returns 'kllo9940pd9333jh'
-
- @oauth.boilerplateParams(@request.params)
- expect(@oauth.signature(@request.method, @request.url, @request.params)).
- to.equal 'tR3+Ty81lMeYAr/Fid0kMTYa/WM='
-
- @nonceStub.restore()
-
- it 'works with an encoded key', ->
- @oauth = new Dropbox.Oauth
- key: Dropbox.encodeKey(@oauth.key, @oauth.secret),
- token: @oauth.token, tokenSecret: @oauth.tokenSecret
-
- @nonceStub = sinon.stub @oauth, 'nonce'
- @nonceStub.returns 'kllo9940pd9333jh'
-
- @oauth.boilerplateParams(@request.params)
- expect(@oauth.signature(@request.method, @request.url, @request.params)).
- to.equal 'tR3+Ty81lMeYAr/Fid0kMTYa/WM='
-
- @nonceStub.restore()
-
- describe '#addAuthParams', ->
- it 'matches the OAuth 1.0a example', ->
- @nonceStub = sinon.stub @oauth, 'nonce'
- @nonceStub.returns 'kllo9940pd9333jh'
-
- goldenParams =
- file: 'vacation.jpg'
- oauth_consumer_key: 'dpf43f3p2l4k3l03'
- oauth_nonce: 'kllo9940pd9333jh'
- oauth_signature: 'tR3+Ty81lMeYAr/Fid0kMTYa/WM='
- oauth_signature_method: 'HMAC-SHA1'
- oauth_timestamp: '1191242096'
- oauth_token: 'nnch734d00sl2jdk'
- oauth_version: '1.0'
- size: 'original'
-
- @oauth.addAuthParams @request.method, @request.url, @request.params
- expect(Dropbox.Xhr.urlEncode(@request.params)).to.
- eql Dropbox.Xhr.urlEncode(goldenParams)
-
- @nonceStub.restore()
-
- it "doesn't leave any OAuth-related value in params", ->
- @oauth.authHeader(@request.method, @request.url, @request.params)
- expect(Dropbox.Xhr.urlEncode(@request.params)).to.
- equal "file=vacation.jpg&size=original"
-
- describe '#authHeader', ->
- it 'matches the OAuth 1.0a example', ->
- @nonceStub = sinon.stub @oauth, 'nonce'
- @nonceStub.returns 'kllo9940pd9333jh'
-
- goldenHeader = 'OAuth oauth_consumer_key="dpf43f3p2l4k3l03",oauth_nonce="kllo9940pd9333jh",oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D",oauth_signature_method="HMAC-SHA1",oauth_timestamp="1191242096",oauth_token="nnch734d00sl2jdk",oauth_version="1.0"'
- header = @oauth.authHeader @request.method, @request.url, @request.params
- expect(header).to.equal goldenHeader
-
- @nonceStub.restore()
-
- it "doesn't leave any OAuth-related value in params", ->
- @oauth.authHeader(@request.method, @request.url, @request.params)
- expect(Dropbox.Xhr.urlEncode(@request.params)).to.
- equal "file=vacation.jpg&size=original"
-
- describe '#appHash', ->
- it 'is a non-trivial string', ->
- expect(@oauth.appHash()).to.be.a 'string'
- expect(@oauth.appHash().length).to.be.greaterThan 4
-
- it 'is consistent', ->
- oauth = new Dropbox.Oauth key: @oauth.key, secret: @oauth.secret
- expect(oauth.appHash()).to.equal @oauth.appHash()
-
- it 'depends on the app key', ->
- oauth = new Dropbox.Oauth key: @oauth.key + '0', secret: @oauth.secret
- expect(oauth.appHash()).not.to.equal @oauth.appHash()
- expect(oauth.appHash()).to.be.a 'string'
- expect(oauth.appHash().length).to.be.greaterThan 4
-
- describe '#constructor', ->
- it 'raises an Error if initialized without an API key / secret', ->
- expect(-> new Dropbox.Oauth(token: '123', tokenSecret: '456')).to.
- throw(Error, /no api key/i)
-
diff --git a/lib/client/storage/dropbox/test/src/pulled_changes_test.coffee b/lib/client/storage/dropbox/test/src/pulled_changes_test.coffee
deleted file mode 100644
index 4d2fe67d..00000000
--- a/lib/client/storage/dropbox/test/src/pulled_changes_test.coffee
+++ /dev/null
@@ -1,128 +0,0 @@
-describe 'Dropbox.PulledChanges', ->
- describe '.parse', ->
- describe 'on a sample response', ->
- beforeEach ->
- deltaInfo = {
- "reset": false,
- "cursor": "nTZYLOcTQnyB7-Wc72M-kEAcBQdk2EjLaJIRupQWgDXmRwKWzuG5V4se2mvU7yzXn4cZSJltoW4tpbqgy0Ezxh1b1p3ygp7wy-vdaYJusujnLAyEsKdYCHPZYZdZt7sQG0BopF2ufAuD56ijYbdX5DhMKe85MFqncnFDvNxSjsodEw-IkCfNZmagDmpOZCxmLqu71hLTApwhqO9-dhm-fk6KSYs-OZwRmVwOE2JAnJbWuifNiM8KwMz5sRBZ5FMJPDqXpOW5PqPCwbkAmKQACbNXFi0k1JuxulpDlQh3zMr3lyLMs-fmaDTTU355mY5xSAXK05Zgs5rPJ6lcaBOUmEBSXcPhxFDHk5NmAdA03Shq04t2_4bupzWX-txT84FmOLNncchl7ZDBCMwyrAzD2kCYOTu1_lhui0C-fiCZgZBKU4OyP6qrkdo4gZu3",
- "has_more": true,
- "entries": [
- [
- "/Getting_Started.pdf",
- {
- "size": "225.4KB",
- "rev": "35e97029684fe",
- "thumb_exists": true, # Changed to test hasThumbnail=true code.
- "bytes": 230783,
- "modified": "Tue, 19 Jul 2011 21:55:38 +0000",
- "client_mtime": "Mon, 18 Jul 2011 18:04:35 +0000",
- "path": "/Getting_Started.pdf",
- "is_dir": false,
- "icon": "page_white_acrobat",
- "root": "app_folder", # Changed to test app_folder code path.
- "mime_type": "application/pdf",
- "revision": 220823
- }
- ],
- [
- "/Public",
- null
- ]
- ]
- }
- @changes = Dropbox.PulledChanges.parse deltaInfo
-
- it 'parses blankSlate correctly', ->
- expect(@changes).to.have.property 'blankSlate'
- expect(@changes.blankSlate).to.equal false
-
- it 'parses cursorTag correctly', ->
- expect(@changes).to.have.property 'cursorTag'
- expect(@changes.cursorTag).to.equal 'nTZYLOcTQnyB7-Wc72M-kEAcBQdk2EjLaJIRupQWgDXmRwKWzuG5V4se2mvU7yzXn4cZSJltoW4tpbqgy0Ezxh1b1p3ygp7wy-vdaYJusujnLAyEsKdYCHPZYZdZt7sQG0BopF2ufAuD56ijYbdX5DhMKe85MFqncnFDvNxSjsodEw-IkCfNZmagDmpOZCxmLqu71hLTApwhqO9-dhm-fk6KSYs-OZwRmVwOE2JAnJbWuifNiM8KwMz5sRBZ5FMJPDqXpOW5PqPCwbkAmKQACbNXFi0k1JuxulpDlQh3zMr3lyLMs-fmaDTTU355mY5xSAXK05Zgs5rPJ6lcaBOUmEBSXcPhxFDHk5NmAdA03Shq04t2_4bupzWX-txT84FmOLNncchl7ZDBCMwyrAzD2kCYOTu1_lhui0C-fiCZgZBKU4OyP6qrkdo4gZu3'
-
- it 'parses shouldPullAgain correctly', ->
- expect(@changes).to.have.property 'shouldPullAgain'
- expect(@changes.shouldPullAgain).to.equal true
-
- it 'parses shouldBackOff correctly', ->
- expect(@changes).to.have.property 'shouldBackOff'
- expect(@changes.shouldBackOff).to.equal false
-
- it 'parses changes correctly', ->
- expect(@changes).to.have.property 'changes'
- expect(@changes.changes).to.have.length 2
- expect(@changes.changes[0]).to.be.instanceOf Dropbox.PullChange
- expect(@changes.changes[0].path).to.equal '/Getting_Started.pdf'
- expect(@changes.changes[1]).to.be.instanceOf Dropbox.PullChange
- expect(@changes.changes[1].path).to.equal '/Public'
-
- it 'passes null through', ->
- expect(Dropbox.PulledChanges.parse(null)).to.equal null
-
- it 'passes undefined through', ->
- expect(Dropbox.PulledChanges.parse(undefined)).to.equal undefined
-
-
-describe 'Dropbox.PullChange', ->
- describe '.parse', ->
- describe 'on a modification change', ->
- beforeEach ->
- entry = [
- "/Getting_Started.pdf",
- {
- "size": "225.4KB",
- "rev": "35e97029684fe",
- "thumb_exists": true, # Changed to test hasThumbnail=true code.
- "bytes": 230783,
- "modified": "Tue, 19 Jul 2011 21:55:38 +0000",
- "client_mtime": "Mon, 18 Jul 2011 18:04:35 +0000",
- "path": "/Getting_Started.pdf",
- "is_dir": false,
- "icon": "page_white_acrobat",
- "root": "app_folder", # Changed to test app_folder code path.
- "mime_type": "application/pdf",
- "revision": 220823
- }
- ]
- @changes = Dropbox.PullChange.parse entry
-
- it 'parses path correctly', ->
- expect(@changes).to.have.property 'path'
- expect(@changes.path).to.equal '/Getting_Started.pdf'
-
- it 'parses wasRemoved correctly', ->
- expect(@changes).to.have.property 'wasRemoved'
- expect(@changes.wasRemoved).to.equal false
-
- it 'parses stat correctly', ->
- expect(@changes).to.have.property 'stat'
- expect(@changes.stat).to.be.instanceOf Dropbox.Stat
- expect(@changes.stat.path).to.equal @changes.path
-
- describe 'on a deletion change', ->
- beforeEach ->
- entry = [
- "/Public",
- null
- ]
- @changes = Dropbox.PullChange.parse entry
-
- it 'parses path correctly', ->
- expect(@changes).to.have.property 'path'
- expect(@changes.path).to.equal '/Public'
-
- it 'parses wasRemoved correctly', ->
- expect(@changes).to.have.property 'wasRemoved'
- expect(@changes.wasRemoved).to.equal true
-
- it 'parses stat correctly', ->
- expect(@changes).to.have.property 'stat'
- expect(@changes.stat).to.equal null
-
- it 'passes null through', ->
- expect(Dropbox.PullChange.parse(null)).to.equal null
-
- it 'passes undefined through', ->
- expect(Dropbox.PullChange.parse(undefined)).to.equal undefined
-
-
diff --git a/lib/client/storage/dropbox/test/src/references_test.coffee b/lib/client/storage/dropbox/test/src/references_test.coffee
deleted file mode 100644
index ac03c567..00000000
--- a/lib/client/storage/dropbox/test/src/references_test.coffee
+++ /dev/null
@@ -1,92 +0,0 @@
-describe 'Dropbox.PublicUrl', ->
- describe '.parse', ->
- describe 'on the /shares API example', ->
- beforeEach ->
- urlData = {
- "url": "http://db.tt/APqhX1",
- "expires": "Tue, 01 Jan 2030 00:00:00 +0000"
- }
- @url = Dropbox.PublicUrl.parse urlData, false
-
- it 'parses url correctly', ->
- expect(@url).to.have.property 'url'
- expect(@url.url).to.equal 'http://db.tt/APqhX1'
-
- it 'parses expiresAt correctly', ->
- expect(@url).to.have.property 'expiresAt'
- expect(@url.expiresAt).to.be.instanceOf Date
- expect([
- 'Tue, 01 Jan 2030 00:00:00 GMT', # every sane JS platform
- 'Tue, 1 Jan 2030 00:00:00 UTC' # Internet Explorer
- ]).to.contain(@url.expiresAt.toUTCString())
-
- it 'parses isDirect correctly', ->
- expect(@url).to.have.property 'isDirect'
- expect(@url.isDirect).to.equal false
-
- it 'parses isPreview correctly', ->
- expect(@url).to.have.property 'isPreview'
- expect(@url.isPreview).to.equal true
-
- it 'round-trips through json / parse correctly', ->
- newUrl = Dropbox.PublicUrl.parse @url.json()
- newUrl.json() # Get _json populated for newUrl.
- expect(newUrl).to.deep.equal @url
-
- it 'passes null through', ->
- expect(Dropbox.PublicUrl.parse(null)).to.equal null
-
- it 'passes undefined through', ->
- expect(Dropbox.PublicUrl.parse(undefined)).to.equal undefined
-
-
-describe 'Dropbox.CopyReference', ->
- describe '.parse', ->
- describe 'on the API example', ->
- beforeEach ->
- refData = {
- "copy_ref": "z1X6ATl6aWtzOGq0c3g5Ng",
- "expires": "Fri, 31 Jan 2042 21:01:05 +0000"
- }
- @ref = Dropbox.CopyReference.parse refData
-
- it 'parses tag correctly', ->
- expect(@ref).to.have.property 'tag'
- expect(@ref.tag).to.equal 'z1X6ATl6aWtzOGq0c3g5Ng'
-
- it 'parses expiresAt correctly', ->
- expect(@ref).to.have.property 'expiresAt'
- expect(@ref.expiresAt).to.be.instanceOf Date
- expect([
- 'Fri, 31 Jan 2042 21:01:05 GMT', # every sane JS platform
- 'Fri, 31 Jan 2042 21:01:05 UTC' # Internet Explorer
- ]).to.contain(@ref.expiresAt.toUTCString())
-
- it 'round-trips through json / parse correctly', ->
- newRef = Dropbox.CopyReference.parse @ref.json()
- expect(newRef).to.deep.equal @ref
-
- describe 'on a reference string', ->
- beforeEach ->
- rawRef = 'z1X6ATl6aWtzOGq0c3g5Ng'
- @ref = Dropbox.CopyReference.parse rawRef
-
- it 'parses tag correctly', ->
- expect(@ref).to.have.property 'tag'
- expect(@ref.tag).to.equal 'z1X6ATl6aWtzOGq0c3g5Ng'
-
- it 'parses expiresAt correctly', ->
- expect(@ref).to.have.property 'expiresAt'
- expect(@ref.expiresAt).to.be.instanceOf Date
- expect(@ref.expiresAt - (new Date())).to.be.below 1000
-
- it 'round-trips through json / parse correctly', ->
- newRef = Dropbox.CopyReference.parse @ref.json()
- expect(newRef).to.deep.equal @ref
-
- it 'passes null through', ->
- expect(Dropbox.CopyReference.parse(null)).to.equal null
-
- it 'passes undefined through', ->
- expect(Dropbox.CopyReference.parse(undefined)).to.equal undefined
-
diff --git a/lib/client/storage/dropbox/test/src/stat_test.coffee b/lib/client/storage/dropbox/test/src/stat_test.coffee
deleted file mode 100644
index 2fecf635..00000000
--- a/lib/client/storage/dropbox/test/src/stat_test.coffee
+++ /dev/null
@@ -1,204 +0,0 @@
-describe 'Dropbox.Stat', ->
- describe '.parse', ->
- describe 'on the API file example', ->
- beforeEach ->
- # File example at
- # https://www.dropbox.com/developers/reference/api#metadata
- metadata = {
- "size": "225.4KB",
- "rev": "35e97029684fe",
- "thumb_exists": true, # Changed to test hasThumbnail=true code.
- "bytes": 230783,
- "modified": "Tue, 19 Jul 2011 21:55:38 +0000",
- "client_mtime": "Mon, 18 Jul 2011 18:04:35 +0000",
- "path": "/Getting_Started.pdf",
- "is_dir": false,
- "icon": "page_white_acrobat",
- "root": "app_folder", # Changed to test app_folder code path.
- "mime_type": "application/pdf",
- "revision": 220823
- }
- @stat = Dropbox.Stat.parse metadata
-
- it 'parses the path correctly', ->
- expect(@stat).to.have.property 'path'
- expect(@stat.path).to.equal '/Getting_Started.pdf'
-
- it 'parses name correctly', ->
- expect(@stat).to.have.property 'name'
- expect(@stat.name).to.equal 'Getting_Started.pdf'
-
- it 'parses inAppFolder corectly', ->
- expect(@stat).to.have.property 'inAppFolder'
- expect(@stat.inAppFolder).to.equal true
-
- it 'parses isFolder correctly', ->
- expect(@stat).to.have.property 'isFolder'
- expect(@stat.isFolder).to.equal false
- expect(@stat).to.have.property 'isFile'
- expect(@stat.isFile).to.equal true
-
- it 'parses isRemoved correctly', ->
- expect(@stat).to.have.property 'isRemoved'
- expect(@stat.isRemoved).to.equal false
-
- it 'parses typeIcon correctly', ->
- expect(@stat).to.have.property 'typeIcon'
- expect(@stat.typeIcon).to.equal 'page_white_acrobat'
-
- it 'parses versionTag correctly', ->
- expect(@stat).to.have.property 'versionTag'
- expect(@stat.versionTag).to.equal '35e97029684fe'
-
- it 'parses mimeType correctly', ->
- expect(@stat).to.have.property 'mimeType'
- expect(@stat.mimeType).to.equal 'application/pdf'
-
- it 'parses size correctly', ->
- expect(@stat).to.have.property 'size'
- expect(@stat.size).to.equal 230783
-
- it 'parses humanSize correctly', ->
- expect(@stat).to.have.property 'humanSize'
- expect(@stat.humanSize).to.equal "225.4KB"
-
- it 'parses hasThumbnail correctly', ->
- expect(@stat).to.have.property 'hasThumbnail'
- expect(@stat.hasThumbnail).to.equal true
-
- it 'parses modifiedAt correctly', ->
- expect(@stat).to.have.property 'modifiedAt'
- expect(@stat.modifiedAt).to.be.instanceOf Date
- expect([
- 'Tue, 19 Jul 2011 21:55:38 GMT', # every sane JS platform
- 'Tue, 19 Jul 2011 21:55:38 UTC' # Internet Explorer
- ]).to.contain(@stat.modifiedAt.toUTCString())
-
- it 'parses clientModifiedAt correctly', ->
- expect(@stat).to.have.property 'clientModifiedAt'
- expect(@stat.clientModifiedAt).to.be.instanceOf Date
- expect([
- 'Mon, 18 Jul 2011 18:04:35 GMT', # every sane JS platform
- 'Mon, 18 Jul 2011 18:04:35 UTC' # Internet Explorer
- ]).to.contain(@stat.clientModifiedAt.toUTCString())
-
- it 'round-trips through json / parse correctly', ->
- newStat = Dropbox.Stat.parse @stat.json()
- expect(newStat).to.deep.equal @stat
-
-
- describe 'on the API directory example', ->
- beforeEach ->
- # Folder example at
- # https://www.dropbox.com/developers/reference/api#metadata
- metadata = {
- "size": "0 bytes",
- "hash": "37eb1ba1849d4b0fb0b28caf7ef3af52",
- "bytes": 0,
- "thumb_exists": false,
- "rev": "714f029684fe",
- "modified": "Wed, 27 Apr 2011 22:18:51 +0000",
- "path": "/Public",
- "is_dir": true,
- "is_deleted": true, # Added to test isRemoved=true code path.
- "icon": "folder_public",
- "root": "dropbox",
- "revision": 29007
- }
- @stat = Dropbox.Stat.parse metadata
-
- it 'parses path correctly', ->
- expect(@stat).to.have.property 'path'
- expect(@stat.path).to.equal '/Public'
-
- it 'parses name correctly', ->
- expect(@stat).to.have.property 'name'
- expect(@stat.name).to.equal 'Public'
-
- it 'parses inAppFolder corectly', ->
- expect(@stat).to.have.property 'inAppFolder'
- expect(@stat.inAppFolder).to.equal false
-
- it 'parses isFolder correctly', ->
- expect(@stat).to.have.property 'isFolder'
- expect(@stat.isFolder).to.equal true
- expect(@stat).to.have.property 'isFile'
- expect(@stat.isFile).to.equal false
-
- it 'parses isRemoved correctly', ->
- expect(@stat).to.have.property 'isRemoved'
- expect(@stat.isRemoved).to.equal true
-
- it 'parses typeIcon correctly', ->
- expect(@stat).to.have.property 'typeIcon'
- expect(@stat.typeIcon).to.equal 'folder_public'
-
- it 'parses versionTag correctly', ->
- expect(@stat).to.have.property 'versionTag'
- expect(@stat.versionTag).to.equal '37eb1ba1849d4b0fb0b28caf7ef3af52'
-
- it 'parses mimeType correctly', ->
- expect(@stat).to.have.property 'mimeType'
- expect(@stat.mimeType).to.equal 'inode/directory'
-
- it 'parses size correctly', ->
- expect(@stat).to.have.property 'size'
- expect(@stat.size).to.equal 0
-
- it 'parses humanSize correctly', ->
- expect(@stat).to.have.property 'humanSize'
- expect(@stat.humanSize).to.equal '0 bytes'
-
- it 'parses hasThumbnail correctly', ->
- expect(@stat).to.have.property 'hasThumbnail'
- expect(@stat.hasThumbnail).to.equal false
-
- it 'parses modifiedAt correctly', ->
- expect(@stat).to.have.property 'modifiedAt'
- expect(@stat.modifiedAt).to.be.instanceOf Date
- expect([
- 'Wed, 27 Apr 2011 22:18:51 GMT', # every sane JS platform
- 'Wed, 27 Apr 2011 22:18:51 UTC' # Internet Explorer
- ]).to.contain(@stat.modifiedAt.toUTCString())
-
- it 'parses missing clientModifiedAt correctly', ->
- expect(@stat).to.have.property 'clientModifiedAt'
- expect(@stat.clientModifiedAt).to.equal null
-
- it 'round-trips through json / parse correctly', ->
- newStat = Dropbox.Stat.parse @stat.json()
- expect(newStat).to.deep.equal @stat
-
- it 'passes null through', ->
- expect(Dropbox.Stat.parse(null)).to.equal null
-
- it 'passes undefined through', ->
- expect(Dropbox.Stat.parse(undefined)).to.equal undefined
-
- describe 'on a contrived file/path example', ->
- beforeEach ->
- metadata = {
- "size": "225.4KB",
- "rev": "35e97029684fe",
- "thumb_exists": true, # Changed to test hasThumbnail=true code.
- "bytes": 230783,
- "modified": "Tue, 19 Jul 2011 21:55:38 +0000",
- "client_mtime": "Mon, 18 Jul 2011 18:04:35 +0000",
- "path": "path/to/a/file/named/Getting_Started.pdf/",
- "is_dir": false,
- "icon": "page_white_acrobat",
- "root": "app_folder", # Changed to test app_folder code path.
- "mime_type": "application/pdf",
- "revision": 220823
- }
- @stat = Dropbox.Stat.parse metadata
-
- it 'parses the path correctly', ->
- expect(@stat).to.have.property 'path'
- expect(@stat.path).to.equal '/path/to/a/file/named/Getting_Started.pdf'
-
- it 'parses name correctly', ->
- expect(@stat).to.have.property 'name'
- expect(@stat.name).to.equal 'Getting_Started.pdf'
-
-
diff --git a/lib/client/storage/dropbox/test/src/token_stash.coffee b/lib/client/storage/dropbox/test/src/token_stash.coffee
deleted file mode 100644
index 8dec2440..00000000
--- a/lib/client/storage/dropbox/test/src/token_stash.coffee
+++ /dev/null
@@ -1,105 +0,0 @@
-# Stashes Dropbox access credentials.
-class TokenStash
- # @param {Object} options the advanced options below
- # @option options {Boolean} fullDropbox if true, the returned credentials
- # will be good for full Dropbox access; otherwise, the credentials will
- # work for Folder access
- constructor: (options) ->
- @fs = require 'fs'
- # Node 0.6 hack.
- unless @fs.existsSync
- path = require 'path'
- @fs.existsSync = (filePath) -> path.existsSync filePath
- @getCache = null
- @sandbox = !options?.fullDropbox
- @setupFs()
-
- # Calls the supplied method with the Dropbox access credentials.
- get: (callback) ->
- @getCache or= @readStash()
- if @getCache
- callback @getCache
- return null
-
- @liveLogin (fullCredentials, sandboxCredentials) =>
- unless fullCredentials and sandboxCredentials
- throw new Error('Dropbox API authorization failed')
-
- @writeStash fullCredentials, sandboxCredentials
- @getCache = @readStash()
- callback @getCache
-
- # Obtains credentials by doing a login on the live site.
- liveLogin: (callback) ->
- Dropbox = require '../../lib/dropbox'
- sandboxClient = new Dropbox.Client @clientOptions().sandbox
- fullClient = new Dropbox.Client @clientOptions().full
- @setupAuth()
- sandboxClient.authDriver @authDriver
- sandboxClient.authenticate (error, data) =>
- if error
- @killAuth()
- callback null
- return
- fullClient.authDriver @authDriver
- fullClient.authenticate (error, data) =>
- @killAuth()
- if error
- callback null
- return
- credentials = @clientOptions()
- callback fullClient.credentials(), sandboxClient.credentials()
-
- # Returns the options used to create a Dropbox Client.
- clientOptions: ->
- {
- sandbox:
- sandbox: true
- key: 'gWJAiHNbmDA=|MJ3xAk3nLeByuOckISnHib+h+1zTCG3TKTOEFvAAZw=='
- full:
- key: 'OYaTsqx6IXA=|z8mRqmTRoSdCqvkTvHTZq4ZZNxa7I5wM8X5E33IwCA=='
- }
-
- # Reads the file containing the access credentials, if it is available.
- #
- # @return {Object?} parsed access credentials, or null if they haven't been
- # stashed
- readStash: ->
- unless @fs.existsSync @jsonPath
- return null
- stash = JSON.parse @fs.readFileSync @jsonPath
- if @sandbox then stash.sandbox else stash.full
-
- # Stashes the access credentials for future test use.
- writeStash: (fullCredentials, sandboxCredentials) ->
- json = JSON.stringify full: fullCredentials, sandbox: sandboxCredentials
- @fs.writeFileSync @jsonPath, json
-
- js = "window.testKeys = #{JSON.stringify sandboxCredentials};" +
- "window.testFullDropboxKeys = #{JSON.stringify fullCredentials};"
- @fs.writeFileSync @jsPath, js
-
- # Sets up a node.js server-based authentication driver.
- setupAuth: ->
- return if @authDriver
-
- Dropbox = require '../../lib/dropbox'
- @authDriver = new Dropbox.Drivers.NodeServer
-
- # Shuts down the node.js server behind the authentication server.
- killAuth: ->
- return unless @authDriver
-
- @authDriver.closeServer()
- @authDriver = null
-
- # Sets up the directory structure for the credential stash.
- setupFs: ->
- @dirPath = 'test/.token'
- @jsonPath = 'test/.token/token.json'
- @jsPath = 'test/.token/token.js'
-
- unless @fs.existsSync @dirPath
- @fs.mkdirSync @dirPath
-
-module.exports = TokenStash
diff --git a/lib/client/storage/dropbox/test/src/upload_cursor_test.coffee b/lib/client/storage/dropbox/test/src/upload_cursor_test.coffee
deleted file mode 100644
index 6997bda5..00000000
--- a/lib/client/storage/dropbox/test/src/upload_cursor_test.coffee
+++ /dev/null
@@ -1,114 +0,0 @@
-describe 'Dropbox.UploadCursor', ->
- describe '.parse', ->
- describe 'on the API example', ->
- beforeEach ->
- cursorData = {
- "upload_id": "v0k84B0AT9fYkfMUp0sBTA",
- "offset": 31337,
- "expires": "Tue, 19 Jul 2011 21:55:38 +0000"
- }
- @cursor = Dropbox.UploadCursor.parse cursorData
-
- it 'parses tag correctly', ->
- expect(@cursor).to.have.property 'tag'
- expect(@cursor.tag).to.equal 'v0k84B0AT9fYkfMUp0sBTA'
-
- it 'parses offset correctly', ->
- expect(@cursor).to.have.property 'offset'
- expect(@cursor.offset).to.equal 31337
-
- it 'parses expiresAt correctly', ->
- expect(@cursor).to.have.property 'expiresAt'
- expect(@cursor.expiresAt).to.be.instanceOf Date
- expect([
- 'Tue, 19 Jul 2011 21:55:38 GMT', # every sane JS platform
- 'Tue, 19 Jul 2011 21:55:38 UTC' # Internet Explorer
- ]).to.contain(@cursor.expiresAt.toUTCString())
-
- it 'round-trips through json / parse correctly', ->
- newCursor = Dropbox.UploadCursor.parse @cursor.json()
- expect(newCursor).to.deep.equal @cursor
-
- describe 'on a reference string', ->
- beforeEach ->
- rawRef = 'v0k84B0AT9fYkfMUp0sBTA'
- @cursor = Dropbox.UploadCursor.parse rawRef
-
- it 'parses tag correctly', ->
- expect(@cursor).to.have.property 'tag'
- expect(@cursor.tag).to.equal 'v0k84B0AT9fYkfMUp0sBTA'
-
- it 'parses offset correctly', ->
- expect(@cursor).to.have.property 'offset'
- expect(@cursor.offset).to.equal 0
-
- it 'parses expiresAt correctly', ->
- expect(@cursor).to.have.property 'expiresAt'
- expect(@cursor.expiresAt).to.be.instanceOf Date
- expect(@cursor.expiresAt - (new Date())).to.be.below 1000
-
- it 'round-trips through json / parse correctly', ->
- newCursor = Dropbox.UploadCursor.parse @cursor.json()
- newCursor.json() # Get _json populated for newCursor.
- expect(newCursor).to.deep.equal @cursor
-
- it 'passes null through', ->
- expect(Dropbox.CopyReference.parse(null)).to.equal null
-
- it 'passes undefined through', ->
- expect(Dropbox.CopyReference.parse(undefined)).to.equal undefined
-
- describe '.constructor', ->
- describe 'with no arguments', ->
- beforeEach ->
- @cursor = new Dropbox.UploadCursor
-
- it 'sets up tag correctly', ->
- expect(@cursor).to.have.property 'tag'
- expect(@cursor.tag).to.equal null
-
- it 'parses offset correctly', ->
- expect(@cursor).to.have.property 'offset'
- expect(@cursor.offset).to.equal 0
-
- it 'parses expiresAt correctly', ->
- expect(@cursor).to.have.property 'expiresAt'
- expect(@cursor.expiresAt - (new Date())).to.be.below 1000
-
- it 'round-trips through json / parse correctly', ->
- newCursor = Dropbox.UploadCursor.parse @cursor.json()
- newCursor.json() # Get _json populated for newCursor.
- expect(newCursor).to.deep.equal @cursor
-
- describe '.replace', ->
- beforeEach ->
- @cursor = new Dropbox.UploadCursor
-
- describe 'on the API example', ->
- beforeEach ->
- cursorData = {
- "upload_id": "v0k84B0AT9fYkfMUp0sBTA",
- "offset": 31337,
- "expires": "Tue, 19 Jul 2011 21:55:38 +0000"
- }
- @cursor.replace cursorData
-
- it 'parses tag correctly', ->
- expect(@cursor).to.have.property 'tag'
- expect(@cursor.tag).to.equal 'v0k84B0AT9fYkfMUp0sBTA'
-
- it 'parses offset correctly', ->
- expect(@cursor).to.have.property 'offset'
- expect(@cursor.offset).to.equal 31337
-
- it 'parses expiresAt correctly', ->
- expect(@cursor).to.have.property 'expiresAt'
- expect(@cursor.expiresAt).to.be.instanceOf Date
- expect([
- 'Tue, 19 Jul 2011 21:55:38 GMT', # every sane JS platform
- 'Tue, 19 Jul 2011 21:55:38 UTC' # Internet Explorer
- ]).to.contain(@cursor.expiresAt.toUTCString())
-
- it 'round-trips through json / parse correctly', ->
- newCursor = Dropbox.UploadCursor.parse @cursor.json()
- expect(newCursor).to.deep.equal @cursor
diff --git a/lib/client/storage/dropbox/test/src/user_info_test.coffee b/lib/client/storage/dropbox/test/src/user_info_test.coffee
deleted file mode 100644
index 65e09476..00000000
--- a/lib/client/storage/dropbox/test/src/user_info_test.coffee
+++ /dev/null
@@ -1,95 +0,0 @@
-describe 'Dropbox.UserInfo', ->
- describe '.parse', ->
- describe 'on the API example', ->
- beforeEach ->
- userData = {
- "referral_link": "https://www.dropbox.com/referrals/r1a2n3d4m5s6t7",
- "display_name": "John P. User",
- "uid": 12345678,
- "country": "US",
- "quota_info": {
- "shared": 253738410565,
- "quota": 107374182400000,
- "normal": 680031877871
- },
- "email": "johnpuser@company.com" # Added to reflect real responses.
- }
- @userInfo = Dropbox.UserInfo.parse userData
-
- it 'parses name correctly', ->
- expect(@userInfo).to.have.property 'name'
- expect(@userInfo.name).to.equal 'John P. User'
-
- it 'parses email correctly', ->
- expect(@userInfo).to.have.property 'email'
- expect(@userInfo.email).to.equal 'johnpuser@company.com'
-
- it 'parses countryCode correctly', ->
- expect(@userInfo).to.have.property 'countryCode'
- expect(@userInfo.countryCode).to.equal 'US'
-
- it 'parses uid correctly', ->
- expect(@userInfo).to.have.property 'uid'
- expect(@userInfo.uid).to.equal '12345678'
-
- it 'parses referralUrl correctly', ->
- expect(@userInfo).to.have.property 'referralUrl'
- expect(@userInfo.referralUrl).to.
- equal 'https://www.dropbox.com/referrals/r1a2n3d4m5s6t7'
-
- it 'parses quota correctly', ->
- expect(@userInfo).to.have.property 'quota'
- expect(@userInfo.quota).to.equal 107374182400000
-
- it 'parses usedQuota correctly', ->
- expect(@userInfo).to.have.property 'usedQuota'
- expect(@userInfo.usedQuota).to.equal 933770288436
-
- it 'parses privateBytes correctly', ->
- expect(@userInfo).to.have.property 'privateBytes'
- expect(@userInfo.privateBytes).to.equal 680031877871
-
- it 'parses sharedBytes correctly', ->
- expect(@userInfo).to.have.property 'usedQuota'
- expect(@userInfo.sharedBytes).to.equal 253738410565
-
- it 'parses publicAppUrl correctly', ->
- expect(@userInfo.publicAppUrl).to.equal null
-
- it 'round-trips through json / parse correctly', ->
- newInfo = Dropbox.UserInfo.parse @userInfo.json()
- expect(newInfo).to.deep.equal @userInfo
-
- it 'passes null through', ->
- expect(Dropbox.UserInfo.parse(null)).to.equal null
-
- it 'passes undefined through', ->
- expect(Dropbox.UserInfo.parse(undefined)).to.equal undefined
-
-
- describe 'on real data from a "public app folder" application', ->
- beforeEach ->
- userData = {
- "referral_link": "https://www.dropbox.com/referrals/NTM1OTg4MTA5",
- "display_name": "Victor Costan",
- "uid": 87654321, # Anonymized.
- "public_app_url": "https://dl-web.dropbox.com/spa/90vw6zlu4268jh4/",
- "country": "US",
- "quota_info": {
- "shared": 6074393565,
- "quota": 73201090560,
- "normal": 4684642723
- },
- "email": "spam@gmail.com" # Anonymized.
- }
- @userInfo = Dropbox.UserInfo.parse userData
-
- it 'parses publicAppUrl correctly', ->
- expect(@userInfo.publicAppUrl).to.
- equal 'https://dl-web.dropbox.com/spa/90vw6zlu4268jh4'
-
- it 'round-trips through json / parse correctly', ->
- newInfo = Dropbox.UserInfo.parse @userInfo.json()
- expect(newInfo).to.deep.equal @userInfo
-
-
diff --git a/lib/client/storage/dropbox/test/src/web_file_server.coffee b/lib/client/storage/dropbox/test/src/web_file_server.coffee
deleted file mode 100644
index 9c9dfd24..00000000
--- a/lib/client/storage/dropbox/test/src/web_file_server.coffee
+++ /dev/null
@@ -1,54 +0,0 @@
-express = require 'express'
-fs = require 'fs'
-https = require 'https'
-open = require 'open'
-
-# Tiny express.js server for the Web files.
-class WebFileServer
- # Starts up a HTTP server.
- constructor: (@port = 8911) ->
- @createApp()
-
- # Opens the test URL in a browser.
- openBrowser: (appName) ->
- open @testUrl(), appName
-
- # The URL that should be used to start the tests.
- testUrl: ->
- "https://localhost:#{@port}/test/html/browser_test.html"
-
- # The server code.
- createApp: ->
- @app = express()
- @app.get '/diediedie', (request, response) =>
- if 'failed' of request.query
- failed = parseInt request.query['failed']
- else
- failed = 1
- total = parseInt request.query['total'] || 0
- passed = total - failed
- exitCode = if failed == 0 then 0 else 1
- console.log "#{passed} passed, #{failed} failed"
-
- response.header 'Content-Type', 'image/png'
- response.header 'Content-Length', '0'
- response.end ''
- unless 'NO_EXIT' of process.env
- @server.close()
- process.exit exitCode
-
- @app.use (request, response, next) ->
- response.header 'Access-Control-Allow-Origin', '*'
- response.header 'Access-Control-Allow-Methods', 'DELETE,GET,POST,PUT'
- response.header 'Access-Control-Allow-Headers',
- 'Content-Type, Authorization'
- next()
-
- @app.use express.static(fs.realpathSync(__dirname + '/../../'),
- { hidden: true })
- options = key: fs.readFileSync 'test/ssl/cert.pem'
- options.cert = options.key
- @server = https.createServer(options, @app)
- @server.listen @port
-
-module.exports = new WebFileServer
diff --git a/lib/client/storage/dropbox/test/src/xhr_test.coffee b/lib/client/storage/dropbox/test/src/xhr_test.coffee
deleted file mode 100644
index afe84a69..00000000
--- a/lib/client/storage/dropbox/test/src/xhr_test.coffee
+++ /dev/null
@@ -1,644 +0,0 @@
-describe 'Dropbox.Xhr', ->
- beforeEach ->
- @node_js = module? and module?.exports? and require?
- @oauth = new Dropbox.Oauth testKeys
-
- describe 'with a GET', ->
- beforeEach ->
- @xhr = new Dropbox.Xhr 'GET', 'https://request.url'
-
- it 'initializes correctly', ->
- expect(@xhr.isGet).to.equal true
- expect(@xhr.method).to.equal 'GET'
- expect(@xhr.url).to.equal 'https://request.url'
- expect(@xhr.preflight).to.equal false
-
- describe '#setHeader', ->
- beforeEach ->
- @xhr.setHeader 'Range', 'bytes=0-1000'
-
- it 'adds a HTTP header header', ->
- expect(@xhr.headers).to.have.property 'Range'
- expect(@xhr.headers['Range']).to.equal 'bytes=0-1000'
-
- it 'does not work twice for the same header', ->
- expect(=> @xhr.setHeader('Range', 'bytes=0-1000')).to.throw Error
-
- it 'flags the Xhr as needing preflight', ->
- expect(@xhr.preflight).to.equal true
-
- it 'rejects Content-Type', ->
- expect(=> @xhr.setHeader('Content-Type', 'text/plain')).to.throw Error
-
- describe '#setParams', ->
- beforeEach ->
- @xhr.setParams 'param 1': true, 'answer': 42
-
- it 'does not flag the XHR as needing preflight', ->
- expect(@xhr.preflight).to.equal false
-
- it 'does not work twice', ->
- expect(=> @xhr.setParams 'answer': 43).to.throw Error
-
- describe '#paramsToUrl', ->
- beforeEach ->
- @xhr.paramsToUrl()
-
- it 'changes the url', ->
- expect(@xhr.url).to.
- equal 'https://request.url?answer=42¶m%201=true'
-
- it 'sets params to null', ->
- expect(@xhr.params).to.equal null
-
- describe '#paramsToBody', ->
- it 'throws an error', ->
- expect(=> @xhr.paramsToBody()).to.throw Error
-
- describe '#addOauthParams', ->
- beforeEach ->
- @xhr.addOauthParams @oauth
-
- it 'keeps existing params', ->
- expect(@xhr.params).to.have.property 'answer'
- expect(@xhr.params.answer).to.equal 42
-
- it 'adds an oauth_signature param', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
-
- it 'does not add an Authorization header', ->
- expect(@xhr.headers).not.to.have.property 'Authorization'
-
- it 'does not work twice', ->
- expect(=> @xhr.addOauthParams()).to.throw Error
-
- describe '#addOauthHeader', ->
- beforeEach ->
- @xhr.addOauthHeader @oauth
-
- it 'keeps existing params', ->
- expect(@xhr.params).to.have.property 'answer'
- expect(@xhr.params.answer).to.equal 42
-
- it 'does not add an oauth_signature param', ->
- expect(@xhr.params).not.to.have.property 'oauth_signature'
-
- it 'adds an Authorization header', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe '#addOauthParams without params', ->
- beforeEach ->
- @xhr.addOauthParams @oauth
-
- it 'adds an oauth_signature param', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
-
- describe '#addOauthHeader without params', ->
- beforeEach ->
- @xhr.addOauthHeader @oauth
-
- it 'adds an Authorization header', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe '#signWithOauth', ->
- describe 'for a request that does not need preflight', ->
- beforeEach ->
- @xhr.signWithOauth @oauth
-
- if Dropbox.Xhr.doesPreflight
- it 'uses addOauthParams', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
- else
- it 'uses addOauthHeader in node.js', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe 'for a request that needs preflight', ->
- beforeEach ->
- @xhr.setHeader 'Range', 'bytes=0-1000'
- @xhr.signWithOauth @oauth
-
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do HTTP headers.
- it 'uses addOauthParams in IE', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
- else
- it 'uses addOauthHeader', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe 'with cacheFriendly: true', ->
- describe 'for a request that does not need preflight', ->
- beforeEach ->
- @xhr.signWithOauth @oauth, true
-
- if Dropbox.Xhr.ieXdr
- it 'uses addOauthParams in IE', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
- else
- it 'uses addOauthHeader', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe 'for a request that needs preflight', ->
- beforeEach ->
- @xhr.setHeader 'Range', 'bytes=0-1000'
- @xhr.signWithOauth @oauth, true
-
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do HTTP headers.
- it 'uses addOauthParams in IE', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
- else
- it 'uses addOauthHeader', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe '#setFileField', ->
- it 'throws an error', ->
- expect(=> @xhr.setFileField('file', 'filename.bin', 'File Data
',
- 'text/html')).to.throw Error
-
- describe '#setBody', ->
- it 'throws an error', ->
- expect(=> @xhr.setBody('body data')).to.throw Error
-
- it 'does not flag the XHR as needing preflight', ->
- expect(@xhr.preflight).to.equal false
-
- describe '#setResponseType', ->
- beforeEach ->
- @xhr.setResponseType 'b'
-
- it 'changes responseType', ->
- expect(@xhr.responseType).to.equal 'b'
-
- it 'does not flag the XHR as needing preflight', ->
- expect(@xhr.preflight).to.equal false
-
- describe '#prepare with params', ->
- beforeEach ->
- @xhr.setParams answer: 42
- @xhr.prepare()
-
- it 'creates the native xhr', ->
- expect(typeof @xhr.xhr).to.equal 'object'
-
- it 'opens the native xhr', ->
- return if Dropbox.Xhr.ieXdr # IE's XDR doesn't do readyState.
- expect(@xhr.xhr.readyState).to.equal 1
-
- it 'pushes the params in the url', ->
- expect(@xhr.url).to.equal 'https://request.url?answer=42'
-
- describe 'with a POST', ->
- beforeEach ->
- @xhr = new Dropbox.Xhr 'POST', 'https://request.url'
-
- it 'initializes correctly', ->
- expect(@xhr.isGet).to.equal false
- expect(@xhr.method).to.equal 'POST'
- expect(@xhr.url).to.equal 'https://request.url'
- expect(@xhr.preflight).to.equal false
-
- describe '#setHeader', ->
- beforeEach ->
- @xhr.setHeader 'Range', 'bytes=0-1000'
-
- it 'adds a HTTP header header', ->
- expect(@xhr.headers).to.have.property 'Range'
- expect(@xhr.headers['Range']).to.equal 'bytes=0-1000'
-
- it 'does not work twice for the same header', ->
- expect(=> @xhr.setHeader('Range', 'bytes=0-1000')).to.throw Error
-
- it 'flags the Xhr as needing preflight', ->
- expect(@xhr.preflight).to.equal true
-
- it 'rejects Content-Type', ->
- expect(=> @xhr.setHeader('Content-Type', 'text/plain')).to.throw Error
-
- describe '#setParams', ->
- beforeEach ->
- @xhr.setParams 'param 1': true, 'answer': 42
-
- it 'does not work twice', ->
- expect(=> @xhr.setParams 'answer': 43).to.throw Error
-
- it 'does not flag the XHR as needing preflight', ->
- expect(@xhr.preflight).to.equal false
-
- describe '#paramsToUrl', ->
- beforeEach ->
- @xhr.paramsToUrl()
-
- it 'changes the url', ->
- expect(@xhr.url).to.
- equal 'https://request.url?answer=42¶m%201=true'
-
- it 'sets params to null', ->
- expect(@xhr.params).to.equal null
-
- it 'does not set the body', ->
- expect(@xhr.body).to.equal null
-
- describe '#paramsToBody', ->
- beforeEach ->
- @xhr.paramsToBody()
-
- it 'url-encodes the params', ->
- expect(@xhr.body).to.equal 'answer=42¶m%201=true'
-
- it 'sets the Content-Type header', ->
- expect(@xhr.headers).to.have.property 'Content-Type'
- expect(@xhr.headers['Content-Type']).to.
- equal 'application/x-www-form-urlencoded'
-
- it 'does not change the url', ->
- expect(@xhr.url).to.equal 'https://request.url'
-
- it 'does not work twice', ->
- @xhr.setParams answer: 43
- expect(=> @xhr.paramsToBody()).to.throw Error
-
- describe '#addOauthParams', ->
- beforeEach ->
- @xhr.addOauthParams @oauth
-
- it 'keeps existing params', ->
- expect(@xhr.params).to.have.property 'answer'
- expect(@xhr.params.answer).to.equal 42
-
- it 'adds an oauth_signature param', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
-
- it 'does not add an Authorization header', ->
- expect(@xhr.headers).not.to.have.property 'Authorization'
-
- it 'does not work twice', ->
- expect(=> @xhr.addOauthParams()).to.throw Error
-
- describe '#addOauthHeader', ->
- beforeEach ->
- @xhr.addOauthHeader @oauth
-
- it 'keeps existing params', ->
- expect(@xhr.params).to.have.property 'answer'
- expect(@xhr.params.answer).to.equal 42
-
- it 'does not add an oauth_signature param', ->
- expect(@xhr.params).not.to.have.property 'oauth_signature'
-
- it 'adds an Authorization header', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe '#addOauthParams without params', ->
- beforeEach ->
- @xhr.addOauthParams @oauth
-
- it 'adds an oauth_signature param', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
-
- describe '#addOauthHeader without params', ->
- beforeEach ->
- @xhr.addOauthHeader @oauth
-
- it 'adds an Authorization header', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe '#signWithOauth', ->
- describe 'for a request that does not need preflight', ->
- beforeEach ->
- @xhr.signWithOauth @oauth
-
- if Dropbox.Xhr.doesPreflight
- it 'uses addOauthParams', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
- else
- it 'uses addOauthHeader in node.js', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe 'for a request that needs preflight', ->
- beforeEach ->
- @xhr.setHeader 'Range', 'bytes=0-1000'
- @xhr.signWithOauth @oauth
-
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do HTTP headers.
- it 'uses addOauthParams in IE', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
- else
- it 'uses addOauthHeader', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe 'with cacheFriendly: true', ->
- describe 'for a request that does not need preflight', ->
- beforeEach ->
- @xhr.signWithOauth @oauth, true
-
- if Dropbox.Xhr.doesPreflight
- it 'uses addOauthParams', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
- else
- it 'uses addOauthHeader in node.js', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe 'for a request that needs preflight', ->
- beforeEach ->
- @xhr.setHeader 'Range', 'bytes=0-1000'
- @xhr.signWithOauth @oauth, true
-
- if Dropbox.Xhr.ieXdr # IE's XDR doesn't do HTTP headers.
- it 'uses addOauthParams in IE', ->
- expect(@xhr.params).to.have.property 'oauth_signature'
- else
- it 'uses addOauthHeader', ->
- expect(@xhr.headers).to.have.property 'Authorization'
-
- describe '#setFileField with a String', ->
- beforeEach ->
- @nonceStub = sinon.stub @xhr, 'multipartBoundary'
- @nonceStub.returns 'multipart----boundary'
- @xhr.setFileField 'file', 'filename.bin', 'File Data
',
- 'text/html'
-
- afterEach ->
- @nonceStub.restore()
-
- it 'sets the Content-Type header', ->
- expect(@xhr.headers).to.have.property 'Content-Type'
- expect(@xhr.headers['Content-Type']).to.
- equal 'multipart/form-data; boundary=multipart----boundary'
-
- it 'sets the body', ->
- expect(@xhr.body).to.equal("""--multipart----boundary\r
-Content-Disposition: form-data; name="file"; filename="filename.bin"\r
-Content-Type: text/html\r
-Content-Transfer-Encoding: binary\r
-\r
-File Data
\r
---multipart----boundary--\r\n
-""")
-
- it 'does not work twice', ->
- expect(=> @xhr.setFileField('file', 'filename.bin', 'File Data
',
- 'text/html')).to.throw Error
-
- it 'does not flag the XHR as needing preflight', ->
- expect(@xhr.preflight).to.equal false
-
- describe '#setBody with a string', ->
- beforeEach ->
- @xhr.setBody 'body data'
-
- it 'sets the request body', ->
- expect(@xhr.body).to.equal 'body data'
-
- it 'does not work twice', ->
- expect(=> @xhr.setBody('body data')).to.throw Error
-
- it 'does not flag the XHR as needing preflight', ->
- expect(@xhr.preflight).to.equal false
-
- describe '#setBody with FormData', ->
- beforeEach ->
- if FormData?
- formData = new FormData()
- formData.append 'name', 'value'
- @xhr.setBody formData
-
- it 'does not flag the XHR as needing preflight', ->
- return unless FormData?
- expect(@xhr.preflight).to.equal false
-
- describe '#setBody with Blob', ->
- beforeEach ->
- if Blob?
- blob = new Blob ["abcdef"], type: 'image/png'
- @xhr.setBody blob
-
- it 'flags the XHR as needing preflight', ->
- return unless Blob?
- expect(@xhr.preflight).to.equal true
-
- it 'sets the Content-Type header', ->
- return unless Blob?
- expect(@xhr.headers).to.have.property 'Content-Type'
- expect(@xhr.headers['Content-Type']).to.
- equal 'application/octet-stream'
-
- describe '#setBody with ArrayBuffer', ->
- beforeEach ->
- if ArrayBuffer?
- buffer = new ArrayBuffer 5
- @xhr.setBody buffer
-
- it 'flags the XHR as needing preflight', ->
- return unless ArrayBuffer?
- expect(@xhr.preflight).to.equal true
-
- it 'sets the Content-Type header', ->
- return unless ArrayBuffer?
- expect(@xhr.headers).to.have.property 'Content-Type'
- expect(@xhr.headers['Content-Type']).to.
- equal 'application/octet-stream'
-
- describe '#setBody with ArrayBufferView', ->
- beforeEach ->
- if Uint8Array?
- view = new Uint8Array 5
- @xhr.setBody view
-
- it 'flags the XHR as needing preflight', ->
- return unless Uint8Array?
- expect(@xhr.preflight).to.equal true
-
- it 'sets the Content-Type header', ->
- return unless Uint8Array?
- expect(@xhr.headers).to.have.property 'Content-Type'
- expect(@xhr.headers['Content-Type']).to.
- equal 'application/octet-stream'
-
- describe '#setResponseType', ->
- beforeEach ->
- @xhr.setResponseType 'b'
-
- it 'changes responseType', ->
- expect(@xhr.responseType).to.equal 'b'
-
- it 'does not flag the XHR as needing preflight', ->
- expect(@xhr.preflight).to.equal false
-
- describe '#prepare with params', ->
- beforeEach ->
- @xhr.setParams answer: 42
- @xhr.prepare()
-
- it 'creates the native xhr', ->
- expect(typeof @xhr.xhr).to.equal 'object'
-
- it 'opens the native xhr', ->
- return if Dropbox.Xhr.ieXdr # IE's XDR doesn't do readyState.
- expect(@xhr.xhr.readyState).to.equal 1
-
- if Dropbox.Xhr.ieXdr
- it 'keeps the params in the URL in IE', ->
- expect(@xhr.url).to.equal 'https://request.url?answer=42'
- expect(@xhr.body).to.equal null
- else
- it 'pushes the params in the body', ->
- expect(@xhr.body).to.equal 'answer=42'
-
- describe 'with a PUT', ->
- beforeEach ->
- @xhr = new Dropbox.Xhr 'PUT', 'https://request.url'
-
- it 'initializes correctly', ->
- expect(@xhr.isGet).to.equal false
- expect(@xhr.method).to.equal 'PUT'
- expect(@xhr.url).to.equal 'https://request.url'
- expect(@xhr.preflight).to.equal true
-
- describe '#send', ->
- it 'reports errors correctly', (done) ->
- @url = 'https://api.dropbox.com/1/oauth/request_token'
- @xhr = new Dropbox.Xhr 'POST', @url
- @xhr.prepare().send (error, data) =>
- expect(data).to.equal undefined
- expect(error).to.be.instanceOf Dropbox.ApiError
- expect(error).to.have.property 'url'
- expect(error.url).to.equal @url
- expect(error).to.have.property 'method'
- expect(error.method).to.equal 'POST'
- unless Dropbox.Xhr.ieXdr # IE's XDR doesn't do HTTP status codes.
- expect(error).to.have.property 'status'
- expect(error.status).to.equal 401 # Bad OAuth request.
- expect(error).to.have.property 'responseText'
- expect(error.responseText).to.be.a 'string'
- unless Dropbox.Xhr.ieXdr # IE's XDR hides the HTTP body on error.
- expect(error).to.have.property 'response'
- expect(error.response).to.be.an 'object'
- expect(error.toString()).to.match /^Dropbox API error/
- expect(error.toString()).to.contain 'POST'
- expect(error.toString()).to.contain @url
- done()
-
- it 'reports errors correctly when onError is set', (done) ->
- @url = 'https://api.dropbox.com/1/oauth/request_token'
- @xhr = new Dropbox.Xhr 'POST', @url
- @xhr.onError = new Dropbox.EventSource
- listenerError = null
- @xhr.onError.addListener (error) -> listenerError = error
- @xhr.prepare().send (error, data) =>
- expect(data).to.equal undefined
- expect(error).to.be.instanceOf Dropbox.ApiError
- expect(error).to.have.property 'url'
- expect(error.url).to.equal @url
- expect(error).to.have.property 'method'
- expect(error.method).to.equal 'POST'
- expect(listenerError).to.equal error
- done()
-
- it 'processes data correctly', (done) ->
- xhr = new Dropbox.Xhr 'POST',
- 'https://api.dropbox.com/1/oauth/request_token',
- xhr.addOauthParams @oauth
- xhr.prepare().send (error, data) ->
- expect(error).to.not.be.ok
- expect(data).to.have.property 'oauth_token'
- expect(data).to.have.property 'oauth_token_secret'
- done()
-
- it 'processes data correctly when using setCallback', (done) ->
- xhr = new Dropbox.Xhr 'POST',
- 'https://api.dropbox.com/1/oauth/request_token',
- xhr.addOauthParams @oauth
- xhr.setCallback (error, data) ->
- expect(error).to.not.be.ok
- expect(data).to.have.property 'oauth_token'
- expect(data).to.have.property 'oauth_token_secret'
- done()
- xhr.prepare().send()
-
- it 'sends Authorize headers correctly', (done) ->
- return done() if Dropbox.Xhr.ieXdr # IE's XDR doesn't set headers.
-
- xhr = new Dropbox.Xhr 'POST',
- 'https://api.dropbox.com/1/oauth/request_token',
- xhr.addOauthHeader @oauth
- xhr.prepare().send (error, data) ->
- expect(error).to.equal null
- expect(data).to.have.property 'oauth_token'
- expect(data).to.have.property 'oauth_token_secret'
- done()
-
- describe 'with a binary response', ->
- beforeEach ->
- testImageServerOn()
- @xhr = new Dropbox.Xhr 'GET', testImageUrl
-
- afterEach ->
- testImageServerOff()
-
- describe 'with responseType b', ->
- beforeEach ->
- @xhr.setResponseType 'b'
-
- it 'retrieves a string where each character is a byte', (done) ->
- @xhr.prepare().send (error, data) ->
- expect(error).to.not.be.ok
- expect(data).to.be.a 'string'
- expect(data).to.equal testImageBytes
- done()
-
- describe 'with responseType arraybuffer', ->
- beforeEach ->
- @xhr.setResponseType 'arraybuffer'
-
- it 'retrieves a well-formed ArrayBuffer', (done) ->
- # Skip this test on node.js and IE 9 and below
- return done() unless ArrayBuffer?
-
- @xhr.prepare().send (error, buffer) ->
- expect(error).to.not.be.ok
- expect(buffer).to.be.instanceOf ArrayBuffer
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal testImageBytes
- done()
-
- describe 'with responseType blob', ->
- beforeEach ->
- @xhr.setResponseType 'blob'
-
- it 'retrieves a well-formed Blob', (done) ->
- # Skip this test on node.js and IE 9 and below
- return done() unless Blob?
-
- @xhr.prepare().send (error, blob) ->
- expect(error).to.not.be.ok
- expect(blob).to.be.instanceOf Blob
- reader = new FileReader
- reader.onloadend = ->
- return unless reader.readyState == FileReader.DONE
- buffer = reader.result
- view = new Uint8Array buffer
- length = buffer.byteLength
- bytes = (String.fromCharCode view[i] for i in [0...length]).
- join('')
- expect(bytes).to.equal testImageBytes
- done()
- reader.readAsArrayBuffer blob
-
- describe '#urlEncode', ->
- it 'iterates properly', ->
- expect(Dropbox.Xhr.urlEncode({foo: 'bar', baz: 5})).to.
- equal 'baz=5&foo=bar'
- it 'percent-encodes properly', ->
- expect(Dropbox.Xhr.urlEncode({'a +x()': "*b'"})).to.
- equal 'a%20%2Bx%28%29=%2Ab%27'
-
- describe '#urlDecode', ->
- it 'iterates properly', ->
- decoded = Dropbox.Xhr.urlDecode('baz=5&foo=bar')
- expect(decoded['baz']).to.equal '5'
- expect(decoded['foo']).to.equal 'bar'
- it 'percent-decodes properly', ->
- decoded = Dropbox.Xhr.urlDecode('a%20%2Bx%28%29=%2Ab%27')
- expect(decoded['a +x()']).to.equal "*b'"
-
diff --git a/lib/client/terminal.js b/lib/client/terminal.js
index 4033e510..341a6448 100644
--- a/lib/client/terminal.js
+++ b/lib/client/terminal.js
@@ -18,7 +18,7 @@ var CloudCommander, Util, DOM, $;
* function loads jquery-terminal
*/
function load(pCallBack){
- console.time('terminal load');
+ Util.time('terminal load');
var lDir = '/lib/client/terminal/jquery-terminal/jquery.',
lFiles = [
@@ -30,8 +30,8 @@ var CloudCommander, Util, DOM, $;
/* //github.com/jquery/jquery-migrate/ */
DOM.anyLoadOnLoad([lFiles, lJqueryMigrate], function(){
- console.timeEnd('terminal load');
- init();
+ Util.timeEnd('terminal load');
+ init();
$(function($, undefined) {
Term = JqueryTerminal.Term = $('#terminal').terminal(function(command, term){
term.echo('');
diff --git a/lib/client/viewer.js b/lib/client/viewer.js
index 0e4a4b91..071859f2 100644
--- a/lib/client/viewer.js
+++ b/lib/client/viewer.js
@@ -1,8 +1,8 @@
-var CloudCommander, Util, DOM, $;
+var CloudCommander, Util, DOM, CloudFunc, $;
/* object contains viewer FancyBox
* https://github.com/fancyapps/fancyBox
*/
-(function(CloudCmd, Util, DOM){
+(function(CloudCmd, Util, DOM, CloudFunc){
'use strict';
var KeyBinding = CloudCmd.KeyBinding,
@@ -37,9 +37,9 @@ var CloudCommander, Util, DOM, $;
};
CloudCmd.Viewer = {
- get: (function(){
+ get: function(){
return this.FancyBox;
- })
+ }
};
/**
@@ -48,13 +48,13 @@ var CloudCommander, Util, DOM, $;
* @pCallBack - executes, when everything loaded
*/
FancyBox.load = function(pCallBack){
- console.time('fancybox load');
+ Util.time('fancybox load');
var lDir = CloudCmd.LIBDIRCLIENT + 'viewer/fancyBox/source/',
lFiles = [ lDir + 'jquery.fancybox.css',
lDir + 'jquery.fancybox.js' ];
DOM.anyLoadOnLoad([lFiles], function(){
- console.timeEnd('fancybox load');
+ Util.timeEnd('fancybox load');
Util.exec( pCallBack );
})
.cssSet({id:'viewer',
@@ -102,7 +102,7 @@ var CloudCommander, Util, DOM, $;
* function shows FancyBox
*/
FancyBox.show = function(pCallBack){
- var lPath = DOM.getCurrentPath();
+ var lPath = CloudFunc.FS + DOM.getCurrentPath();
if( Util.checkExtension(lPath, ['png','jpg', 'gif','ico']) )
$.fancybox.open({ href : lPath }, Config);
@@ -137,20 +137,26 @@ var CloudCommander, Util, DOM, $;
/* если клавиши можно обрабатывать */
if( lKeyBinded){
- if(lKeyCode === lF3 && lShift){
- lView();
- pEvent.preventDefault();
+ switch(lKeyCode){
+ case lF3:
+ if(lShift){
+ lView();
+ DOM.preventDefault(pEvent);
+ }
+ break;
+
+ case lKEY.F1:
+ FancyBox.showHelp();
+ break;
}
- else if(lKeyCode === lKEY.F1)
- FancyBox.showHelp();
}
};
/* добавляем обработчик клавишь */
- DOM.addKeyListener(lKeyListener)
+ DOM .addKeyListener(lKeyListener)
.setButtonKey('f3', lView);
};
CloudCmd.Viewer.FancyBox = FancyBox;
-})(CloudCommander, Util, DOM);
\ No newline at end of file
+})(CloudCommander, Util, DOM, CloudFunc);
\ No newline at end of file
diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js
index 915523f2..52d5bda5 100644
--- a/lib/cloudfunc.js
+++ b/lib/cloudfunc.js
@@ -1,42 +1,60 @@
-var CloudFunc, exports;
+var Util, exports, CloudFunc = {};
-(function(){
+(function(Util, CloudFunc, exports){
'use strict';
/**
* Модуль, содержащий функции, которые
* будут работать и на клиенте и на сервере
*/
-
- CloudFunc = exports || {};
+ var FS;
+ if(exports){
+ if(!global.cloudcmd)
+ return console.log(
+ '# cloudfunc.js' + '\n' +
+ '# -----------' + '\n' +
+ '# Module is part of Cloud Commander,' + '\n' +
+ '# used for generate html from json.' + '\n' +
+ '# ' + '\n' +
+ '# http://coderaiser.github.com/cloudcmd' + '\n');
+
+ Util = global.cloudcmd.main.util;
+ CloudFunc = exports;
+ }
+
/* Путь с которым мы сейчас работаем */
- CloudFunc.Path = '';
+ CloudFunc.Path = '';
/* КОНСТАНТЫ (общие для клиента и сервера)*/
/* название программы */
- CloudFunc.NAME = 'Cloud Commander';
+ CloudFunc.NAME = 'Cloud Commander';
/* если в ссылке будет эта строка - в браузере js отключен */
- CloudFunc.FS = '/fs';
+ CloudFunc.FS = FS = '/fs';
/* название css-класа кнопки обновления файловой структуры*/
- CloudFunc.REFRESHICON = 'refresh-icon';
+ CloudFunc.REFRESHICON = 'refresh-icon';
/* id панелей с файлами */
- CloudFunc.LEFTPANEL = 'left';
- CloudFunc.RIGHTPANEL = 'right';
+ CloudFunc.LEFTPANEL = 'left';
+ CloudFunc.RIGHTPANEL = 'right';
/**
* Функция убирает последний слеш,
* если он - последний символ строки
*/
CloudFunc.removeLastSlash = function(pPath){
- if(typeof pPath==='string')
- return (pPath.lastIndexOf('/') === pPath.length-1) ?
- pPath.substr(pPath, pPath.length-1):pPath;
- else return pPath;
+ var lRet = pPath,
+ lIsStr = typeof pPath==='string',
+ lLengh = pPath.length-1,
+ lLastSlash = pPath.lastIndexOf('/');
+
+ if(lIsStr && lLastSlash === lLengh)
+ lRet = pPath.substr(pPath, lLengh);
+
+ return lRet;
};
/** Функция возвращает заголовок веб страницы
@@ -54,7 +72,7 @@ var CloudFunc, exports;
* @param pPerm_s - строка с правами доступа
* к файлу в 8-миричной системе
*/
- CloudFunc.convertPermissionsToSymbolic = function(pPerm_s){
+ CloudFunc.getSymbolicPermissions = function(pPerm_s){
/*
S_IRUSR 0000400 protection: readable by owner
S_IWUSR 0000200 writable by owner
@@ -86,7 +104,7 @@ var CloudFunc, exports;
}
/* оставляем последние 3 символа*/
- pPerm_s = pPerm_s.length> 5 ?pPerm_s.substr(3) : pPerm_s.substr(2);
+ pPerm_s = pPerm_s.length > 5 ? pPerm_s.substr(3) : pPerm_s.substr(2);
/* Рекомендации гугла советуют вместо string[3]
* использовать string.charAt(3)
@@ -102,28 +120,24 @@ var CloudFunc, exports;
of using an application-specific shorthand).
*/
/* Переводим в двоичную систему */
- var lOwner = (pPerm_s[0]-0).toString(2),
- lGroup = (pPerm_s[1]-0).toString(2),
- lAll = (pPerm_s[2]-0).toString(2),
- /*
- console.log(lOwner+' '+lGroup+' '+lAll);
- */
+ var lOwner = ( pPerm_s[0] - 0 ).toString(2),
+ lGroup = ( pPerm_s[1] - 0 ).toString(2),
+ lAll = ( pPerm_s[2] - 0 ).toString(2),
+
/* переводим в символьную систему*/
- lPermissions = //lType+' '+
- (lOwner[0]-0>0?'r':'-') +
- (lOwner[1]-0>0?'w':'-') +
- (lOwner[2]-0>0?'x':'-') +
- ' ' +
- (lGroup[0]-0>0?'r':'-') +
- (lGroup[1]-0>0?'w':'-') +
- (lGroup[2]-0>0?'x':'-') +
- ' ' +
- (lAll[0]-0>0?'r':'-') +
- (lAll[1]-0>0?'w':'-') +
- (lAll[2]-0>0?'x':'-');
- /*
- console.log(lPermissions);
- */
+ lPermissions =
+ ( lOwner[0] - 0 > 0 ? 'r' : '-' ) +
+ ( lOwner[1] - 0 > 0 ? 'w' : '-' ) +
+ ( lOwner[2] - 0 > 0 ? 'x' : '-' ) +
+ ' ' +
+ ( lGroup[0] - 0 > 0 ? 'r' : '-' ) +
+ ( lGroup[1] - 0 > 0 ? 'w' : '-' ) +
+ ( lGroup[2] - 0 > 0 ? 'x' : '-' ) +
+ ' ' +
+ ( lAll[0]- 0 > 0 ? 'r' : '-' ) +
+ ( lAll[1]- 0 > 0 ? 'w' : '-' ) +
+ ( lAll[2]- 0 > 0 ? 'x' : '-' );
+
return lPermissions;
};
@@ -131,10 +145,7 @@ var CloudFunc, exports;
* Функция конвертирует права доступа к файлам из символьного вида
* в цыфровой
*/
- CloudFunc.convertPermissionsToNumberic = function(pPerm_s){
- /* если передана правильная строка, конвертированная
- * функциец convertPermissionsToSymbolic
- */
+ CloudFunc.getNumericPermissions = function(pPerm_s){
if(!pPerm_s || pPerm_s.length!==11)return pPerm_s;
var lOwner= (pPerm_s[0] === 'r' ? 4 : 0) +
@@ -152,33 +163,30 @@ var CloudFunc, exports;
/* добавляем 2 цыфры до 5 */
return '00' + lOwner + lGroup + lAll;
};
+
/** Функция получает короткие размеры
* конвертируя байт в килобайты, мегабойты,
* гигайбайты и терабайты
* @pSize - размер в байтах
*/
- CloudFunc.getShortedSize = function(pSize){
- /* if pSize=0 - return it */
- if (pSize !== pSize-0) return pSize;
+ CloudFunc.getShortSize = function(pSize){
+ if (pSize === pSize-0){
+ /* Константы размеров, что используются внутри функции */
+ var l1KB = 1024,
+ l1MB = l1KB * l1KB,
+ l1GB = l1MB * l1KB,
+ l1TB = l1GB * l1KB,
+ l1PB = l1TB * l1KB;
+
+ if (pSize < l1KB) pSize = pSize + 'b';
+ else if (pSize < l1MB) pSize = (pSize/l1KB).toFixed(2) + 'kb';
+ else if (pSize < l1GB) pSize = (pSize/l1MB).toFixed(2) + 'mb';
+ else if (pSize < l1TB) pSize = (pSize/l1GB).toFixed(2) + 'gb';
+ else if (pSize < l1PB) pSize = (pSize/l1TB).toFixed(2) + 'tb';
+ else pSize = (pSize/l1PB).toFixed(2) + 'pb';
+ }
- /* Константы размеров, что используются
- * внутри функции
- */
- var l1BMAX = 1024;
- var l1KBMAX = 1048576;
- var l1MBMAX = 1073741824;
- var l1GBMAX = 1099511627776;
- var l1TBMAX = 1125899906842624;
-
- var lShorted;
-
- if (pSize < l1BMAX) lShorted = pSize + 'b';
- else if (pSize < l1KBMAX) lShorted = (pSize/l1BMAX) .toFixed(2) + 'kb';
- else if (pSize < l1MBMAX) lShorted = (pSize/l1KBMAX).toFixed(2) + 'mb';
- else if (pSize < l1GBMAX) lShorted = (pSize/l1MBMAX).toFixed(2) + 'gb';
- else if (pSize < l1TBMAX) lShorted = (pSize/l1GBMAX).toFixed(2) + 'tb';
-
- return lShorted;
+ return pSize;
};
/** Функция парсит uid и имена пользователей
@@ -197,11 +205,11 @@ var CloudFunc, exports;
if(lLine){
/* удаляем первую строку из /etc/passwd*/
- pPasswd_s = pPasswd_s.replace(lLine, '');
+ pPasswd_s = Util.removeStr(pPasswd_s, lLine);
/* получаем первое слово строки */
var lName = lLine.substr(lLine,lLine.indexOf(':'));
- lLine = lLine.replace(lName+':x:','');
+ lLine = Util.removeStr(lLine, lName + ':x:');
/* получаем uid*/
var lUID = lLine.substr(lLine,lLine.indexOf(':'));
@@ -222,7 +230,8 @@ var CloudFunc, exports;
* @param url - адрес каталога
*/
CloudFunc._getDirPath = function(url){
- var folders = [],
+ var lShortName,
+ folders = [],
i = 0;
do{
folders[i++] = url;
@@ -235,30 +244,25 @@ var CloudFunc, exports;
_l = '">',
lHrefEnd ='',
- lHtmlPath,
+ /* корневой каталог */
+ lHtmlPath = lHref + FS + lTitle +
+ '/' + _l + '/' +
+ lHrefEnd;
+
+ for(i = folders.length - 1; i > 0; i--){
+ var lUrl = folders[i],
+ lSlashIndex = lUrl.lastIndexOf('/') + 1;
- lFS_s = CloudFunc.FS;
- /* корневой каталог */
- lHtmlPath = lHref +
- lFS_s +
- lTitle +
- '/' +
- _l +
- '/' +
- lHrefEnd;
-
- for(i = folders.length - 1; i > 0; i--)
- {
- var lUrl=folders[i],
- lShortName = lUrl.replace(lUrl.substr(lUrl,lUrl.lastIndexOf('/')+1),'');
- if (i!==1)
- lHtmlPath += lHref + lFS_s + lUrl +
- lTitle + lUrl + _l +
- lShortName + lHrefEnd + '/';
+ lShortName = Util.removeStr(lUrl, lUrl.substr(lUrl, lSlashIndex) );
+
+ if(i !== 1)
+ lHtmlPath += lHref + FS + lUrl +
+ lTitle + lUrl + _l +
+ lShortName + lHrefEnd + '/';
else
- lHtmlPath+=lShortName+'/';
+ lHtmlPath += lShortName + '/';
}
- /* *** */
+
return lHtmlPath;
};
@@ -289,7 +293,7 @@ var CloudFunc, exports;
* [{path:'путь',size:'dir'},
* {name:'имя',size:'размер',mode:'права доступа'}]
*/
- CloudFunc.buildFromJSON = function(pJSON, pSetCurrent)
+ CloudFunc.buildFromJSON = function(pJSON, pTemplate, pPathTemplate)
{
var files = pJSON,
/* сохраняем путь каталога в котором мы сейчас находимся*/
@@ -306,21 +310,11 @@ var CloudFunc, exports;
* если он есть
*/
lRefreshPath = CloudFunc.removeLastSlash(lPath),
- lFS_s = CloudFunc.FS,
- lFileTable =
- ''+
- '' +
- ' ' +
- '' +
- '' +
- ' ' +
- ' ' +
- '' + lHtmlPath + ' ' +
- ' ',
+ lFileTable = Util.render(pPathTemplate, {
+ link: FS + lRefreshPath,
+ path: lHtmlPath
+ }),
fileTableTitles = ['name','size','owner','mode'];
@@ -340,80 +334,34 @@ var CloudFunc, exports;
if(lDotDot === '')
lDotDot = '/';
- lLink = lFS_s + lDotDot;
-
+ lLink = FS + lDotDot;
/* Сохраняем путь к каталогу верхнего уровня*/
- lFileTable += '' +
- '' +
- '' + ".. " +
- ' ' +
- '<dir> ' +
- '. ' +
- ' ';
+ lFileTable += Util.render(pTemplate,{
+ type : 'directory',
+ link : lLink,
+ target : '',
+ name : '..',
+ size : '<dir>',
+ owner : '.',
+ mode : ''
+ });
}
for(var i = 1, n = files.length; i < n; i++){
- lFileTable += '';
- lFileTable += '';
- lFileTable += ' ';
- lFileTable += '' +
- '' + files[i].name +
- " " +
- ' ';
- /* если папка - не выводим размер */
- lFileTable += '' +
- (files[i].size === 'dir' ?
- '<dir>'
- /* если это файл - получаем
- * короткий размер
- */
- : CloudFunc.getShortedSize(
- files[i].size));
- lFileTable += ' ' +
- '' +
- (!files[i].uid ? 'root' : files[i].uid) +
- ' ' +
- '' +
- /* конвертируем названия разрешений
- * из числового формата в буквенный
- * при этом корневой каталог не трогаем
- * по скольку в нём и так всё уже
- * установлено еще на сервере
- */
- (//lPath==='/'?files[i].mode:
- CloudFunc
- .convertPermissionsToSymbolic
- (files[i].mode)) +
- ' ';
- lFileTable += ' ';
+ lFileTable += Util.render(pTemplate,{
+ type : lFile.size === 'dir' ? 'directory' : 'text-file',
+ link : FS + lPath + lFile.name,
+ target : lFile.size === 'dir' ? '' : "_blank",
+ name : lFile.name,
+ size : lFile.size === 'dir' ? '<dir>' : CloudFunc.getShortSize( lFile.size ),
+ owner : !lFile.uid ? 'root' : lFile.uid,
+ mode : CloudFunc.getSymbolicPermissions(lFile.mode)
+ });
}
- /* если клавиши назначены и
- * мы в корневом каталоге и
- * верхний файл еще не выделен -
- * выделяем верхний файл
- */
- if(pSetCurrent)
- lFileTable = lFileTable.replace('',
- ' ');
-
return lFileTable;
};
-})();
\ No newline at end of file
+})(Util, CloudFunc, exports);
\ No newline at end of file
diff --git a/lib/server.js b/lib/server.js
index 313f31c6..37c09ef8 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -15,7 +15,7 @@
LIBDIR = main.LIBDIR,
SRVDIR = main.SRVDIR,
- /* модуль для работы с путями */
+ URL = main.url,
Path = main.path,
Querystring = main.querystring,
@@ -24,9 +24,10 @@
Socket = main.socket,
http = main.http,
+ https = main.https,
Util = main.util,
- Server, Rest, Route, Minimize, Port, IP;
+ Server, Rest, Route, Minimize;
/* базовая инициализация */
function init(pAppCachProcessing){
@@ -58,39 +59,79 @@
if(!pProcessing)
pProcessing = {};
- Rest = pProcessing.rest;
- Route = pProcessing.route;
- Minimize = pProcessing.minimize;
+ Rest = pProcessing.rest;
+ Route = pProcessing.route;
+ Minimize = pProcessing.minimize;
init(pProcessing.appcache);
- Port = process.env.PORT || /* c9 */
- process.env.app_port || /* nodester */
- process.env.VCAP_APP_PORT || /* cloudfoundry */
- lConfig.port;
-
- IP = process.env.IP || /* c9 */
- lConfig.ip ||
- (main.WIN32 ? '127.0.0.1' : '0.0.0.0');
+ var lPort = process.env.PORT || /* c9 */
+ process.env.app_port || /* nodester */
+ process.env.VCAP_APP_PORT || /* cloudfoundry */
+ lConfig.port,
+ lIP = process.env.IP || /* c9 */
+ lConfig.ip ||
+ (main.WIN32 ? '127.0.0.1' : '0.0.0.0'),
+
+ lSSL = pProcessing.ssl,
+ lSSLPort = lConfig.sslPort,
+ lHTTP = 'http://',
+ lHTTPS = 'https://',
+
+ lSockets = function(pServer){
+ var lListen;
+ if(lConfig.socket && Socket)
+ lListen = Socket.listen(pServer);
+
+ Util.log('* Sockets ' + (lListen ? 'running' : 'disabled'));
+ },
+
+ lHTTPServer = function(){
+ Server = http.createServer( controller );
+ Server.on('error', function (pError) {
+ Util.log(pError);
+ });
+ Server.listen(lPort, lIP);
+ lServerLog(lHTTP, lPort);
+ lSockets(Server);
+ },
+
+ lServerLog = function(pHTTP, pPort){
+ Util.log('* Server running at ' + pHTTP + lIP + ':' + pPort);
+ };
/* server mode or testing mode */
if (lConfig.server) {
- var lError = Util.tryCatchLog(function(){
- Server = http.createServer( controller );
- Server.listen(Port, IP);
+ if(lSSL){
+ Util.log('* Redirection http -> https is setted up');
+ lServerLog(lHTTP, lPort);
+ var lRedirectServer = http.createServer( function(pReq, pRes){
+ var lHost = pReq.headers.host;
- var lListen;
- if(lConfig.socket && Socket)
- lListen = Socket.listen(Server);
-
- Util.log('* Sockets ' + (lListen ? 'running' : 'disabled'));
- Util.log('* Server running at http://' + IP + ':' + Port);
- });
-
- if(lError){
- Util.log('Cloud Commander server could not started');
- Util.log(lError);
+ main.redirect({
+ response: pRes,
+ url: lHTTPS + lHost + pReq.url
+ });
+ });
+
+ lRedirectServer.listen(lPort, lIP);
+
+ Server = https.createServer( lSSL, controller );
+ Server.on('error', function (pError) {
+ Util.log('Could not use https port: ' + lSSLPort);
+ Util.log(pError);
+ lRedirectServer.close();
+ Util.log('* Redirection http -> https removed');
+ lHTTPServer();
+ });
+
+ lSockets(Server);
+
+ Server.listen(lSSLPort, lIP);
+ lServerLog(lHTTPS, lSSLPort);
}
+ else
+ lHTTPServer();
}else
Util.log('Cloud Commander testing mode');
}
@@ -107,8 +148,7 @@
/* Читаем содержимое папки, переданное в url */
var lRet,
lConfig = main.config,
- lURL = main.url,
- lParsedUrl = lURL.parse(pReq.url),
+ lParsedUrl = URL.parse(pReq.url),
lPath = lParsedUrl.pathname;
/* added supporting of Russian language in directory names */
@@ -117,23 +157,21 @@
Util.log("request for " + lPath + " received...");
+ var lData = {
+ name : lPath,
+ request : pReq,
+ response : pRes
+ };
+
if( lConfig.rest )
- lRet = Util.exec(Rest, {
- name : lPath,
- request : pReq,
- response : pRes
- });
+ lRet = Util.exec(Rest, lData);
if( !lRet && Route)
- lRet = Util.exec(Route, {
- name : lPath,
- request : pReq,
- response : pRes
- });
+ lRet = Util.exec(Route, lData);
if(!lRet){
/* добавляем текующий каталог к пути */
- var lName = '.' + lPath;
+ var lName = '.' + lData.name;
Util.log('reading ' + lName);
/* watching is file changed */
@@ -154,13 +192,13 @@
main.sendFile({
name : lSendName,
+ cache : lConfig.cache,
+ gzip : true,
request : pReq,
response : pRes
});
}, function(pCallBack){
Minify.optimize(lName, {
- request : pReq,
- response : pRes,
callback : pCallBack,
returnName : true
});
diff --git a/lib/server/cache.js b/lib/server/cache.js
deleted file mode 100644
index f2c2cf2a..00000000
--- a/lib/server/cache.js
+++ /dev/null
@@ -1,61 +0,0 @@
-(function(){
- "use strict";
-
- var main = global.cloudcmd.main,
- SRVDIR = main.SRVDIR;
-
- /*
- * Обьект для работы с кэшем
- * аналог клиентского обьекта
- * с тем отличием, что в нём
- * будут храниться серверные
- * данные, такие как файлы
- * отдаваемые клиенту
- * (файлы проэкта по большому
- * счёту, для ускорения
- * первичной загрузки)
- */
- exports.Cache = {
- /* приватный переключатель возможности работы с кэшем */
- _allowed : true,
- /* данные в которых храняться файлы
- * в формате <поле> : <значение>
- * _data[name]=pData;
- * одному имени соответствуют
- * одни данные
- */
- _data : {},
-
- /* функция говорит можно ли работать с кэшем */
- isAllowed : (function(){
- return this._allowed;
- }),
- /* функция устанавливает возможность работать с кэшем */
- setAllowed : function(pAllowed){
- this._allowed = pAllowed;
- },
- /* Если доступен кэш
- * сохраняем в него данные
- */
- set : function(pName, pData){
- if(this._allowed && pName && pData){
- this._data[pName]=pData;
- }
- },
- /* Если доступен Cache принимаем из него данные*/
- get : function(pName){
- var lRet;
- if(this._allowed && pName)
- lRet = this._data[pName];
-
- return lRet;
- },
-
- /* Функция очищает кэш*/
- clear :(function(){
- if(this._allowed){
- this._data={};
- }
- })
- };
-})();
diff --git a/lib/server/commander.js b/lib/server/commander.js
index 784b0008..ab88d557 100644
--- a/lib/server/commander.js
+++ b/lib/server/commander.js
@@ -93,12 +93,11 @@
var p = pParams,
c = p.params;
- if(c.stats)
- c.stats[c.name] = !p.error ? p.data : {
- 'mode' : 0,
- 'size' : 0,
- 'isDirectory' : Util.retFalse
- };
+ c.stats[c.name] = !p.error ? p.data : {
+ 'mode' : 0,
+ 'size' : 0,
+ 'isDirectory' : Util.retFalse
+ };
if(c.count === Object.keys(c.stats).length)
Util.exec(c.callback);
@@ -154,8 +153,6 @@
lJSON[i+1] = lJSONFile;
}
- lDirPath = lDirPath.substr(lDirPath, lDirPath.lastIndexOf('/') );
-
Util.exec(p.callback, null, lJSON);
}
diff --git a/lib/server/dir.js b/lib/server/dir.js
new file mode 100644
index 00000000..761aee67
--- /dev/null
+++ b/lib/server/dir.js
@@ -0,0 +1,104 @@
+/* inspired by http://procbits.com/2011/10/29/a-node-js-experiment-thinking-asynchronously-recursion-calculate-file-size-directory */
+(function(){
+ 'use strict';
+
+ if(!global.cloudcmd)
+ return console.log(
+ '# dir.js' + '\n' +
+ '# -----------' + '\n' +
+ '# Module is part of Cloud Commander,' + '\n' +
+ '# used for getting dir size.' + '\n' +
+ '# If you wont to see at work' + '\n' +
+ '# try GET /api/v1/fs/etc?size or' + '\n' +
+ '# dir.getSize(\'/etc, function(err, size){' + '\n' +
+ '# });' + '\n' +
+ '# http://coderaiser.github.com/cloudcmd' + '\n');
+
+ var main = global.cloudcmd.main,
+ fs = main.fs,
+ Util = main.util,
+ path = main.path;
+
+ exports.getSize = function(pDir, pCallBack) {
+ var lTotal = 0;
+
+ function calcSize(pParams){
+ var lStat = pParams.stat,
+ lSize = lStat && lStat.size || 0;
+
+ lTotal += lSize;
+ }
+
+ processDir(pDir, calcSize, function(){
+ Util.log(pDir + ' -> ' + lTotal);
+ Util.exec(pCallBack, null, lTotal);
+ });
+ };
+
+ function processDir(pDir, pFunc, pCallBack){
+ var lAsyncRunning = 0,
+ lFileCounter = 1;
+
+ function getDirInfo(pDir) {
+ /* The lstat() function shall be equivalent to stat(),
+ except when path refers to a symbolic link. In that case lstat()
+ shall return information about the link, while stat() shall return
+ information about the file the link references. */
+
+ fs.lstat(pDir, Util.call(getStat, {
+ name: pDir
+ }));
+ }
+
+ function getStat(pParams) {
+ var lRet = Util.checkObj(pParams, ['params']);
+ if(lRet){
+ var p = pParams,
+ d = p.params,
+ lStat = p.data,
+ lPath = d.name;
+
+ --lFileCounter;
+
+ if (!p.error) {
+ if ( lStat.isFile() )
+ Util.exec(pFunc, {
+ name: d.name,
+ stat: lStat
+ });
+ else if ( lStat.isDirectory() ) {
+ ++lAsyncRunning;
+
+ fs.readdir(lPath, function(pError, pFiles) {
+ lAsyncRunning--;
+
+ var lDirPath, n;
+
+ if (!pError){
+ n = pFiles.length;
+ lFileCounter += n;
+
+ for (var i = 0; i < n; i++) {
+ lDirPath = path.join(lPath, pFiles[i]);
+ process.nextTick( Util.retExec(getDirInfo, lDirPath) );
+ }
+ }
+
+ if(!n)
+ execCallBack();
+ });
+ }
+ }
+ }
+
+ execCallBack();
+ }
+
+ function execCallBack(){
+ if (!lFileCounter && !lAsyncRunning)
+ Util.exec(pCallBack);
+ }
+
+ getDirInfo(pDir);
+ }
+})();
\ No newline at end of file
diff --git a/lib/server/main.js b/lib/server/main.js
index 246ae04d..79c0cceb 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -12,7 +12,8 @@
ext,
path, fs, zlib, url,
- OK, FILE_NOT_FOUND,
+ OK, FILE_NOT_FOUND, MOVED_PERMANENTLY = 301,
+ REQUEST, RESPONSE,
Config = {
server : true,
@@ -22,10 +23,11 @@
/* Consts */
- exports.OK = OK = 200;
- exports.FILE_NOT_FOUND = FILE_NOT_FOUND = 404;
- exports.REQUEST = 'request';
- exports.RESPONSE = 'response';
+ exports.OK = OK = 200;
+ exports.FILE_NOT_FOUND = FILE_NOT_FOUND = 404;
+
+ exports.REQUEST = REQUEST = 'request';
+ exports.RESPONSE = RESPONSE = 'response';
/* Native Modules*/
exports.crypto = require('crypto'),
@@ -40,7 +42,7 @@
/* Constants */
/* current dir + 2 levels up */
exports.WIN32 = ISWIN32 = isWin32();
- exports.SLASH = SLASH = ISWIN32 ? '\\' : '/',
+ exports.SLASH = SLASH = '/',
exports.SRVDIR = SRVDIR = __dirname + SLASH,
exports.LIBDIR = LIBDIR = path.normalize(SRVDIR + '../'),
@@ -53,7 +55,7 @@
exports.librequire = librequire,
exports.srvrequire = srvrequire,
exports.rootrequire = rootrequire,
- exports.quietrequire = quietrequire,
+ exports.quietrequire = quietrequire,
exports.generateHeaders = generateHeaders,
exports.getQuery = getQuery,
@@ -62,6 +64,8 @@
exports.sendFile = sendFile,
exports.sendResponse = sendResponse,
exports.sendError = sendError,
+ exports.redirect = redirect,
+ exports.readFiles = readFiles,
exports.checkParams = checkParams,
@@ -69,6 +73,8 @@
exports.fs.exists = exports.fs.exists || exports.path.exists,
/* Needed Modules */
+
+ /* we can not use librequare heare */
exports.util = Util = require(LIBDIR + 'util'),
exports.zlib = zlib = mrequire('zlib'),
@@ -95,18 +101,18 @@
exports.socket = srvrequire('socket'),
exports.auth = srvrequire('auth').auth,
exports.appcache = srvrequire('appcache'),
- exports.cache = srvrequire('cache').Cache,
exports.cloudfunc = librequire('cloudfunc'),
+ exports.dir = srvrequire('dir'),
exports.rest = srvrequire('rest').api,
exports.update = srvrequire('update'),
exports.ischanged = srvrequire('ischanged');
exports.commander = srvrequire('commander');
exports.minify = srvrequire('minify').Minify;
- /*
- * second initializing after all modules load, so global var is
- * totally filled of all information that should know all modules
- */
+
+ /* second initializing after all modules load, so global var is *
+ * totally filled of all information that should know all modules */
global.cloudcmd.main = exports;
+
/**
* function do safe require of needed module
* @param {Strin} pSrc
@@ -172,11 +178,11 @@
* https://developers.google.com/speed/docs/best-practices/caching?hl=ru#LeverageProxyCaching
*/
function generateHeaders(pParams){
- var lRet = Util.checkObjTrue(pParams, ['name']),
- p = pParams;
+ var lRet = Util.checkObjTrue(pParams, ['name']);
if(lRet){
- var lExt = Util.getExtension(p.name),
+ var p = pParams,
+ lExt = Util.getExtension(p.name),
lType = ext[lExt] || 'text/plain',
lContentEncoding = '';
@@ -194,10 +200,8 @@
'Vary': 'Accept-Encoding'
};
- if( !Util.strCmp(lExt, '.appcache') && exports.config.cache){
- var lCacheControl = 31337 * 21;
- lRet['cache-control'] = 'max-age=' + lCacheControl;
- }
+ if( !Util.strCmp(lExt, '.appcache') && p.cache)
+ lRet['cache-control'] = 'max-age=' + 31337 * 21;
if(p.gzip)
lRet['content-encoding'] = 'gzip';
@@ -214,37 +218,37 @@
* @param pGzip - данные сжаты gzip'ом
*/
function sendFile(pParams){
- var lRet,
- lName, lReq, lRes, lGziped;
+ var lRet = checkParams(pParams);
- if(pParams){
- lName = pParams.name,
- lReq = pParams.request,
- lRes = pParams.response;
- lGziped = pParams.gziped;
- }
- if(lName && lRes && lReq){
- var lGzip = isGZIP(lReq),
+ if(lRet){
+ var p = pParams,
+ lGzip = isGZIP(p.request) && p.gzip,
- lReadStream = fs.createReadStream(lName, {
+ lReadStream = fs.createReadStream(p.name, {
'bufferSize': 4 * 1024
});
lReadStream.on('error', function(pError){
- lRes.writeHead(FILE_NOT_FOUND, 'OK');
- lRes.end(String(pError));
+ p.response.writeHead(FILE_NOT_FOUND, 'OK');
+ p.response.end(String(pError));
});
- lRes.writeHead(OK, generateHeaders({
- name : lName,
+ p.response.writeHead(OK, generateHeaders({
+ name : p.name,
+ cache : p.cache,
gzip : lGzip,
- query : getQuery(lReq)
+ query : getQuery(p.request)
}) );
- if (lGzip && !lGziped)
- lReadStream = lReadStream.pipe( zlib.createGzip() );
+ var lZipStream;
- lReadStream.pipe(lRes);
+ if (lGzip && !p.gziped)
+ lZipStream = lReadStream.pipe( zlib.createGzip() );
+ else
+ lZipStream = lReadStream;
+
+
+ lZipStream.pipe(p.response);
lRet = true;
}
@@ -260,8 +264,7 @@
* @param pName - имя отсылаемого файла
*/
function sendResponse(pParams, pData){
- var lRet = Util.checkObjTrue(pParams,
- ['name', 'request', 'response']);
+ var lRet = checkParams(pParams);
if(lRet){
var p = pParams;
@@ -271,6 +274,7 @@
lGzip = isGZIP(p.request),
lHead = generateHeaders({
name : p.name,
+ cache : p.cache,
gzip : lGzip,
query : lQuery
});
@@ -299,9 +303,28 @@
}
}
- function sendError(pParams, pError){
+
+ /**
+ * redirect to another URL
+ */
+ function redirect(pParams){
var lRet = Util.checkObjTrue(pParams,
- ['name', 'request', 'response']);
+ [RESPONSE]);
+
+ if(lRet){
+ var p = pParams;
+
+ p.response.writeHead(MOVED_PERMANENTLY, {'Location': p.url});
+ p.response.end();
+ }
+ }
+
+
+ /**
+ * send error response
+ */
+ function sendError(pParams, pError){
+ var lRet = checkParams(pParams);
if(lRet){
var p = pParams;
@@ -317,14 +340,14 @@
* @pName
*/
function gzipData(pParams){
- var lRet = checkCallBackParams(pParams);
+ var lRet = checkCallBackParams(pParams),
+ p = pParams;
if(lRet)
lRet = Util.checkObj(pParams.params, ['callback']);
if(lRet){
- var p = pParams,
- c = pParams.params,
+ var lCallBack = p.params.callback,
lParams = {};
if(!p.error)
@@ -334,7 +357,7 @@
lParams.data = p.error.toString();
}
- Util.exec(c.callback, lParams);
+ Util.exec(lCallBack, lParams);
}
}
@@ -343,8 +366,49 @@
return Util.checkObj(pParams, ['error', 'data', 'params']);
}
+ function readFiles(pFiles, pCallBack){
+ var lDone = [],
+ lFiles,
+ lErrors,
+ lReadedFiles = {},
+ lDoneFunc = function (pParams){
+ var lRet = Util.checkObj(pParams, ['error', 'data', 'params']);
+
+ if(lRet){
+ lDone.pop();
+ var p = pParams,
+ lName = p.params;
+
+ if(p.error){
+ if(!lErrors) lErrors = {};
+
+ lErrors[lName] = p.error;
+ }
+ else{
+ Util.log(lName + ' readed');
+ lReadedFiles[lName] = p.data;
+ }
+
+ if( !lDone.length )
+ Util.exec(pCallBack, lErrors, lReadedFiles);
+ }
+ };
+
+ if( Util.isArray(pFiles) )
+ lFiles = pFiles;
+ else
+ lFiles = [pFiles];
+
+ for(var i = 0, n = lFiles.length; i < n; i++){
+ var lName = lFiles.pop();
+ lDone.push(lName);
+
+ fs.readFile(lName, Util.call( lDoneFunc, lName ));
+ }
+ }
+
function checkParams(pParams, pAdditional){
- var lRet = Util.checkObjTrue( pParams, ['name', 'request', 'response'] );
+ var lRet = Util.checkObjTrue( pParams, ['name', REQUEST, RESPONSE] );
if(lRet && pAdditional)
lRet = Util.checkObjTrue( pParams, pAdditional);
diff --git a/lib/server/minify.js b/lib/server/minify.js
index d1c1f2ed..4f8245d8 100644
--- a/lib/server/minify.js
+++ b/lib/server/minify.js
@@ -36,9 +36,6 @@
img : true
},
- /* minimize even if file not changed */
- forse : false,
-
/* функция разрешает или
* запрещает минимизировать
* css/js/html
@@ -49,13 +46,13 @@
* img отвечает за перевод картинок в base64
* и сохранение их в css-файл
*/
- setAllowed :(function(pAllowed){
+ setAllowed :function(pAllowed){
this.allowed = pAllowed && Minify ? pAllowed : {
js : false,
css : false,
html : false
};
- }),
+ },
optimize: function(pName, pParams){
var lRet;
@@ -74,7 +71,7 @@
if(pChanged)
Minify.optimize(pName, pParams);
else
- main.sendFile(pParams);
+ Util.exec(pParams.callback, pParams);
});
}
else{
diff --git a/lib/server/rest.js b/lib/server/rest.js
index e49add33..bc3f9332 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -17,6 +17,7 @@
fs = main.fs,
Util = main.util,
CloudFunc = main.cloudfunc,
+ dir = main.dir,
OK = 200,
Header = main.generateHeaders({
name:'api.json'
@@ -34,14 +35,13 @@
lRet = Util.isContainStr(p.name, lAPIURL);
if( lRet ){
- p.name = Util.removeStr(p.name, lAPIURL);
+ p.name = Util.removeStrOneTime(p.name, lAPIURL);
sendData( pParams);
}
}
return lRet;
};
-
/**
* send data
*
@@ -66,12 +66,12 @@
if(lRet){
var p = pParams;
- lRet = Util.isContainStr(p.name, CloudFunc.FS);
+ lRet = Util.isContainStrAtBegin(p.name, CloudFunc.FS);
if( lRet)
onFS(pParams);
else{
if(p.name[0] === '/')
- p.command = Util.removeStr(p.name, '/');
+ p.command = Util.removeStrOneTime(p.name, '/');
switch(p.request.method){
case 'GET':
@@ -96,29 +96,39 @@
var p = pParams,
lQuery = main.getQuery(p.request);
- p.name = Util.removeStrOneTime(p.name, [CloudFunc.FS, '?dir']) || '/';
+ p.name = Util.removeStrOneTime(p.name, CloudFunc.FS) || '/';
switch(p.request.method){
case 'GET':
- fs.stat(p.name, function(pError, pStat){
- if(!pError)
- if( pStat.isDirectory() )
- main.commander.getDirContent(pParams.name, function(pError, pData){
- if(!pError){
- pParams.request.url += '.json';
- pParams.data = Util.stringifyJSON(pData);
- main.sendResponse(pParams);
- }
- else
- main.sendError(pParams, pError);
- });
+ if( Util.strCmp(lQuery, 'size') )
+ dir.getSize(p.name, function(pErr, pSize){
+ if(!pErr){
+ var lSize = CloudFunc.getShortSize(pSize);
+ console.log(lSize);
+ main.sendResponse(p, lSize);
+ }
else
- main.sendFile(pParams);
- else
- main.sendError(pParams, pError);
+ main.sendError(p, pErr);
+ });
+ else
+ fs.stat(p.name, function(pError, pStat){
+ if(!pError)
+ if( pStat.isDirectory() )
+ main.commander.getDirContent(p.name, function(pError, pData){
+ if(!pError){
+ p.name += '.json';
+ p.data = Util.stringifyJSON(pData);
+ main.sendResponse(p);
+ }
+ else
+ main.sendError(p, pError);
+ });
+ else
+ main.sendFile(p);
+ else
+ main.sendError(p, pError);
- });
-
- break;
+ });
+ break;
case 'PUT':
if(lQuery === 'dir')
@@ -129,14 +139,13 @@
main.sendError(pParams, pError);
});
else{
- var lWriteStream = fs.createWriteStream(p.name);
+ var lWriteStream = fs.createWriteStream(p.name);
lWriteStream.on('error', function(pError){
- console.log(pError);
main.sendError(pParams, pError);
});
- p.request.on('end', function(){
+ lWriteStream.on('open', function(){
main.sendResponse(pParams, 'writed: ' + p.name);
});
@@ -147,12 +156,55 @@
case 'DELETE':
if(lQuery === 'dir')
fs.rmdir(p.name, function(pError){
- if(!pError)
- main.sendResponse(pParams, 'Folder ' + p.name + ' deleted.');
- else
- main.sendError(pParams, pError);
+ if(!pError)
+ main.sendResponse(pParams, 'Folder ' + p.name + ' deleted.');
+ else
+ main.sendError(pParams, pError);
+ });
+ else if(lQuery === 'files'){
+ getBody(p.request, function(pBody){
+ var lFiles = Util.parseJSON(pBody),
+ n = lFiles.length,
+ lDir = p.name,
+ log = Util.retExec(Util.log),
+ lAssync = 0;
+
+ function stat(pStat){
+ var lRet = Util.checkObjTrue(pStat, 'params') &&
+ Util.checkObjTrue(pStat.params, 'name');
+
+ if(lRet){
+ var p = pStat,
+ d = p.params;
+
+ ++lAssync;
+
+ if( p.error ){
+ main.sendError(pParams, p.error);
+ Util.log(p.error);
+ }
+ else
+ if(p.data.isDirectory())
+ fs.rmdir(d.name, log);
+
+ else if(p.data.isFile())
+ fs.unlink(d.name, log);
+
+ if(lAssync === n && !p.error)
+ main.sendResponse(pParams, 'Files deleted: ' + pBody);
+ }
+ }
+
+
+ for(var i = 0; i < n; i ++){
+ var lName = lDir + lFiles[i];
+ Util.log(lName);
+ fs.stat(lName, Util.call(stat, {
+ name: lName
+ }));
+ }
});
- else
+ }else
fs.unlink(p.name, function(pError){
if(!pError)
main.sendResponse(pParams, 'File ' + p.name + ' delete.');
@@ -184,6 +236,14 @@
};
send(p);
break;
+
+ case 'proxy':
+
+ break;
+
+ case 'zip':
+ main.sendFile(pParams);
+ break;
case 'kill':
p.data = {
@@ -234,6 +294,7 @@
main.sendError(pParams, lError);
});
break;
+
case 'mv':
if( Util.checkObjTrue(lFiles, ['from', 'to']) )
fs.rename(lFiles.from, lFiles.to, function(pError){
@@ -243,27 +304,30 @@
main.sendError(pParams, pError);
});
else
- main.sendError(pParams, p.data);
+ main.sendError(pParams, p.data);
break;
case 'cp':
- if(lFiles){
- var lReadStream = fs.createReadStream(lFiles.from),
- lWriteStream = fs.createWriteStream(lFiles.to),
+ if( Util.checkObjTrue(lFiles, ['from', 'to']) ){
+ var l = lFiles,
+ lReadStream = fs.createReadStream(l.from),
+ lWriteStream = fs.createWriteStream(l.to),
+
lError = function(pError){
main.sendError(pParams, pError);
};
-
lWriteStream.on('error', lError);
lReadStream.on('error', lError);
- lWriteStream.on('end', function(){
- main.sendResponse(pParams, 'copied: ' + p.name);
+ lReadStream.on('end', function(){
+ main.sendResponse(pParams, 'copied to: ' + l.to);
});
lReadStream.pipe(lWriteStream);
}
+ else
+ main.sendError(pParams, p.data);
break;
default:
send(pParams);
diff --git a/lib/server/socket.js b/lib/server/socket.js
index f064a044..0a63de2a 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -22,16 +22,15 @@
exports.listen = function(pServer){
var lRet;
if(io){
- io = io.listen(pServer);
+ var lListen = io.listen(pServer),
+ /* number of connections */
+ lConnNum = 0;
- /* number of connections */
- var lConnNum = 0;
-
- lRet = io.sockets.on('connection', function (socket){
+ lRet = lListen.sockets.on('connection', function (socket){
++lConnNum;
socket.send('{"stdout":"client connected"}');
- console.log('server connected');
+ Util.log('server connected');
if(!OnMessageFuncs[lConnNum])
OnMessageFuncs[lConnNum] = onMessage(lConnNum, socket);
@@ -54,7 +53,7 @@
*/
function onMessage(pConnNum, pSocket){
return function(pCommand) {
- console.log(pCommand);
+ Util.log(pCommand);
if( Util.isContainStr(pCommand, 'cloudcmd') ){
pCommand = Util.removeStr(pCommand, 'cloudcmd');
@@ -80,10 +79,8 @@
lMsg = JSON.stringify(lMsg);
pSocket.send(lMsg);
- console.log('received from client: ' + pCommand);
- console.log('sended to client: ' + lMsg);
-
- return;
+ Util.log('received from client: ' + pCommand);
+ Util.log('sended to client: ' + lMsg);
}
}
@@ -114,7 +111,7 @@
function getExec(pSocket){
return function(pError, pStdout, pStderr) {
if (pError !== null) {
- console.log('exec error: ' + pError);
+ Util.log('exec error: ' + pError);
}
var lExec = {
diff --git a/lib/util.js b/lib/util.js
index cafe5cf9..66e7a8b5 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -7,7 +7,7 @@ Util = exports || {};
(function(Util){
'use strict';
-
+
var Scope = exports ? global : window;
/** setting function context
@@ -15,7 +15,7 @@ Util = exports || {};
* @param {object} pContext
*/
Util.bind = function(pFunction, pContext){
- var lRet = false;
+ var lRet;
if( Util.isFunction(pFunction) )
lRet = pFunction.bind(pContext);
@@ -23,16 +23,6 @@ Util = exports || {};
return lRet;
};
- Util.breakpoint = function(){
- var lRet = Util.tryCatch(function(){
- debugger;
- });
-
- Util.log(lRet);
-
- return lRet;
- };
-
/**
* callback for functions(pError, pData)
* thet moves on our parameters.
@@ -41,13 +31,13 @@ Util = exports || {};
* @param pParams
*/
Util.call = function(pFunc, pParams){
- var lFunc = function(pError, pData){
+ function lFunc(pError, pData){
Util.exec(pFunc, {
error : pError,
data : pData,
params : pParams
});
- };
+ }
return lFunc;
};
@@ -61,9 +51,8 @@ Util = exports || {};
Util.checkExtension = function(pName, pExt){
var lRet = false,
lLength = pName.length; /* длина имени*/
- /* если длина имени больше
- * длинны расширения -
- * имеет смысл продолжать
+
+ /* если длина имени больше длинны расширения - имеет смысл продолжать
*/
if (Util.isString(pExt) && pName.length > pExt.length) {
var lExtNum = pName.lastIndexOf(pExt), /* последнее вхождение расширения*/
@@ -117,7 +106,7 @@ Util = exports || {};
return lRet;
};
- /**
+ /**
* Check is Properties exists and they are true
*
* @param pObj
@@ -125,21 +114,20 @@ Util = exports || {};
* @param pTrueArr
*/
Util.checkObjTrue = function(pObj, pTrueArr){
- var lRet,
+ var lRet, lTrueArr,
i, n;
if( pObj ){
- lRet = Util.isArray(pTrueArr);
- if(lRet){
- n = pTrueArr.length;
- for(i = 0; i < n; i++){
- var lProp = pTrueArr[i];
- lRet = pObj[lProp];
-
- if( !lRet){
- Util.logError(lProp + ' not true!');
- Util.log(pObj);
- break;
- }
+ lTrueArr = Util.isArray(pTrueArr) ? pTrueArr : [pTrueArr];
+
+ n = lTrueArr.length;
+ for(i = 0; i < n; i++){
+ var lProp = lTrueArr[i];
+ lRet = pObj[lProp];
+
+ if( !lRet){
+ Util.logError(lProp + ' not true!');
+ Util.log(pObj);
+ break;
}
}
}
@@ -147,6 +135,39 @@ Util = exports || {};
return lRet;
};
+ /**
+ * Copy properties array pProps from pFromObj to pToObj
+ *
+ * @param pFromObj
+ * @param pToObj
+ * @param pProps
+ */
+ Util.copyObj = function(pFromObj, pToObj, pProps){
+ var lRet;
+
+ if( !pToObj )
+ lRet = pToObj = {};
+
+ function copy(pI){
+ var lName = pProps ? pProps[pI] : pI,
+ lValue = pFromObj[lName];
+
+ if(lValue)
+ pToObj[lName] = pFromObj[lName];
+ }
+
+ if( Util.isObject(pFromObj) ){
+ if(!pProps)
+ Util.forIn(pFromObj, copy);
+ else
+ Util.fori(pProps.length, copy);
+
+ lRet = lRet || true;
+ }
+
+ return lRet;
+ };
+
/** for function
* @param pI
* @param pN
@@ -160,6 +181,17 @@ Util = exports || {};
}
};
+ /** for in function
+ * @param pObj
+ * @param pFunc
+ */
+ Util.forIn = function(pObj, pFunc){
+ if(Util.isFunction(pFunc))
+ for(var lName in pObj)
+ if(pFunc(lName))
+ break;
+ };
+
/** for function with i = 0
* @param pN
* @param pFunc
@@ -176,7 +208,7 @@ Util = exports || {};
Util.parseJSON = function(pJSON){
var lRet;
- Util.tryCatchLog(function(){
+ Util.tryCatch(function(){
lRet = JSON.parse(pJSON);
});
@@ -247,6 +279,24 @@ Util = exports || {};
return lRet;
};
+ /**
+ * is pStr1 contains pStr2 at begin
+ * @param pStr1
+ * @param pStr2
+ */
+ Util.isContainStrAtBegin = function(pStr1, pStr2){
+ var lRet;
+
+ if( Util.isString(pStr1) && Util.isString(pStr2) ){
+ var lLength = pStr2.length,
+ lSubStr = pStr1.substring(0, lLength);
+
+ lRet = lSubStr === pStr2;
+ }
+
+ return lRet;
+ };
+
/**
* function log pArg if it's not empty
* @param pArg
@@ -485,6 +535,14 @@ Util = exports || {};
return Util.isType(pVarible, 'function');
};
+ /**
+ * functions check is pVarible is number
+ * @param pVarible
+ */
+ Util.isNumber = function(pVarible){
+ return Util.isType(pVarible, 'number');
+ };
+
/**
* functions check is pVarible is object
* @param pVarible
@@ -707,8 +765,11 @@ Util = exports || {};
*/
Util.execIfExist = function(pObj, pName, pArg){
var lRet;
- if(pObj)
- lRet = Util.exec(pObj[pName], pArg);
+
+ if(pObj){
+ var lFunc = Util.bind(pObj[pName], pObj);
+ lRet = Util.exec(lFunc, pArg);
+ }
return lRet;
};
@@ -814,6 +875,7 @@ Util = exports || {};
return lRet;
};
+
/**
* stop timer
* @pArg
@@ -824,8 +886,9 @@ Util = exports || {};
lRet = Util.execIfExist(lConsole, 'timeEnd', pArg);
- return this;
+ return lRet;
};
+
/**
* Gets current date in format yy.mm.dd hh:mm:ss
*/
diff --git a/manifest.yml b/manifest.yml
new file mode 100644
index 00000000..5353529e
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,13 @@
+---
+applications:
+ .:
+ name: cloudcmd
+ framework:
+ name: node
+ info:
+ mem: 512M
+ description: Node.js Application
+ exec:
+ url: ${name}.${target-base}
+ mem: 128M
+ instances: 2
diff --git a/package.json b/package.json
index 284725e8..31355ad9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cloudcmd",
- "version": "0.1.9",
+ "version": "0.2.0",
"author": "coderaiser (https://github.com/coderaiser)",
"description": "User friendly cloud file manager.",
"homepage": "https://github.com/coderaiser/cloudcmd",
@@ -9,18 +9,19 @@
"url": "git://github.com/coderaiser/cloudcmd.git"
},
"scripts": {
- "test": "sh test/test.sh",
+ "test": "sh ./test/test.sh",
"start": "cloudcmd.js"
},
"node": "0.6.17",
"subdomain": "cloudcmd",
"dependencies": {
- "minify": "0.1.9",
- "socket.io": "0.9.13"
+ "dropbox": "0.9.2",
+ "minify": "0.2.0",
+ "socket.io": "0.9.14"
},
"devDependencies": {},
"engines": {
"node": ">=0.4.x"
},
"main": "cloudcmd.js"
-}
\ No newline at end of file
+}
diff --git a/shell/deploy.sh b/shell/deploy.sh
index 316dbf69..d91f5825 100755
--- a/shell/deploy.sh
+++ b/shell/deploy.sh
@@ -1,12 +1,11 @@
-cd ..
+echo 'jitsu'
+cp package.json tmp/package.json
+echo 'y'|jitsu deploy
+echo '://cloudcmd.jit.su'
+cp tmp/package.json package.json
echo 'appfog'
af update
-echo 'http://cloudcmd.aws.af.cm/'
+echo '://cloudcmd.aws.af.cm'
echo 'cloud foundry'
-vmc update
-echo 'http://cloudcmd.cloudfoundry.com/'
-echo 'nodester'
-git push nodester master
-echo 'heroku'
-git push heroku master
-cd shell
\ No newline at end of file
+vmc push
+echo '://cloudcmd.cloudfoundry.com'
\ No newline at end of file
diff --git a/shell/ssl.sh b/shell/ssl.sh
new file mode 100644
index 00000000..e703ad7d
--- /dev/null
+++ b/shell/ssl.sh
@@ -0,0 +1,3 @@
+openssl genrsa -out privatekey.pem 1024
+openssl req -new -key privatekey.pem -out certrequest.csr
+openssl x509 -req -in certrequest.csr -signkey privatekey.pem -out certificate.pem
\ No newline at end of file
diff --git a/ssl/ssl.crt b/ssl/ssl.crt
new file mode 100644
index 00000000..a0c89725
--- /dev/null
+++ b/ssl/ssl.crt
@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+MIIGbTCCBVWgAwIBAgIDCW2NMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwMzA3MDYzMDAz
+WhcNMTQwMzA3MTQxMDM1WjB0MRkwFwYDVQQNExAwN005bXA1NnloSllmV0NIMQsw
+CQYDVQQGEwJVQTEeMBwGA1UEAxMVc3NsLnJhc3RhY29kaW5nLnJ2LnVhMSowKAYJ
+KoZIhvcNAQkBFht3ZWJtYXN0ZXJAcmFzdGFjb2RpbmcucnYudWEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL+GkzmHlBF/5zNwY1KRRw9lZFUd8ON7d7
+KeA8GTyB1OlZiWsOFGrYGuCAbnBElM6kDqRWjIgqjna/81eapZq7lTNXmJN7l9g1
+digOPJHHs1oVJvztMZ1kHc75I1t4cOYNeq0l4m3UbvazFpEN90B4Uh1vKSfzLXN8
+3EF0SQFcmA90e5G/D3ZTJZ7em7t/tbrlAdZfF7Nsc5Rq7pNG+WxLsjbt1eA5lM9x
+GMNcMLqo+O74WZYyLQarKhRDESqaQL0UxdFg9I2SmU73YyYqRmRv6SKkCWWaNvyB
+7gi+2ocvXHI3UD9jOxH2vf3YchOkzmn3byMogAUVMTt8eM+rhI2vAgMBAAGjggLt
+MIIC6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUina5BS9zmNpc7s8zf9+I7kV/eaEwHwYDVR0jBBgwFoAU60I0
+0Jiwq5/0G2sI98xkLu8OLEUwMwYDVR0RBCwwKoIVc3NsLnJhc3RhY29kaW5nLnJ2
+LnVhghFyYXN0YWNvZGluZy5ydi51YTCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAEC
+ATCCATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5z
+dGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRD
+b20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNh
+dGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlv
+biByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFu
+Y2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBv
+ZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCig
+JoYkaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEF
+BQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20v
+c3ViL2NsYXNzMS9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3Rh
+cnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIE
+HDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEB
+AHLUd3DlzMItncDAGft5EjmgD2A/1aO4yfPfzfxR9XxrjhwLq9l526myJi2cSHuF
+jasS09gRqKmEQWghiINGIzXJWAzjTA+pq8Kwlbepm2K8rItmePd4TpZc4xd8gXFj
+P5d74ix12HQW78vap7WavLDLtbVG6LygQ8CE566fc6J7rkiEJdfWmsWNP3ihH2GB
+DL2fPzH2hIn3qgymnvnpCpS0MU4/L8+Jr6AJes+kOpgesDVqFWvUMOjfSIZga2eF
+/5FJP5NOcHlv7cq3LodKYtPy2vRDHHALDgjV01G3kKGz9A0BOT6KWbVbLTRkTwFP
+FT4BPrLPkRSAXgI1Vj6LHYs=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/ssl/ssl.key b/ssl/ssl.key
new file mode 100644
index 00000000..1f62598e
--- /dev/null
+++ b/ssl/ssl.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAy/hpM5h5QRf+czcGNSkUcPZWRVHfDje3eyngPBk8gdTpWYlr
+DhRq2BrggG5wRJTOpA6kVoyIKo52v/NXmqWau5UzV5iTe5fYNXYoDjyRx7NaFSb8
+7TGdZB3O+SNbeHDmDXqtJeJt1G72sxaRDfdAeFIdbykn8y1zfNxBdEkBXJgPdHuR
+vw92UyWe3pu7f7W65QHWXxezbHOUau6TRvlsS7I27dXgOZTPcRjDXDC6qPju+FmW
+Mi0GqyoUQxEqmkC9FMXRYPSNkplO92MmKkZkb+kipAllmjb8ge4IvtqHL1xyN1A/
+YzsR9r392HITpM5p928jKIAFFTE7fHjPq4SNrwIDAQABAoIBAQCPZuqvt7coKLJg
+VoMqxOL2OHqW6eSknk+Fa/+WwTdlIEefB5oYoAouPVcxdHPCA8z0Usb/gnYJVXfv
+pConM98Bmvgp0b9+2VbM33Fx8OudN19SF8MjEArT5JErX8xjdRyIxYMOa49EF2+i
+oW8CHp9Y+IJxMMJBmebkFgZ+twUaDxz8YcOfKJcGL4aHPPIde6JPvom2Bg14YBKa
+pMtOWTuYFKyVSwWD1xgY886laGG7WB6Nbevlu8vpUr4mSX2N2BloJUrq4JhFx/7f
+iWs/QrqTJFenVCj6S+xWlBbRau10ajvyqIJtqdWMZStUjeuCY/0Dw/G4fAed3H6c
+aIHEB4fhAoGBAOstXMfbqHONhNKd1xrZCN9qADfsCJvfBE9nHmoPmmgyKL5FfMaU
+Fr6ebfW2P+4rxNbC31gl8c3OfZ9cv9PjmcBPyO14ALb5LAZne9FjmH4aKyV8tWox
+J5WjNpC8yIo/XIBdn4Y72r9VgYjF5tceNJZoHeZj7i36Ug84N2LKllhFAoGBAN4H
+sxFx5wgzlDy8fitiCY4wN6NE2zOQSwFk2NyuWzRzw/vbqnJ7kwX/3yS3NtT1P4Ha
+ma6jIpD/LEr6rVNLbw2okgUAM6BWQ5ZZaIyTwLahqnXmNlsG+t/SeALVgEryqxz1
+0tTPkTK0HJEy2dIXtIVauss450TyzQ6/eJ42mO9jAoGARo2EURzvy0LAfyMFHjPQ
+Op4lVKGF76UXOO75q93kd6/ck0Brb3OL40HKQTWctkoBMmCh+mLfyNtSypVboyib
+vprw73TZ2gqkj4NKHQYhAGu/V+6yyhnXA0hEnWVVUEwz5vqvWejo9g+j3bFpUE3q
+ftjbZ3vBP5/iMFiwHP4j3nUCgYAGx3NnN/QW4wRGqnarum2SQtSgDo0m0OQJYdvh
+OQ2d118HhJh6sF031K0qgNGSxP4wZ81DcMWwaaofi/HY1jfI0fnLX0s0PQ4JPCee
+CzDaIquCuAm208q7JMD3TS+CmlAxLSxHxSKoyqkIoeXWrVScsb18UPt2tnceWShE
+pGQdAwKBgAcwUjldLORhwKUEvaKtExwxTMjS6mzxp2zIm+6SCFwBUAvazbE9xD7Z
+P4yKB8C6lKpq+MqgiyBPk2tlLjF1rbJX7ARXtFsiXpx6RTAvYzV8IxlDwHSvncmx
+GkQ+hpORn8BHD1pjEDxmGRQCNHWLCjLYwISrWaNXe1QmkJF+MtbT
+-----END RSA PRIVATE KEY-----
diff --git a/ssl/sub.class1.server.ca.pem b/ssl/sub.class1.server.ca.pem
new file mode 100644
index 00000000..4a894c7b
--- /dev/null
+++ b/ssl/sub.class1.server.ca.pem
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGNDCCBBygAwIBAgIBGDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDcxMDI0MjA1NDE3WhcNMTcxMDI0MjA1NDE3WjCB
+jDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsT
+IlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0
+YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgU2VydmVyIENBMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtonGrO8JUngHrJJj0PREGBiE
+gFYfka7hh/oyULTTRwbw5gdfcA4Q9x3AzhA2NIVaD5Ksg8asWFI/ujjo/OenJOJA
+pgh2wJJuniptTT9uYSAK21ne0n1jsz5G/vohURjXzTCm7QduO3CHtPn66+6CPAVv
+kvek3AowHpNz/gfK11+AnSJYUq4G2ouHI2mw5CrY6oPSvfNx23BaKA+vWjhwRRI/
+ME3NO68X5Q/LoKldSKqxYVDLNM08XMML6BDAjJvwAwNi/rJsPnIO7hxDKslIDlc5
+xDEhyBDBLIf+VJVSH1I8MRKbf+fAoKVZ1eKPPvDVqOHXcDGpxLPPr21TLwb0pwID
+AQABo4IBrTCCAakwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFOtCNNCYsKuf9BtrCPfMZC7vDixFMB8GA1UdIwQYMBaAFE4L7xqkQFul
+F2mHMMo0aEPQQa7yMGYGCCsGAQUFBwEBBFowWDAnBggrBgEFBQcwAYYbaHR0cDov
+L29jc3Auc3RhcnRzc2wuY29tL2NhMC0GCCsGAQUFBzAChiFodHRwOi8vd3d3LnN0
+YXJ0c3NsLmNvbS9zZnNjYS5jcnQwWwYDVR0fBFQwUjAnoCWgI4YhaHR0cDovL3d3
+dy5zdGFydHNzbC5jb20vc2ZzY2EuY3JsMCegJaAjhiFodHRwOi8vY3JsLnN0YXJ0
+c3NsLmNvbS9zZnNjYS5jcmwwgYAGA1UdIAR5MHcwdQYLKwYBBAGBtTcBAgEwZjAu
+BggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjA0
+BggrBgEFBQcCARYoaHR0cDovL3d3dy5zdGFydHNzbC5jb20vaW50ZXJtZWRpYXRl
+LnBkZjANBgkqhkiG9w0BAQUFAAOCAgEAIQlJPqWIbuALi0jaMU2P91ZXouHTYlfp
+tVbzhUV1O+VQHwSL5qBaPucAroXQ+/8gA2TLrQLhxpFy+KNN1t7ozD+hiqLjfDen
+xk+PNdb01m4Ge90h2c9W/8swIkn+iQTzheWq8ecf6HWQTd35RvdCNPdFWAwRDYSw
+xtpdPvkBnufh2lWVvnQce/xNFE+sflVHfXv0pQ1JHpXo9xLBzP92piVH0PN1Nb6X
+t1gW66pceG/sUzCv6gRNzKkC4/C2BBL2MLERPZBOVmTX3DxDX3M570uvh+v2/miI
+RHLq0gfGabDBoYvvF0nXYbFFSF87ICHpW7LM9NfpMfULFWE7epTj69m8f5SuauNi
+YpaoZHy4h/OZMn6SolK+u/hlz8nyMPyLwcKmltdfieFcNID1j0cHL7SRv7Gifl9L
+WtBbnySGBVFaaQNlQ0lxxeBvlDRr9hvYqbBMflPrj0jfyjO1SPo2ShpTpjMM0InN
+SRXNiTE8kMBy12VLUjWKRhFEuT2OKGWmPnmeXAhEKa2wNREuIU640ucQPl2Eg7PD
+wuTSxv0JS3QJ3fGz0xk+gA2iCxnwOOfFwq/iI9th4p1cbiCJSS4jarJiwUW0n6+L
+p/EiO/h94pDQehn7Skzj0n1fSoMD7SfWI55rjbRZotnvbIIp3XUZPD9MEI3vu3Un
+0q6Dp6jOW6c=
+-----END CERTIFICATE-----
diff --git a/test/expect.html b/test/expect.html
new file mode 100644
index 00000000..49b3f67f
--- /dev/null
+++ b/test/expect.html
@@ -0,0 +1,22 @@
+
+
+ ..
+
+ <dir> .
+
+
+ applnk
+
+ <dir> root
+ rwx r-x r-x
+
+
+ prefdm
+
+ 1.30kb root
+ rwx r-x r-x
+
\ No newline at end of file
diff --git a/test/test.js b/test/test.js
index fd131686..2ead67a1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,10 +1,19 @@
(function(){
'use strict';
- var DIR = process.cwd() + '/',
- main = require(DIR + 'lib/server/main'),
+ var DIR = process.cwd() + '/',
+ main = require(DIR + 'lib/server/main'),
+
+ Util = main.util,
- CloudFunc = main.cloudfunc,
+ CloudFunc = main.cloudfunc,
+ HTMLDIR = main.HTMLDIR,
+
+ TEMPLATEPATH = HTMLDIR + 'file.html',
+ PATHTEMPLATE_PATH = HTMLDIR + 'path.html',
+ EXPECT_PATH = DIR + 'test/expect.html',
+
+ Files = [TEMPLATEPATH, PATHTEMPLATE_PATH, EXPECT_PATH],
lJSON = [{
"path": "/etc/X11/",
@@ -19,80 +28,59 @@
"size": 1328,
"uid": 0,
"mode": "100755"
- }];
-
- start();
- var lResult = CloudFunc.buildFromJSON(lJSON);
- end();
-
- var lExpect =
- '' +
- '' +
- ' ' +
- ''+
- ' ' +
- '' +
- '/ ' +
- '' +
- 'etc' +
- ' /X11/' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '.. ' +
- ' ' +
- '<dir> ' +
- '. ' +
- ' ' +
- '' +
- '' +
- 'applnk ' +
- ' ' +
- '<dir> ' +
- 'root ' +
- 'rwx r-x r-x ' +
- ' ' +
- '' +
- '' +
- '' +
- 'prefdm' +
- ' ' +
- ' ' +
- '1.30kb ' +
- 'root ' +
- 'rwx r-x r-x ' +
- ' ';
+ }],
- for(var i = 0, n = lExpect.length; i < n; i++)
- if(lResult[i] !== lExpect[i]){
- console.log('Error in char number: ' + i + '\n' +
- 'Expect: ' + lExpect.substr(i) + '\n' +
- 'Result: ' + lResult.substr(i) );
- break;
+
+ Expect =
+ '' +
+ '' +
+ ' ' +
+ ''+
+ ' ' +
+ '' +
+ '/ ' +
+ '' +
+ 'etc' +
+ ' /X11/' +
+ ' ' +
+ ' ' +
+ '';
+
+
+ main.readFiles(Files, function(pErrors, pFiles){
+ if(pErrors)
+ Util.log(pErrors);
+ else{
+ console.time('CloudFunc.buildFromJSON');
+
+ var lTemplate = pFiles[TEMPLATEPATH].toString(),
+ lPathTemplate = pFiles[PATHTEMPLATE_PATH].toString(),
+ lExpect = pFiles[EXPECT_PATH].toString(),
+
+ lResult = CloudFunc.buildFromJSON(lJSON, lTemplate, lPathTemplate);
+
+ Expect += lExpect;
+
+ for(var i = 0, n = Expect.length; i < n; i++)
+ if(lResult[i] !== Expect[i]){
+ console.log('Error in char number: ' + i + '\n' +
+ 'Expect: ' + Expect.substr(i) + '\n' +
+ 'Result: ' + lResult.substr(i) );
+ break;
+ }
+
+ if(i===n)
+ console.log('CloudFunc.buildFromJSON: OK');
+
+ console.timeEnd('CloudFunc.buildFromJSON');
}
- if(i===n)
- console.log('CloudFunc.buildFromJSON: OK');
-
-
- function start(){
- return console.time('CloudFunc.buildFromJSON');
- }
- function end(){
- return console.timeEnd('CloudFunc.buildFromJSON');
- }
+ });
+
})();
diff --git a/test/test.sh b/test/test.sh
index 8a20d346..e9c2fd3e 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -1,13 +1,13 @@
#!/bin/sh
npm i recess jshint
echo "jshint server.js client.js cloudcmd.js"
-node_modules/jshint/bin/hint --config test/.jshintrc lib/server.js lib/client.js cloudcmd.js
+node_modules/jshint/bin/jshint --config test/.jshintrc lib/server.js lib/client.js cloudcmd.js
echo "jshint lib/cloudfunc.js lib/client/keyBinding.js"
-node_modules/jshint/bin/hint --config test/.jshintrc lib/util.js lib/cloudfunc.js lib/client/keyBinding.js
+node_modules/jshint/bin/jshint --config test/.jshintrc lib/util.js lib/cloudfunc.js lib/client/keyBinding.js
echo "lib/client/dom.js lib/client/ie.js lib/client/menu.js lib/client/socket.js ./lib/client/terminal.js lib/client/viewer.js lib/client/storage/_github.js lib/client/menu.js lib/client/editor/_codemirror.js"
-node_modules/jshint/bin/hint --config test/.jshintrc lib/client/dom.js lib/client/ie.js lib/client/menu.js lib/client/socket.js ./lib/client/terminal.js lib/client/viewer.js lib/client/storage/_github.js lib/client/menu.js lib/client/editor/_codemirror.js
-echo "jshint ./package.json ./config.json"
-node_modules/jshint/bin/hint --config test/.jshintrc ./package.json ./config.json
+node_modules/jshint/bin/jshint --config test/.jshintrc lib/client/dom.js lib/client/ie.js lib/client/menu.js lib/client/socket.js ./lib/client/terminal.js lib/client/viewer.js lib/client/storage/_github.js lib/client/menu.js lib/client/editor/_codemirror.js
+echo "jshint ./package.json ./json/config.json"
+node_modules/jshint/bin/jshint --config test/.jshintrc ./package.json ./json/config.json
#linting css files
echo "recess css/*.css"
./node_modules/recess/bin/recess css/*.css