Merge remote-tracking branch 'upstream/master' into multi-token

Author: carols10cents

.bowerrc

@@ -4,19 +4,19 @@ dist: trusty
 
 cache:
   cargo: true
-  directories:
-    - $HOME/.yarn-cache
+  yarn: true
+
+addons:
+  chrome: stable
 
 before_install:
   - nvm install 6.10.0
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - npm config set spin false
-  - npm install -g yarn
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
   - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-  - yarn
-  - yarn run bower install
+  - yarn install
   - cargo install --force diesel_cli --debug --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
   - cargo install --force rustfmt
   - rustfmt --version
@@ -36,19 +36,31 @@ addons:
       - libdw-dev
 
 matrix:
+  fast_finish: true
+  allow_failures:
+    - rust: nightly
   include:
   - rust: stable
+    env: RUSTFMT=YESPLEASE
     script:
     - cargo fmt -- --write-mode=diff
   - rust: stable
     script:
     - cargo build
     - cargo test
-    - yarn run test
+    - yarn test
   - rust: nightly-2017-03-04
     env: CLIPPY=YESPLEASE
     script:
     - cargo rustc --lib --features "lint" -- -Zno-trans
+  - rust: beta
+    script:
+    - cargo build
+    - cargo test
+  - rust: nightly
+    script:
+    - cargo build
+    - cargo test
 
 env:
   global:

.travis.yml

@@ -4,7 +4,7 @@ import Ember from 'ember';
 export default ApplicationAdapter.extend({
     pathForType(modelName) {
         let decamelized = Ember.String.underscore(
-          Ember.String.decamelize(modelName)
+            Ember.String.decamelize(modelName)
         );
         return Ember.String.pluralize(decamelized);
     }

app/adapters/category-slug.js

@@ -0,0 +1,8 @@
+import ApplicationAdapter from './application';
+
+export default ApplicationAdapter.extend({
+    queryRecord(store, type, query) {
+        let url = this.urlForFindRecord(query.team_id, 'team');
+        return this.ajax(url, 'GET');
+    },
+});

app/adapters/team.js

@@ -0,0 +1,8 @@
+import ApplicationAdapter from './application';
+
+export default ApplicationAdapter.extend({
+    queryRecord(store, type, query) {
+        let url = this.urlForFindRecord(query.user_id, 'user');
+        return this.ajax(url, 'GET');
+    },
+});

app/adapters/user.js

@@ -2,24 +2,13 @@ import Ember from 'ember';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
-import RouteAliasResolverMixin from 'cargo/mixins/route-alias-resolver';
 
-let App;
-
-let CargoResolver = Resolver.extend(RouteAliasResolverMixin);
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
+let App = Ember.Application.extend({
     modulePrefix: config.modulePrefix,
     podModulePrefix: config.podModulePrefix,
-    Resolver: CargoResolver
+    Resolver
 });
 
 loadInitializers(App, config.modulePrefix);
 
-Ember.$.ajaxSetup({
-    cache: false
-});
-
 export default App;

app/app.js

@@ -0,0 +1,10 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+    flashMessages: Ember.inject.service(),
+    message: Ember.computed.readOnly('flashMessages.message'),
+
+    elementId: 'flash',
+    tagName: 'p',
+    classNameBindings: ['message:shown']
+});

app/components/.gitkeep

@@ -0,0 +1,17 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+    tagName: '',
+
+    didInsertElement() {
+        Ember.$.getScript('https://www.google.com/jsapi', function() {
+            window.google.load('visualization', '1.0', {
+                packages: ['corechart'],
+                callback() {
+                    window.googleChartsLoaded = true;
+                    Ember.$(document).trigger('googleChartsLoaded');
+                }
+            });
+        });
+    }
+});

app/components/flash-message.js

@@ -1,12 +1,7 @@
 import Ember from 'ember';
 
