Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	package.json
  • Loading branch information
Awesome User committed Feb 28, 2015
2 parents 8898c45 + 0a54a1a commit a6b5605
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 64 deletions.
5 changes: 3 additions & 2 deletions package.json
View file
Expand Up @@ -22,8 +22,9 @@
},
"dependencies": {
"express": "3.0.6",
"request": "*",
"mongoskin": "0.5.0",
"request":"*",
"handlebars":"1.0.7",
"mongoskin":"^1.4",
"connect-mongo": "0.1.x",
"d3": "3.1.4",
"inlet": "git://github.com/enjalot/Inlet.git",
Expand Down
25 changes: 11 additions & 14 deletions reports/aggregators/inletsByUser.js
View file
Expand Up @@ -8,7 +8,7 @@ var mongoConf = {
db: 'tributary'
}
var mongo = require('mongoskin');
var db = mongo.db(mongoConf.host + ':' + mongoConf.port + '/' + mongoConf.db + '?auto_reconnect');
var db = mongo.db('mongodb://' + mongoConf.host + ':' + mongoConf.port + '/' + mongoConf.db + '?auto_reconnect');
db.open(function(err, db) {
//collection to store some info on our users
var $users = db.collection("users");
Expand All @@ -17,7 +17,7 @@ db.open(function(err, db) {
//collection that's the output of mapreduce
var out = "mr_users";
var $mr_users = db.collection(out);
$mr_users.remove({});
$mr_users.remove({}, function(err) { if(err) console.log(err) });

function mapUsers() {
if(this.user) {
Expand Down Expand Up @@ -60,32 +60,29 @@ db.open(function(err, db) {
query: query
}, function(err, coll) {
console.log("Users reduced!", err);
db.close();

//iterate over the inlets, get the created_at time and set it on the mongo inlet
$mr_users.find().toArray(function(err, mr_users) {
$mr_users.find({}, function(err, cursor){ //.toArray(function(err, mr_users) {
var count = 0;
var num = mr_users.length;
function finish() {
count++;
if(count === num) {
db.close();
process.exit();
}
db.close();
process.exit();
}
mr_users.forEach(function(mr_user) {
cursor.nextObject(iterator);
function iterator(err, mr_user) {
if(!mr_user) return finish();
console.log("user id", mr_user._id);
$users.findOne({id: mr_user._id}, function(error, user) {
if(error || !user ) return finish();
if(error || !user ) return cursor.nextObject(iterator);
user.inlets = mr_user.value.count || 1;
user.visits = mr_user.value.visits || 1;
user.nforks = mr_user.value.nforks || 0;
$users.update({id: user.id}, user, {safe: true}, function(error) {
if(error) console.log(error)
finish()
cursor.nextObject(iterator);
});
})
})
}
})
})

Expand Down
41 changes: 16 additions & 25 deletions reports/aggregators/visitsByGist.js
View file
Expand Up @@ -8,14 +8,14 @@ var mongoConf = {
db: 'tributary'
}
var mongo = require('mongoskin');
var db = mongo.db(mongoConf.host + ':' + mongoConf.port + '/' + mongoConf.db + '?auto_reconnect');
var db = mongo.db('mongodb://' + mongoConf.host + ':' + mongoConf.port + '/' + mongoConf.db + '?auto_reconnect');
db.open(function(err, db) {
//collection where we store info on inlets that are created and saved
var $inlets = db.collection("inlets");
//collection that's the output of mapreduce
var out = "mr_inlets";
var $mr_inlets = db.collection(out);
$mr_inlets.remove({});
$mr_inlets.remove({}, function(err) { if(err) console.log("err", err); });
//collection where we store visits (specifically to particular inlets)
var $visits = db.collection("visits");

Expand Down Expand Up @@ -85,50 +85,41 @@ db.open(function(err, db) {
query: query
}, function(err, coll) {
console.log("Visits reduced!", err);
db.close();
//db.close();

//Count up and collect forks for each inlet
$inlets.mapReduce(mapForks, reduceForks, {
out: {reduce: out},
query: query
}, function(err, coll) {
console.log("Forks reduced!", err);
db.close();
//db.close();

//iterate over the inlets, get the created_at time and set it on the mongo inlet
$mr_inlets.find().toArray(function(err, mr_inlets) {
$mr_inlets.find({}, function(err, cursor) { //.toArray(function(err, mr_inlets) {
console.log("still here?")
var count = 0;
var num = mr_inlets.length;
function finish() {
count++;
if(count === num) {
db.close();
process.exit();
}
db.close();
process.exit();
}
mr_inlets.forEach(function(mr_inlet) {
console.log("inlet id", mr_inlet._id);
cursor.nextObject(iterator);
function iterator(err, mr_inlet) {
if(!mr_inlet) return finish();
console.log("inlet id", mr_inlet._id, mr_inlet.value.count);
$inlets.findOne({gistid: mr_inlet._id}, function(error, inlet) {
if(error || !inlet ) return finish();
if(error || !inlet ) return cursor.nextObject(iterator);
inlet.visits = mr_inlet.value.count || 1;
inlet.nforks = mr_inlet.value.nforks || 0;
inlet.forks = mr_inlet.value.forks || [];
$inlets.update({gistid: inlet.gistid}, inlet, {safe: true}, function(error) {
if(error) console.log(error)
finish();
//db.close();
console.log("updated!")
cursor.nextObject(iterator);
});
})
})
//db.close();
}
})

})

})



//db.close();

})
2 changes: 1 addition & 1 deletion sandbox/index.js
View file
Expand Up @@ -52,7 +52,7 @@ var mongoConf = {

//MONGO SETUP
var mongo = require('mongoskin');
var db = mongo.db(mongoConf.host + ':' + mongoConf.port + '/' + mongoConf.db + '?auto_reconnect');
var db = mongo.db('mongodb://' + mongoConf.host + ':' + mongoConf.port + '/' + mongoConf.db + '?auto_reconnect');

//collection to store a cache of gists (for faster loading)
var cache = require('../cache');
Expand Down
8 changes: 4 additions & 4 deletions server.js
View file
Expand Up @@ -23,7 +23,7 @@ var mongoConf = {

//MONGO SETUP
var mongo = require('mongoskin');
var db = mongo.db(mongoConf.host + ':' + mongoConf.port + '/' + mongoConf.db + '?auto_reconnect');
var db = mongo.db('mongodb://' + mongoConf.host + ':' + mongoConf.port + '/' + mongoConf.db + '?auto_reconnect');

//collection to store some info on our users
var $users = db.collection("users");
Expand Down Expand Up @@ -109,7 +109,7 @@ function inlet(req,res,next) {

// invalidate the cache if get provides ?update=true
if(req.query['update']) {
cache.invalidate($gistcache, gistid)
cache.invalidate($gistcache, gistid, function(err) { if(err) console.log(err)})
}

var user = req.session.user;
Expand Down Expand Up @@ -393,7 +393,7 @@ function after_fork(oldgist, newgist, token, callback) {
function after_save(gist, callback) {
// after a save, invalidate our cached gist

cache.invalidate($gistcache, gist.id)
cache.invalidate($gistcache, gist.id, function(err) { if(err) console.log(err) })
//update the raw url for the thumbnail

//save info in mongo.
Expand Down Expand Up @@ -839,4 +839,4 @@ app.listen(port, function() {
livereload = require('livereload');
//Print debug messages, and watch 'md' files
server = livereload.createServer({debug: true, exts:['md']});
server.watch(__dirname + "/static");
server.watch(__dirname + "/static");
2 changes: 1 addition & 1 deletion static/css/less/style.less
View file
Expand Up @@ -517,7 +517,7 @@ px 68 160 252 344 436 */
background-image: linear-gradient(top, rgb(235, 235, 235), rgb(255, 255, 255));
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#ebebeb', EndColorStr='#ffffff');

.transition(0.8s);
//.transition(0.8s);

&:hover {
border: 2px solid rgba(0,0,0,0.4);
Expand Down
28 changes: 24 additions & 4 deletions static/css/style.css
View file
Expand Up @@ -18,12 +18,16 @@ pre {
padding: 15px;
white-space: pre;
/* CSS2 */

white-space: pre-wrap;
/* CSS 2.1 */

white-space: pre-line;
/* CSS 3 (and 2.1 as well, actually) */

word-wrap: break-word;
/* IE */

}
/* hand cursor on clickable input elements */
label,
Expand Down Expand Up @@ -241,6 +245,7 @@ body {
color: #333333;
-webkit-text-size-adjust: 100%;
/* Stops Mobile Safari from auto-adjusting font-sizes */

margin-left: auto;
margin-right: auto;
}
Expand Down Expand Up @@ -353,6 +358,7 @@ input[type=checkbox]:checked {
input[type=radio] {
-webkit-border-radius: 2em;
/* Make radios round */

}
input[type=submit] {
opacity: 0.95;
Expand Down Expand Up @@ -486,10 +492,13 @@ px 68 160 252 344 436 528 620 712 804 896 */
background-color: white;
-webkit-box-shadow: -3px 0 6px 1px rgba(0, 0, 0, 0.15);
/* Saf3.0+, Chrome */

-moz-box-shadow: -3px 0 6px 1px rgba(0, 0, 0, 0.15);
/* FF3.5+ */

box-shadow: -3px 0 6px 1px rgba(0, 0, 0, 0.15);
/* Opera 10.5, IE 9.0 */

}
#panel #files {
z-index: 6;
Expand All @@ -505,6 +514,7 @@ px 68 160 252 344 436 528 620 712 804 896 */
overflow: hidden;
background-color: transparent;
/*background-color: #ebebeb;*/

background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(rgba(255, 255, 255, 0.16)));
background-image: -webkit-linear-gradient(top, #ebebeb, rgba(255, 255, 255, 0.16));
background-image: -moz-linear-gradient(top, #ebebeb, rgba(255, 255, 255, 0.16));
Expand All @@ -514,10 +524,13 @@ px 68 160 252 344 436 528 620 712 804 896 */
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, StartColorStr='#ebebeb', EndColorStr='#ffffff');
-webkit-box-shadow: inset 0 -4px 1em 1px rgba(5, 5, 5, 0.15);
/* Saf3.0+, Chrome */

-moz-box-shadow: inset 0 -4px 1em 1px rgba(5, 5, 5, 0.15);
/* FF3.5+ */

box-shadow: inset 0 -4px 1em 1px rgba(5, 5, 5, 0.15);
/* Opera 10.5, IE 9.0 */

}
#panel #file-list {
height: 100%;
Expand Down Expand Up @@ -550,8 +563,9 @@ px 68 160 252 344 436 528 620 712 804 896 */
background-image: linear-gradient(top, rgba(113, 112, 113, 0.72), rgba(227, 226, 228, 0.60));
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#717071', EndColorStr='#e3e2e4');
*/

/*background-color: #ffffff;*/
/*background-color: #ffffff;*/

background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, 0)), to(rgba(66, 66, 66, 0.6)));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), rgba(66, 66, 66, 0.6));
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), rgba(66, 66, 66, 0.6));
Expand All @@ -562,6 +576,7 @@ px 68 160 252 344 436 528 620 712 804 896 */
}
#panel #file-list li:hover {
/*background-color: #ffffff;*/

background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, 0)), to(rgba(40, 40, 40, 0.73)));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), rgba(40, 40, 40, 0.73));
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), rgba(40, 40, 40, 0.73));
Expand All @@ -575,6 +590,7 @@ px 68 160 252 344 436 528 620 712 804 896 */
border: 1px solid black;
font-weight: bold;
/*background-color: #f8f7fa;*/

background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(248, 247, 250, 0.6)), to(rgba(169, 168, 169, 0.73)));
background-image: -webkit-linear-gradient(top, rgba(248, 247, 250, 0.6), rgba(169, 168, 169, 0.73));
background-image: -moz-linear-gradient(top, rgba(248, 247, 250, 0.6), rgba(169, 168, 169, 0.73));
Expand All @@ -584,10 +600,13 @@ px 68 160 252 344 436 528 620 712 804 896 */
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, StartColorStr='#f8f7fa', EndColorStr='#a9a8a9');
-webkit-box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
/* Saf3.0+, Chrome */

-moz-box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
/* FF3.5+ */

box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
/* Opera 10.5, IE 9.0 */

}
#panel #file-list .delete-file {
z-index: 1000;
Expand Down Expand Up @@ -652,6 +671,7 @@ px 68 160 252 344 436 528 620 712 804 896 */
border: 1px solid black;
color: white;
/*background-color: #8f8f90;*/

background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(143, 143, 144, 0.02)), to(#212121));
background-image: -webkit-linear-gradient(top, rgba(143, 143, 144, 0.02), #212121);
background-image: -moz-linear-gradient(top, rgba(143, 143, 144, 0.02), #212121);
Expand Down Expand Up @@ -772,10 +792,13 @@ px 68 160 252 */
position: relative;
-webkit-box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.2);
/* Saf3.0+, Chrome */

-moz-box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.2);
/* FF3.5+ */

box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.2);
/* Opera 10.5, IE 9.0 */

border-radius: 10px;
}
#panel #files {
Expand Down Expand Up @@ -845,9 +868,6 @@ select {
background-image: -ms-linear-gradient(top, #ebebeb, #ffffff);
background-image: linear-gradient(top, #ebebeb, #ffffff);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, StartColorStr='#ebebeb', EndColorStr='#ffffff');
-webkit-transition: all 0.8s ease-out;
-moz-transition: all 0.8s ease-out;
transition: all 0.8s ease-out;
}
#container input:hover,
textarea:hover,
Expand Down
8 changes: 6 additions & 2 deletions static/lib/coffee-script.js
View file

Large diffs are not rendered by default.

0 comments on commit a6b5605

Please sign in to comment.