Merge branch 'release/java-scala-030'

snowplow-referer-parser · Sep 2, 2015 · ae0d180 · ae0d180
2 parents 34bb33f + 29eddf0
commit ae0d180
Show file tree

Hide file tree

Showing 19 changed files with 420 additions and 56 deletions.
diff --git a/dotnet/RefererParser/Resources/referers.json b/dotnet/RefererParser/Resources/referers.json
@@ -1,5 +1,10 @@
 {
     "unknown": {
+        "Outbrain": {
+            "domains": [
+                "paid.outbrain.com"
+            ]
+        }, 
         "Google": {
             "domains": [
                 "support.google.com", 
@@ -13,6 +18,12 @@
                 "news.google.co.uk"
             ]
         }, 
+        "Taboola": {
+            "domains": [
+                "trc.taboola.com", 
+                "api.taboola.com"
+            ]
+        }, 
         "Yahoo!": {
             "domains": [
                 "finance.yahoo.com", 
@@ -419,7 +430,6 @@
                 "google.com.hk/imgres", 
                 "google.com.jm/imgres", 
                 "google.com.kh/imgres", 
-                "google.com.kh/imgres", 
                 "google.com.kw/imgres", 
                 "google.com.lb/imgres", 
                 "google.com.lc/imgres", 
@@ -3745,9 +3755,9 @@
                 "renren.com"
             ]
         }, 
-        "vKruguDruzei.ru": {
+        "Quora": {
             "domains": [
-                "vkrugudruzei.ru"
+                "quora.com"
             ]
         }, 
         "Gaia Online": {
@@ -3849,6 +3859,11 @@
                 "t.co"
             ]
         }, 
+        "vKruguDruzei.ru": {
+            "domains": [
+                "vkrugudruzei.ru"
+            ]
+        }, 
         "Donanimhaber": {
             "domains": [
                 "donanimhaber.com"
@@ -3891,7 +3906,8 @@
         }, 
         "LinkedIn": {
             "domains": [
-                "linkedin.com"
+                "linkedin.com", 
+                "lnkd.in"
             ]
         }, 
         "Foursquare": {
@@ -3933,7 +3949,17 @@
         "Facebook": {
             "domains": [
                 "facebook.com", 
-                "fb.me"
+                "fb.me", 
+                "m.facebook.com", 
+                "l.facebook.com", 
+                "lm.facebook.com"
+            ]
+        }, 
+        "Disqus": {
+            "domains": [
+                "redirect.disqus.com", 
+                "disq.us", 
+                "disqus.com"
             ]
         }, 
         "StudiVZ": {

diff --git a/dotnet/RefererParser/Resources/referers.yml b/dotnet/RefererParser/Resources/referers.yml
@@ -51,6 +51,15 @@ unknown:
       - omg.yahoo.com
       - match.yahoo.net
 
+  Taboola:
+    domains:
+      - trc.taboola.com
+      - api.taboola.com
+
+  Outbrain:
+    domains:
+      - paid.outbrain.com
+
 
 # #######################################################################################################
 #
@@ -129,6 +138,9 @@ social:
     domains:
       - facebook.com
       - fb.me
+      - m.facebook.com
+      - l.facebook.com
+      - lm.facebook.com
 
   Qzone:
     domains:
@@ -167,6 +179,7 @@ social:
   LinkedIn:
     domains:
       - linkedin.com
+      - lnkd.in
 
   Bebo:
     domains:
@@ -437,7 +450,17 @@ social:
 
   Donanimhaber:
     domains:
-      - donanimhaber.com    
+      - donanimhaber.com 
+
+  Disqus:
+    domains:
+      - redirect.disqus.com
+      - disq.us
+      - disqus.com
+
+  Quora:
+    domains:
+      - quora.com
 
 # #######################################################################################################
 #
@@ -1771,7 +1794,6 @@ search:
       - google.com.hk/imgres
       - google.com.jm/imgres
       - google.com.kh/imgres
-      - google.com.kh/imgres
       - google.com.kw/imgres
       - google.com.lb/imgres
       - google.com.lc/imgres

diff --git a/go/data/referers.json b/go/data/referers.json
@@ -1,5 +1,10 @@
 {
     "unknown": {
+        "Outbrain": {
+            "domains": [
+                "paid.outbrain.com"
+            ]
+        }, 
         "Google": {
             "domains": [
                 "support.google.com", 
@@ -13,6 +18,12 @@
                 "news.google.co.uk"
             ]
         }, 
+        "Taboola": {
+            "domains": [
+                "trc.taboola.com", 
+                "api.taboola.com"
+            ]
+        }, 
         "Yahoo!": {
             "domains": [
                 "finance.yahoo.com", 
@@ -419,7 +430,6 @@
                 "google.com.hk/imgres", 
                 "google.com.jm/imgres", 
                 "google.com.kh/imgres", 
-                "google.com.kh/imgres", 
                 "google.com.kw/imgres", 
                 "google.com.lb/imgres", 
                 "google.com.lc/imgres", 
@@ -3745,9 +3755,9 @@
                 "renren.com"
             ]
         }, 
-        "vKruguDruzei.ru": {
+        "Quora": {
             "domains": [
-                "vkrugudruzei.ru"
+                "quora.com"
             ]
         }, 
         "Gaia Online": {
@@ -3849,6 +3859,11 @@
                 "t.co"
             ]
         }, 
+        "vKruguDruzei.ru": {
+            "domains": [
+                "vkrugudruzei.ru"
+            ]
+        }, 
         "Donanimhaber": {
             "domains": [
                 "donanimhaber.com"
@@ -3891,7 +3906,8 @@
         }, 
         "LinkedIn": {
             "domains": [
-                "linkedin.com"
+                "linkedin.com", 
+                "lnkd.in"
             ]
         }, 
         "Foursquare": {
@@ -3933,7 +3949,17 @@
         "Facebook": {
             "domains": [
                 "facebook.com", 
-                "fb.me"
+                "fb.me", 
+                "m.facebook.com", 
+                "l.facebook.com", 
+                "lm.facebook.com"
+            ]
+        }, 
+        "Disqus": {
+            "domains": [
+                "redirect.disqus.com", 
+                "disq.us", 
+                "disqus.com"
             ]
         }, 
         "StudiVZ": {

diff --git a/go/data/referers.yml b/go/data/referers.yml
@@ -51,6 +51,15 @@ unknown:
       - omg.yahoo.com
       - match.yahoo.net
 
+  Taboola:
+    domains:
+      - trc.taboola.com
+      - api.taboola.com
+
+  Outbrain:
+    domains:
+      - paid.outbrain.com
+
 
 # #######################################################################################################
 #
@@ -129,6 +138,9 @@ social:
     domains:
       - facebook.com
       - fb.me
+      - m.facebook.com
+      - l.facebook.com
+      - lm.facebook.com
 
   Qzone:
     domains:
@@ -167,6 +179,7 @@ social:
   LinkedIn:
     domains:
       - linkedin.com
+      - lnkd.in
 
   Bebo:
     domains:
@@ -437,7 +450,17 @@ social:
 
   Donanimhaber:
     domains:
-      - donanimhaber.com    
+      - donanimhaber.com 
+
+  Disqus:
+    domains:
+      - redirect.disqus.com
+      - disq.us
+      - disqus.com
+
+  Quora:
+    domains:
+      - quora.com
 
 # #######################################################################################################
 #
@@ -1771,7 +1794,6 @@ search:
       - google.com.hk/imgres
       - google.com.jm/imgres
       - google.com.kh/imgres
-      - google.com.kh/imgres
       - google.com.kw/imgres
       - google.com.lb/imgres
       - google.com.lc/imgres

diff --git a/java-scala/CHANGELOG b/java-scala/CHANGELOG
@@ -1,3 +1,9 @@
+Version 0.3.0 (2015-09-02)
+--------------------------
+Added Taboola, Outbrain and other referers (#109)
+Updated vagrant up to work with latest Peru version (#110) 
+Removed duplicate google.com.kh/imgres entry (#111)
+
 Version 0.2.3 (2014-02-01)
 --------------------------
 Added dedicated Vagrant setup (#92)

diff --git a/java-scala/README.md b/java-scala/README.md
@@ -61,7 +61,7 @@ Then add into your project's `pom.xml`:
 <dependency>
     <groupId>com.snowplowanalytics</groupId>
     <artifactId>referer-parser_2.11</artifactId>
-    <version>0.2.1</version>
+    <version>0.3.0</version>
 </dependency>
 ```
 
@@ -118,7 +118,7 @@ Add this to your SBT config:
 val snowplowRepo = "SnowPlow Repo" at "http://maven.snplow.com/releases/"
 
 // Dependency
-val refererParser = "com.snowplowanalytics" %% "referer-parser" % "0.2.1"
+val refererParser = "com.snowplowanalytics" %% "referer-parser" % "0.3.0"
 ```
 
 ## Contributing
@@ -131,7 +131,7 @@ val refererParser = "com.snowplowanalytics" %% "referer-parser" % "0.2.1"
 
 ## Copyright and license
 
-The referer-parser Java/Scala library is copyright 2012-2013 Snowplow Analytics Ltd.
+The referer-parser Java/Scala library is copyright 2012-2015 Snowplow Analytics Ltd.
 
 Licensed under the [Apache License, Version 2.0] [license] (the "License");
 you may not use this software except in compliance with the License.

diff --git a/java-scala/project/BuildSettings.scala b/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.2.3",
+    version       := "0.3.0",
     description   := "Library for extracting marketing attribution data from referer URLs",
     scalaVersion  := "2.9.1",
     crossScalaVersions := Seq("2.9.1", "2.10.4", "2.11.1"),