Merge remote-tracking branch 'upstream/master'

Upgraded to AngularFire 1.0.0 and SDK 2.2.2
Renamed fbutil service to Ref
Renamed simpleLogin service to Auth
Removed waitForAuth service (use Auth.$waitForAuth())

Conflicts:
	CHANGELOG.md
	app/index.js
	package.json
	readme.md
	templates/coffeescript/app.coffee
	templates/common/app/index.html
	templates/common/root/.jshintrc
	templates/common/root/_bower.json
	templates/common/root/_package.json
	test/test-apppath.js
	test/test-file-creation.js

Author: katowulf

CHANGELOG.md

@@ -1,3 +1,33 @@
+
+<a name="1.0.0"></a>
+### 1.0.0 (2015-03-27)
+
+### Features
+
+* **app**
+   * Upgraded AngularFire to 1.0.0
+   * Upgraded Firebase SDK to 2.2.3
+* **auth**
+   * renamed `simpleLogin` service to `Auth` and the module is now `firebase.auth`
+   * removed `authRequired` service (part of `$firebaseAuth` now)
+   * removed `createProfile` service (part of `Auth` now)
+   * 
+* **release** merged latest changes from generator-angular upstream branch
+
+### Breaking Changes
+
+* Requires Firebase SDK 2.x
+* Requires AngularFire 1.x
+
+<a name="0.9.4"></a>
+### 0.9.4 (2015-01-15)
+
+### Features
+
+* merge latest changes to generator-angular
+* upgraded Firebase SDK to 2.1.0
+* upgraded AngularFire to 0.9.1
+
 <a name="0.8.2"></a>
 ### 0.8.2 (2014-09-04)
 

angularfire/config.json

@@ -1,8 +1,8 @@
 {
   "bower": {
-    "firebase": "2.1.x",
-    "angularfire": "0.9.1",
-    "mockfirebase": "0.8.x"
+    "firebase": "2.2.2",
+    "angularfire": "1.0.0",
+    "mockfirebase": "0.11.0"
   },
 
   "authProviders": [
@@ -12,9 +12,5 @@
     { "name": "Google",         "value": "google"    },
     { "name": "Twitter",        "value": "twitter"   },
     { "name": "GitHub",         "value": "github"    }
-  ],
-
-  "specialRoutes": {
-    "chat": true, "login": true, "account": true
-  }
+  ]
 }

app/index.js

@@ -155,25 +155,27 @@ var Generator = module.exports = function Generator(args, options) {
       callback: this._injectDependencies.bind(this)
     });
 
+    //angularfire
     if (this.env.options.ngRoute) {
-      // this will not create controller or html because
-      // "chat" exists in config.json::specialRoutes
       this.invoke('angularfire:route', {
-        //angularfire
-        args: ['chat']
+        args: ['chat'],
+        options: { skipController: true, skipView: true, authRequired: false }
       });
-    }
 
-    //angularfire
-    if(this.env.options.loginModule) {
-      if( this.env.options.ngRoute ) {
-        // this will not create controller or html because
-        // "login" exists in config.json::specialRoutes
+      if(this.env.options.loginModule) {
         this.invoke('angularfire:route', {
-          args: ['login']
+          args: ['login'],
+          options: { skipController: true, skipView: true, authRequired: false }
         });
+
+        this.invoke('angularfire:route', {
+          args: ['account'],
+          options: { skipController: true, skipView: true, authRequired: true }
+        })
       }
     }
+
+    //angularfire
   });
 
   this.pkg = require('../package.json');
