Merge remote-tracking branch 'upstream/master' into record-readme-filename

Author: carols10cents

Cargo.lock

@@ -55,8 +55,8 @@ serde_derive = "1.0.0"
 serde = "1.0.0"
 clippy = { version = "=0.0.162", optional = true }
 chrono = { version = "0.4.0", features = ["serde"] }
-comrak = { version = "0.1.9", default-features = false }
-ammonia = "0.7.0"
+comrak = { version = "0.2.3", default-features = false }
+ammonia = { git = "https://github.com/notriddle/ammonia" }
 docopt = "0.8.1"
 itertools = "0.6.0"
 lettre = "0.6"

Cargo.toml

@@ -1,5 +1,7 @@
 import Component from '@ember/component';
 
 export default Component.extend({
-    classNames: ['crate', 'row']
+    classNames: ['crate', 'row'],
+
+    'data-test-crate-row': true,
 });

app/components/crate-row.js

@@ -1,8 +1,9 @@
 import Controller from '@ember/controller';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import ArrayProxy from '@ember/array/proxy';
-import { computed } from '@ember/object';
+import { computed, observer } from '@ember/object';
 import { later } from '@ember/runloop';
+import $ from 'jquery';
 import moment from 'moment';
 
 const NUM_VERSIONS = 5;
@@ -173,4 +174,8 @@ export default Controller.extend({
         },
     },
 
+    report: observer('crate.readme', function() {
+        setTimeout(() => $(window).trigger('hashchange'));
+    }),
+
 });

app/controllers/crate/version.js

@@ -1,4 +1,5 @@
 import Controller from '@ember/controller';
+import { A } from '@ember/array';
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 
@@ -14,9 +15,9 @@ export default Controller.extend({
         this.fetchingFeed = true;
         this.loadingMore = false;
         this.hasMore = false;
-        this.myCrates = [];
-        this.myFollowing = [];
-        this.myFeed = [];
+        this.myCrates = A();
+        this.myFollowing = A();
+        this.myFeed = A();
         this.myStats = 0;
     },
 

app/controllers/dashboard.js

@@ -0,0 +1,50 @@
+import $ from 'jquery';
+
+function decodeFragmentValue(hash) {
+    try {
+        return decodeURIComponent(hash.slice(1));
+    } catch(_) {
+        return '';
+    }
+}
+
+function findElementByFragmentName(document, name) {
+    if (name === '') {
+        return;
+    }
+
+    return document.getElementById(name) || document.getElementsByName(name)[0];
+}
+
+function hashchange() {
+    if (document.querySelector(':target')) {
+        return;
+    }
+
+    const hash = decodeFragmentValue(location.hash);
+    const target = findElementByFragmentName(document, `user-content-${hash}`);
+    if (target) {
+        target.scrollIntoView();
+    }
+}
+
+export function initialize() {
+    $(window).on('hashchange', hashchange);
+
+    // If clicking on a link to the same fragment as currently in the address bar,
+    // hashchange won't be fired, so we need to manually trigger rescroll.
+    $(document).on('a[href]', 'click', function(event) {
+        if (this.href === location.href && location.hash.length > 1) {
+            setTimeout(function() {
+                if (!event.defaultPrevented) {
+                    hashchange();
+                }
+            });
+        }
+    });
+}
+
+export default {
+    name: 'app.hashchange',
+    initialize
+};

app/initializers/hashchange.js

@@ -1,4 +1,5 @@
 import Route from '@ember/routing/route';
+import { A } from '@ember/array';
 import RSVP from 'rsvp';
 
 import AuthenticatedRoute from '../mixins/authenticated-route';
@@ -15,7 +16,7 @@ export default Route.extend(AuthenticatedRoute, {
         controller.set('myStats', this.get('data.myStats'));
 
         if (!controller.get('loadingMore')) {
-            controller.set('myFeed', []);
+            controller.set('myFeed', A());
             controller.send('loadMore');
         }
     },

app/routes/dashboard.js

@@ -17,17 +17,18 @@
       </h1>
     {{/link-to}}
 
-    <form class='search' action='/search' {{ action "search" on="submit" }} >
+    <form class='search' action='/search' {{ action "search" on="submit" }} data-test-search-form>
         {{input type="text" class="search" name="q" id="cargo-desktop-search"
                 placeholder="Click or press 'S' to search..."
                 value=search
                 autofocus="autofocus"
                 tabindex="1"
-                required=true}}
+                required=true
+                data-test-search-input=true}}
     </form>
 
     <div class='nav'>
