Add top range and downvote reason

Closes #8
Closes #5

Author: LucaScorpion

src/main/java/com/scorpiac/javarant/DevRant.java

@@ -19,6 +19,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class DevRant {
     static final String APP_ID = "3";
@@ -167,7 +168,8 @@ private <T> List<T> getFeed(String url, Function<JsonObject, T> converter, Sort
         return getFeed(url, converter,
                 new BasicNameValuePair("sort", sort.toString()),
                 new BasicNameValuePair("limit", String.valueOf(limit)),
-                new BasicNameValuePair("skip", String.valueOf(skip))
+                new BasicNameValuePair("skip", String.valueOf(skip)),
+                sort.getParameter()
         );
     }
 
@@ -255,7 +257,7 @@ public boolean vote(Rant rant, Vote vote) {
     public boolean voteRant(int id, Vote vote) {
         // Rants url, id, vote url.
         String url = String.format("%1$s/%2$d%3$s", API_RANTS, id, API_VOTE);
-        return Util.jsonSuccess(post(url, new BasicNameValuePair("vote", String.valueOf(vote.getValue()))));
+        return Util.jsonSuccess(post(url, new BasicNameValuePair("vote", vote.toString()), vote.getParameter()));
     }
 
     /**
@@ -279,7 +281,7 @@ public boolean vote(Comment comment, Vote vote) {
     public boolean voteComment(int id, Vote vote) {
         // API url, comments url, id, vote url.
         String url = String.format("%1$s%2$s/%3$d%4$s", API, API_COMMENT, id, API_VOTE);
-        return Util.jsonSuccess(post(url, new BasicNameValuePair("vote", String.valueOf(vote.getValue()))));
+        return Util.jsonSuccess(post(url, new BasicNameValuePair("vote", String.valueOf(vote.toString())), vote.getParameter()));
     }
 
     /**
@@ -356,13 +358,14 @@ JsonObject get(String url, NameValuePair... params) {
 
     /**
      * Get a list with all the parameters, including default and auth parameters.
+     * This also filters out any parameters that are {@code null}.
      *
      * @param params The parameters to use.
      * @return A list containing the given parameters, the default parameters, and the auth parameters.
      */
     private List<NameValuePair> getParameters(NameValuePair... params) {
-        List<NameValuePair> paramList = new ArrayList<>(params.length + 5);
-        paramList.addAll(Arrays.asList(params));
+        List<NameValuePair> paramList = new ArrayList<>(params.length + 6);
+        paramList.addAll(Arrays.stream(params).filter(p -> p != null).collect(Collectors.toList()));
 
         // Add the parameters which always need to be present.
         paramList.add(new BasicNameValuePair("app", APP_ID));

src/main/java/com/scorpiac/javarant/Option.java

@@ -0,0 +1,25 @@
+package com.scorpiac.javarant;
+
+import org.apache.http.NameValuePair;
+
+class Option {
+    private final String name;
+    private final NameValuePair parameter;
+
+    protected Option(String name, NameValuePair parameter) {
+        this.name = name;
+        this.parameter = parameter;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    /**
+     * Get the parameter for this {@link Option}, or {@code null} if it has no option.
+     */
+    public NameValuePair getParameter() {
+        return parameter;
+    }
+}

src/main/java/com/scorpiac/javarant/Range.java

@@ -0,0 +1,10 @@
+package com.scorpiac.javarant;
+
+public enum Range {
+    DAY, WEEK, MONTH, ALL;
+
+    @Override
+    public String toString() {
+        return name().toLowerCase();
+    }
+}

src/main/java/com/scorpiac/javarant/Reason.java

@@ -0,0 +1,18 @@
+package com.scorpiac.javarant;
+
+public enum Reason {
+    NOT_FOR_ME("0"),
+    REPOST("1"),
+    OFFENSIVE_SPAM("2");
+
+    private final String value;
+
+    Reason(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}

src/main/java/com/scorpiac/javarant/Sort.java

@@ -1,10 +1,17 @@
 package com.scorpiac.javarant;
 
-public enum Sort {
-    ALGO, RECENT, TOP;
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
 
-    @Override
-    public String toString() {
-        return this.name().toLowerCase();
+public final class Sort extends Option {
+    public static final Sort ALGO = new Sort("algo", null);
+    public static final Sort RECENT = new Sort("recent", null);
+
+    private Sort(String name, NameValuePair option) {
+        super(name, option);
+    }
+
+    public static Sort TOP(Range range) {
+        return new Sort("top", new BasicNameValuePair("range", range.toString()));
     }
 }

src/main/java/com/scorpiac/javarant/Vote.java

@@ -1,17 +1,17 @@
 package com.scorpiac.javarant;
 
-public enum Vote {
-    UP(1),
-    NONE(0),
-    DOWN(-1);
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
 
-    private final int value;
+public final class Vote extends Option {
+    public static final Vote UP = new Vote("1", null);
+    public static final Vote NONE = new Vote("0", null);
 
-    private Vote(int value) {
-        this.value = value;
+    private Vote(String value, NameValuePair parameter) {
+        super(value, parameter);
     }
 
-    public int getValue() {
-        return value;
+    public static Vote DOWN(Reason reason) {
+        return new Vote("-1", new BasicNameValuePair("reason", reason.toString()));
     }
 }