Merge branch 'master' into omit-na

Author: yutannihilation

.Rbuildignore

@@ -12,3 +12,4 @@
 ^docs$
 ^README\.Rmd$
 ^README-.*\.png$
+^appveyor\.yml$

.travis.yml

@@ -4,5 +4,12 @@ language: R
 sudo: false
 cache: packages
 
+r:
+- 3.1
+- 3.2
+- oldrel
+- release
+- devel
+
 after_success:
   - Rscript -e 'covr::codecov()'

DESCRIPTION

@@ -1,31 +1,33 @@
 Package: stringr
-Version: 1.2.0.9000
 Title: Simple, Consistent Wrappers for Common String Operations
+Version: 1.2.0.9000
+Authors@R: c(
+    person("Hadley", "Wickham", , "[email protected]", c("aut", "cre", "cph")),
+    person("RStudio", role = c("cph", "fnd"))
+    )
 Description: A consistent, simple and easy to use set of wrappers around the
     fantastic 'stringi' package. All function and argument names (and positions)
     are consistent, all functions deal with "NA"'s and zero length vectors
     in the same way, and the output from one function is easy to feed into
     the input of another.
-Authors@R: c(
-    person("Hadley", "Wickham", , "[email protected]", c("aut", "cre", "cph")),
-    person("RStudio", role = c("cph", "fnd"))
-    )
 License: GPL-2 | file LICENSE
-Depends:
-    R (>= 2.14)
-Imports:
-    stringi (>= 1.1.6),
-    magrittr
-Suggests:
-    testthat,
-    knitr,
+URL: http://stringr.tidyverse.org, 
+     https://github.com/tidyverse/stringr
+BugReports: https://github.com/tidyverse/stringr/issues
+Depends: 
+    R (>= 3.1)
+Imports: 
+    glue,
+    magrittr,
+    stringi (>= 1.1.6)
+Suggests: 
+    covr,
     htmltools,
     htmlwidgets,
+    knitr,
     rmarkdown,
-    covr
+    testthat
 VignetteBuilder: knitr
-URL: http://stringr.tidyverse.org, 
-     https://github.com/tidyverse/stringr
-BugReports: https://github.com/tidyverse/stringr/issues
-RoxygenNote: 6.0.1
 LazyData: true
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 6.0.1

NAMESPACE

@@ -5,9 +5,7 @@ export("str_sub<-")
 export(boundary)
 export(coll)
 export(fixed)
-export(ignore.case)
 export(invert_match)
-export(perl)
 export(regex)
 export(str_c)
 export(str_conv)
@@ -16,8 +14,10 @@ export(str_detect)
 export(str_dup)
 export(str_extract)
 export(str_extract_all)
+export(str_flatten)
+export(str_glue)
+export(str_glue_data)
 export(str_interp)
-export(str_join)
 export(str_length)
 export(str_locate)
 export(str_locate_all)

NEWS.md

@@ -1,5 +1,17 @@
 # stringr 1.2.0.9000
 
