Tidy JSON string before parsing

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: ngramr
 Type: Package
 Title: Retrieve and Plot Google n-Gram Data
-Version: 1.7.4
-Date: 2021-05-13
+Version: 1.7.5
+Date: 2022-01-08
 Authors@R: c(
     person("Sean", "Carmody", email = "[email protected]", role = c("aut", "cre", "cph"))
     )
@@ -29,7 +29,7 @@ Imports:
 URL: https://github.com/seancarmody/ngramr
 BugReports: https://github.com/seancarmody/ngramr/issues
 License: GPL (>=2)
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 Roxygen: list(markdown = TRUE)
 Encoding: UTF-8
 Suggests: 

NEWS

@@ -1,3 +1,8 @@
+ngramr 1.7.5
+------------
+* Tidied fromJSON call
+* Started to use lifecycle in documentation (ngrami)
+
 ngramr 1.7.4
 ------------
 * Imposed version dependency for dplyr to ensure relocate available

R/ngram.R

@@ -182,17 +182,17 @@ ngram_check_warnings <- function(html) {
   return(warnings)
 }
 
-ngram_fetch_data <- function(html, debug = FALSE) {
+ngram_fetch_data <- function(html) {
   corpus <- xml2::xml_find_first(html, "//select[@id='form-corpus']/option")
   corpus <- as.integer(xml2::xml_attr(corpus, "value"))
   json <- xml2::xml_find_first(html, "//div[@id='chart']/following::script")
   json <- xml2::xml_text(json)
   json <- stringr::str_split(json, "\n")[[1]]
   json <- stringr::str_trim(json)
   years <- as.integer(stringr::str_split(grep("drawD3Chart", json, value = TRUE), ",")[[1]][2:3])
-  if (debug) return(list(json = json, years = years, corpus = corpus))
-  json <- grep("ngrams.data", json, value = TRUE)
-  data <- rjson::fromJSON(sub(".*?=", "", json))
+  json <- grep("ngrams.data =", json, value = TRUE)
+  json <- stringr::str_match(json, "ngrams.data = (.*);")[2]
+  data <- rjson::fromJSON(json)
   if (length(data) == 0) return(NULL)
   data <- lapply(data,
                  function(x) tibble::add_column(tibble::as_tibble(x),

R/ngrami.R

@@ -3,6 +3,9 @@
 #' @param phrases vector of phrases
 #' @param aggregate sum up each of the terms
 #' @param ... remaining parameters passed to ngram
+#' @description 
+#' `r lifecycle::badge("stable")`
+#' This function is a simple wrapper of `ngram` for case insensitive searches.
 #' @export
 
 ngrami <- function(phrases, aggregate = TRUE, ...){

R/ngramr-package.R

@@ -38,8 +38,8 @@
 #' millions of digitized books." \emph{Science} 331, No. 6014 (2011): 176--182.
 #' 
 #' @keywords internal
-#' @import dplyr tidyr ggplot2
-#' @importFrom rlang .data
+#' @import dplyr tidyr ggplot2 
+#' @importFrom rlang .data 
 #' @docType package
 #' @name ngramr
 #' @aliases ngramr ngramr-package