Merge branch 'master' into pr/342

Author: DaftMonk

Diff for: app/index.js

@@ -79,7 +79,7 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
         name: "stylesheet",
         default: 1,
         message: "What would you like to write stylesheets with?",
-        choices: [ "CSS", "Sass", "Less"],
+        choices: [ "CSS", "Sass", "Stylus", "Less"],
         filter: function( val ) { return val.toLowerCase(); }
       },  {
         type: "list",
@@ -202,6 +202,7 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
     if(this.filters['html']) extensions.push('html');
     if(this.filters['jade']) extensions.push('jade');
     if(this.filters['css']) extensions.push('css');
+    if(this.filters['stylus']) extensions.push('styl');
     if(this.filters['sass']) extensions.push('scss');
     if(this.filters['less']) extensions.push('less');
 

Diff for: app/templates/Gruntfile.js

@@ -70,7 +70,17 @@ module.exports = function (grunt) {
           '<%%= yeoman.client %>/{app,components}/**/*.mock.js'
         ],
         tasks: ['newer:jshint:all', 'karma']
-      },<% if(filters.sass) { %>
+      },<% if(filters.stylus) { %>
+      injectStylus: {
+        files: [
+          '<%%= yeoman.client %>/{app,components}/**/*.styl'],
+        tasks: ['injector:stylus']
+      },
+      stylus: {
+        files: [
+          '<%%= yeoman.client %>/{app,components}/**/*.styl'],
+        tasks: ['stylus', 'autoprefixer']
+      },<% } %><% if(filters.sass) { %>
       injectSass: {
         files: [
           '<%%= yeoman.client %>/{app,components}/**/*.{scss,sass}'],
@@ -394,13 +404,15 @@ module.exports = function (grunt) {
     concurrent: {
       server: [<% if(filters.coffee) { %>
         'coffee',<% } %><% if(filters.jade) { %>
-        'jade',<% } %><% if(filters.sass) { %>
+        'jade',<% } %><% if(filters.stylus) { %>
+        'stylus',<% } %><% if(filters.sass) { %>
         'sass',<% } %><% if(filters.less) { %>
         'less',<% } %>
       ],
       test: [<% if(filters.coffee) { %>
         'coffee',<% } %><% if(filters.jade) { %>
-        'jade',<% } %><% if(filters.sass) { %>
+        'jade',<% } %><% if(filters.stylus) { %>
+        'stylus',<% } %><% if(filters.sass) { %>
         'sass',<% } %><% if(filters.less) { %>
         'less',<% } %>
       ],
@@ -415,7 +427,8 @@ module.exports = function (grunt) {
       },
       dist: [<% if(filters.coffee) { %>
         'coffee',<% } %><% if(filters.jade) { %>
-        'jade',<% } %><% if(filters.sass) { %>
+        'jade',<% } %><% if(filters.stylus) { %>
+        'stylus',<% } %><% if(filters.sass) { %>
         'sass',<% } %><% if(filters.less) { %>
         'less',<% } %>
         'imagemin',
@@ -499,6 +512,23 @@ module.exports = function (grunt) {
           ext: '.js'
         }]
       }
+    },<% } %><% if(filters.stylus) { %>
+
+    // Compiles Stylus to CSS
+    stylus: {
+      server: {
+        options: {
+          paths: [
+            '<%%= yeoman.client %>/bower_components',
+            '<%%= yeoman.client %>/app',
+            '<%%= yeoman.client %>/components'
+          ],
+          "include css": true
+        },
+        files: {
+          '.tmp/app/app.css' : '<%%= yeoman.client %>/app/app.styl'
+        }
+      }
     },<% } %><% if(filters.sass) { %>
 
     // Compiles Sass to CSS
@@ -557,7 +587,26 @@ module.exports = function (grunt) {
                '!{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.mock.js']
             ]
         }
