Fixed wrong method call

README.textile

@@ -20,10 +20,12 @@ h3. Threadsafe
 
 Hit Scribe as hard and with many threads as you like.
 
-h3. Supports all major OAuth APIs out-of-the-box
+h3. Supports all major 1.0a and 2.0 OAuth APIs out-of-the-box
 
 * Google
 
+* Facebook
+
 * Yahoo
 
 * LinkedIn
@@ -61,7 +63,7 @@ You can pull scribe from a maven repository, just add this to your __pom.xml__ f
 @<dependency>@
   @<groupId>org.scribe</groupId>@
   @<artifactId>scribe</artifactId>@
-  @<version>1.0.6</version>@
+  @<version>1.1.0</version>@
 @</dependency>@
 
 h1. Getting started in less than 2 minutes

changelog.txt

@@ -29,3 +29,5 @@
 
   * FIX: Removed isEmpty() from OAuth2.0 code in order to support older JVMs
   * FEATURE: Overloaded provider() method to support instances as well as classes (thanks dustismo)
+  * FIX: White-space parameter bug (thanks Krogoth)
+  * FEATURE: OAuth 2.0 now implements server-flow (thanks Diego Silveira)

pom.xml

@@ -4,7 +4,7 @@
   <groupId>org.scribe</groupId>
   <artifactId>scribe</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <name>Scribe OAuth Library</name>
   <description>The best OAuth library out there</description>
   <url>http://github.com/fernandezpablo85/scribe-java</url>

src/main/java/org/scribe/builder/api/DefaultApi20.java

@@ -1,5 +1,6 @@
 package org.scribe.builder.api;
 
+import org.scribe.extractors.*;
 import org.scribe.model.*;
 import org.scribe.oauth.*;
 
@@ -22,6 +23,33 @@ import org.scribe.oauth.*;
 public abstract class DefaultApi20 implements Api
 {
 
+  /**
+   * Returns the access token extractor.
+   * 
+   * @return access token extractor
+   */
+  public AccessTokenExtractor getAccessTokenExtractor()
+  {
+    return new TokenExtractor20Impl();
+  }
+	
+  /**
+   * Returns the verb for the access token endpoint (defaults to GET)
+   * 
+   * @return access token endpoint verb
+   */
+  public Verb getAccessTokenVerb()
+  {
+    return Verb.GET;
+  }
+	
+  /**
+   * Returns the URL that receives the access token requests.
+   * 
+   * @return access token URL
+   */
+  public abstract String getAccessTokenEndpoint();
+	
   /**
    * Returns the URL where you should redirect your users to authenticate
    * your application.

src/main/java/org/scribe/builder/api/FacebookApi.java

@@ -5,12 +5,18 @@ import org.scribe.utils.*;
 
 public class FacebookApi extends DefaultApi20
 {
-  private static final String AUTHORIZE_URL = "https://graph.facebook.com/oauth/authorize?response_type=token&client_id=%s&redirect_uri=%s";
+  private static final String AUTHORIZE_URL = "https://www.facebook.com/dialog/oauth?client_id=%s&redirect_uri=%s";
+
+  @Override
+  public String getAccessTokenEndpoint()
+  {
+    return "https://graph.facebook.com/oauth/access_token";
+  }
   
   @Override
   public String getAuthorizationUrl(OAuthConfig config)
   {
     Preconditions.checkValidUrl(config.getCallback(), "Must provide a valid url as callback. Facebook does not support OOB");
-    return String.format(AUTHORIZE_URL, config.getApiKey(), URLUtils.urlEncodeWrapper(config.getCallback()));
+    return String.format(AUTHORIZE_URL, config.getApiKey(), URLUtils.formURLEncode(config.getCallback()));
   }
 }

src/main/java/org/scribe/extractors/BaseStringExtractorImpl.java

@@ -32,29 +32,9 @@ public class BaseStringExtractorImpl implements BaseStringExtractor
   private String getSortedAndEncodedParams(OAuthRequest request)
   {
     Map<String, String> params = new HashMap<String, String>();
-    Map<String, String> tmp = null;
-    //params.putAll(request.getQueryStringParams());
-    tmp = request.getQueryStringParams();
-    for (String key:tmp.keySet()){
-    	params.put(
-    			URLUtils.percentEncode(key),
-    			URLUtils.percentEncode(tmp.get(key))
-    			);
-    }
-    tmp = request.getBodyParams();
-    for (String key:tmp.keySet()){
-    	params.put(
-    			URLUtils.percentEncode(key),
-    			URLUtils.percentEncode(tmp.get(key))
-    			);
-    }
-    tmp = request.getOauthParameters();
-    for (String key:tmp.keySet()){
-    	params.put(
-    			URLUtils.percentEncode(key),
-    			URLUtils.percentEncode(tmp.get(key))
-    			);
-    }
+    MapUtils.decodeAndAppendEntries(request.getQueryStringParams(), params);
+    MapUtils.decodeAndAppendEntries(request.getBodyParams(), params);
+    MapUtils.decodeAndAppendEntries(request.getOauthParameters(), params);
     params = MapUtils.sort(params);
     return URLUtils.percentEncode(URLUtils.concatSortedPercentEncodedParams(params));
   }

src/main/java/org/scribe/extractors/TokenExtractor20Impl.java

@@ -0,0 +1,36 @@
+package org.scribe.extractors;
+
+import java.util.regex.*;
+
+import org.scribe.exceptions.*;
+import org.scribe.model.*;
+import org.scribe.utils.*;
+
+/**
+ * Default implementation of {@AccessTokenExtractor}. Conforms to OAuth 2.0
+ *
+ */
+public class TokenExtractor20Impl implements AccessTokenExtractor
+{
+  private static final String TOKEN_REGEX = "access_token=(\\S*?)(&(\\S*))?";
+  private static final String EMPTY_SECRET = "";
+
+  /**
+   * {@inheritDoc} 
+   */
+  public Token extract(String response)
+  {
+    Preconditions.checkEmptyString(response, "Response body is incorrect. Can't extract a token from an empty string");
+
+    Matcher matcher = Pattern.compile(TOKEN_REGEX).matcher(response);
+    if (matcher.matches())
+    {
+      String token = URLUtils.formURLDecode(matcher.group(1));
+      return new Token(token, EMPTY_SECRET);
+    } 
+    else
+    {
+      throw new OAuthException("Response body is incorrect. Can't extract a token from this: '" + response + "'", null);
+    }
+  }
+}

src/main/java/org/scribe/extractors/TokenExtractorImpl.java

@@ -27,10 +27,11 @@ public class TokenExtractorImpl implements RequestTokenExtractor, AccessTokenExt
     Matcher matcher = Pattern.compile(TOKEN_REGEX).matcher(response);
     if (matcher.matches())
     {
-      String token = URLUtils.urlDecodeWrapper(matcher.group(1));
-      String secret = URLUtils.urlDecodeWrapper(matcher.group(2));
+      String token = URLUtils.formURLDecode(matcher.group(1));
+      String secret = URLUtils.formURLDecode(matcher.group(2));
       return new Token(token, secret);
-    } else
+    }
+    else
     {
       throw new OAuthException("Response body is incorrect. Can't extract a token from this: '" + response + "'", null);
     }

