import changes

.Rbuildignore

@@ -3,6 +3,7 @@
 inst/extras
 # inst/doc
 README.Rmd
+README.html
 index.*
 
 # pkgdown

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: eurostat
 Type: Package
 Title: Tools for Eurostat Open Data
-Date: 2019-12-19
-Version: 3.4.20002
+Date: 2020-01-20
+Version: 3.5.2
 Encoding: UTF-8
 Authors@R: c(
   person("Leo", "Lahti", email = "leo.lahti@iki.fi", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5537-637X")),
@@ -29,6 +29,7 @@ Imports:
     dplyr,
     httr,
     jsonlite,
+    lubridate,
     RColorBrewer,
     readr,
     RefManageR,        
@@ -42,7 +43,6 @@ Suggests:
     Cairo,
     ggplot2,
     knitr,    
-    lubridate,
     mapproj,    
     plotrix,
     rmarkdown,

NAMESPACE

@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+export(check_access_to_data)
 export(clean_eurostat_cache)
 export(cut_to_classes)
 export(dic_order)
@@ -24,6 +25,7 @@ importFrom(RefManageR,toBiblatex)
 importFrom(broom,tidy)
 importFrom(classInt,classIntervals)
 importFrom(countrycode,countrycode)
+importFrom(curl,curl_download)
 importFrom(dplyr,"%>%")
 importFrom(dplyr,filter)
 importFrom(dplyr,left_join)
@@ -35,6 +37,10 @@ importFrom(httr,content)
 importFrom(httr,http_error)
 importFrom(httr,status_code)
 importFrom(jsonlite,fromJSON)
+importFrom(lubridate,day)
+importFrom(lubridate,dmy)
+importFrom(lubridate,month)
+importFrom(lubridate,year)
 importFrom(methods,as)
 importFrom(readr,col_character)
 importFrom(readr,read_tsv)

NEWS

@@ -1,3 +1,8 @@
+# eurostat 3.5.1
+
+* internet and proxy setting fixes
+* bibentry fix
+
 # eurostat 3.4.1
 
 * Fixed vignette

R/check_access_to_data.R

@@ -0,0 +1,38 @@
+#' @title Check access to ec.europe.eu
+#' @description Check if R has access to resources at http://ec.europa.eu
+#' @export
+#' @author Markus Kainu \email{markus.kainu@@kapsi.fi}
+#' @return a logical.
+#' @examples
+#'  \dontrun{
+#'    check_access_to_data()
+#'  }
+
+check_access_to_data <- function(){ 
+  temp <- tempfile()
+  http_url <- "http://ec.europa.eu/eurostat/cache/GISCO/distribution/v2/nuts/geojson/NUTS_RG_60M_2006_4326_LEVL_0.geojson"
+  # If unix use curl::curl_download to test connection
+  # If windows use download.file with default method 'wininet'
+  if(.Platform$OS.type == "unix") {
+    suppressWarnings(
+      try(
+        curl::curl_download(http_url, temp, quiet = TRUE, ), 
+        silent = TRUE)
+    )
+
+  } else {
+    suppressWarnings(
+      try(
+        download.file(http_url, 
+                      temp, 
+                      quiet= TRUE), 
+        silent = TRUE)
+    )
+  }
+  if (is.na(file.info(temp)$size)){
+    FALSE
+  }
+  else{
+    TRUE
+  }
+}

R/firstlib.R

@@ -2,6 +2,7 @@
 #' @importFrom broom tidy
 #' @importFrom classInt classIntervals
 #' @importFrom countrycode countrycode
+#' @importFrom curl curl_download
 #' @importFrom dplyr %>%
 #' @importFrom dplyr filter
 #' @importFrom dplyr mutate
@@ -14,6 +15,10 @@
 #' @importFrom httr http_error
 #' @importFrom httr status_code
 #' @importFrom jsonlite fromJSON
+#' @importFrom lubridate dmy
+#' @importFrom lubridate year
+#' @importFrom lubridate month
+#' @importFrom lubridate day
 #' @importFrom methods as
 #' @importFrom RColorBrewer brewer.pal
 #' @importFrom RefManageR BibEntry 

R/get_bibentry.R

@@ -11,7 +11,6 @@
 #' @export
 #' @author Daniel Antal, Przemyslaw Biecek
 #' @return a bibentry, Bibtex or Biblatex object.
-#' @importFrom  lubridate dmy year month day
 #' @examples
 #'  \dontrun{
 #'    my_bibliography <- get_bibentry (
@@ -50,21 +49,22 @@ get_bibentry <- function(
   toc <- toc[! duplicated(toc), ]
 
   urldate <- as.character(Sys.Date())
-  last_update_date  <- lubridate::dmy(toc$`last update of data`[i])
-  last_update_year  <- lubridate::year(last_update_date)
-  last_update_month <- lubridate::month(last_update_date)
-  last_update_day   <- lubridate::day(last_update_date)
 
-
-    if (nrow(toc) == 0) {
+  if (nrow(toc) == 0) {
       warning(paste0("Code ",code, "not found"))
       return()
-    }
+  }
 
-    eurostat_id <- paste0( toc$code, "_",
+  eurostat_id <- paste0( toc$code, "_",
                            gsub("\\.", "-",  toc$`last update of data`))
 
-    for ( i in 1:nrow(toc) ) {
+  for ( i in 1:nrow(toc) ) {
+
+    last_update_date  <- lubridate::dmy(toc[["last update of data"]][[i]])
+    last_update_year  <- lubridate::year(last_update_date)
+    last_update_month <- lubridate::month(last_update_date)
+    last_update_day   <- lubridate::day(last_update_date)
+
 
       if ( !is.null(keywords) ) {                             #if user entered keywords
         if ( length(keywords)<i ) {                           #last keyword not entered
@@ -93,10 +93,9 @@ get_bibentry <- function(
       } else {
         entries <- entry
       }
-    }
+  }
 
     if (format == "bibtex") {
-
       entries <- utils::toBibtex(entries)
     } else if ( format == "biblatex") {
       entries <- RefManageR::toBiblatex ( entries )

R/get_eurostat.R

@@ -117,10 +117,13 @@ get_eurostat <- function(id, time_format = "date", filters = "none",
                          stringsAsFactors = default.stringsAsFactors(),
                          keepFlags = FALSE, ...){
 
-  # Check if you have internet connection
-  internet_available <- curl::has_internet()
-  if (!internet_available) stop("You have no internet connection, please reconnect!")
-
+  # Check if you have access to ec.europe.eu. 
+  if (!check_access_to_data()){
+    message("You have no access to ec.europe.eu. 
+Please check your connection and/or review your proxy settings")
+  } else {
+
+
   #Warning for flags with filter
   if (keepFlags & !is.character(filters) && filters != "none") {
     warning("The keepFlags argument of the get_eurostat function can be used only without filters. 
@@ -209,5 +212,5 @@ get_eurostat <- function(id, time_format = "date", filters = "none",
   }
 
   y
-
+}
 }

R/get_eurostat_geospatial.R

@@ -37,9 +37,11 @@ get_eurostat_geospatial <- function(output_class="sf",resolution="60",
                                     nuts_level = "all", year = "2016",
                                     cache = TRUE, update_cache = FALSE,
 				    cache_dir = NULL){
-  # Check if you have internet connection
-  internet_available <- curl::has_internet()
-  if (!internet_available) stop("You have no internet connection, please reconnect!")
+  # Check if you have access to ec.europe.eu. 
+  if (!check_access_to_data()){
+    message("You have no access to ec.europe.eu. 
+Please check your connection and/or review your proxy settings")
+  } else {
 
   eurostat_geodata_60_2016 <- NULL
   LEVL_CODE <- NULL
@@ -246,5 +248,5 @@ get_eurostat_geospatial <- function(output_class="sf",resolution="60",
   # Adding a `geo` column for easier joins with dplyr 
   shp$geo <- shp$NUTS_ID
   return(shp)
-
+}
 }

R/get_eurostat_json.R

@@ -55,9 +55,12 @@ get_eurostat_json <- function(id, filters = NULL,
                               stringsAsFactors = default.stringsAsFactors(),
                               ...){
 
-  # Check if you have internet connection
-  internet_available <- curl::has_internet()
-  if (!internet_available) stop("You have no internet connection, please reconnect!")
+  # Check if you have access to ec.europe.eu. 
+  if (!check_access_to_data()){
+    message("You have no access to ec.europe.eu. 
+Please check your connection and/or review your proxy settings")
+  } else {
+
 
   # get response  
   # url <- try(eurostat_json_url(id = id, filters = filters, lang = lang))
@@ -118,7 +121,7 @@ get_eurostat_json <- function(id, filters = NULL,
   dat <- data.frame(variables[rev(names(variables))], values = jdat[[1]]$value)
 
   tibble::as_tibble(dat)
-
+  }
 }
 
 
@@ -140,3 +143,8 @@ eurostat_json_url <- function(id, filters, lang){
   url <- httr::build_url(url_list)
   url
 }
+
+
+
+
+

R/get_eurostat_raw.R

@@ -53,3 +53,27 @@ get_eurostat_raw <- function(id) {
 
   dat
 }
+
+
+
+# #' @title Check if download.file() can access the internet
+# #' @description Check if download.file() can access the internet.
+# #' @return A Boolean which corresponds to if base function download.file() can access the internet
+# #' @author Colm Bates
+# #' @examples
+# #'   \dontrun{
+# #'     eurostat:::has_internet:::download.file()
+# #'
+# #'   }
+# 
+# has_internet_download.file <- function(){
+#     temp <- tempfile()
+#     suppressWarnings(try(download.file("http://captive.apple.com/html", temp, quiet= TRUE), silent = TRUE))
+#     if (is.na(file.info(temp)$size)){
+#         FALSE
+#     }
+#     else{
+#         data<- readChar(temp, file.info(temp)$size)
+#         grepl("Success", readChar(temp, file.info(temp)$size), data)
+#     }
+# }

R/label_eurostat.R

@@ -69,9 +69,11 @@ label_eurostat <-
            custom_dic = NULL,
            fix_duplicated = FALSE) {
 
-    # Check if you have internet connection
-    internet_available <- curl::has_internet()
-    if (!internet_available) stop("You have no internet connection, please reconnect!")
+    # Check if you have access to ec.europe.eu. 
+    if (!check_access_to_data()){
+      message("You have no access to ec.europe.eu. 
+Please check your connection and/or review your proxy settings")
+    } else {
 
     # Avoid warnings
     code_name <- NULL
@@ -201,7 +203,7 @@ label_eurostat <-
 
 
     y
-
+    }
   }
 
 #' @describeIn label_eurostat Get definitions for variable (column) names. For

R/search_eurostat.R

@@ -32,14 +32,17 @@
 #' @keywords utilities database
 search_eurostat <- function(pattern, type = "dataset", fixed = TRUE) {
 
-  # Check if you have internet connection
-  internet_available <- curl::has_internet()
-  if (!internet_available) stop("You have no internet connection, please reconnect!")
+  # Check if you have access to ec.europe.eu. 
+  if (!check_access_to_data()){
+    message("You have no access to ec.europe.eu. 
+Please check your connection and/or review your proxy settings")
+  } else {
 
   set_eurostat_toc()
   tmp <- get(".eurostatTOC", envir = .EurostatEnv)
   if (type != "all") tmp <- tmp[ tmp$type %in% type, ]
   tmp[ grep(tmp$title, pattern = pattern, fixed = fixed), ]
+  }
 }
 
 

README.Rmd

@@ -1,4 +1,5 @@
 ---
+title: eurostat R package
 output: 
   html_document: 
     keep_md: yes

README.md

@@ -1,4 +1,5 @@
 ---
+title: eurostat R package
 output: 
   html_document: 
     keep_md: yes
@@ -57,7 +58,7 @@ Contributions are very welcome:
 
 ### Acknowledgements
 
-**Kindly cite this work** as follows: [Leo Lahti](https://github.com/antagomir), Przemyslaw Biecek, Markus Kainu and Janne Huovari. Retrieval and analysis of Eurostat open data with the eurostat package. [R Journal 9(1):385-392, 2017](https://journal.r-project.org/archive/2017/RJ-2017-019/index.html). R package version 3.4.20002. URL: [http://ropengov.github.io/eurostat](http://ropengov.github.io/eurostat)
+**Kindly cite this work** as follows: [Leo Lahti](https://github.com/antagomir), Przemyslaw Biecek, Markus Kainu and Janne Huovari. Retrieval and analysis of Eurostat open data with the eurostat package. [R Journal 9(1):385-392, 2017](https://journal.r-project.org/archive/2017/RJ-2017-019/index.html). R package version . URL: [http://ropengov.github.io/eurostat](http://ropengov.github.io/eurostat)
 
 We are grateful to all [contributors](https://github.com/rOpenGov/eurostat/graphs/contributors), including Daniel Antal, Joona Lehtomäki, Francois Briatte, and Oliver Reiter, and for the [Eurostat](https://ec.europa.eu/eurostat/) open data portal! This project is part of [rOpenGov](http://ropengov.github.io).