-      },<% if(filters.sass) { %>
+      },<% if(filters.stylus) { %>
+
+      // Inject component styl into app.styl
+      stylus: {
+        options: {
+          transform: function(filePath) {
+            filePath = filePath.replace('/client/app/', '');
+            filePath = filePath.replace('/client/components/', '');
+            return '@import \'' + filePath + '\';';
+          },
+          starttag: '// injector',
+          endtag: '// endinjector'
+        },
+        files: {
+          '<%%= yeoman.client %>/app/app.styl': [
+            '<%%= yeoman.client %>/{app,components}/**/*.styl',
+            '!<%%= yeoman.client %>/app/app.styl'
+          ]
+        }
+      },<% } %><% if(filters.sass) { %>
 
       // Inject component scss into app.scss
       sass: {

Diff for: app/templates/_package.json

@@ -25,7 +25,7 @@
     "passport-google-oauth": "latest",<% } %>
     "composable-middleware": "^0.3.0",
     "connect-mongo": "^0.4.1"<% if(filters.socketio) { %>,
-    "socket.io": "~0.9.16",
+    "socket.io": "~1.0.6",
     "socketio-jwt": "^2.0.2"<% } %>
   },
   "devDependencies": {
@@ -59,8 +59,9 @@
     "grunt-protractor-runner": "^0.2.4",
     "grunt-asset-injector": "^0.1.0",
     "grunt-karma": "~0.8.2",
-    "grunt-mocha-test": "~0.10.2",<% if (filters.sass) { %>
-    "grunt-contrib-sass": "^0.7.3",<% } %>
+    "grunt-mocha-test": "~0.10.2",<% if(filters.sass) { %>
+    "grunt-contrib-sass": "^0.7.3",<% } %><% if(filters.stylus) { %>
+    "grunt-contrib-stylus": "latest",<% } %>
     "jit-grunt": "^0.5.0",
     "time-grunt": "~0.3.1",
     "grunt-express-server": "~0.4.17",

Diff for: app/templates/client/app/account(auth)/login/login(stylus).styl

@@ -0,0 +1,22 @@
+// Social buttons
+// --------------------------------------------------
+
+.btn-facebook
+    color: #fff;
+    background-color: #3B5998;
+    border-color: #133783;
+
+.btn-twitter
+    color: #fff;
+    background-color: #2daddc;
+    border-color: #0271bf;
+
+.btn-github
+    color: #fff;
+    background-color: #fafafa;
+    border-color: #ccc;
+
+.btn-google-plus
+    color: #fff;
+    background-color: #dd4b39;
+    border-color: #c53727;

Diff for: app/templates/client/app/admin(auth)/admin(stylus).styl

@@ -0,0 +1,2 @@
+.trash
+    color rgb(209, 91, 71)

Diff for: app/templates/client/app/app(css).css

@@ -10,9 +10,24 @@
     url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
     url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
     url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+}<% } %>
