Merge from snowplow/master.

Author: donspaulding

README.md

@@ -171,6 +171,8 @@ We welcome contributions to referer-parser:
 2. **Ports of referer-parser to other languages** - we welcome ports of referer-parser to new programming languages (e.g. JavaScript, PHP, Go, Haskell)
 3. **Bug fixes, feature requests etc** - much appreciated!
 
+**Please sign the [Snowplow CLA] [cla] before making pull requests.**
+
 ## Support
 
 General support for referer-parser is handled by the team at Snowplow Analytics Ltd.
@@ -211,3 +213,4 @@ The .NET port is copyright 2013 [iPerform Software] [iperform] and is available
 
 [apache-license]: http://www.apache.org/licenses/LICENSE-2.0
 [gpl-license]: http://www.gnu.org/licenses/gpl-3.0.html
+[cla]: https://github.com/snowplow/snowplow/wiki/CLA

java-scala/project/BuildSettings.scala

@@ -22,7 +22,7 @@ object BuildSettings {
   // Basic settings for our app
   lazy val basicSettings = Seq[Setting[_]](
     organization  := "com.snowplowanalytics",
-    version       := "0.1.0",
+    version       := "0.1.1",
     description   := "Library for extracting marketing attribution data from referer URLs",
     scalaVersion  := "2.9.1",
     scalacOptions := Seq("-deprecation", "-encoding", "utf8"),

java-scala/src/main/java/com/snowplowanalytics/refererparser/Parser.java

@@ -106,22 +106,36 @@ public Referer parse(String refererUri, String pageHost) throws URISyntaxExcepti
 
   public Referer parse(URI refererUri, String pageHost) {
 
+    // Have to declare up here without `final` due to try/catch scoping
+    String scheme;
+    String host;
+    String path;
+
     // null unless we have a valid http: or https: URI
     if (refererUri == null) return null;
-    final String scheme = refererUri.getScheme();
+
+    try {
+      scheme = refererUri.getScheme();
+      host = refererUri.getHost();
+      path = refererUri.getPath();
+    } catch(Exception e) { // Not a valid URL
+      return null;
+    }
+
     if (scheme == null || (!scheme.equals("http") && !scheme.equals("https"))) return null;
 
     // Internal link if hosts match exactly
     // TODO: would also be nice to:
     // 1. Support a list of other hosts which count as internal
     // 2. Have an algo for stripping subdomains before checking match
-    if (refererUri.getHost().equals(pageHost)) return new Referer(Medium.INTERNAL, null, null);
+    if (host == null) return null; // Not a valid URL
+    if (host.equals(pageHost)) return new Referer(Medium.INTERNAL, null, null);
 
     // Try to lookup our referer. First check with paths, then without.
     // This is the safest way of handling lookups
-    RefererLookup referer = lookupReferer(refererUri.getHost(), refererUri.getPath(), true);
+    RefererLookup referer = lookupReferer(host, path, true);
     if (referer == null) {
-      referer = lookupReferer(refererUri.getHost(), refererUri.getPath(), false);
+      referer = lookupReferer(host, path, false);
     }
 
     if (referer == null) {

java-scala/src/test/scala/com/snowplowanalytics/refererparser/scala/CorruptedRefererUriTest.scala

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2012-2013 Snowplow Analytics Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.snowplowanalytics.refererparser.scala
+
+// Java
+import java.net.URI
+
+// Specs2
+import org.specs2.mutable.Specification
+
+class CorruptedRefererUriTest extends Specification {
+
+  // Our data
+  val refererUri = "http://bigcommerce%20wordpress%20plugin/"
+  val pageUri = null.asInstanceOf[String]
+
+  "A corrupted referer URI" should {
+    "return None, not throw an Exception" in {
+      Parser.parse(refererUri,pageUri) must beNone
+    }
+  }
+}