@@ -187,7 +189,7 @@ Generator.prototype.welcome = function welcome() {
     this.log(yosay());
     this.log(
       chalk.magenta(
-        'Out of the box I include Bootstrap and some AngularJS recommended modules, AngularFire, and Firebase Simple Login.' +
+        'Out of the box I include Bootstrap and some AngularJS recommended modules, AngularFire, and Firebase authentication.' +
         '\n'
       )
     );
@@ -358,10 +360,10 @@ Generator.prototype.askForModules = function askForModules() {
 
     //angularfire
     angMods.push("'firebase'");
-    angMods.push("'firebase.utils'");
+    angMods.push("'firebase.ref'");
     if( this.loginModule ) {
-      this.env.options.simpleLogin = true;
-      angMods.push("'simpleLogin'");
+      this.env.options.loginModule = true;
+      angMods.push("'firebase.auth'");
     }
 
     if (angMods.length) {
@@ -389,13 +391,13 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {
 //angularfire
 Generator.prototype.copyAngularFireFiles = function() {
   this._common('scripts/angularfire/config.js');
-  this._common('scripts/angularfire/firebase.utils.js');
+  this._common('scripts/angularfire/firebase.ref.js');
   this._tpl('controllers/chat');
   this._htmlTpl('views/chat.html');
   this._tpl('filters/reverse');
 
   if( this.loginModule ) {
-    this._common('scripts/angularfire/simpleLogin.js');
+    this._common('scripts/angularfire/auth.js');
     this._tpl('controllers/login');
     this._tpl('controllers/account');
     this._htmlTpl('views/login.html');

route/index.js

@@ -14,6 +14,9 @@ var Generator = module.exports = function Generator(name) {
     required: false
   });
 
+  console.log('options', this.options);
+  console.log('env', this.env.options);
+
   var bower = require(path.join(process.cwd(), 'bower.json'));
   var match = require('fs').readFileSync(path.join(
     this.env.options.appPath,
@@ -28,8 +31,10 @@ var Generator = module.exports = function Generator(name) {
     this.foundWhenForRoute = true;
   }
 
-  if( this.env.options.afconfig.specialRoutes[name] !== true) {
+  if( !this.options.skipController ) {
     this.hookFor('angularfire:controller');
+  }
+  if( !this.options.skipView ) {
     this.hookFor('angularfire:view');
   }
 };
@@ -68,7 +73,7 @@ Generator.prototype.rewriteRoutesJs = function () {
   };
 
 
-  var whenMethod = this.env.options.authRequired || this.options['auth-required']? 'whenAuthenticated' : 'when';
+  var whenMethod = this.options['authRequired']? 'whenAuthenticated' : 'when';
 
   if (coffee) {
     config.splicable.unshift("." + whenMethod + " '/" + this.uri + "',");

templates/coffeescript/controllers/account.coffee

@@ -7,7 +7,7 @@
 # AccountCtrl
 Provides rudimentary account management functions.
 ###
-angular.module("<%= scriptAppName %>").controller "AccountCtrl", ($scope, user, simpleLogin, fbutil, $timeout) ->
+angular.module("<%= scriptAppName %>").controller "AccountCtrl", ($scope, user, Auth, Ref, $firebaseObject, $timeout) ->
   <% if( hasPasswordProvider ) { %>error = (err) ->
     alert err, "danger"
     return
@@ -26,17 +26,14 @@ angular.module("<%= scriptAppName %>").controller "AccountCtrl", ($scope, user,
     ), 10000
     return
 
-  <% } %>loadProfile = (user) ->
-    profile.$destroy()  if profile
-    profile = fbutil.syncObject("users/" + user.uid);
-    profile.$bindTo $scope, "profile"
-    return
+  <% } %>
 
+  profile = $firebaseObject(Ref.child("users/" + user.uid))
+  profile.$bindTo $scope, "profile"
   $scope.user = user
-  $scope.logout = simpleLogin.logout
+  $scope.logout = () -> Auth.$unauth()
   $scope.messages = []
-  profile = null
-  loadProfile user
+
   <% if( hasPasswordProvider ) { %>
   $scope.changePassword = (oldPass, newPass, confirm) ->
     $scope.err = null
@@ -45,15 +42,15 @@ angular.module("<%= scriptAppName %>").controller "AccountCtrl", ($scope, user,
     else if newPass isnt confirm
       error "Passwords do not match"
     else
-      simpleLogin.changePassword(profile.email, oldPass, newPass).then (->
+      Auth.$changePassword({email: profile.email, oldPassword: oldPass, newPassword: newPass}).then (->
         success "Password changed"
         return
       ), error
     return
 
   $scope.changeEmail = (pass, newEmail) ->
     $scope.err = null
-    simpleLogin.changeEmail(pass, newEmail, profile.email).then ((user) ->
+    Auth.$changeEmail({password: pass, oldEmail: profile.email, newEmail: newEmail}).then ((user) ->
       profile.email = newEmail
       profile.$save()
       success "Email changed"

templates/coffeescript/controllers/chat.coffee

@@ -7,15 +7,15 @@
 # ChatCtrl
 A demo of using AngularFire to manage a synchronized list.
 ###
-angular.module("<%= scriptAppName %>").controller "ChatCtrl", ($scope, fbutil, $timeout) ->
+angular.module("<%= scriptAppName %>").controller "ChatCtrl", ($scope, Ref, $firebaseArray, $timeout) ->
   alert = (msg) ->
     $scope.err = msg
     $timeout (->
       $scope.err = null
     ), 5000
 
   # synchronize a read-only, synchronized array of messages, limit to most recent 10
-  $scope.messages = fbutil.syncArray("messages", limitToLast: 10)
+  $scope.messages = $firebaseArray(Ref.child("messages").limitToLast(10));
 
   # display any errors
   $scope.messages.$loaded().then null, alert

templates/coffeescript/controllers/login.coffee

@@ -7,7 +7,7 @@
 # LoginCtrl
 Manages authentication to any active providers.
 ###
-angular.module("<%= scriptAppName %>").controller "LoginCtrl", ($scope, simpleLogin, $location) ->
+angular.module("<%= scriptAppName %>").controller "LoginCtrl", ($scope, Auth, $location<% if( hasPasswordProvider ) { %>, $q, Ref, $timeout<% } %>) ->
   redirect = ->
     $location.path "/account"
     return
@@ -17,36 +17,67 @@ angular.module("<%= scriptAppName %>").controller "LoginCtrl", ($scope, simpleLo
 
   <% if( hasOauthProviders ) { %>$scope.oauthLogin = (provider) ->
     $scope.err = null
-    simpleLogin.login(provider,
+    Auth.$authWithOAuthPopup(provider,
       rememberMe: true
     ).then redirect, showError
     return
 
   $scope.anonymousLogin = ->
-    simpleLogin.anonymousLogin(rememberMe: true).then redirect, showError
+    Auth.$authAnonymously(rememberMe: true).then redirect, showError
     return
   <% } %><% if( hasPasswordProvider ) { %>
   $scope.passwordLogin = (email, pass) ->
     $scope.err = null
-    simpleLogin.passwordLogin(
+    Auth.$authWithPassword(
       email: email
       password: pass
     ,
       rememberMe: true
     ).then redirect, showError
     return
 
+  firstPartOfEmail = (email) ->
+    ucfirst email.substr(0, email.indexOf('@')) or ''
+
+  ucfirst = (str) ->
+    # inspired by: http://kevin.vanzonneveld.net
+    str += ''
+    f = str.charAt(0).toUpperCase()
+    f + str.substr(1)
+
   $scope.createAccount = (email, pass, confirm) ->
+
+    createProfile = (user) ->
+      ref = Ref.child('users', user.uid)
+      def = $q.defer()
+      ref.set {
+        email: email
+        name: firstPartOfEmail(email)
+      }, (err) ->
+        $timeout ->
+          if err
+            def.reject err
+          else
+            def.resolve ref
+          return
+        return
+      def.promise
+
     $scope.err = null
-    unless pass
-      $scope.err = "Please enter a password"
-    else if pass isnt confirm
-      $scope.err = "Passwords do not match"
+    if !pass
+      $scope.err = 'Please enter a password'
+    else if pass != confirm
+      $scope.err = 'Passwords do not match'
     else
-      simpleLogin.createAccount(email, pass,
-        rememberMe: true
-      ).then redirect, showError
-
+      Auth.$createUser(
+        email: email
+        password: pass).then(->
+        # authenticate so we have permission to write to Firebase
+        Auth.$authWithPassword {
+          email: email
+          password: pass
+        }, rememberMe: true
+      ).then(createProfile).then redirect, showError
     return
   <% } %>
   return