From 33f8c43e93a40e723cf118061e685847f9817418 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Mon, 24 Sep 2012 16:45:37 -0400 Subject: [PATCH] more bug-fixing on async cron, using lodash instead of underscore --- lib/app/index.js | 4 +++- lib/app/schema.js | 4 +++- lib/app/scoring.js | 19 ++++++++++++++----- public/js/underscore-min.js | 32 -------------------------------- src/app/index.coffee | 19 +++++++++---------- src/app/schema.coffee | 1 + src/app/scoring.coffee | 13 +++++++++---- test/user.mocha.coffee | 6 +++--- views/app/index.html | 1 - 9 files changed, 42 insertions(+), 57 deletions(-) delete mode 100644 public/js/underscore-min.js diff --git a/lib/app/index.js b/lib/app/index.js index 5c0b767b94..9d8147ee7c 100644 --- a/lib/app/index.js +++ b/lib/app/index.js @@ -1,5 +1,5 @@ // Generated by CoffeeScript 1.3.3 -var content, derby, get, helpers, ready, schema, scoring, view, _ref; +var content, derby, get, helpers, ready, schema, scoring, view, _, _ref; derby = require('derby'); @@ -19,6 +19,8 @@ helpers = require('./helpers'); helpers.viewHelpers(view); +_ = require('lodash'); + get('/:uidParam?', function(page, model, _arg, next) { var sess, uidParam; uidParam = _arg.uidParam; diff --git a/lib/app/schema.js b/lib/app/schema.js index 0fe90b0dc2..f84ab5fbf9 100644 --- a/lib/app/schema.js +++ b/lib/app/schema.js @@ -1,10 +1,12 @@ // Generated by CoffeeScript 1.3.3 -var content, moment, userSchema; +var content, moment, userSchema, _; content = require('./content'); moment = require('moment'); +_ = require('lodash'); + userSchema = { balance: 2, stats: { diff --git a/lib/app/scoring.js b/lib/app/scoring.js index 95c702d329..0bfd8b96b1 100644 --- a/lib/app/scoring.js +++ b/lib/app/scoring.js @@ -1,10 +1,12 @@ // Generated by CoffeeScript 1.3.3 -var MODIFIER, async, content, cron, expModifier, helpers, hpModifier, model, moment, score, setModel, setupNotifications, updateStats, user; +var MODIFIER, async, content, cron, expModifier, helpers, hpModifier, model, moment, score, setModel, setupNotifications, updateStats, user, _; async = require('async'); moment = require('moment'); +_ = require('lodash'); + content = require('./content'); helpers = require('./helpers'); @@ -166,7 +168,7 @@ score = function(taskId, direction, options) { if (type === 'habit') { if (taskObj.value !== value) { task.push('history', { - date: moment().sod().toDate(), + date: moment().toDate(), value: value }); } @@ -206,7 +208,7 @@ cron = function() { if (daysPassed > 0) { todoTally = 0; tallyTask = function(taskObj, next) { - var absVal, completed, dayMapping, daysFailed, dueToday, id, repeat, task, type, value; + var absVal, completed, dayMapping, daysFailed, id, repeat, task, type, value; id = taskObj.id, type = taskObj.type, completed = taskObj.completed, repeat = taskObj.repeat; if (id == null) { return; @@ -226,9 +228,16 @@ cron = function() { 6: 's', 7: 'su' }; - dueToday = repeat && repeat[dayMapping[momentDate.day()]] === true; + daysFailed = 0; + _.times(daysPassed, function(n) { + var thatDay; + thatDay = today.subtract('days', n + 1); + if (repeat[dayMapping[thatDay.day()]] === true) { + return daysFailed++; + } + }); } - score(taskId, 'down', { + score(id, 'down', { cron: true, times: daysFailed }); diff --git a/public/js/underscore-min.js b/public/js/underscore-min.js deleted file mode 100644 index 5a0cb3b008..0000000000 --- a/public/js/underscore-min.js +++ /dev/null @@ -1,32 +0,0 @@ -// Underscore.js 1.3.3 -// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc. -// Underscore is freely distributable under the MIT license. -// Portions of Underscore are inspired or borrowed from Prototype, -// Oliver Steele's Functional, and John Resig's Micro-Templating. -// For all details and documentation: -// http://documentcloud.github.com/underscore -(function(){function r(a,c,d){if(a===c)return 0!==a||1/a==1/c;if(null==a||null==c)return a===c;a._chain&&(a=a._wrapped);c._chain&&(c=c._wrapped);if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return!1;switch(e){case "[object String]":return a==""+c;case "[object Number]":return a!=+a?c!=+c:0==a?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source== -c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if("object"!=typeof a||"object"!=typeof c)return!1;for(var f=d.length;f--;)if(d[f]==a)return!0;d.push(a);var f=0,g=!0;if("[object Array]"==e){if(f=a.length,g=f==c.length)for(;f--&&(g=f in a==f in c&&r(a[f],c[f],d)););}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return!1;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,h)&&!f--)break; -g=!f}}d.pop();return g}var s=this,I=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,J=k.unshift,l=p.toString,K=p.hasOwnProperty,y=k.forEach,z=k.map,A=k.reduce,B=k.reduceRight,C=k.filter,D=k.every,E=k.some,q=k.indexOf,F=k.lastIndexOf,p=Array.isArray,L=Object.keys,t=Function.prototype.bind,b=function(a){return new m(a)};"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(exports=module.exports=b),exports._=b):s._=b;b.VERSION="1.3.3";var j=b.each=b.forEach=function(a, -c,d){if(a!=null)if(y&&a.forEach===y)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e2;a==null&&(a=[]);if(A&& -a.reduce===A){e&&(c=b.bind(c,e));return f?a.reduce(c,d):a.reduce(c)}j(a,function(a,b,i){if(f)d=c.call(e,d,a,b,i);else{d=a;f=true}});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(B&&a.reduceRight===B){e&&(c=b.bind(c,e));return f?a.reduceRight(c,d):a.reduceRight(c)}var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a, -c,b){var e;G(a,function(a,g,h){if(c.call(b,a,g,h)){e=a;return true}});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(C&&a.filter===C)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(D&&a.every===D)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b, -a,g,h)))return o});return!!e};var G=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(E&&a.some===E)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;if(q&&a.indexOf===q)return a.indexOf(c)!=-1;return b=G(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck= -function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;bd?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]}; -j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e>1;d(a[g])=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1),true);return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a= -i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=L||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&& -c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.pick=function(a){var c={};j(b.flatten(i.call(arguments,1)),function(b){b in a&&(c[b]=a[b])});return c};b.defaults=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty= -function(a){if(a==null)return true;if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};b.isArguments(arguments)||(b.isArguments=function(a){return!(!a||!b.has(a,"callee"))});b.isFunction=function(a){return l.call(a)=="[object Function]"}; -b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isFinite=function(a){return b.isNumber(a)&&isFinite(a)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a, -b){return K.call(a,b)};b.noConflict=function(){s._=I;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.result=function(a,c){if(a==null)return null;var d=a[c];return b.isFunction(d)?d.call(a):d};b.mixin=function(a){j(b.functions(a),function(c){M(c,b[c]=a[c])})};var N=0;b.uniqueId= -function(a){var b=N++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/,n={"\\":"\\","'":"'",r:"\r",n:"\n",t:"\t",u2028:"\u2028",u2029:"\u2029"},v;for(v in n)n[n[v]]=v;var O=/\\|'|\r|\n|\t|\u2028|\u2029/g,P=/\\(\\|'|r|n|t|u2028|u2029)/g,w=function(a){return a.replace(P,function(a,b){return n[b]})};b.template=function(a,c,d){d=b.defaults(d||{},b.templateSettings);a="__p+='"+a.replace(O,function(a){return"\\"+n[a]}).replace(d.escape|| -u,function(a,b){return"'+\n_.escape("+w(b)+")+\n'"}).replace(d.interpolate||u,function(a,b){return"'+\n("+w(b)+")+\n'"}).replace(d.evaluate||u,function(a,b){return"';\n"+w(b)+"\n;__p+='"})+"';\n";d.variable||(a="with(obj||{}){\n"+a+"}\n");var a="var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n"+a+"return __p;\n",e=new Function(d.variable||"obj","_",a);if(c)return e(c,b);c=function(a){return e.call(this,a,b)};c.source="function("+(d.variable||"obj")+"){\n"+a+"}";return c}; -b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var x=function(a,c){return c?b(a).chain():a},M=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);J.call(a,this._wrapped);return x(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return x(d, -this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return x(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}}).call(this); diff --git a/src/app/index.coffee b/src/app/index.coffee index a08c7caacc..cf67183b08 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -1,16 +1,15 @@ -derby = require('derby') +derby = require 'derby' {get, view, ready} = derby.createApp module -derby.use require('derby-ui-boot') -derby.use(require('../../ui')) +derby.use require 'derby-ui-boot' +derby.use require('../../ui') # Custom requires -content = require('./content') -scoring = require('./scoring') -schema = require('./schema') -helpers = require('./helpers') -helpers.viewHelpers(view) -# $ = require('jQuery') -# und = require('underscore') # node.js uses _ +content = require './content' +scoring = require './scoring' +schema = require './schema' +helpers = require './helpers' +helpers.viewHelpers view +_ = require 'lodash' # ========== ROUTES ========== diff --git a/src/app/schema.coffee b/src/app/schema.coffee index f2510a7992..a7659ae202 100644 --- a/src/app/schema.coffee +++ b/src/app/schema.coffee @@ -1,5 +1,6 @@ content = require './content' moment = require 'moment' +_ = require 'lodash' userSchema = { balance: 2 diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee index f0e13210ad..6bb2412b28 100644 --- a/src/app/scoring.coffee +++ b/src/app/scoring.coffee @@ -1,5 +1,6 @@ async = require 'async' moment = require 'moment' +_ = require 'lodash' content = require './content' helpers = require './helpers' MODIFIER = .03 # each new level, armor, weapon add 3% modifier (this number may change) @@ -144,10 +145,10 @@ score = (taskId, direction, options={cron:false, times:1}) -> # If multiple days have passed, multiply times days missed value *= options.times - + if type == 'habit' # Add habit value to habit-history (if different) - task.push 'history', { date: moment().sod().toDate(), value: value } if taskObj.value != value + task.push 'history', { date: moment().toDate(), value: value } if taskObj.value != value task.set('value', value) # Update the user's status @@ -203,8 +204,12 @@ cron = -> # to calculate how many they've missed according to their own schedule if type=='daily' && repeat dayMapping = {0:'su',1:'m',2:'t',3:'w',4:'th',5:'f',6:'s',7:'su'} - dueToday = (repeat && repeat[dayMapping[momentDate.day()]]==true) - score(taskId, 'down', {cron:true, times: daysFailed}) + daysFailed = 0 + _.times daysPassed, (n) -> + thatDay = today.subtract('days', n+1) + if repeat[dayMapping[thatDay.day()]]==true + daysFailed++ + score(id, 'down', {cron:true, times:daysFailed}) value = task.get('value') #get updated value if type == 'daily' diff --git a/test/user.mocha.coffee b/test/user.mocha.coffee index f6f64f6fa5..cb2887c81c 100644 --- a/test/user.mocha.coffee +++ b/test/user.mocha.coffee @@ -141,8 +141,8 @@ describe 'User', -> it 'calculates user.stats & task.value properly on cron', -> [statsBefore, taskBefore] = pathSnapshots(['_user.stats', taskPath]) # Set lastCron to yesterday - today = moment() - model.set '_user.lastCron', today.subtract('days',1).toDate() + today = moment().sod() + model.set '_user.lastCron', today.subtract('days',1).sod().toDate() # Run run scoring.cron() [statsAfter, taskAfter] = pathSnapshots(['_user.stats', taskPath]) @@ -152,9 +152,9 @@ describe 'User', -> expect(today.diff(lastCron, 'days')).to.eql 0 # Should have updated points properly + expect(taskAfter.value).to.eql -1 expect(statsBefore.hp).to.be.lessThan statsAfter.hp expect(taskBefore.value).to.eql 0 - expect(taskAfter.value).to.eql -1 #TODO clicking repeat dates on newly-created item doesn't refresh until you refresh the page #TODO dates on dailies is having issues, possibility: date cusps? my saturday exempts were set to exempt at 8pm friday diff --git a/views/app/index.html b/views/app/index.html index f006fc466a..3e3a8ddb5a 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -377,7 +377,6 @@ {#unless _mobileDevice}{/} -