Skip to content

Fix glue encoding #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimhester merged 8 commits into from
Feb 12, 2018
Merged

Fix glue encoding #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e64ef39
Actually test encoding
dpprdan Feb 9, 2018
0bf6233
Amend encoding test with collapse function
dpprdan Feb 9, 2018
7935b29
Encode glue output as UTF-8
dpprdan Feb 9, 2018
4da072a
Encode collapse output as UTF-8
dpprdan Feb 9, 2018
161b768
Update NEWS
dpprdan Feb 9, 2018
d225bdb
Revert previous changes re: encoding
dpprdan Feb 10, 2018
029c7ba
Test for UTF-8 encoding of glue and collapse output
dpprdan Feb 10, 2018
9417554
enc2utf8(x) in as_glue.character()
dpprdan Feb 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

* Do not drop the `glue` class when subsetting (#66).

* Fix `glue()` and `collapse()` always return UTF-8 encoded strings (#81, @dpprdan)

# glue 1.2.0

* The implementation has been tweaked to be slightly faster in most cases.
Expand Down
2 changes: 1 addition & 1 deletion R/glue.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ as_glue.glue <- function(x, ...) {
#' @export
as_glue.character <- function(x, ...) {
class(x) <- c("glue", "character")
x
enc2utf8(x)
}

#' @export
Expand Down
8 changes: 8 additions & 0 deletions tests/testthat/test-glue.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ test_that("glue always returns UTF-8 encoded strings regardless of input encodin

expect_identical(x_out, glue(x))
expect_identical(x_out, glue("{x}"))
expect_equal(Encoding(glue(x)), "UTF-8")
expect_equal(Encoding(glue("{x}")), "UTF-8")

y <- "p\u00E4o"
Encoding(y) <- "UTF-8"
Expand All @@ -241,11 +243,17 @@ test_that("glue always returns UTF-8 encoded strings regardless of input encodin

expect_identical(y_out, glue(y))
expect_identical(y_out, glue("{y}"))
expect_equal(Encoding(glue(y)), "UTF-8")
expect_equal(Encoding(glue("{y}")), "UTF-8")

xy_out <- as_glue(paste0(x_out, y_out))

expect_identical(xy_out, glue(x, y))
expect_identical(xy_out, glue("{x}{y}"))
expect_equal(Encoding(glue(x, y)), "UTF-8")
expect_equal(Encoding(glue("{x}{y}")), "UTF-8")

expect_equal(Encoding(collapse(x)), "UTF-8")
})

test_that("glue always returns NA_character_ if given any NA input and `.na` == NULL", {
Expand Down