-const { observer } = Ember;
-
 export default Ember.Controller.extend({
     searchController: Ember.inject.controller('search'),
-
-    flashError: null,
-    nextFlashError: null,
     search: Ember.computed.oneWay('searchController.q'),
 
     init() {
@@ -56,20 +51,6 @@ export default Ember.Controller.extend({
         Ember.$(document).off('keydown');
     },
 
-    stepFlash() {
-        this.set('flashError', this.get('nextFlashError'));
-        this.set('nextFlashError', null);
-    },
-
-    _scrollToTop() {
-        window.scrollTo(0, 0);
-    },
-
-    // TODO: remove observer & DOM mutation in controller..
-    currentPathChanged: observer('currentPath', function() {
-        Ember.run.scheduleOnce('afterRender', this, this._scrollToTop);
-    }),
-
     actions: {
         search() {
             this.transitionToRoute('search', {

app/components/google-jsapi.js

@@ -11,6 +11,9 @@ export default Ember.Controller.extend(PaginationMixin, {
 
     totalItems: computed.readOnly('model.meta.total'),
 
+    categoryController: Ember.inject.controller('category'),
+    category: computed.alias('categoryController.model'),
+
     currentSortBy: computed('sort', function() {
         return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
     }),

app/controllers/.gitkeep

@@ -8,5 +8,8 @@ export default Ember.Controller.extend(PaginationMixin, {
     page: '1',
     per_page: 10,
 
+    crateController: Ember.inject.controller('crate'),
+    crate: computed.alias('crateController.model'),
+
     totalItems: computed.readOnly('model.meta.total'),
 });

app/controllers/application.js

@@ -1,9 +1,10 @@
 import Ember from 'ember';
-import DS from 'ember-data';
 import moment from 'moment';
 
 const NUM_VERSIONS = 5;
-const { computed } = Ember;
+const { computed, run: { later } } = Ember;
+
+const PromiseArray = Ember.ArrayProxy.extend(Ember.PromiseProxyMixin);
 
 export default Ember.Controller.extend({
     isDownloading: false,
@@ -30,15 +31,10 @@ export default Ember.Controller.extend({
 
     hasMoreVersions: computed.gt('sortedVersions.length', NUM_VERSIONS),
 
-    anyLinks: computed.or('crate.homepage',
-                          'crate.wiki',
-                          'crate.mailing_list',
-                          'crate.documentation',
-                          'crate.repository',
-                          'crate.reverse_dependencies'),
+    anyLinks: computed.or('crate.{homepage,wiki,mailing_list,documentation,repository,reverse_dependencies}'),
 
     displayedAuthors: computed('currentVersion.authors.[]', function() {
-        return DS.PromiseArray.create({
+        return PromiseArray.create({
             promise: this.get('currentVersion.authors').then((authors) => {
                 let ret = authors.slice();
                 let others = authors.get('meta');
@@ -60,20 +56,11 @@ export default Ember.Controller.extend({
             return [];
         }
 
-        return DS.PromiseArray.create({
+        return PromiseArray.create({
             promise: deps.then((deps) => {
-                let non_dev = deps.filter((dep) => dep.get('kind') !== 'dev');
-                let map = {};
-                let ret = [];
-
-                non_dev.forEach((dep) => {
-                    if (!(dep.get('crate_id') in map)) {
-                        map[dep.get('crate_id')] = 1;
-                        ret.push(dep);
-                    }
-                });
-
-                return ret;
+                return deps
+                    .filter((dep) => dep.get('kind') !== 'dev')
+                    .uniqBy('crate_id');
             })
         });
     }),
@@ -83,35 +70,13 @@ export default Ember.Controller.extend({
         if (deps === null) {
             return [];
         }
-        return DS.PromiseArray.create({
+        return PromiseArray.create({
             promise: deps.then((deps) => {
                 return deps.filterBy('kind', 'dev');
             }),
         });
     }),
 
-    actions: {
-        download(version) {
-            this.set('isDownloading', true);
-
-            version.getDownloadUrl().then(url => {
-                this.incrementProperty('crate.downloads');
-                this.incrementProperty('currentVersion.downloads');
-                Ember.$('#download-frame').attr('src', url);
-            }).finally(() => this.set('isDownloading', false));
-        },
-
-        toggleFollow() {
-            this.set('fetchingFollowing', true);
-
-            let crate = this.get('crate');
-            let op = this.toggleProperty('following') ?
-                crate.follow() : crate.unfollow();
-
-            return op.finally(() => this.set('fetchingFollowing', false));
-        },
-    },
-
     downloadData: computed('downloads', 'extraDownloads', 'requestedVersion', function() {
         let downloads = this.get('downloads');
         if (!downloads) {
@@ -173,4 +138,46 @@ export default Ember.Controller.extend({
 
         return data;
     }),
+
+    toggleClipboardProps(isSuccess) {
+        this.setProperties({
+            showSuccess: isSuccess,
+            showNotification: true
+        });
+        later(this, () => {
+            this.set('showNotification', false);
+        }, 2000);
+    },
+
+    actions: {
+        copySuccess(event) {
+            event.clearSelection();
+            this.toggleClipboardProps(true);
+        },
+
+        copyError() {
+            this.toggleClipboardProps(false);
+        },
+
+        download(version) {
+            this.set('isDownloading', true);
+
+            version.getDownloadUrl().then(url => {
+                this.incrementProperty('crate.downloads');
+                this.incrementProperty('currentVersion.downloads');
+                Ember.$('#download-frame').attr('src', url);
+            }).finally(() => this.set('isDownloading', false));
+        },
+
+        toggleFollow() {
+            this.set('fetchingFollowing', true);
+
+            let crate = this.get('crate');
+            let op = this.toggleProperty('following') ?
+                crate.follow() : crate.unfollow();
+
+            return op.finally(() => this.set('fetchingFollowing', false));
+        },
+    },
+
 });

app/controllers/category/index.js

@@ -1,10 +1,12 @@
 import Ember from 'ember';
-import ajax from 'ic-ajax';
 
 const TO_SHOW = 5;
-const { computed } = Ember;
+const { computed, inject: { service } } = Ember;
 
 export default Ember.Controller.extend({
+
+    ajax: service(),
+
     init() {
         this._super(...arguments);
 
@@ -37,7 +39,7 @@ export default Ember.Controller.extend({
             this.set('loadingMore', true);
             let page = (this.get('myFeed').length / 10) + 1;
 
-            ajax(`/me/updates?page=${page}`).then((data) => {
+            this.get('ajax').request(`/me/updates?page=${page}`).then((data) => {
                 let versions = data.versions.map(version =>
                     this.store.push(this.store.normalize('version', version)));
 

app/controllers/crate/reverse-dependencies.js

@@ -1,9 +1,18 @@
 import Ember from 'ember';
 
+const { inject: { service } } = Ember;
+
 export default Ember.Controller.extend({
     tokenSort: ['created_at:desc'],
+
     sortedTokens: Ember.computed.sort('model.api_tokens', 'tokenSort'),
 
+    ajax: service(),
+
+    flashMessages: service(),
+
+    isResetting: false,
+
     newTokens: Ember.computed.filterBy('model.api_tokens', 'isNew', true),
     disableCreate: Ember.computed.notEmpty('newTokens'),