-        {{#link-to "crates" (query-params letter="null" page=1)}}
+        {{#link-to "crates" (query-params letter="null" page=1) data-test-all-crates-link}}
             Browse All Crates
         {{/link-to}}
         <span class="sep">|</span>
@@ -70,7 +71,7 @@
                 {{/rl-dropdown}}
             {{/rl-dropdown-container}}
         {{else}}
-            {{#link-to "login"}}
+            {{#link-to "login" data-test-login-link}}
                     {{svg-jar "lock"}}
                     Log in with GitHub
             {{/link-to}}

app/templates/application.hbs

@@ -6,18 +6,18 @@
 </div>
 
 <div id='results'>
-    <div class='nav'>
+    <div class='nav' data-test-categories-nav>
         <span class='amt small'>
             Displaying
             <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
             of <span class='total'>{{ totalItems }}</span> total results
         </span>
     </div>
 
-    <div class='sort'>
+    <div class='sort' data-test-categories-sort>
         <span class='small'>Sort by</span>
         {{#rl-dropdown-container class="dropdown-container"}}
-            {{#rl-dropdown-toggle tagName="a" class="dropdown"}}
+            {{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
                 {{svg-jar "sort"}}
                 {{ currentSortBy }}
                 <span class='arrow'></span>
@@ -41,11 +41,11 @@
 
 <div class='white-rows'>
     {{#each model as |category|}}
-        <div class='row'>
+        <div class='row' data-test-category={{category.slug}}>
             <div class='desc'>
                 <div class='info'>
                     {{link-to category.category "category" category.slug}}
-                    <span class='small'>
+                    <span class='small' data-test-crate-count>
                         {{ pluralize (format-num category.crates_cnt) "crate" }}
                     </span>
                 </div>

app/templates/categories.hbs

@@ -36,18 +36,18 @@
 
 <h2>Crates</h2>
 <div id='results'>
-    <div class='nav'>
+    <div class='nav' data-test-category-nav>
         <span class='amt small'>
             Displaying
             <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
             of <span class='total'>{{ totalItems }}</span> total results
         </span>
     </div>
 
-    <div class='sort'>
+    <div class='sort' data-test-category-sort>
         <span class='small'>Sort by</span>
         {{#rl-dropdown-container class="dropdown-container"}}
-            {{#rl-dropdown-toggle tagName="a" class="dropdown"}}
+            {{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
                 {{svg-jar "sort"}}
                 {{ currentSortBy }}
                 <span class='arrow'></span>

app/templates/category/index.hbs

@@ -1,7 +1,7 @@
 <ul>
-    {{#each crates as |crate|}}
+    {{#each crates as |crate index|}}
         <li>
-            {{#link-to 'crate' crate.id class='name'}}
+            {{#link-to 'crate' crate.id class='name' data-test-crate-link=index}}
                 <span>{{ crate.name }} ({{ crate.max_version }})</span>
                 <div class='arrow-in-list'>
                     {{svg-jar "right-arrow"}}

app/templates/components/crate-list.hbs

@@ -1,28 +1,29 @@
 <div class='desc'>
     <div class='info'>
-        {{#link-to 'crate' crate.id}}{{ crate.name }}{{/link-to}}
+        {{#link-to 'crate' crate.id data-test-crate-link}}{{ crate.name }}{{/link-to}}
         <span class='vers'>
             <img
                 src="https://img.shields.io/crates/v/{{ crate.name }}.svg"
                 alt="{{ crate.max_version }}"
-                title="{{ crate.name }}’s current version badge" />
+                title="{{ crate.name }}’s current version badge"
+                data-test-version-badge />
         </span>
         {{#each crate.annotated_badges as |badge|}}
-            {{component badge.component_name badge=badge}}
+            {{component badge.component_name badge=badge data-test-badge=badge.badge_type}}
         {{/each}}
     </div>
-    <div class='summary'>
+    <div class='summary' data-test-description>
         <span class='small'>
             {{ truncate-text crate.description }}
         </span>
     </div>
 </div>
 <div class='stats'>
-    <div class='downloads'>
+    <div class='downloads' data-test-downloads>
         {{svg-jar "download"}}
         <span class='num'>All-Time: {{ format-num crate.downloads }}</span>
     </div>
-    <div class="recent-downloads">
+    <div class="recent-downloads" data-test-recent-downloads>
         {{svg-jar "download"}}
         <span class='num'><abbr title="Downloads in the last 90 days">Recent:</abbr> {{ format-num crate.recent_downloads }}</span>
     </div>