Skip to content

Commit ae0d180

Browse files
alexanderdeanalexanderdean
committed
Merge branch 'release/java-scala-030'
2 parents 34bb33f + 29eddf0 commit ae0d180

File tree

19 files changed

+420
-56
lines changed

19 files changed

+420
-56
lines changed

‎dotnet/RefererParser/Resources/referers.json

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"unknown": {
3+
"Outbrain": {
4+
"domains": [
5+
"paid.outbrain.com"
6+
]
7+
},
38
"Google": {
49
"domains": [
510
"support.google.com",
@@ -13,6 +18,12 @@
1318
"news.google.co.uk"
1419
]
1520
},
21+
"Taboola": {
22+
"domains": [
23+
"trc.taboola.com",
24+
"api.taboola.com"
25+
]
26+
},
1627
"Yahoo!": {
1728
"domains": [
1829
"finance.yahoo.com",
@@ -419,7 +430,6 @@
419430
"google.com.hk/imgres",
420431
"google.com.jm/imgres",
421432
"google.com.kh/imgres",
422-
"google.com.kh/imgres",
423433
"google.com.kw/imgres",
424434
"google.com.lb/imgres",
425435
"google.com.lc/imgres",
@@ -3745,9 +3755,9 @@
37453755
"renren.com"
37463756
]
37473757
},
3748-
"vKruguDruzei.ru": {
3758+
"Quora": {
37493759
"domains": [
3750-
"vkrugudruzei.ru"
3760+
"quora.com"
37513761
]
37523762
},
37533763
"Gaia Online": {
@@ -3849,6 +3859,11 @@
38493859
"t.co"
38503860
]
38513861
},
3862+
"vKruguDruzei.ru": {
3863+
"domains": [
3864+
"vkrugudruzei.ru"
3865+
]
3866+
},
38523867
"Donanimhaber": {
38533868
"domains": [
38543869
"donanimhaber.com"
@@ -3891,7 +3906,8 @@
38913906
},
38923907
"LinkedIn": {
38933908
"domains": [
3894-
"linkedin.com"
3909+
"linkedin.com",
3910+
"lnkd.in"
38953911
]
38963912
},
38973913
"Foursquare": {
@@ -3933,7 +3949,17 @@
39333949
"Facebook": {
39343950
"domains": [
39353951
"facebook.com",
3936-
"fb.me"
3952+
"fb.me",
3953+
"m.facebook.com",
3954+
"l.facebook.com",
3955+
"lm.facebook.com"
3956+
]
3957+
},
3958+
"Disqus": {
3959+
"domains": [
3960+
"redirect.disqus.com",
3961+
"disq.us",
3962+
"disqus.com"
39373963
]
39383964
},
39393965
"StudiVZ": {

‎dotnet/RefererParser/Resources/referers.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@ unknown:
5151
- omg.yahoo.com
5252
- match.yahoo.net
5353

54+
Taboola:
55+
domains:
56+
- trc.taboola.com
57+
- api.taboola.com
58+
59+
Outbrain:
60+
domains:
61+
- paid.outbrain.com
62+
5463

5564
# #######################################################################################################
5665
#
@@ -129,6 +138,9 @@ social:
129138
domains:
130139
- facebook.com
131140
- fb.me
141+
- m.facebook.com
142+
- l.facebook.com
143+
- lm.facebook.com
132144

133145
Qzone:
134146
domains:
@@ -167,6 +179,7 @@ social:
167179
LinkedIn:
168180
domains:
169181
- linkedin.com
182+
- lnkd.in
170183

171184
Bebo:
172185
domains:
@@ -437,7 +450,17 @@ social:
437450

438451
Donanimhaber:
439452
domains:
440-
- donanimhaber.com
453+
- donanimhaber.com
454+
455+
Disqus:
456+
domains:
457+
- redirect.disqus.com
458+
- disq.us
459+
- disqus.com
460+
461+
Quora:
462+
domains:
463+
- quora.com
441464

442465
# #######################################################################################################
443466
#
@@ -1771,7 +1794,6 @@ search:
17711794
- google.com.hk/imgres
17721795
- google.com.jm/imgres
17731796
- google.com.kh/imgres
1774-
- google.com.kh/imgres
17751797
- google.com.kw/imgres
17761798
- google.com.lb/imgres
17771799
- google.com.lc/imgres

‎go/data/referers.json

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"unknown": {
3+
"Outbrain": {
4+
"domains": [
5+
"paid.outbrain.com"
6+
]
7+
},
38
"Google": {
49
"domains": [
510
"support.google.com",
@@ -13,6 +18,12 @@
1318
"news.google.co.uk"
1419
]
1520
},
21+
"Taboola": {
22+
"domains": [
23+
"trc.taboola.com",
24+
"api.taboola.com"
25+
]
26+
},
1627
"Yahoo!": {
1728
"domains": [
1829
"finance.yahoo.com",
@@ -419,7 +430,6 @@
419430
"google.com.hk/imgres",
420431
"google.com.jm/imgres",
421432
"google.com.kh/imgres",
422-
"google.com.kh/imgres",
423433
"google.com.kw/imgres",
424434
"google.com.lb/imgres",
425435
"google.com.lc/imgres",
@@ -3745,9 +3755,9 @@
37453755
"renren.com"
37463756
]
37473757
},
3748-
"vKruguDruzei.ru": {
3758+
"Quora": {
37493759
"domains": [
3750-
"vkrugudruzei.ru"
3760+
"quora.com"
37513761
]
37523762
},
37533763
"Gaia Online": {
@@ -3849,6 +3859,11 @@
38493859
"t.co"
38503860
]
38513861
},
3862+
"vKruguDruzei.ru": {
3863+
"domains": [
3864+
"vkrugudruzei.ru"
3865+
]
3866+
},
38523867
"Donanimhaber": {
38533868
"domains": [
38543869
"donanimhaber.com"
@@ -3891,7 +3906,8 @@
38913906
},
38923907
"LinkedIn": {
38933908
"domains": [
3894-
"linkedin.com"
3909+
"linkedin.com",
3910+
"lnkd.in"
38953911
]
38963912
},
38973913
"Foursquare": {
@@ -3933,7 +3949,17 @@
39333949
"Facebook": {
39343950
"domains": [
39353951
"facebook.com",
3936-
"fb.me"
3952+
"fb.me",
3953+
"m.facebook.com",
3954+
"l.facebook.com",
3955+
"lm.facebook.com"
3956+
]
3957+
},
3958+
"Disqus": {
3959+
"domains": [
3960+
"redirect.disqus.com",
3961+
"disq.us",
3962+
"disqus.com"
39373963
]
39383964
},
39393965
"StudiVZ": {

‎go/data/referers.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@ unknown:
5151
- omg.yahoo.com
5252
- match.yahoo.net
5353

54+
Taboola:
55+
domains:
56+
- trc.taboola.com
57+
- api.taboola.com
58+
59+
Outbrain:
60+
domains:
61+
- paid.outbrain.com
62+
5463

5564
# #######################################################################################################
5665
#
@@ -129,6 +138,9 @@ social:
129138
domains:
130139
- facebook.com
131140
- fb.me
141+
- m.facebook.com
142+
- l.facebook.com
143+
- lm.facebook.com
132144

133145
Qzone:
134146
domains:
@@ -167,6 +179,7 @@ social:
167179
LinkedIn:
168180
domains:
169181
- linkedin.com
182+
- lnkd.in
170183

171184
Bebo:
172185
domains:
@@ -437,7 +450,17 @@ social:
437450

438451
Donanimhaber:
439452
domains:
440-
- donanimhaber.com
453+
- donanimhaber.com
454+
455+
Disqus:
456+
domains:
457+
- redirect.disqus.com
458+
- disq.us
459+
- disqus.com
460+
461+
Quora:
462+
domains:
463+
- quora.com
441464

442465
# #######################################################################################################
443466
#
@@ -1771,7 +1794,6 @@ search:
17711794
- google.com.hk/imgres
17721795
- google.com.jm/imgres
17731796
- google.com.kh/imgres
1774-
- google.com.kh/imgres
17751797
- google.com.kw/imgres
17761798
- google.com.lb/imgres
17771799
- google.com.lc/imgres

‎java-scala/CHANGELOG

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 0.3.0 (2015-09-02)
2+
--------------------------
3+
Added Taboola, Outbrain and other referers (#109)
4+
Updated vagrant up to work with latest Peru version (#110)
5+
Removed duplicate google.com.kh/imgres entry (#111)
6+
17
Version 0.2.3 (2014-02-01)
28
--------------------------
39
Added dedicated Vagrant setup (#92)

‎java-scala/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Then add into your project's `pom.xml`:
6161
<dependency>
6262
<groupId>com.snowplowanalytics</groupId>
6363
<artifactId>referer-parser_2.11</artifactId>
64-
<version>0.2.1</version>
64+
<version>0.3.0</version>
6565
</dependency>
6666
```
6767

@@ -118,7 +118,7 @@ Add this to your SBT config:
118118
val snowplowRepo = "SnowPlow Repo" at "http://maven.snplow.com/releases/"
119119

120120
// Dependency
121-
val refererParser = "com.snowplowanalytics" %% "referer-parser" % "0.2.1"
121+
val refererParser = "com.snowplowanalytics" %% "referer-parser" % "0.3.0"
122122
```
123123

124124
## Contributing
@@ -131,7 +131,7 @@ val refererParser = "com.snowplowanalytics" %% "referer-parser" % "0.2.1"
131131

132132
## Copyright and license
133133

134-
The referer-parser Java/Scala library is copyright 2012-2013 Snowplow Analytics Ltd.
134+
The referer-parser Java/Scala library is copyright 2012-2015 Snowplow Analytics Ltd.
135135

136136
Licensed under the [Apache License, Version 2.0] [license] (the "License");
137137
you may not use this software except in compliance with the License.

‎java-scala/project/BuildSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object BuildSettings {
2222
// Basic settings for our app
2323
lazy val basicSettings = Seq[Setting[_]](
2424
organization := "com.snowplowanalytics",
25-
version := "0.2.3",
25+
version := "0.3.0",
2626
description := "Library for extracting marketing attribution data from referer URLs",
2727
scalaVersion := "2.9.1",
2828
crossScalaVersions := Seq("2.9.1", "2.10.4", "2.11.1"),

0 commit comments

Comments
 (0)