Merge remote-tracking branch 'upstream/master' into bump-dep-versions

Author: carols10cents

.travis.yml

@@ -39,10 +39,10 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2017-09-20
+  - rust: nightly-2017-11-07
     env: RUSTFMT=YESPLEASE
     script:
-    - cargo install --force rustfmt-nightly --vers 0.2.7
+    - cargo install --force rustfmt-nightly --vers 0.2.15
     - export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib:$LD_LIBRARY_PATH
     - rustfmt --version
     - cargo fmt -- --write-mode=diff
@@ -51,7 +51,7 @@ matrix:
     - cargo build
     - cargo test
     - npm test
-  - rust: nightly-2017-09-20
+  - rust: nightly-2017-11-07
     env: CLIPPY=YESPLEASE
     script:
     - cargo check --features "lint"

Cargo.lock

@@ -53,7 +53,7 @@ diesel_full_text_search = "0.16.0"
 serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
-clippy = { version = "=0.0.162", optional = true }
+clippy = { version = "=0.0.169", optional = true }
 chrono = { version = "0.4.0", features = ["serde"] }
 comrak = { version = "0.2.3", default-features = false }
 ammonia = "1.0.0-rc3"

Cargo.toml

@@ -5,11 +5,31 @@ export default ApplicationAdapter.extend({
         return this.ajax(this.urlForFollowAction(id), 'PUT');
     },
 
+    inviteOwner(id, username) {
+        return this.ajax(this.urlForOwnerAction(id), 'PUT', {
+            data: {
+                owners: [username],
+            }
+        });
+    },
+
+    removeOwner(id, username) {
+        return this.ajax(this.urlForOwnerAction(id), 'DELETE', {
+            data: {
+                owners: [username],
+            }
+        });
+    },
+
     unfollow(id) {
         return this.ajax(this.urlForFollowAction(id), 'DELETE');
     },
 
     urlForFollowAction(id) {
         return `${this.buildURL('crate', id)}/follow`;
     },
+
+    urlForOwnerAction(id) {
+        return `${this.buildURL('crate', id)}/owners`;
+    }
 });

app/adapters/crate.js

@@ -0,0 +1,55 @@
+import Controller, { inject as controller } from '@ember/controller';
+import { computed } from '@ember/object';
+
+export default Controller.extend({
+    crateController: controller('crate'),
+    crate: computed.alias('crateController.model'),
+    error: false,
+    invited: false,
+    removed: false,
+    username: '',
+
+    actions: {
+        addOwner() {
+            this.set('error', false);
+            this.set('invited', false);
+
+            const username = this.get('username');
+
+            if (!username) {
+                this.set('error', 'Please enter a username');
+                return false;
+            }
+
+            return this.get('crate').inviteOwner(username).then(() => {
+                this.set('invited', `An invite has been sent to ${username}`);
+            }).catch((error) => {
+                if (error.payload) {
+                    this.set('error',
+                        `Error sending invite: ${error.payload.errors[0].detail}`
+                    );
+                } else {
+                    this.set('error', 'Error sending invite');
+                }
+            });
+        },
+
+        removeOwner(user) {
+            this.set('removed', false);
+
+            return this.get('crate').removeOwner(user.get('login')).then(() => {
+                this.set('removed', `User ${user.get('login')} removed as crate owner`);
+
+                this.get('crate.owner_user').removeObject(user);
+            }).catch((error) => {
+                if (error.payload) {
+                    this.set('removed',
+                        `Error removing owner: ${error.payload.errors[0].detail}`
+                    );
+                } else {
+                    this.set('removed', 'Error removing owner');
+                }
+            });
+        }
+    }
+});

app/controllers/crate/owners.js

