Refactor pair() to handle regular, QR and SMS pairings

src/main/java/com/toopher/ToopherAPI.java

@@ -157,64 +157,39 @@ public ToopherAPI(String consumerKey, String consumerSecret, URI uri, HttpClient
 
 
     /**
-     * Create a pairing
-     *
-     * @param pairingPhrase
-     *            The pairing phrase supplied by the user
-     * @param userName
-     *            A user-facing descriptive name for the user (displayed in requests)
-     * @return A Pairing object
-     * @throws RequestError
-     *             Thrown when an exceptional condition is encountered
-     */
-    public Pairing pair(String pairingPhrase, String userName) throws RequestError {
-        return this.pair(pairingPhrase, userName, null);
-    }
-
-    /**
-     * Create a pairing
-     *
-     * @param pairingPhrase
-     *            The pairing phrase supplied by the user
+     * Create a QR pairing
      * @param userName
-     *            A user-facing descriptive name for the user (displayed in requests)
-     * @param extras
-     *            An optional Map of extra parameters to provide to the API
-     * @return A Pairing object
+     *          A user-facing descriptive name for the user (displayed in requests)
+     * @return  A Pairing object
      * @throws RequestError
-     *             Thrown when an exceptional condition is encountered
+     *          Thrown when an exceptional condition is encountered
      */
-    public Pairing pair(String pairingPhrase, String userName, Map<String, String> extras) throws RequestError {
-        final String endpoint = "pairings/create";
-
-        List<NameValuePair> params = new ArrayList<NameValuePair>();
-        params.add(new BasicNameValuePair("pairing_phrase", pairingPhrase));
-        params.add(new BasicNameValuePair("user_name", userName));
-
-        JSONObject json = advanced.raw.post(endpoint, params, extras);
-        try {
-            return new Pairing(json);
-        } catch (Exception e) {
-            throw new RequestError(e);
-        }
+    public Pairing pair(String userName) throws RequestError {
+        Map<String, String> extras = new HashMap<String, String>();
+        return this.pair(userName, "", extras);
     }
-
+    
     /**
-     * Create a pairing that is presented as a QR code
+     * Create an SMS pairing or regular pairing
      *
+     * @param pairingPhraseOrNum
+     *            The pairing phrase or phone number supplied by the user
      * @param userName
      *            A user-facing descriptive name for the user (displayed in requests)
      * @return A Pairing object
      * @throws RequestError
      *             Thrown when an exceptional condition is encountered
      */
-    public Pairing pairWithQrCode(String userName) throws RequestError {
-        return this.pairWithQrCode(userName, null);
+    public Pairing pair(String userName, String pairingPhraseOrNum) throws RequestError {
+        Map<String, String> extras = new HashMap<String, String>();
+        return this.pair(userName, pairingPhraseOrNum, extras);
     }
 
     /**
-     * Create a pairing that is presented as a QR code
+     * Create an SMS pairing or regular pairing
      *
+     * @param pairingPhraseOrNum
+     *            The pairing phrase or phone number supplied by the user
      * @param userName
      *            A user-facing descriptive name for the user (displayed in requests)
      * @param extras
@@ -223,15 +198,33 @@ public Pairing pairWithQrCode(String userName) throws RequestError {
      * @throws RequestError
      *             Thrown when an exceptional condition is encountered
      */
-    public Pairing pairWithQrCode(String userName, Map<String, String> extras) throws RequestError {
-        final String endpoint = "pairings/create/qr";
+    public Pairing pair( String userName, String pairingPhraseOrNum, Map<String, String> extras) throws RequestError {
+        String endpoint;
+        JSONObject result;
 
         List<NameValuePair> params = new ArrayList<NameValuePair>();
         params.add(new BasicNameValuePair("user_name", userName));
 
-        JSONObject json = advanced.raw.post(endpoint, params, extras);
+        for (Map.Entry<String, String> entry : extras.entrySet()) {
+            params.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+        }
+
+        if (!pairingPhraseOrNum.isEmpty()) {
+            if (pairingPhraseOrNum.matches("\\d+")) {
+                params.add(new BasicNameValuePair("phone_number", pairingPhraseOrNum));
+                endpoint = "pairings/create/sms";
+            } else {
+                params.add(new BasicNameValuePair("pairing_phrase", pairingPhraseOrNum));
+                endpoint = "pairings/create";
+            }
+        } else {
+            endpoint = "pairings/create/qr";
+        }
+
+        result = advanced.raw.post(endpoint, params, null);
+
         try {
-            return new Pairing(json);
+            return new Pairing(result);
         } catch (Exception e) {
             throw new RequestError(e);
         }

src/test/java/com/toopher/TestToopherAPI.java

@@ -65,7 +65,7 @@ public void testCreatePairing() throws InterruptedException, RequestError {
 
         ToopherAPI toopherApi = new ToopherAPI("key", "secret",
                 createURI("https://api.toopher.test/v1"), httpClient);
-        Pairing pairing = toopherApi.pair("awkward turtle", "some user");
+        Pairing pairing = toopherApi.pair("some user", "awkward turtle");
 
         assertEquals(httpClient.getLastCalledMethod(), "POST");
         assertEquals(httpClient.getLastCalledData("pairing_phrase"), "awkward turtle");
@@ -88,7 +88,7 @@ public void testCreateQrPairing() throws InterruptedException, RequestError {
 
         ToopherAPI toopherApi = new ToopherAPI("key", "secret",
                 createURI("https://api.toopher.test/v1"), httpClient);
-        Pairing pairing = toopherApi.pairWithQrCode(userName);
+        Pairing pairing = toopherApi.pair(userName);
 
         assertEquals(httpClient.getLastCalledMethod(), "POST");
         assertEquals(pairing.user.id, userId);
@@ -97,6 +97,29 @@ public void testCreateQrPairing() throws InterruptedException, RequestError {
         assertTrue(pairing.enabled);
     }
 
+    @Test
+    public void testCreateSmsPairing() throws InterruptedException, RequestError {
+        JSONObject jsonResponse = new JSONObject();
+        jsonResponse.put("id", id);
+        jsonResponse.put("enabled", true);
+        jsonResponse.put("pending", true);
+        jsonResponse.put("user", user);
+
+        HttpClientMock httpClient = new HttpClientMock(200, jsonResponse.toString());
+
+        ToopherAPI toopherApi = new ToopherAPI("key", "secret",
+                createURI(DEFAULT_BASE_URL), httpClient);
+        Pairing pairing = toopherApi.pair(userName, "123456");
+
+        assertEquals(httpClient.getLastCalledMethod(), "POST");
+        assertEquals(httpClient.getLastCalledData("phone_number"), "123456");
+
+        assertEquals(pairing.user.id, userId);
+        assertEquals(pairing.user.name, userName);
+        assertTrue(pairing.pending);
+        assertTrue(pairing.enabled);
+    }
+
     @Test
     public void testAdvancedPairingsGetById() throws InterruptedException, RequestError {
         JSONObject jsonResponse = new JSONObject();