Added support for custom URIs

fernandezpablo85 · fernandezpablo85 · commit ffb1042146e4 · 2010-10-07T21:10:32.000-03:00
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.scribe</groupId>
   <artifactId>scribe</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <name>OAuth Library</name>
 
   <dependencies>
diff --git a/src/main/java/org/scribe/utils/Preconditions.java b/src/main/java/org/scribe/utils/Preconditions.java
@@ -1,10 +1,13 @@
 package org.scribe.utils;
 
+import java.util.regex.Pattern;
+
 import org.scribe.model.OAuthConstants;
 
 public class Preconditions
 {
   private static final String DEFAULT_MESSAGE = "Received an invalid parameter";
+  private static final Pattern URL_PATTERN = Pattern.compile("[a-zA-Z]+://\\S+");
 
   public static void checkNotNull(Object object, String errorMsg)
   {
@@ -33,7 +36,7 @@ public static void checkValidOAuthCallback(String url, String errorMsg)
   
   static boolean isUrl(String url)
   {
-    return url.startsWith("http://") || url.startsWith("https://");
+    return URL_PATTERN.matcher(url).matches();
   }
   
   private static void check(boolean requirements, String error)
diff --git a/src/test/java/org/scribe/utils/PreconditionsTest.java b/src/test/java/org/scribe/utils/PreconditionsTest.java
@@ -53,6 +53,17 @@ public void shouldAllowSSLUrls()
     Preconditions.checkValidUrl("https://www.example.com", ERROR_MSG);
   }
   
+  public void shouldAllowNonStandarProtocolsForAndroid()
+  {
+    Preconditions.checkValidUrl("myUrl://www.example.com", ERROR_MSG);
+  }
+  
+  @Test(expected = IllegalArgumentException.class)
+  public void shouldNotAllowStrangeProtocolNames()
+  {
+    Preconditions.checkValidUrl("_weird*://www.example.com", ERROR_MSG);
+  }
+  
   public void shouldAllowOutOfBandAsValidCallbackValue()
   {
     Preconditions.checkValidOAuthCallback("oob", ERROR_MSG);

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
`1`	`1`	`package org.scribe.utils;`
`2`	`2`
	`3`	`+import java.util.regex.Pattern;`
	`4`	`+`
`3`	`5`	`import org.scribe.model.OAuthConstants;`
`4`	`6`
`5`	`7`	`public class Preconditions`
`6`	`8`	`{`
`7`	`9`	`private static final String DEFAULT_MESSAGE = "Received an invalid parameter";`
	`10`	`+ private static final Pattern URL_PATTERN = Pattern.compile("[a-zA-Z]+://\\S+");`
`8`	`11`
`9`	`12`	`public static void checkNotNull(Object object, String errorMsg)`
`10`	`13`	`{`
`@@ -33,7 +36,7 @@ public static void checkValidOAuthCallback(String url, String errorMsg)`
`33`	`36`
`34`	`37`	`static boolean isUrl(String url)`
`35`	`38`	`{`
`36`		`- return url.startsWith("http://") \|\| url.startsWith("https://");`
	`39`	`+ return URL_PATTERN.matcher(url).matches();`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`private static void check(boolean requirements, String error)`