@@ -26,6 +26,9 @@ export default Controller.extend({
     keywords: computed.alias('crate.keywords'),
     categories: computed.alias('crate.categories'),
     badges: computed.alias('crate.badges'),
+    isOwner: computed('crate.owner_user', function() {
+        return this.get('crate.owner_user').findBy('login', this.session.get('currentUser.login'));
+    }),
 
     sortedVersions: computed.readOnly('crate.versions'),
 

app/controllers/crate/version.js

@@ -38,6 +38,14 @@ export default DS.Model.extend({
         return this.store.adapterFor('crate').follow(this.get('id'));
     },
 
+    inviteOwner(username) {
+        return this.store.adapterFor('crate').inviteOwner(this.get('id'), username);
+    },
+
+    removeOwner(username) {
+        return this.store.adapterFor('crate').removeOwner(this.get('id'), username);
+    },
+
     unfollow() {
         return this.store.adapterFor('crate').unfollow(this.get('id'));
     },

app/models/crate.js

@@ -21,6 +21,8 @@ Router.map(function() {
 
         this.route('reverse_dependencies');
 
+        this.route('owners');
+
         // Well-known routes
         this.route('docs');
         this.route('repo');

app/router.js

@@ -65,7 +65,7 @@
     <div class='row new-token'>
         <div>
             Please record this token somewhere, you cannot retrieve
-            its value again. For use on the command line you can save it to <code>~/.cargo/config</code>
+            its value again. For use on the command line you can save it to <code>~/.cargo/credentials</code>
             with:
 
             <pre>cargo login {{ api_token.token }}</pre>

app/templates/components/api-token-row.hbs

@@ -0,0 +1,68 @@
+{{ title 'Manage Crate Owners' }}
+
+<div id='crates-heading'>
+    {{svg-jar "gear"}}
+    <h1>Manage Crate Owners</h1>
+    <h2>{{ crate.name }}</h2>
+</div>
+
+<div id="me-email">
+    <h2>Add Owner</h2>
+
+    <div class="row">
+        <div class="label">
+            <dt>Username</dt>
+        </div>
+
+        <form class="email-form" {{action 'addOwner' on='submit'}}>
+            {{input type='text' value=username placeholder='Username' class='form-control space-right' name='username'}}
+
+            {{#if error}}
+                <div class='error'>
+                    <p class='small-text error'>{{error}}</p>
+                </div>
+            {{/if}}
+
+            {{#if invited}}
+                <div class='invited'>
+                    <p>{{invited}}</p>
+                </div>
+            {{/if}}
+
+            <div class="actions">
+                <button id="add-owner" type="submit" class="small yellow-button space-right">Save</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<h2>Owners</h2>
+
+{{#if removed}}
+<div class='removed'>
+    <p>{{removed}}</p>
+</div>
+{{/if}}
+
+<div class='owners white-rows'>
+    {{#each crate.owner_user as |user|}}
+        <div class='crate row'>
+            <div>
+                {{#link-to user.kind user.login}}
+                    {{user-avatar user=user size='medium-small'}}
+                {{/link-to}}
+            </div>
+            <div>
+                {{#link-to user.kind user.login}}
+                    {{ user.name }}
+                {{/link-to}}
+            </div>
+            <div class='stats'>
+                {{{ if user.email user.email "&nbsp;" }}}
+            </div>
+            <div class='stats downloads'>
+                <button class='remove-owner small yellow-button' {{action 'removeOwner' user}}>Remove</button>
+            </div>
+        </div>
+    {{/each}}
+</div>

app/templates/crate/owners.hbs

@@ -167,8 +167,17 @@
                 {{/if}}
             {{/unless}}
 
-            <div>
+            <div id='crate-owners'>
                 <h3>Owners</h3>
+
+                {{#if isOwner}}
+                <p>
+                    {{#link-to 'crate.owners' crate}}
+                        Manage owners
+                    {{/link-to}}
+                </p>
+                {{/if}}
+
                 <ul class='owners' data-test-owners>
                    {{#each crate.owner_team as |team|}}
                         <li>

app/templates/crate/version.hbs

@@ -206,6 +206,44 @@ export default function() {
         let user = schema.users.findBy({ login });
         return user ? user : notFound();
     });
+
+    this.put('/crates/:crate_id/owners', (schema, request) => {
+        const crateId = request.params.crate_id;
+        const crate = schema.crates.find(crateId);
+
+        if (!crate) {
+            return notFound();
+        }
+
+        const body = JSON.parse(request.requestBody);
+        const [ownerId] = body.owners;
+        const user = schema.users.findBy({ login: ownerId });
+
+        if (!user) {
+            return notFound();
+        }
+
+        return { ok: true };
+    });
+
+    this.delete('/crates/:crate_id/owners', (schema, request) => {
+        const crateId = request.params.crate_id;
+        const crate = schema.crates.find(crateId);
+
+        if (!crate) {
+            return notFound();
+        }
+
+        const body = JSON.parse(request.requestBody);
+        const [ownerId] = body.owners;
+        const user = schema.users.findBy({ login: ownerId });
+
+        if (!user) {
+            return notFound();
+        }
+
+        return {};
+    });
 }
 
 function notFound() {

mirage/config.js

@@ -13,4 +13,11 @@ export default [{
     "login": "thehydroimpulse",
     "name": "Daniel Fagnan",
     "url": "https://github.com/thehydroimpulse"
+}, {
+    "avatar": "https://avatars3.githubusercontent.com/u/1179195?v=3",
+    "email": "[email protected]",
+    "id": 10982,
+    "login": "iain8",
+    "name": "Iain Buchanan",
+    "url": "https://github.com/iain8"
 }];

mirage/fixtures/users.js

@@ -107,7 +107,9 @@ impl Badge {
             delete(badges::table)
                 .filter(badges::crate_id.eq(krate.id))
                 .execute(conn)?;
-            insert_into(badges::table).values(&new_badges).execute(conn)?;
+            insert_into(badges::table)
+                .values(&new_badges)
+                .execute(conn)?;
             Ok(invalid_badges)
         })
     }