src/main/java/org/scribe/model/OAuthConstants.java

@@ -41,4 +41,9 @@ public class OAuthConstants
 
   //OAuth 2.0
   public static final String ACCESS_TOKEN = "access_token";
+  public static final String CLIENT_ID = "client_id";
+  public static final String CLIENT_SECRET = "client_secret";
+  public static final String REDIRECT_URI = "redirect_uri";
+  public static final String CODE = "code";
+  
 }

src/main/java/org/scribe/model/OAuthRequest.java

@@ -1,6 +1,5 @@
 package org.scribe.model;
 
-import java.net.MalformedURLException;
 import java.util.*;
 
 /**
@@ -20,9 +19,8 @@ public class OAuthRequest extends Request
    * 
    * @param verb Http verb/method
    * @param url resource URL
- * @throws MalformedURLException 
    */
-  public OAuthRequest(Verb verb, String url) throws MalformedURLException
+  public OAuthRequest(Verb verb, String url)
   {
     super(verb, url);
     this.oauthParameters = new HashMap<String, String>();

src/main/java/org/scribe/model/Request.java

@@ -17,7 +17,7 @@ class Request
 {
   private static final String CONTENT_LENGTH = "Content-Length";
 
-  private URL url;
+  private String url;
   private Verb verb;
   private Map<String, String> querystringParams;
   private Map<String, String> bodyParams;
@@ -30,12 +30,11 @@ class Request
    * 
    * @param verb Http Verb (GET, POST, etc)
    * @param url url with optional querystring parameters.
- * @throws MalformedURLException 
    */
-  public Request(Verb verb, String url) throws MalformedURLException
+  public Request(Verb verb, String url)
   {
     this.verb = verb;
-    this.url = new URL(url);
+    this.url = url;
     this.querystringParams = new HashMap<String, String>();
     this.bodyParams = new HashMap<String, String>();
     this.headers = new HashMap<String, String>();
@@ -62,7 +61,7 @@ class Request
 
   private void createConnection() throws IOException
   {
-    String effectiveUrl = URLUtils.appendParametersToQueryString(url.toString(), querystringParams);
+    String effectiveUrl = URLUtils.appendParametersToQueryString(url, querystringParams);
     if (connection == null)
     {
       connection = (HttpURLConnection) new URL(effectiveUrl).openConnection();
@@ -145,26 +144,23 @@ class Request
    * Get a {@link Map} of the query string parameters.
    * 
    * @return a map containing the query string parameters
+   * @throws OAuthException if the URL is not valid
    */
   public Map<String, String> getQueryStringParams()
+  {
+    try
     {
       Map<String, String> params = new HashMap<String, String>();
-      String query = url.getQuery();
-      if (query != null)
-      {
-        for (String param : query.split("&"))
-        {
-          String pair[] = param.split("=");
-          String valuePart = "";
-          if (pair.length > 1) {
-        	  valuePart = URLUtils.urlDecodeWrapper(pair[1]);
-          }
-          params.put(URLUtils.urlDecodeWrapper(pair[0]),valuePart ); 
-        }
-      }
-      params.putAll(querystringParams);
+      String queryString = new URL(url).getQuery();
+      params.putAll(URLUtils.queryStringToMap(queryString));
+      params.putAll(this.querystringParams);
       return params;
     }
+    catch (MalformedURLException mue)
+    {
+      throw new OAuthException("Malformed URL", mue);
+    }
+  }
 
   /**
    * Obtains a {@link Map} of the body parameters.
@@ -183,7 +179,7 @@ class Request
    */
   public String getUrl()
   {
-    return url.toString();
+    return url;
   }
 
   /**
@@ -193,7 +189,7 @@ class Request
    */
   public String getSanitizedUrl()
   {
-	return URLUtils.convertUrlToBaseStringURI(url);
+    return url.replaceAll("\\?.*", "").replace("\\:\\d{4}", "");
   }
 
   /**

src/main/java/org/scribe/model/Verifier.java

@@ -1,5 +1,7 @@
 package org.scribe.model;
 
+import org.scribe.utils.*;
+
 /**
  * Represents an OAuth verifier code.
  * 
@@ -17,9 +19,7 @@ public class Verifier
    */
   public Verifier(String value)
   {
-	  if (value == null) {
-		  throw new IllegalArgumentException();
-	  }
+    Preconditions.checkNotNull(value, "Must provide a valid string as verifier");
     this.value = value;
   }
 

src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java

@@ -1,9 +1,6 @@
 package org.scribe.oauth;
 
-import java.net.MalformedURLException;
-
 import org.scribe.builder.api.*;
-import org.scribe.exceptions.OAuthException;
 import org.scribe.model.*;
 
 /**
@@ -38,13 +35,9 @@ public class OAuth10aServiceImpl implements OAuthService
    */
   public Token getRequestToken()
   {
-    OAuthRequest request = null;;
-	try {
-		request = new OAuthRequest(api.getRequestTokenVerb(), api.getRequestTokenEndpoint());
-	} catch (MalformedURLException e) {
-		throw new OAuthException("Problems while creating connection", e);
-	}
+    OAuthRequest request = new OAuthRequest(api.getRequestTokenVerb(), api.getRequestTokenEndpoint());
     addOAuthParams(request, OAuthConstants.EMPTY_TOKEN);
+    request.addOAuthParameter(OAuthConstants.CALLBACK, config.getCallback());
     addOAuthHeader(request);
     Response response = request.send();
     return api.getRequestTokenExtractor().extract(response.getBody());
@@ -57,7 +50,6 @@ public class OAuth10aServiceImpl implements OAuthService
     request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, config.getApiKey());
     request.addOAuthParameter(OAuthConstants.SIGN_METHOD, api.getSignatureService().getSignatureMethod());
     request.addOAuthParameter(OAuthConstants.VERSION, getVersion());
-    request.addOAuthParameter(OAuthConstants.CALLBACK, config.getCallback());
     if(scope != NO_SCOPE) request.addOAuthParameter(OAuthConstants.SCOPE, scope);
     request.addOAuthParameter(OAuthConstants.SIGNATURE, getSignature(request, token));
   }
@@ -67,12 +59,7 @@ public class OAuth10aServiceImpl implements OAuthService
    */
   public Token getAccessToken(Token requestToken, Verifier verifier)
   {
-    OAuthRequest request = null;
-	try {
-		request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
-	} catch (MalformedURLException e) {
-		throw new OAuthException("Problems while creating connection", e);
-	}
+    OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
     request.addOAuthParameter(OAuthConstants.TOKEN, requestToken.getToken());
     request.addOAuthParameter(OAuthConstants.VERIFIER, verifier.getValue());
     addOAuthParams(request, requestToken);

src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java

@@ -35,7 +35,13 @@ public class OAuth20ServiceImpl implements OAuthService
    */
   public Token getAccessToken(Token requestToken, Verifier verifier)
   {
-    throw new UnsupportedOperationException("Unsupported operation, please use 'getAuthorizationUrl' and redirect your users there");
+    OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
+    request.addQuerystringParameter(OAuthConstants.CLIENT_ID, config.getApiKey());
+    request.addQuerystringParameter(OAuthConstants.CLIENT_SECRET, config.getApiSecret());
+    request.addQuerystringParameter(OAuthConstants.CODE, verifier.getValue());
+    request.addQuerystringParameter(OAuthConstants.REDIRECT_URI, config.getCallback());
+    Response response = request.send();
+    return api.getAccessTokenExtractor().extract(response.getBody());
   }
 
   /**

src/main/java/org/scribe/utils/MapUtils.java

@@ -33,4 +33,19 @@ public class MapUtils
     Collections.sort(keys);
     return keys;
   }
+
+  /**
+   * Form-urlDecodes and appends all keys from the source {@link Map} to the
+   * target {@link Map}
+   *
+   * @param source Map from where the keys get copied and decoded
+   * @param target Map where the decoded keys are copied to
+   */
+  public static void decodeAndAppendEntries(Map<String, String> source, Map<String, String> target)
+  {
+    for (String key: source.keySet())
+    {
+      target.put(URLUtils.percentEncode(key), URLUtils.percentEncode(source.get(key)));
+    }
+  }
 }

src/main/java/org/scribe/utils/URLUtils.java

@@ -13,13 +13,9 @@ public class URLUtils
 {
   private static final String EMPTY_STRING = "";
   private static final String UTF_8 = "UTF-8";
-  private static final char PAIR_SEPARATOR = '=';
-  private static final char PARAM_SEPARATOR = '&';
+  private static final String PAIR_SEPARATOR = "=";
+  private static final String PARAM_SEPARATOR = "&";
   private static final char QUERY_STRING_SEPARATOR = '?';
-  private static final String HTTP_PROTOCOL = "http";
-  private static final int HTTP_DEFAULT_PORT = 80;
-  private static final String HTTPS_PROTOCOL = "https";
-  private static final int HTTPS_DEFAULT_PORT = 443;
 
   private static final String ERROR_MSG = String.format("Cannot find specified encoding: %s", UTF_8);
 
@@ -35,7 +31,7 @@ public class URLUtils
   }
 
   /**
-   * Turns a map into a form-url-encoded string (key=value&key2&key3=value)
+   * Turns a map into a form-urlencoded string
    * 
    * @param map any map
    * @return form-url-encoded string
@@ -51,49 +47,38 @@ public class URLUtils
     StringBuffer encodedString = new StringBuffer(map.size() * 20);
     for (String key : map.keySet())
     {
-      if(encodedString.length() > 0) 
+      encodedString.append(PARAM_SEPARATOR).append(formURLEncode(key));
+      if(map.get(key) != null)
       {
-        encodedString.append(PARAM_SEPARATOR);
-      }
-      encodedString.append(urlEncodeWrapper(key));
-      if (map.get(key).length() > 0) {
-    	  encodedString.append(PAIR_SEPARATOR).append(urlEncodeWrapper(map.get(key)));
+        encodedString.append(PAIR_SEPARATOR).append(formURLEncode(map.get(key)));
       }
     }
-    return encodedString.toString();
+    return encodedString.toString().substring(1);
   }
 
   /**
    * Percent encodes a string
    * 
-   * @param plain
+   * @param string plain string
    * @return percent encoded string
    */
   public static String percentEncode(String string)
   {
-    Preconditions.checkNotNull(string, "Cannot encode null string");
-    try
-    {
-      String encoded = URLEncoder.encode(string, UTF_8);
-      for(EncodingRule rule : ENCODING_RULES)
+    String encoded = formURLEncode(string);
+    for (EncodingRule rule : ENCODING_RULES)
     {
       encoded = rule.apply(encoded);
     }
     return encoded;
   }
-    catch (UnsupportedEncodingException uee)
-    {
-      throw new IllegalStateException(ERROR_MSG, uee);
-    }
-  }
 
   /**
-   * URL encodes a string
+   * Translates a string into application/x-www-form-urlencoded format
    *
    * @param plain
-   * @return percent encoded string
+   * @return form-urlencoded string
    */
-  public static String urlEncodeWrapper(String string)
+  public static String formURLEncode(String string)
   {
     Preconditions.checkNotNull(string, "Cannot encode null string");
     try
@@ -107,12 +92,12 @@ public class URLUtils
   }
 
   /**
-   * URL decodes a string
+   * Decodes a application/x-www-form-urlencoded string
    * 
-   * @param string percent encoded string
+   * @param string form-urlencoded string
    * @return plain string
    */
-  public static String urlDecodeWrapper(String string)
+  public static String formURLDecode(String string)
   {
     Preconditions.checkNotNull(string, "Cannot decode null string");
     try
@@ -136,13 +121,58 @@ public class URLUtils
   {
     Preconditions.checkNotNull(url, "Cannot append to null URL");
     String queryString = URLUtils.formURLEncodeMap(params);
-    if (queryString.length() == 0) return url;
-
-    // Check if there are parameters in the url already and use '&' instead of '?'
+    if (queryString.equals(EMPTY_STRING))
+    {
+      return url;
+    }
+    else
+    {
       url += url.indexOf(QUERY_STRING_SEPARATOR) != -1 ? PARAM_SEPARATOR : QUERY_STRING_SEPARATOR;
       url += queryString;
       return url;
     }
+  }
+
+  /**
+   * Concats a key-value map into a querystring-like String
+   *
+   * @param params key-value map
+   * @return querystring-like String
+   */
+  // TODO Move to MapUtils
+  public static String concatSortedPercentEncodedParams(Map<String, String> params)
+  {
+    StringBuilder result = new StringBuilder();
+    for (String key : params.keySet())
+    {
+      result.append(key).append(PAIR_SEPARATOR);
+      result.append(params.get(key)).append(PARAM_SEPARATOR);
+    }
+    return result.toString().substring(0, result.length() - 1);
+  }
+
+  /**
+   * Parses and form-urldecodes a querystring-like string into a map
+   *
+   * @param queryString querystring-like String
+   * @return a map with the form-urldecoded parameters
+   */
+  // TODO Move to MapUtils
+  public static Map<String, String> queryStringToMap(String queryString)
+  {
+    Map<String, String> result = new HashMap<String, String>();
+    if (queryString != null && queryString.length() > 0)
+    {
+      for (String param : queryString.split(PARAM_SEPARATOR))
+      {
+        String pair[] = param.split(PAIR_SEPARATOR);
+        String key = formURLDecode(pair[0]);
+        String value = pair.length > 1 ? formURLDecode(pair[1]) : EMPTY_STRING;
+        result.put(key, value);
+      }
+    }
+    return result;
+  }
 
   private static final class EncodingRule
   {
@@ -159,40 +189,4 @@ public class URLUtils
       return string.replace(ch, toCh);
     }
   }
-
-  public static String concatSortedPercentEncodedParams(Map<String, String> params) {
-	  	StringBuilder target = new StringBuilder();
-	    for (String key:params.keySet()){
-	    	target.append(key);
-	    	target.append(PAIR_SEPARATOR);
-	    	target.append(params.get(key));
-	    	target.append(PARAM_SEPARATOR);
-	    }
-	    return target.deleteCharAt(target.length() - 1).toString();
-}
-  
-  public static String convertUrlToBaseStringURI(URL url){
-	    URI uri = null;
-		try {
-			uri = url.toURI();
-		} catch (URISyntaxException e1) {
-			e1.printStackTrace();
-		}
-		String scheme = uri.getScheme().toLowerCase();
-		String host = uri.getHost().toLowerCase();
-		int port = uri.getPort();
-		if (
-				(scheme.equals(HTTP_PROTOCOL) && port == HTTP_DEFAULT_PORT)
-			||  (scheme.equals(HTTPS_PROTOCOL) && port == HTTPS_DEFAULT_PORT)
-			){
-			port = -1;
-		}
-		URI baseUri = null;
-		try {
-			baseUri = new URI(scheme,null, host, port, uri.getPath(), null, null);
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		}
-		return baseUri.toString();
-  }
 }

src/test/java/org/scribe/examples/FacebookExample.java

@@ -1,6 +1,5 @@
 package org.scribe.examples;
 
-import java.net.MalformedURLException;
 import java.util.*;
 
 import org.scribe.builder.*;
@@ -12,13 +11,12 @@ public class FacebookExample
 {
   private static final String NETWORK_NAME = "Facebook";
   private static final String PROTECTED_RESOURCE_URL = "https://graph.facebook.com/me";
-  private static final String NO_SECRET_NEEDED = "";
   private static final Token EMPTY_TOKEN = null;
 
-  public static void main(String[] args) throws MalformedURLException
+  public static void main(String[] args)
   {
     // Replace these with your own api key and secret
-    String apiKey = "your_api_key";
+    String apiKey = "your_app_id";
     String apiSecret = "your_api_secret";
     OAuthService service = new ServiceBuilder()
                                   .provider(FacebookApi.class)
@@ -37,9 +35,16 @@ public class FacebookExample
     System.out.println("Got the Authorization URL!");
     System.out.println("Now go and authorize Scribe here:");
     System.out.println(authorizationUrl);
-    System.out.println("And paste the access token here");
+    System.out.println("And paste the authorization code here");
     System.out.print(">>");
-    Token accessToken = new Token(in.nextLine(), NO_SECRET_NEEDED);
+    Verifier verifier = new Verifier(in.nextLine());
+    System.out.println();
+    
+    // Trade the Request Token and Verfier for the Access Token
+    System.out.println("Trading the Request Token for an Access Token...");
+    Token accessToken = service.getAccessToken(EMPTY_TOKEN, verifier);
+    System.out.println("Got the Access Token!");
+    System.out.println("(if your curious it looks like this: " + accessToken + " )");
     System.out.println();
 
     // Now let's go and ask for a protected resource!

src/test/java/org/scribe/examples/FoursquareExample.java

@@ -1,6 +1,5 @@
 package org.scribe.examples;
 
-import java.net.MalformedURLException;
 import java.util.Scanner;
 
 import org.scribe.builder.*;
@@ -12,7 +11,7 @@ public class FoursquareExample
 {
   private static final String PROTECTED_RESOURCE_URL = "http://api.foursquare.com/v1/user";
   
-  public static void main(String[] args) throws MalformedURLException
+  public static void main(String[] args)
   {
     OAuthService service = new ServiceBuilder()
                                 .provider(FoursquareApi.class)

src/test/java/org/scribe/examples/GoogleExample.java

@@ -1,6 +1,5 @@
 package org.scribe.examples;
 
-import java.net.MalformedURLException;
 import java.util.*;
 
 import org.scribe.builder.*;
@@ -15,7 +14,7 @@ public class GoogleExample
   private static final String PROTECTED_RESOURCE_URL = "https://docs.google.com/feeds/default/private/full/";
   private static final String SCOPE = "https://docs.google.com/feeds/"; 
 
-  public static void main(String[] args) throws MalformedURLException
+  public static void main(String[] args)
   {
     OAuthService service = new ServiceBuilder()
                                   .provider(GoogleApi.class)

src/test/java/org/scribe/examples/LinkedInExample.java

@@ -1,6 +1,5 @@
 package org.scribe.examples;
 
-import java.net.MalformedURLException;
 import java.util.Scanner;
 
 import org.scribe.builder.*;
@@ -12,7 +11,7 @@ public class LinkedInExample
 {
   private static final String PROTECTED_RESOURCE_URL = "http://api.linkedin.com/v1/people/~/connections:(id,last-name)";
   
-  public static void main(String[] args) throws MalformedURLException
+  public static void main(String[] args)
   {
     OAuthService service = new ServiceBuilder()
                                 .provider(LinkedInApi.class)

src/test/java/org/scribe/examples/TwitterExample.java

@@ -1,6 +1,5 @@
 package org.scribe.examples;
 
-import java.net.MalformedURLException;
 import java.util.Scanner;
 
 import org.scribe.builder.*;
@@ -12,7 +11,7 @@ public class TwitterExample
 {
   private static final String PROTECTED_RESOURCE_URL = "http://api.twitter.com/1/account/verify_credentials.xml";
   
-  public static void main(String[] args) throws MalformedURLException
+  public static void main(String[] args)
   {
     OAuthService service = new ServiceBuilder()
                                 .provider(TwitterApi.class)

src/test/java/org/scribe/examples/YahooExample.java

@@ -1,6 +1,5 @@
 package org.scribe.examples;
 
-import java.net.MalformedURLException;
 import java.util.Scanner;
 
 import org.scribe.builder.*;
@@ -12,7 +11,7 @@ public class YahooExample
 {
   private static final String PROTECTED_RESOURCE_URL = "http://social.yahooapis.com/v1/user/A6ROU63MXWDCW3Y5MGCYWVHDJI/profile/status?format=json";
 
-  public static void main(String[] args) throws MalformedURLException
+  public static void main(String[] args)
   {
     OAuthService service = new ServiceBuilder()
                                 .provider(YahooApi.class)

src/test/java/org/scribe/extractors/BaseStringExtractorTest.java

@@ -2,8 +2,6 @@ package org.scribe.extractors;
 
 import static org.junit.Assert.*;
 
-import java.net.MalformedURLException;
-
 import org.junit.*;
 import org.scribe.exceptions.*;
 import org.scribe.model.*;
@@ -14,16 +12,12 @@ public class BaseStringExtractorTest
 
   private BaseStringExtractorImpl extractor;
   private OAuthRequest request;
-  private OAuthRequest request2;
 
   @Before
-  public void setup() throws MalformedURLException
+  public void setup()
   {
     request = ObjectMother.createSampleOAuthRequest();
-    request2 = ObjectMother.createSampleOAuthRequest2();
     extractor = new BaseStringExtractorImpl();
-    
-   
   }
 
   @Test
@@ -34,14 +28,6 @@ public class BaseStringExtractorTest
     assertEquals(expected, baseString);
   }
 
-  @Test
-  public void shouldExtractBaseStringFromOAuthRequest2()
-  {
-    String expected = "GET&http%3A%2F%2Fexample.com&oauth_callback%3Dhttp%253A%252F%252Fexample%252Fcallback%26oauth_consumer_key%3DAS%2523%2524%255E%252A%2540%2526%26oauth_signature%3DOAuth-Signature%26oauth_timestamp%3D123456";
-    String baseString = extractor.extract(request2);
-    assertEquals(expected, baseString);
-  }
-
   @Test(expected = IllegalArgumentException.class)
   public void shouldThrowExceptionIfRquestIsNull()
   {
@@ -50,7 +36,7 @@ public class BaseStringExtractorTest
   }
 
   @Test(expected = OAuthParametersMissingException.class)
-  public void shouldThrowExceptionIfRquestHasNoOAuthParameters() throws MalformedURLException
+  public void shouldThrowExceptionIfRquestHasNoOAuthParameters()
   {
     OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");
     extractor.extract(request);

src/test/java/org/scribe/extractors/HeaderExtractorTest.java

@@ -2,8 +2,6 @@ package org.scribe.extractors;
 
 import static org.junit.Assert.*;
 
-import java.net.MalformedURLException;
-
 import org.junit.*;
 import org.scribe.exceptions.*;
 import org.scribe.model.*;
@@ -16,7 +14,7 @@ public class HeaderExtractorTest
   private OAuthRequest request;
 
   @Before
-  public void setup() throws MalformedURLException
+  public void setup()
   {
     request = ObjectMother.createSampleOAuthRequest();
     extractor = new HeaderExtractorImpl();
@@ -39,7 +37,7 @@ public class HeaderExtractorTest
   }
 
   @Test(expected = OAuthParametersMissingException.class)
-  public void shouldExceptionIfRequestHasNoOAuthParams() throws MalformedURLException
+  public void shouldExceptionIfRequestHasNoOAuthParams()
   {
     OAuthRequest emptyRequest = new OAuthRequest(Verb.GET, "http://example.com");
     extractor.extract(emptyRequest);

src/test/java/org/scribe/extractors/TokenExtractor20Test.java

@@ -0,0 +1,58 @@
+package org.scribe.extractors;
+
+import static org.junit.Assert.*;
+
+import org.junit.*;
+import org.scribe.exceptions.*;
+import org.scribe.model.*;
+
+public class TokenExtractor20Test
+{
+
+  private TokenExtractor20Impl extractor;
+
+  @Before
+  public void setup()
+  {
+    extractor = new TokenExtractor20Impl();
+  }
+
+  @Test
+  public void shouldExtractTokenFromOAuthStandardResponse()
+  {
+    String response = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE";
+    Token extracted = extractor.extract(response);
+    assertEquals("166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE", extracted.getToken());
+    assertEquals("", extracted.getSecret());
+  }
+
+  @Test
+  public void shouldExtractTokenFromResponseWithExpiresParam()
+  {
+    String response = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE&expires=5108";
+    Token extracted = extractor.extract(response);
+    assertEquals("166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE", extracted.getToken());
+    assertEquals("", extracted.getSecret());
+  }
+
+  @Test(expected = OAuthException.class)
+  public void shouldThrowExceptionIfTokenIsAbsent()
+  {
+    String response = "&expires=5108";
+    extractor.extract(response);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void shouldThrowExceptionIfResponseIsNull()
+  {
+    String response = null;
+    extractor.extract(response);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void shouldThrowExceptionIfResponseIsEmptyString()
+  {
+    String response = "";
+    extractor.extract(response);
+  }
+}

src/test/java/org/scribe/model/OAuthRequestTest.java

@@ -2,8 +2,6 @@ package org.scribe.model;
 
 import static org.junit.Assert.*;
 
-import java.net.MalformedURLException;
-
 import org.junit.*;
 
 public class OAuthRequestTest
@@ -12,7 +10,7 @@ public class OAuthRequestTest
   private OAuthRequest request;
 
   @Before
-  public void setup() throws MalformedURLException
+  public void setup()
   {
     request = new OAuthRequest(Verb.GET, "http://example.com");
   }

src/test/java/org/scribe/model/RequestTest.java

@@ -2,8 +2,6 @@ package org.scribe.model;
 
 import static org.junit.Assert.*;
 
-import java.net.MalformedURLException;
-
 import org.junit.*;
 
 public class RequestTest
@@ -18,6 +16,8 @@ public class RequestTest
   {
     connection = new ConnectionStub();
     postRequest = new Request(Verb.POST, "http://example.com");
+    postRequest.addBodyParameter("param", "value");
+    postRequest.addBodyParameter("param with spaces", "value with spaces");
     postRequest.setConnection(connection);
     getRequest = new Request(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces");
     getRequest.setConnection(connection);
@@ -37,7 +37,6 @@ public class RequestTest
     assertEquals(0, postRequest.getQueryStringParams().size());
     assertTrue(getRequest.getQueryStringParams().containsKey("qsparam"));
     assertTrue(getRequest.getQueryStringParams().get("qsparam").equals("value"));
-    assertTrue(getRequest.getQueryStringParams().get("other param").equals("value with spaces"));
   }
 
   @Test
@@ -51,12 +50,10 @@ public class RequestTest
   }
 
   @Test
-  public void shouldSetBodyParamsAndHeaders()
+  public void shouldSetBodyParamsAndAddContentLength()
   {
-    postRequest.addBodyParameter("param", "value");
-    postRequest.addBodyParameter("param two", "value with spaces");
+    assertEquals("param=value&param+with+spaces=value+with+spaces", postRequest.getBodyContents());
     postRequest.send();
-    assertEquals("param+two=value+with+spaces&param=value", postRequest.getBodyContents());
     assertTrue(connection.getHeaders().containsKey("Content-Length"));
   }
 
@@ -70,7 +67,7 @@ public class RequestTest
   }
 
   @Test
-  public void shouldAllowAddingQuerystringParametersAfterCreation() throws MalformedURLException
+  public void shouldAllowAddingQuerystringParametersAfterCreation()
   {
     Request request = new Request(Verb.GET, "http://example.com?one=val");
     request.addQuerystringParameter("two", "other val");
@@ -79,36 +76,8 @@ public class RequestTest
   }
 
   @Test
-  public void sanatizeUrlTest() throws MalformedURLException
+  public void shouldHandleQueryStringSpaceEncodingProperly()
   {
-    Request request = new Request(Verb.GET, "http://example.com?one=val");
-    assertEquals("http://example.com", request.getSanitizedUrl());
-    
-    request = new Request(Verb.GET, "http://EXAMPLE.com:80/?one=val");
-    assertEquals("http://example.com/", request.getSanitizedUrl());
-    
-    request = new Request(Verb.GET, "http://EXAMPLE.com:8080?one=val");
-    assertEquals("http://example.com:8080", request.getSanitizedUrl());
-    
-    request = new Request(Verb.GET, "http://EXAMPLE.com:8080?one=val");
-    assertEquals("http://example.com:8080", request.getSanitizedUrl());
-    
-    request = new Request(Verb.GET, "http://EXAMPLE.com:80/test/?one=val");
-    assertEquals("http://example.com/test/", request.getSanitizedUrl());
-    
-    request = new Request(Verb.GET, "http://EXAMPLE.com:8080/test/?one=val#Hello");
-    assertEquals("http://example.com:8080/test/", request.getSanitizedUrl());
-    
-    request = new Request(Verb.GET, "HTTP://EXAMPLE.com:8080/test/?one=val#Hello");
-    assertEquals("http://example.com:8080/test/", request.getSanitizedUrl());
-    
-    //From RFC5849 example p.20
-    request = new Request(Verb.GET, "http://example.com:80/r%20v/X?id=123");
-    assertEquals("http://example.com/r%20v/X", request.getSanitizedUrl());
-    
-    //From RFC5849 example p.20
-    request = new Request(Verb.GET, "https://www.example.com:8080/?q=1");
-    assertEquals("https://www.example.com:8080/", request.getSanitizedUrl());
+    assertTrue(getRequest.getQueryStringParams().get("other param").equals("value with spaces"));
   }
-  
 }

src/test/java/org/scribe/model/VerifierTest.java

@@ -1,14 +0,0 @@
-package org.scribe.model;
-
-
-import org.junit.*;
-
-public class VerifierTest
-{
-
-  @Test(expected = IllegalArgumentException.class)
-  public void shouldThrowErrorForNullString()
-  {
-    new Verifier(null);
-  }
-}

src/test/java/org/scribe/test/helpers/ObjectMother.java

@@ -1,13 +1,11 @@
 package org.scribe.test.helpers;
 
-import java.net.MalformedURLException;
-
 import org.scribe.model.*;
 
 public class ObjectMother
 {
 
-  public static OAuthRequest createSampleOAuthRequest() throws MalformedURLException
+  public static OAuthRequest createSampleOAuthRequest()
   {
     OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");
     request.addOAuthParameter(OAuthConstants.TIMESTAMP, "123456");
@@ -16,14 +14,4 @@ public class ObjectMother
     request.addOAuthParameter(OAuthConstants.SIGNATURE, "OAuth-Signature");
     return request;
   }
-  
-  public static OAuthRequest createSampleOAuthRequest2() throws MalformedURLException
-  {
-    OAuthRequest request = new OAuthRequest(Verb.GET, "http://EXAMPLE.com");
-    request.addOAuthParameter(OAuthConstants.TIMESTAMP, "123456");
-    request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, "AS#$^*@&");
-    request.addOAuthParameter(OAuthConstants.CALLBACK, "http://example/callback");
-    request.addOAuthParameter(OAuthConstants.SIGNATURE, "OAuth-Signature");
-    return request;
-  }
 }

src/test/java/org/scribe/utils/URLUtilsTest.java

@@ -28,6 +28,17 @@ public class URLUtilsTest
     assertEquals(expected, URLUtils.formURLEncodeMap(params));
   }
 
+  @Test
+  public void shouldFormURLEncodeMapWithMissingValues()
+  {
+    Map<String, String> params = new LinkedHashMap<String, String>();
+    params.put("key", "value");
+    params.put("key with spaces", null);
+
+    String expected = "key=value&key+with+spaces";
+    assertEquals(expected, URLUtils.formURLEncodeMap(params));
+  }
+
   @Test
   public void shouldPercentEncodeString()
   {
@@ -37,24 +48,32 @@ public class URLUtilsTest
   }
 
   @Test
-  public void shouldPercentDecodeString()
+  public void shouldFormURLEncodeString()
   {
-    String toDecode = "this+is+a+test+%26%5E";
-    String expected = "this is a test &^";
-    assertEquals(expected, URLUtils.urlDecodeWrapper(toDecode));
+    String toEncode = "this is a test &^";
+    String expected = "this+is+a+test+%26%5E";
+    assertEquals(expected, URLUtils.formURLEncode(toEncode));
   }
 
   @Test
-  public void shouldEncodeAllSpecialCharacters()
+  public void shouldFormURLDecodeString()
+  {
+    String toDecode = "this+is+a+test+%26%5E";
+    String expected = "this is a test &^";
+    assertEquals(expected, URLUtils.formURLDecode(toDecode));
+  }
+
+  @Test
+  public void shouldPercentEncodeAllSpecialCharacters()
   {
     String plain = "!*'();:@&=+$,/?#[]";
     String encoded = "%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%23%5B%5D";
     assertEquals(encoded, URLUtils.percentEncode(plain));
-    assertEquals(plain, URLUtils.urlDecodeWrapper(encoded));
+    assertEquals(plain, URLUtils.formURLDecode(encoded));
   }
 
   @Test
-  public void shouldNotEncodeReservedCharacters()
+  public void shouldNotPercentEncodeReservedCharacters()
   {
     String plain = "abcde123456-._~";
     String encoded = plain;
@@ -79,7 +98,7 @@ public class URLUtilsTest
   public void shouldThrowExceptionIfStringToDecodeIsNull()
   {
     String toDecode = null;
-    URLUtils.urlDecodeWrapper(toDecode);
+    URLUtils.formURLDecode(toDecode);
   }
 
   @Test(expected = IllegalArgumentException.class)
@@ -128,7 +147,7 @@ public class URLUtilsTest
   }
 
   @Test
-  public void shouldEncodePlusSymbol()
+  public void shouldPercentEncodePlusSymbol()
   {
     String plain = "7aEP+jNAwvjc0mjhqg0nuXPf";
     String encoded = "7aEP%2BjNAwvjc0mjhqg0nuXPf";
@@ -137,11 +156,11 @@ public class URLUtilsTest
   }
 
   @Test
-  public void shouldDecodePlusSymbol()
+  public void shouldURLDecodePlusSymbol()
   {
     String encoded = "oauth_verifier=7aEP%2BjNAwvjc0mjhqg0nuXPf";
     String expected = "oauth_verifier=7aEP+jNAwvjc0mjhqg0nuXPf";
 
-    Assert.assertEquals(expected, URLUtils.urlDecodeWrapper(encoded));
+    Assert.assertEquals(expected, URLUtils.formURLDecode(encoded));
   }
 }