Sort dependencies & dependents

This sorts them by group + project name, alpha descending.

Fixes #900.

Author: tobias

dev-resources/fake-0.0.2/fake.pom

@@ -19,6 +19,11 @@
       <artifactId>clojure</artifactId>
       <version>1.3.0-beta1</version>
     </dependency>
+    <dependency>
+      <groupId>foo</groupId>
+      <artifactId>bar</artifactId>
+      <version>1.0</version>
+    </dependency>
     <dependency>
       <groupId>org.clojurer</groupId>
       <artifactId>clojure</artifactId>

dev-resources/test-0.0.3/test.pom

@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.dantheman</groupId>
+  <artifactId>test</artifactId>
+  <version>0.0.3</version>
+  <packaging>jar</packaging>
+
+  <name>asdf</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>fake</groupId>
+      <artifactId>fake</artifactId>
+      <version>0.0.2</version>
+    </dependency>
+  </dependencies>
+</project>

src/clojars/web/jar.clj

@@ -229,6 +229,10 @@
      [:p (safe-link-to (str (jar-url jar) "/versions")
                        (str "Show All Versions (" count " total)"))])))
 
+(defn- sort-deps
+  [deps]
+  (sort-by (juxt :group_name :jar_name) deps))
+
 (defn- dependencies [db {:keys [group_name jar_name version]}]
   (when-some [deps (seq (into []
                               (comp
@@ -241,7 +245,7 @@
     (list
      [:h3 "Dependencies"]
      [:ul#dependencies
-      (for [dep deps]
+      (for [dep (sort-deps deps)]
         [:li (dependency-link db dep)])])))
 
 (defn- get-dependents [db {:keys [group_name jar_name]}]
@@ -257,7 +261,7 @@
       (list
        [:h3 "Dependents (on Clojars)"]
        [:ul#dependents
-        (for [dep (take 10 distinct-deps)]
+        (for [dep (take 10 (sort-deps distinct-deps))]
           [:li (dependent-link dep)])]
        [:p (link-to (str (jar-url jar) "/dependents")
                     (format "All Dependents (%s) for all Versions (%s)"
@@ -377,7 +381,7 @@
           [:h2 (safe-link-to (jar-versioned-url (assoc jar :version version))
                              version)]
           (for [[base-d dep-versions] (->> deps
-                                           (sort-by first)
+                                           (sort-deps)
                                            (group-by #(select-keys % #{:group_name :jar_name})))]
             [:div.dependent-jar
              [:h3 (jar-link base-d)]

test/clojars/integration/jars_test.clj

@@ -87,23 +87,25 @@
   (-> (session (help/app))
       (visit "/fake")
       (within [:ul#dependencies]
-        (has (text? "org.clojure/clojure 1.3.0-beta1")))))
+        (has (text? "foo/bar 1.0org.clojure/clojure 1.3.0-beta1")))))
 
 (deftest jars-can-view-dependents
   (inject-artifacts-into-repo! help/*db* "someuser" "fake.jar" "fake-0.0.2/fake.pom")
   (inject-artifacts-into-repo! help/*db* "someuser" "test.jar" "test-0.0.2/test.pom")
+  (inject-artifacts-into-repo! help/*db* "someuser" "test.jar" "test-0.0.3/test.pom")
   (-> (session (help/app))
       (visit "/fake")
       (within [:ul#dependents]
-        (has (text? "org.clojars.dantheman/test")))))
+        (has (text? "com.dantheman/testorg.clojars.dantheman/test")))))
 
 (deftest jars-can-view-dependents-on-dependents-page
   (inject-artifacts-into-repo! help/*db* "someuser" "fake.jar" "fake-0.0.2/fake.pom")
   (inject-artifacts-into-repo! help/*db* "someuser" "test.jar" "test-0.0.2/test.pom")
+  (inject-artifacts-into-repo! help/*db* "someuser" "test.jar" "test-0.0.3/test.pom")
   (-> (session (help/app))
       (visit "/fake/dependents")
       (within [:div.dependents]
-        (has (text? "0.0.2org.clojars.dantheman/test0.0.2")))))
+        (has (text? "0.0.2com.dantheman/test0.0.3org.clojars.dantheman/test0.0.2")))))
 
 (deftest shadow-jars-have-a-message
   (inject-artifacts-into-repo! help/*db* "someuser" "fake.jar"