Merge remote-tracking branch 'upstream/master' into sg-port-categories-sync

Author: carols10cents

.buildpacks

@@ -1,5 +1,5 @@
 https://github.com/rcaught/heroku-buildpack-cmake#e4e2c9e
 https://github.com/emk/heroku-buildpack-rust#578d630
 https://codon-buildpacks.s3.amazonaws.com/buildpacks/heroku/emberjs.tgz
-https://github.com/ryandotsmith/nginx-buildpack.git#af813ba
+https://github.com/travis-ci/nginx-buildpack.git#2fbde35
 https://github.com/sgrif/heroku-buildpack-diesel#f605edd

.travis.yml

@@ -2,6 +2,10 @@ language: rust
 sudo: false
 dist: trusty
 
+branches:
+  except:
+  - staging.tmp
+
 cache:
   cargo: true
 

Cargo.lock

@@ -40,10 +40,10 @@ hex = "0.2"
 license-exprs = "^1.3"
 dotenv = "0.10.0"
 toml = "0.4"
-diesel = { version = "0.14.0", features = ["postgres", "serde_json", "deprecated-time", "chrono"] }
-diesel_codegen = "0.14.0"
-r2d2-diesel = "0.14.0"
-diesel_full_text_search = "0.14.0"
+diesel = { version = "0.15.0", features = ["postgres", "serde_json", "deprecated-time", "chrono"] }
+diesel_codegen = "0.15.0"
+r2d2-diesel = "0.15.0"
+diesel_full_text_search = "0.15.0"
 serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
@@ -53,6 +53,7 @@ chrono = "0.4.0"
 conduit = "0.8"
 conduit-conditional-get = "0.8"
 conduit-cookie = "0.8"
+cookie = "0.9"
 conduit-json-parser = "0.8"
 conduit-log-requests = "0.8"
 conduit-middleware = "0.8"
@@ -67,7 +68,7 @@ bufstream = "0.1"
 
 [build-dependencies]
 dotenv = "0.10"
-diesel = { version = "0.14", features = ["postgres"] }
+diesel = { version = "0.15.0", features = ["postgres"] }
 
 [features]
 unstable = []

Cargo.toml

@@ -56,19 +56,7 @@
   ],
   "buildpacks": [
       {
-        "url": "https://github.com/rcaught/heroku-buildpack-cmake.git#e4e2c9e"
+        "url": "https://github.com/heroku/heroku-buildpack-multi"
       },
-      {
-        "url": "https://github.com/emk/heroku-buildpack-rust.git#578d630"
-      },
-      {
-        "url": "https://codon-buildpacks.s3.amazonaws.com/buildpacks/heroku/emberjs.tgz"
-      },
-      {
-        "url": "https://github.com/ryandotsmith/nginx-buildpack.git#af813ba"
-      },
-      {
-        "url": "https://github.com/sgrif/heroku-buildpack-diesel.git#f605edd"
-      }
   ]
 }

app.json

@@ -0,0 +1,62 @@
+import Component from '@ember/component';
+import { empty } from '@ember/object/computed';
+
+export default Component.extend({
+    type: '',
+    value: '',
+    isEditing: false,
+    user: null,
+    disableSave: empty('user.email'),
+    notValidEmail: false,
+    prevEmail: '',
+    emailIsNull: true,
+
+    actions: {
+        editEmail() {
+            let email = this.get('value');
+            let isEmailNull = function(email) {
+                return (email == null);
+            };
+
+            this.set('emailIsNull', isEmailNull(email));
+            this.set('isEditing', true);
+            this.set('prevEmail', this.get('value'));
+        },
+
+        saveEmail() {
+            let userEmail = this.get('value');
+            let user = this.get('user');
+
+            let emailIsProperFormat = function(userEmail) {
+                let regExp = /^\S+@\S+\.\S+$/;
+                return regExp.test(userEmail);
+            };
+
+            if (!emailIsProperFormat(userEmail)) {
+                this.set('notValidEmail', true);
+                return;
+            }
+
+            user.set('email', userEmail);
+            user.save()
+                .then(() => this.set('serverError', null))
+                .catch(err => {
+                    let msg;
+                    if (err.errors && err.errors[0] && err.errors[0].detail) {
+                        msg = `An error occurred while saving this email, ${err.errors[0].detail}`;
+                    } else {
+                        msg = 'An unknown error occurred while saving this email.';
+                    }
+                    this.set('serverError', msg);
+                });
+
+            this.set('isEditing', false);
+            this.set('notValidEmail', false);
+        },
+
+        cancelEdit() {
+            this.set('isEditing', false);
+            this.set('value', this.get('prevEmail'));
+        }
+    }
+});

