Merge branch 'master' of https://github.com/ember-cli/ember-twiddle into ember_cli_2_11

Gaurav0 · Gaurav0 · commit 118eb25c42cf · 2017-05-08T10:16:56.000-07:00
diff --git a/app/components/main-gist.js b/app/components/main-gist.js
@@ -8,7 +8,7 @@ import AppBuilderMixin from "../mixins/app-builder";
 const { inject, computed } = Ember;
 
 export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, TestFilesMixin, {
-  emberCli: inject.service('ember-cli'),
+  emberCli: inject.service(),
   dependencyResolver: inject.service(),
   notify: inject.service(),
   store: inject.service(),
diff --git a/app/components/twiddle-panes.js b/app/components/twiddle-panes.js
@@ -3,7 +3,7 @@ import Ember from 'ember';
 const { inject } = Ember;
 
 export default Ember.Component.extend({
-  resizeableColumns: inject.service('resizeable-columns'),
+  resizeableColumns: inject.service(),
   classNames: ['row', 'twiddle-panes'],
 
   init() {
diff --git a/app/mixins/gist-controller.js b/app/mixins/gist-controller.js
@@ -1,6 +1,6 @@
 import Ember from "ember";
 
-const { inject, RSVP, run } = Ember;
+const { inject, run } = Ember;
 
 export default Ember.Mixin.create({
   fastboot: inject.service(),
@@ -14,18 +14,16 @@ export default Ember.Mixin.create({
   applicationUrl: undefined,
   unsaved: true,
 
-  init(...args) {
-    this._super(...args);
+  init() {
+    this._super(...arguments);
     if (!this.get('fastboot.isFastBoot')) {
       this.setupWindowUpdate();
     }
   },
 
   actions: {
     transitionQueryParams(queryParams) {
-      return this.transitionToRoute({ queryParams: queryParams }).then(() => {
-        return RSVP.resolve(queryParams);
-      });
+      return this.transitionToRoute({ queryParams }).then(() => queryParams);
     }
   },
 
diff --git a/app/routes/gist-base-route.js b/app/routes/gist-base-route.js
@@ -5,7 +5,7 @@ const CONFIRM_MSG = "Unsaved changes will be lost. Are you sure?";
 const { inject } = Ember;
 
 export default Ember.Route.extend({
-  emberCli: inject.service('ember-cli'),
+  emberCli: inject.service(),
 
   afterModel(context) {
     return this.get('emberCli').setup(context);
diff --git a/app/routes/gist.js b/app/routes/gist.js
@@ -7,7 +7,7 @@ const CONFIRM_MSG = "Unsaved changes will be lost.";
 
 export default Ember.Route.extend({
   toriiProvider: config.toriiProvider,
-  notify: inject.service('notify'),
+  notify: inject.service(),
   app: inject.service(),
   fastboot: inject.service(),
 
diff --git a/app/routes/gist/edit.js b/app/routes/gist/edit.js
@@ -10,8 +10,8 @@ export default GistRoute.extend({
     return this.get('store').find('gist', params.gistId);
   },
 
-  setupController(...args) {
-    this._super(...args);
+  setupController() {
+    this._super(...arguments);
 
     const gistController = this.controllerFor('gist');
     Ember.run.schedule('afterRender', function() {
diff --git a/app/routes/gist/edit/revision.js b/app/routes/gist/edit/revision.js
@@ -16,8 +16,8 @@ export default GistEditRoute.extend({
     });
   },
 
-  setupController(...args) {
-    this._super(...args);
+  setupController() {
+    this._super(...arguments);
 
     const gistController = this.controllerFor('gist');
     gistController.set('isRevision', true);
diff --git a/app/routes/gist/new.js b/app/routes/gist/new.js
@@ -1,34 +1,38 @@
 import Ember from 'ember';
 import GistRoute from "ember-twiddle/routes/gist-base-route";
 
+const { inject, run } = Ember;
+
 export default GistRoute.extend({
-  emberCli: Ember.inject.service('ember-cli'),
+  emberCli: inject.service(),
 
   model(params) {
-    var model = this.get('store').createRecord('gist', {description: 'New Twiddle'});
+    let store = this.get('store');
+    let model = store.createRecord('gist', {description: 'New Twiddle'});
 
     if (params.copyCurrentTwiddle) {
-      this.get('store').peekAll('gistFile').setEach('gist', model);
+      store.peekAll('gistFile').setEach('gist', model);
     } else {
-      this.get('store').unloadAll('gistFile');
-
-      model.get('files').pushObject(this.get('emberCli').generate('controllers/application'));
-      model.get('files').pushObject(this.get('emberCli').generate('templates/application'));
-      model.get('files').pushObject(this.get('emberCli').generate('twiddle.json'));
+      store.unloadAll('gistFile');
+      let files = model.get('files');
+      let emberCli = this.get('emberCli');
+      files.pushObject(emberCli.generate('controllers/application'));
+      files.pushObject(emberCli.generate('templates/application'));
+      files.pushObject(emberCli.generate('twiddle.json'));
     }
 
     return model;
   },
 
   setupController(controller) {
-    this._super.apply(this, arguments);
+    this._super(...arguments);
 
     // reset copyCurrentTwiddle, so it is not shown in the URL: this QP is only
     // needed when initializing the model for this route
     controller.set('copyCurrentTwiddle', false);
 
     const gistController = this.controllerFor('gist');
-    Ember.run.schedule('afterRender', function() {
+    run.schedule('afterRender', function() {
       gistController.set('unsaved', false);
     });
   }
diff --git a/app/serializers/gist.js b/app/serializers/gist.js
@@ -6,23 +6,21 @@ export default ApplicationSerializer.extend({
     history: { embedded: 'always', deserialize: 'records', serialize: false }
   },
 
-  init(...args) {
-    this._super(...args);
+  init() {
+    this._super(...arguments);
     this.set('seq', 0);
   },
 
-  normalizeSingleResponse(store, primaryModelClass, payload, id, requestType) {
+  normalizeSingleResponse(store, primaryModelClass, payload) {
     this.normalizeGist(payload, false);
 
-    return this._super(store, primaryModelClass, payload, id, requestType);
+    return this._super(...arguments);
   },
 
-  normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
-    payload.forEach(function(hash) {
-      this.normalizeGist(hash, true);
-    }.bind(this));
+  normalizeArrayResponse(store, primaryModelClass, payload) {
+    payload.forEach((hash)=> this.normalizeGist(hash, true));
 
-    return this._super(store, primaryModelClass, payload, id, requestType);
+    return this._super(...arguments);
   },
 
   normalizeGist(payload, isArray) {
@@ -59,9 +57,7 @@ export default ApplicationSerializer.extend({
 
     // Deleted files need to be given a null value
     if(deletedFiles) {
-      deletedFiles.forEach((fileId) => {
-        filesJson[fileId] = null;
-      });
+      deletedFiles.forEach((fileId) => filesJson[fileId] = null);
     }
 
     files.forEach((fileSnapshot) => {
@@ -101,7 +97,7 @@ export default ApplicationSerializer.extend({
       this.serializeFiles(snapshot, json, relationship);
     }
     else {
-      this._super.apply(this, arguments);
+      this._super(...arguments);
     }
   }
 });
diff --git a/app/services/dependency-resolver.js b/app/services/dependency-resolver.js
@@ -55,9 +55,7 @@ export default Ember.Service.extend({
 
   resolveAddons(addons, dependencies, emberVersion) {
     const taskInstance = this.get('resolveAddonsTask').perform(addons, dependencies, emberVersion);
-    return taskInstance.then(() => {
-      return RSVP.resolve(taskInstance.value);
-    });
+    return taskInstance.then(() => taskInstance.value);
   },
 
   resolveAddonsTask: task(function *(addons, dependencies, emberVersion) {
@@ -117,9 +115,9 @@ export default Ember.Service.extend({
   }),
 
   resolveAddon(name, value, emberVersion) {
+    const url = `${config.addonUrl}?ember_version=${emberVersion}&addon=${name}&addon_version=${value}`;
     return new RSVP.Promise(function(resolve) {
-      const url = `${config.addonUrl}?ember_version=${emberVersion}&addon=${name}&addon_version=${value}`;
-      resolve(Ember.$.getJSON(url).then(data => RSVP.resolve(data)));
+      Ember.$.getJSON(url).then(resolve);
     });
   },
 
diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js
@@ -197,25 +197,24 @@ export default Ember.Service.extend({
    * @return {Ember Object}       Source code for built Ember app
    */
   compileGist(gist) {
-    let promise = new RSVP.Promise((resolve, reject) => {
-      let errors = [];
-      let out = [];
-      let cssOut = [];
+    let errors = [];
+    let out = [];
+    let cssOut = [];
 
-      this.checkRequiredFiles(out, gist);
+    this.checkRequiredFiles(out, gist);
 
-      gist.get('files').forEach(file => {
-        this.compileFile(file, errors, out, cssOut);
-      });
-
-      if (errors.length) {
-        return reject(errors);
-      }
+    gist.get('files').forEach(file => {
+      this.compileFile(file, errors, out, cssOut);
+    });
 
-      this.addBoilerPlateFiles(out, gist);
+    if (errors.length) {
+      return RSVP.reject(errors);
+    }
 
-      resolve(this.get('twiddleJson').getTwiddleJson(gist).then(twiddleJSON => {
+    this.addBoilerPlateFiles(out, gist);
 
+    return this.get('twiddleJson').getTwiddleJson(gist)
+      .then(twiddleJSON => {
         this.addConfig(out, gist, twiddleJSON);
         this.set('enableTesting', testingEnabled(twiddleJSON));
 
@@ -229,12 +228,8 @@ export default Ember.Service.extend({
             legacyTesting: legacyTesting(twiddleJSON)
           }
         );
-
-        return RSVP.resolve(this.buildHtml(gist, out.join('\n'), cssOut.join('\n'), twiddleJSON));
-      }));
-    });
-
-    return promise;
+        return this.buildHtml(gist, out.join('\n'), cssOut.join('\n'), twiddleJSON);
+      });
   },
 
   compileFile(file, errors, out, cssOut) {
@@ -430,17 +425,17 @@ export default Ember.Service.extend({
     let moduleName = this.nameWithModule(filePath);
 
     const mungedCode = (code || '')
-            .replace(/\\/g, "\\\\") // Prevent backslashes from being escaped
-            .replace(/`/g, "\\`") // Prevent backticks from causing syntax errors
-            .replace(/\$/g, "\\$"); // Allow ${} expressions in the code
+      .replace(/\\/g, "\\\\") // Prevent backslashes from being escaped
+      .replace(/`/g, "\\`") // Prevent backticks from causing syntax errors
+      .replace(/\$/g, "\\$"); // Allow ${} expressions in the code
 
     return this.compileJs('export default Ember.HTMLBars.compile(`' + mungedCode + '`, { moduleName: `' + moduleName + '`});', filePath);
   },
 
   compileCss(code, moduleName) {
     var prefix = "styles/";
     if (moduleName.substring(0, prefix.length) === prefix) {
-        return code;
+      return code;
     }
     return '';
   },
@@ -475,8 +470,8 @@ export default Ember.Service.extend({
  */
 function babelOpts(moduleName) {
   return {
-    modules:'amdStrict',
-    moduleIds:true,
+    modules: 'amdStrict',
+    moduleIds: true,
     moduleId: moduleName,
     plugins: [ hbsPlugin ]
   };
diff --git a/app/services/twiddle-json.js b/app/services/twiddle-json.js
@@ -63,27 +63,19 @@ export default Ember.Service.extend({
       const emberVersion = twiddleJson.dependencies.ember;
       dependencyResolver.resolveDependencies(twiddleJson.dependencies);
       if ('addons' in twiddleJson) {
-        return dependencyResolver.resolveAddons(twiddleJson.addons, twiddleJson.dependencies, emberVersion).then(() => {
-          return RSVP.resolve(twiddleJson);
-        }).catch(() => {
-          return RSVP.reject();
-        });
+        return dependencyResolver.resolveAddons(twiddleJson.addons, twiddleJson.dependencies, emberVersion)
+          .then(() => twiddleJson);
       }
 
-      return RSVP.resolve(twiddleJson);
+      return twiddleJson;
     });
   },
 
   _updateTwiddleJson(gist, updateFn) {
-    return new RSVP.Promise(function(resolve, reject) {
+    return new RSVP.Promise(function(resolve) {
       const twiddle = gist.get('files').findBy('filePath', 'twiddle.json');
 
-      let json;
-      try {
-        json = JSON.parse(twiddle.get('content'));
-      } catch (e) {
-        return reject(e);
-      }
+      let json = JSON.parse(twiddle.get('content'));
 
       json = updateFn(json);
 
diff --git a/app/torii-adapters/application.js b/app/torii-adapters/application.js
@@ -1,5 +1,5 @@
-import config from '../config/environment';
 import Ember from 'ember';
+import config from '../config/environment';
 
 const { inject, isBlank, RSVP } = Ember;
 
@@ -13,27 +13,27 @@ export default Ember.Object.extend({  /**
   ajax: inject.service(),
   fastboot: inject.service(),
 
-  resolveUser (token) {
+  resolveUser(token) {
     config.TMP_TORII_TOKEN = token;
-    return this.get('store').find('user', 'current').then((user) => {
+    return this.get('store').find('user', 'current').then((currentUser) => {
       config.TMP_TORII_TOKEN = null;
       if (!this.get('fastboot.isFastBoot')) {
         localStorage.setItem('fiddle_gh_session', token);
       }
-      return { currentUser: user, token: token };
+      return { currentUser, token };
     });
   },
 
   /**
    * Try loading the user from cookie
    * @return Promise
    */
-  fetch () {
+  fetch() {
     if (this.get('fastboot.isFastBoot')) {
       return RSVP.reject();
     }
 
-    var token = localStorage.getItem('fiddle_gh_session');
+    let token = localStorage.getItem('fiddle_gh_session');
 
     if (isBlank(token)) {
       return RSVP.reject();
@@ -46,21 +46,23 @@ export default Ember.Object.extend({  /**
    * Open a new session, authenticate with Github
    * @return Promise
    */
-  open (authorization) {
-    return this.get('ajax').request(config.githubOauthUrl + authorization.authorizationCode).then(result => this.resolveUser(result.token));
+  open(authorization) {
+    let url = config.githubOauthUrl + authorization.authorizationCode;
+    return this.get('ajax').request(url)
+      .then(result => this.resolveUser(result.token));
   },
 
 
   /**
    * Close a session
    * @return Promise
    */
-  close () {
+  close() {
     if (this.get('fastboot.isFastBoot')) {
-      return Ember.RSVP.reject();
+      return RSVP.reject();
     } else {
       localStorage.removeItem('fiddle_gh_session');
-      return Ember.RSVP.resolve();
+      return RSVP.resolve();
     }
   }
 });