+
+/**
+ *Font Awesome Fonts
+ */
+
+@font-face {
+    font-family: 'FontAwesome';
+    src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?v=4.1.0');
+    src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
+    url('../bower_components/font-awesome/fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'),
+    url('../bower_components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
+    url('../bower_components/font-awesome/fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
+    font-weight: normal;
+    font-style: normal;
 }
 
-<% } %>/**
+/**
  * App-wide Styles
  */
 

Diff for: app/templates/client/app/app(stylus).styl

@@ -0,0 +1,50 @@
+@import "bootstrap/dist/css/bootstrap.css"
+@import "font-awesome/css/font-awesome.css"
+
+//
+// Bootstrap Fonts
+//
+
+@font-face
+    font-family: 'Glyphicons Halflings'
+    src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot')
+    src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
+    url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
+    url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
+    url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+
+//
+// Font Awesome Fonts
+//
+
+@font-face
+  font-family: 'FontAwesome'
+  src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?v=4.1.0')
+  src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
+  url('../bower_components/font-awesome/fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'),
+  url('../bower_components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
+  url('../bower_components/font-awesome/fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
+  font-weight: normal
+  font-style: normal
+
+// 
+// App-wide Styles
+// 
+
+.browsehappy
+    background #ccc
+    color #000
+    margin 0.2em 0
+    padding 0.2em 0
+
+// Responsive: Portrait tablets and up
+@media screen and (min-width: 768px)
+    .container
+        max-width 730px
+
+// Component styles are injected through grunt
+// injector
+@import "account/login/login"
+@import "admin/admin"
+@import "main/main"
+// endinjector

Diff for: app/templates/client/app/main/main(stylus).styl

@@ -0,0 +1,25 @@
+.thing-form
+    margin 20px 0
+
+#banner
+    border-bottom none
+    margin-top -20px
+
+#banner h1
+    font-size 60px
+    letter-spacing -1px
+    line-height 1
+
+.hero-unit
+    background #4393B9
+    color #F5F5F5
+    padding 30px 15px
+    position relative
+    text-align center
+    text-shadow 0 1px 0 rgba(0, 0, 0, 0.1)
+
+.footer
+    border-top 1px solid #E5E5E5
+    margin-top 70px
+    padding 30px 0
+    text-align center

Diff for: app/templates/client/components/socket(socketio)/socket.service.js

@@ -3,30 +3,13 @@
 
 angular.module('<%= scriptAppName %>')
   .factory('socket', function(socketFactory) {
-    var retryInterval = 5000;
-    var retryTimer;
 
-    clearInterval(retryTimer);
-
-    var ioSocket = io.connect('', {
-      'force new connection': true,
-
-      'max reconnection attempts': Infinity,
-
-      'reconnection limit': 10 * 1000,
-
-      // Send auth token on connection
+    // socket.io now auto-configures its connection when we ommit a connection url
+    var ioSocket = io(null, {
+      // Send auth token on connection, you will need to DI the Auth service above
       // 'query': 'token=' + Auth.getToken()
     });
 
-    retryTimer = setInterval(function () {
-      if (!ioSocket.socket.connected &&
-          !ioSocket.socket.connecting &&
-          !ioSocket.socket.reconnecting) {
-        ioSocket.connect();
-      }
-    }, retryInterval);
-
     var socket = socketFactory({
       ioSocket: ioSocket
     });

Diff for: app/templates/server/api/thing/thing.controller.js

@@ -17,7 +17,7 @@ exports.index = function(req, res) {<% if (!filters.mongoose) { %>
   res.json([
   {
   name : 'Development Tools',
-  info : 'Integration with popular tools such as Bower, Grunt, Karma, Mocha, JSHint, Node Inspector, Livereload, Protractor, Jade, Sass, CoffeeScript, and Less.'
+  info : 'Integration with popular tools such as Bower, Grunt, Karma, Mocha, JSHint, Node Inspector, Livereload, Protractor, Jade, Stylus, Sass, CoffeeScript, and Less.'
   }, {
   name : 'Server and Client integration',
   info : 'Built with a powerful and fun stack: MongoDB, Express, AngularJS, and Node.'

Diff for: app/templates/server/api/user(auth)/user.model.spec.js

@@ -1,19 +1,18 @@
 'use strict';
 
 var should = require('should');
+var app = require('../../app');
 var User = require('./user.model');
 
-var user;
+var user = new User({
+  provider: 'local',
+  name: 'Fake User',
+  email: '[email protected]',
+  password: 'password'
+});
 
 describe('User Model', function() {
-  before(function(done) {
-    user = new User({
-      provider: 'local',
-      name: 'Fake User',
-      email: '[email protected]',
-      password: 'password'
-    });
-
+  beforeEach(function(done) {
     // Clear users before testing
     User.remove().exec().then(function() {
       done();

Diff for: app/templates/server/config/_local.env.js

@@ -12,5 +12,7 @@ module.exports = {
   TWITTER_ID: "app-id",
   TWITTER_SECRET: "secret",
   GOOGLE_ID: "app-id",
-  GOOGLE_SECRET: "secret"
+  GOOGLE_SECRET: "secret",
+  // Control debug level for modules using visionmedia/debug
+  // DEBUG: ""
 };

Diff for: app/templates/server/config/seed(mongoose).js

@@ -11,7 +11,7 @@ var Thing = require('../api/thing/thing.model');
 Thing.find({}).remove(function() {
   Thing.create({
     name : 'Development Tools',
-    info : 'Integration with popular tools such as Bower, Grunt, Karma, Mocha, JSHint, Node Inspector, Livereload, Protractor, Jade, Sass, CoffeeScript, and Less.'
+    info : 'Integration with popular tools such as Bower, Grunt, Karma, Mocha, JSHint, Node Inspector, Livereload, Protractor, Jade, Stylus, Sass, CoffeeScript, and Less.'
   }, {
     name : 'Server and Client integration',
     info : 'Built with a powerful and fun stack: MongoDB, Express, AngularJS, and Node.'

Diff for: app/templates/server/config/socketio(socketio).js

@@ -22,24 +22,22 @@ function onConnect(socket) {
 }
 
 module.exports = function (socketio) {
-  // The amount of detail that the server should output to the logger.
-  // 0 - error
-  // 1 - warn
-  // 2 - info
-  // 3 - debug
-  socketio.set('log level', 2);
+  // socket.io (v1.x.x) is powered by debug.
+  // In order to see all the debug output, set DEBUG (in server/config/local.env.js) to including the desired scope.
+  //
+  // ex: DEBUG: "http*,socket.io:socket"
 
   // We can authenticate socket.io users and access their token through socket.handshake.decoded_token
   //
   // 1. You will need to send the token in `client/components/socket/socket.service.js`
   //
   // 2. Require authentication here:
-  // socketio.set('authorization', require('socketio-jwt').authorize({
+  // socketio.use(require('socketio-jwt').authorize({
   //   secret: config.secrets.session,
   //   handshake: true
   // }));
 
-  socketio.sockets.on('connection', function (socket) {
+  socketio.on('connection', function (socket) {
     socket.address = socket.handshake.address.address + ':' +
                      socket.handshake.address.port;
     socket.connectedAt = new Date();