Merge pull request #50 from CodersTV/update-1.0

Update to Meteor 1.0

.meteor/packages

@@ -3,35 +3,41 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
+raix:handlebar-helpers
+cmather:handlebars-server
+natestrauser:font-awesome
+gadicohen:sitemaps
+dburles:collection-helpers
+matb33:collection-hooks
+chuangbo:[email protected]
+meteorhacks:fast-render
+xorax:multiple-callbacks
+gadicohen:robots-txt
+arunoda:streams
+iron:router
+joshowens:shareit
+meteor
+patrickleet:tags
+service-configuration
 underscore
 accounts-google
 less
 spiderable
 jquery
 email
-standard-app-packages
-chatroom
-collection-hooks
-font-awesome
-handlebar-helpers
-handlebars-server
-iron-router
-marked
-mongo-counter
-npm
-presence
-robots-txt
-roles
-sitemaps
-streams
-fast-render
-bootstrap-3
-service-configuration
 accounts-ui-unstyled
-collection-helpers
-reactive-path
-multiple-callbacks
-shareit
-kadira
-publish-composite
-tags
+alanning:roles
+meteorhacks:npm
+
+
+npm-container
+check
+reywood:publish-composite
+mongo
+random
+meteor-platform
+twbs:bootstrap
+coderstv:reactive-path
+tmeasday:presence
+coderstv:chat
+meteorhacks:kadira

.meteor/platforms

@@ -0,0 +1,2 @@
+server
+browser

.meteor/release

@@ -1 +1 @@
-0.8.3
+[email protected]

.meteor/versions

@@ -0,0 +1,101 @@
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+alanning:[email protected]
+[email protected]
+arunoda:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+chuangbo:[email protected]
+chuangbo:[email protected]
+cmather:[email protected]
+coderstv:[email protected]
+coderstv:[email protected]
+[email protected]
+dburles:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+gadicohen:[email protected]
+gadicohen:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+iron:[email protected]
+iron:[email protected]
+iron:[email protected]
+iron:[email protected]
+iron:[email protected]
+iron:[email protected]
+iron:[email protected]
+iron:[email protected]
+joshowens:[email protected]
+[email protected]
+[email protected]
+[email protected]
+lepozepo:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+matb33:[email protected]
+[email protected]
+[email protected]
+meteorhacks:[email protected]
+meteorhacks:[email protected]
+meteorhacks:[email protected]
+meteorhacks:[email protected]
+meteorhacks:[email protected]
+meteorhacks:[email protected]
+meteorhacks:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+natestrauser:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+patrickleet:[email protected]
+raix:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+reywood:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+tmeasday:[email protected]
+[email protected]
+twbs:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+xorax:[email protected]

client/lib/controllers/channel.js

@@ -11,6 +11,8 @@ CoderController = RouteController.extend({
     var coder = Meteor.users.findOneFromCoderId(this.params.coderId);
     if (! _.isEmpty(coder)) {
       Session.set('coder', coder);
+      Session.set('chatHost', coder._id);
+      Session.set('currentCoder', coder._id);
       Meteor.subscribe(
         'userPresenceWithProfile',
         coder.profile.username,
@@ -19,7 +21,6 @@ CoderController = RouteController.extend({
           Session.set('chatSubsReady', true);
         }
       );
-      Session.set('currentCoder', coder._id);
     }
   }
 });

client/lib/routes.js

@@ -27,7 +27,7 @@ Router.onBeforeAction(function setTitle () {
 });
 
 Router.onBeforeAction(function headerActiveLi () {
-  var href = Router.current().path;
+  var href = Router.current().location.get().path;
 
   $('li.active').removeClass('active');
   $('.navbar li').find('a[href="'+href+'"]').parent().addClass('active');
@@ -37,7 +37,7 @@ Router.onAfterAction(function setPath () {
   var current = Router.current();
   if (! current) return;
 
-  Path.set(current.path);
+  Path.set(current.location.get().path);
 });
 
 Deps.autorun(function () {
@@ -68,7 +68,7 @@ Router.onRun(function reactiveTrackPageview () {
     return;
   }
 
-  var path = current.path;
+  var path = current.location.get().path;
   trackPageview(path);
 });
 

dev

@@ -18,7 +18,7 @@ APP_DIR=/home/meteor
 ROOT_URL=http://$APP_HOST
 MONGO_URL=mongodb://localhost:27017/$APP_NAME
 
-METEOR_CMD=mrt
+METEOR_CMD=meteor
 METEOR_OPTIONS=''
 
 if [ -z "$EC2_PEM_FILE" ]; then
@@ -61,17 +61,15 @@ sudo git clone $GIT_URL $APP_NAME;
 DEPLOY="
 cd $APP_DIR;
 cd $APP_NAME;
-sudo npm -g update meteorite;
 sudo git fetch --all;
 sudo git reset --hard origin/$GIT_BRANCH;
 sudo git checkout $GIT_BRANCH;
-sudo rm -rf ../dev-bundle;
-sudo rm -rf ../dev-bundle.tgz;
-sudo $METEOR_CMD update --force;
-sudo $METEOR_CMD bundle --debug ../dev-bundle.tgz;
-cd ..;
-mkdir -p dev-bundle;
-sudo tar -zxvf dev-bundle.tgz;
+sudo git clean -f -d;
+sudo rm -rf ../bundle;
+sudo $METEOR_CMD build ../ --debug --directory;
+cd ../bundle/programs/server;
+npm install;
+cd ../../..;
 pm2 delete dev;
 mongo $APP_NAME $APP_DIR/$APP_NAME/mongo.config;
 METEOR_SETTINGS=\$(cat ${APP_DIR}/${APP_NAME}/dev.json) DEBUG=ct:* PORT=80 ROOT_URL=$ROOT_URL MONGO_URL=$MONGO_URL pm2 start bundle/main.js -x --name 'dev';

dev.config

@@ -8,10 +8,10 @@ APP_HOST=dev.coderstv.com
 [email protected]:CodersTV/site.git
 
 # Does your project use meteorite, or plain meteor?
-METEORITE=true
+METEORITE=false
 
 # What's your app name?
 APP_NAME=dev-coderstv
 
 # Git branch
-GIT_BRANCH=master
+GIT_BRANCH=update-1.0

lib/both/collections/channels.js

@@ -52,7 +52,6 @@ Channel = (function () {
   function set (doc) {
     _validate(doc);
 
-    Language.incVideos(doc.language);
     return Channels.insert(doc);
   }
 
@@ -71,7 +70,6 @@ Channel = (function () {
   function removeByURL (URL) {
     var channel = Channels.findOne({URL: URL});
     if (channel) {
-      Language.incVideos(channel.language, -1);
       Channels.remove(channel._id);
       return true;
     }