app/adapters/version.js

@@ -0,0 +1,41 @@
+import Ember from 'ember';
+
+const {
+    computed,
+    defineProperty
+} = Ember;
+
+export default Ember.Component.extend({
+    classNames: ['validated-input'],
+    classNameBindings: ['showErrorClass:has-error', 'isValid:has-success'],
+    model: null,
+    value: null,
+    type: 'text',
+    valuePath: '',
+    placeholder: '',
+    validation: null,
+    showValidations: false,
+    didValidate: false,
+
+    notValidating: computed.not('validation.isValidating').readOnly(),
+    hasContent: computed.notEmpty('value').readOnly(),
+    hasWarnings: computed.notEmpty('validation.warnings').readOnly(),
+    isValid: computed.and('hasContent', 'validation.isTruelyValid').readOnly(),
+    shouldDisplayValidations: computed.or('showValidations', 'didValidate', 'hasContent').readOnly(),
+
+    showErrorClass: computed.and('notValidating', 'showErrorMessage', 'hasContent', 'validation').readOnly(),
+    showErrorMessage: computed.and('shouldDisplayValidations', 'validation.isInvalid').readOnly(),
+
+    init() {
+        this._super(...arguments);
+        let valuePath = this.get('valuePath');
+
+        defineProperty(this, 'validation', computed.readOnly(`model.validations.attrs.${valuePath}`));
+        defineProperty(this, 'value', computed.alias(`model.${valuePath}`));
+    },
+
+    focusOut() {
+        this._super(...arguments);
+        this.set('showValidations', true);
+    }
+});

app/components/email-input.js

@@ -7,14 +7,20 @@ export default Controller.extend(PaginationMixin, {
     queryParams: ['page', 'per_page', 'sort'],
     page: '1',
     per_page: 10,
-    sort: 'downloads',
+    sort: 'recent-downloads',
 
     totalItems: computed.readOnly('model.meta.total'),
 
     categoryController: controller('category'),
     category: computed.alias('categoryController.model'),
 
     currentSortBy: computed('sort', function() {
-        return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
+        if (this.get('sort') === 'downloads') {
+            return 'All-Time Downloads';
+        } else if (this.get('sort') === 'alpha') {
+            return 'Alphabetical';
+        } else {
+            return 'Recent Downloads';
+        }
     }),
 });

app/components/validated-input.js

@@ -3,7 +3,6 @@ import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import ArrayProxy from '@ember/array/proxy';
 import { computed } from '@ember/object';
 import { later } from '@ember/runloop';
-import $ from 'jquery';
 import moment from 'moment';
 
 const NUM_VERSIONS = 5;
