Fix #51

Ironholds · Aug 30, 2016 · 6a56483 · 6a56483
1 parent a54f89d
commit 6a56483
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,13 @@
+Version 1.5.1 [WIP]
+-------------------------------------------------------------------------
+
+BUGS
+* Fixed a bug in which punycode TLDs were excluded from TLD extraction (thanks to
+  Alex Pinto for pointing that out) #51
+
+DEVELOPMENT
+* Removed the non-portable -g compiler flag in response to CRAN feedback.
+
 Version 1.5.0
 -------------------------------------------------------------------------
 FEATURES

diff --git a/R/suffix.R b/R/suffix.R
@@ -81,7 +81,7 @@ suffix_refresh <- function(){
       rez <- data.frame(suffixes = suff[!iscomment],
                  comments = suff[which(iscomment)[1]], stringsAsFactors = FALSE)
     }
-    rez
+    return(rez)
   }))
   ## this is the old way
   #suffix_dataset <- results[!grepl(x = results, pattern = "//", fixed = TRUE) & !results == ""]
@@ -192,7 +192,7 @@ suffix_extract <- function(domains, suffixes = NULL){
 #'@export
 tld_refresh <- function(){
   raw_tlds <- readLines("http://data.iana.org/TLD/tlds-alpha-by-domain.txt", warn = FALSE)
-  raw_tlds <- tolower(raw_tlds[!grepl(x = raw_tlds, pattern = "(#|--)")])
+  raw_tlds <- tolower(raw_tlds[!grepl(x = raw_tlds, pattern = "#", fixed = TRUE)])
   return(raw_tlds)
 }
 

diff --git a/data/tld_dataset.rda b/data/tld_dataset.rda
diff --git a/src/Makevars b/src/Makevars
@@ -1 +1 @@
-PKG_CPPFLAGS = -UNDEBUG -g
+PKG_CPPFLAGS = -UNDEBUG
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		PKG_CPPFLAGS = -UNDEBUG -g
		PKG_CPPFLAGS = -UNDEBUG