+* New `str_glue()` and `str_glue_data()` provide convenient wrappers around
+  `glue` and `glue_data()` from the [glue](http://glue.tidyverse.org/) package
+  (#157).
+
+* Long deprecated `str_join()`, `ignore.case()` and `perl()` have now been 
+  removed.
+
+* New `str_flatten()` is a wrapper around `stri_flatten()` and clearly
+  conveys flattening a character vector into a single string (#186).
+
+* `str_trunc()` now preserves NAs (@ClaytonJY, #162)
+
 # stringr 1.2.0
 
 ## API changes

R/c.r

@@ -1,11 +1,11 @@
 #' Join multiple strings into a single string.
 #'
-#' To understand how \code{str_c} works, you need to imagine that you are
+#' To understand how `str_c` works, you need to imagine that you are
 #' building up a matrix of strings. Each input argument forms a column, and
 #' is expanded to the length of the longest argument, using the usual
-#' recyling rules.  The \code{sep} string is inserted between each column. If
-#' collapse is \code{NULL} each row is collapsed into a single string. If
-#' non-\code{NULL} that string is inserted at the end of each row, and
+#' recyling rules.  The `sep` string is inserted between each column. If
+#' collapse is `NULL` each row is collapsed into a single string. If
+#' non-`NULL` that string is inserted at the end of each row, and
 #' the entire matrix collapsed to a single string.
 #'
 #' @param ... One or more character vectors. Zero length arguments
@@ -14,16 +14,16 @@
 #'
 #'   Like most other R functions, missing values are "infectious": whenever
 #'   a missing value is combined with another string the result will always
-#'   be missing. Use \code{\link{str_replace_na}} to convert \code{NA} to
-#'   \code{"NA"}
+#'   be missing. Use [str_replace_na()] to convert `NA` to
+#'   `"NA"`
 #' @param sep String to insert between input vectors.
 #' @param collapse Optional string used to combine input vectors into single
 #'   string.
-#' @return If \code{collapse = NULL} (the default) a character vector with
-#'   length equal to the longest input string. If \code{collapse} is
+#' @return If `collapse = NULL` (the default) a character vector with
+#'   length equal to the longest input string. If `collapse` is
 #'   non-NULL, a character vector of length 1.
-#' @seealso \code{\link{paste}} for equivalent base R functionality, and
-#'    \code{\link[stringi]{stri_join}} which this function wraps
+#' @seealso [paste()] for equivalent base R functionality, and
+#'    [stringi::stri_join()] which this function wraps
 #' @export str_c
 #' @examples
 #' str_c("Letter: ", letters)
@@ -42,11 +42,3 @@
 str_c <- function(..., sep = "", collapse = NULL) {
   stri_c(..., sep = sep, collapse = collapse, ignore_null = TRUE)
 }
-
-#' @export
-#' @rdname str_c
-#' @usage NULL
-str_join <- function(..., sep = "", collapse = NULL) {
-  .Deprecated("str_c")
-  stri_c(..., sep = sep, collapse = collapse, ignore_null = TRUE)
-}

R/conv.R

@@ -3,7 +3,7 @@
 #' This is a convenient way to override the current encoding of a string.
 #'
 #' @param string String to re-encode.
-#' @param encoding Name of encoding. See \code{\link[stringi]{stri_enc_list}}
+#' @param encoding Name of encoding. See [stringi::stri_enc_list()]
 #'   for a complete list.
 #' @export
 #' @examples

R/count.r

@@ -1,13 +1,13 @@
 #' Count the number of matches in a string.
 #'
-#' Vectorised over \code{string} and \code{pattern}.
+#' Vectorised over `string` and `pattern`.
 #'
 #' @inheritParams str_detect
 #' @return An integer vector.
 #' @seealso
-#'  \code{\link[stringi]{stri_count}} which this function wraps.
+#'  [stringi::stri_count()] which this function wraps.
 #'
-#'  \code{\link{str_locate}}/\code{\link{str_locate_all}} to locate position
+#'  [str_locate()]/[str_locate_all()] to locate position
 #'  of matches
 #'
 #' @export

R/data.R

@@ -1,9 +1,9 @@
 #' Sample character vectors for practicing string manipulations.
 #'
-#' \code{fruit} and \code{word} come from the \code{rcorpora} package
+#' `fruit` and `word` come from the `rcorpora` package
 #' written by Gabor Csardi; the data was collected by Darius Kazemi
 #' and made available at \url{https://github.com/dariusk/corpora}.
-#' \code{sentences} is a collection of "Harvard sentences" used for
+#' `sentences` is a collection of "Harvard sentences" used for
 #' standardised testing of voice.
 #'
 #' @format A character vector.

R/detect.r

@@ -1,27 +1,27 @@
 #' Detect the presence or absence of a pattern in a string.
 #'
-#' Vectorised over \code{string} and \code{pattern}.
+#' Vectorised over `string` and `pattern`.
 #'
 #' @param string Input vector. Either a character vector, or something
 #'  coercible to one.
 #' @param pattern Pattern to look for.
 #'
 #'   The default interpretation is a regular expression, as described
-#'   in \link[stringi]{stringi-search-regex}. Control options with
-#'   \code{\link{regex}()}.
+#'   in [stringi::stringi-search-regex]. Control options with
+#'   [regex()].
 #'
 #'   Match a fixed string (i.e. by comparing only bytes), using
-#'   \code{\link{fixed}(x)}. This is fast, but approximate. Generally,
-#'   for matching human text, you'll want \code{\link{coll}(x)} which
+#'   [fixed()]. This is fast, but approximate. Generally,
+#'   for matching human text, you'll want [coll()] which
 #'   respects character matching rules for the specified locale.
 #'
 #'   Match character, word, line and sentence boundaries with
-#'   \code{\link{boundary}()}. An empty pattern, "", is equivalent to
-#'   \code{boundary("character")}.
+#'   [boundary()]. An empty pattern, "", is equivalent to
+#'   `boundary("character")`.
 #' @return A logical vector.
-#' @seealso \code{\link[stringi]{stri_detect}} which this function wraps,
-#'   \code{\link{str_subset}} for a convenient wrapper around 
-#'   \code{x[str_detect(x, pattern)]}
+#' @seealso [stringi::stri_detect()] which this function wraps,
+#'   [str_subset()] for a convenient wrapper around
+#'   `x[str_detect(x, pattern)]`
 #' @export
 #' @examples
 #' fruit <- c("apple", "banana", "pear", "pinapple")
@@ -42,4 +42,3 @@ str_detect <- function(string, pattern) {
     regex = stri_detect_regex(string, pattern, opts_regex = opts(pattern))
   )
 }
-