@@ -163,16 +162,6 @@ export default Controller.extend({
             this.toggleClipboardProps(false);
         },
 
-        download(version) {
-            this.set('isDownloading', true);
-
-            version.getDownloadUrl().then(url => {
-                this.incrementProperty('crate.downloads');
-                this.incrementProperty('currentVersion.downloads');
-                $('#download-frame').attr('src', url);
-            }).finally(() => this.set('isDownloading', false));
-        },
-
         toggleFollow() {
             this.set('fetchingFollowing', true);
 

app/controllers/category/index.js

@@ -14,6 +14,12 @@ export default Controller.extend(PaginationMixin, {
     totalItems: computed.readOnly('model.meta.total'),
 
     currentSortBy: computed('sort', function() {
-        return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
+        if (this.get('sort') === 'downloads') {
+            return 'All-Time Downloads';
+        } else if (this.get('sort') === 'recent-downloads') {
+            return 'Recent Downloads';
+        } else {
+            return 'Alphabetical';
+        }
     }),
 });

app/controllers/crate/version.js

@@ -7,11 +7,17 @@ export default Controller.extend(PaginationMixin, {
     queryParams: ['page', 'per_page', 'sort'],
     page: '1',
     per_page: 10,
-    sort: 'alpha',
+    sort: 'recent-downloads',
 
     totalItems: computed.readOnly('model.meta.total'),
 
     currentSortBy: computed('sort', function() {
-        return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
+        if (this.get('sort') === 'downloads') {
+            return 'All-Time Downloads';
+        } else if (this.get('sort') === 'alpha') {
+            return 'Alphabetical';
+        } else {
+            return 'Recent Downloads';
+        }
     }),
 });

app/controllers/crates.js

@@ -13,7 +13,13 @@ export default Controller.extend(PaginationMixin, {
     totalItems: computed.readOnly('model.meta.total'),
 
     currentSortBy: computed('sort', function() {
-        return (this.get('sort') === 'downloads') ? 'Downloads' : 'Relevance';
+        if (this.get('sort') === 'downloads') {
+            return 'All-Time Downloads';
+        } else if (this.get('sort') === 'recent-downloads') {
+            return 'Recent Downloads';
+        } else {
+            return 'Relevance';
+        }
     }),
 
     hasItems: computed.bool('totalItems'),

app/controllers/keyword/index.js

@@ -12,6 +12,12 @@ export default Controller.extend(PaginationMixin, {
     totalItems: computed.readOnly('model.crates.meta.total'),
 
     currentSortBy: computed('sort', function() {
-        return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
+        if (this.get('sort') === 'downloads') {
+            return 'All-Time Downloads';
+        } else if (this.get('sort') === 'recent-downloads') {
+            return 'Recent Downloads';
+        } else {
+            return 'Alphabetical';
+        }
     }),
 });

app/controllers/search.js

@@ -13,6 +13,12 @@ export default Controller.extend(PaginationMixin, {
     totalItems: computed.readOnly('model.crates.meta.total'),
 
     currentSortBy: computed('sort', function() {
-        return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
+        if (this.get('sort') === 'downloads') {
+            return 'All-Time Downloads';
+        } else if (this.get('sort') === 'recent-downloads') {
+            return 'Recent Downloads';
+        } else {
+            return 'Alphabetical';
+        }
     }),
 });

app/controllers/team.js

@@ -4,6 +4,7 @@ import DS from 'ember-data';
 export default DS.Model.extend({
     name: DS.attr('string'),
     downloads: DS.attr('number'),
+    recent_downloads: DS.attr('number'),
     created_at: DS.attr('date'),
     updated_at: DS.attr('date'),
     max_version: DS.attr('string'),

app/controllers/user.js

@@ -20,8 +20,4 @@ export default DS.Model.extend({
     crateName: computed('crate', function() {
         return this.belongsTo('crate').id();
     }),
-
-    getDownloadUrl() {
-        return this.store.adapterFor('version').getDownloadUrl(this.get('dl_path'));
-    },
 });

app/models/crate.js

@@ -1,13 +1,13 @@
-import RSVP from 'rsvp';
-import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import RSVP from 'rsvp';
 
 export default Route.extend({
     flashMessages: service(),
 
     queryParams: {
-        page: { refreshedModel: true },
-        sort: { refreshedModel: true },
+        page: { refreshModel: true },
+        sort: { refreshModel: true },
     },
     data: {},
 

app/models/version.js

@@ -119,7 +119,7 @@
         padding-top: 5px;
         @include display-flex;
         @include flex-direction(column);
-        width: 85%;
+        width: 75%;
     }
 
     .info a {
@@ -133,10 +133,18 @@
     }
 
     .stats {
-        width: 15%;
+        width: 25%;
         color: $main-color-light;
     }
-    .downloads { @include display-flex; @include align-items(center); }
+    .downloads {
+        @include display-flex;
+        @include align-items(center);
+        padding-bottom: 5px;
+    }
+    .recent-downloads {
+        @include display-flex;
+        @include align-items(center);
+    }
 
     .rev-dep-downloads {padding-left: 7px}
 }