Merge pull request #5 from guidomaggioorg/develop

myfinalpkg 1.1.0

Author: guimaggio

.github/workflows/workflow.yml

@@ -11,8 +11,8 @@ on:
   pull_request:
   # Allow manual runs from the Actions tab
   workflow_dispatch:
-  schedule:
-  - cron: '*/10 * * * 4'
+  # schedule:
+  # - cron: '*/10 * * * 4'
 
 jobs:
   CI-CD:

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: myfinalpkg
 Title: IntroR4 example pkg
-Version: 1.0.0
+Version: 1.1.0
 Author: Guido Maggio
 Maintainer: Guido Maggio <[email protected]>
 Description: Example package for IntroR4 workshop.
@@ -14,6 +14,7 @@ Depends:
 Imports: 
     dplyr,
     ggplot2,
+    plotly,
     scales,
     utils,
     zoo

NAMESPACE

@@ -9,6 +9,7 @@ export(roll_mean)
 import(dplyr)
 import(ggplot2)
 importFrom(dplyr,filter)
+importFrom(plotly,ggplotly)
 importFrom(scales,cut_si)
 importFrom(scales,label_number)
 importFrom(utils,read.csv)

NEWS.md

@@ -0,0 +1,8 @@
+# myfinalpkg 1.1.0
+
+* Added News md file to track releases (#1).
+* Add plotly graphs (#3)
+
+# myfinalpkg 1.0.0
+
+* 1st version of myfinalpkg.

R/plots_utils.R

@@ -85,6 +85,7 @@ get_date_breaks <- function(dates, threshold = 160) {
 #'
 #' @import dplyr
 #' @import ggplot2
+#' @importFrom plotly ggplotly
 #' @importFrom dplyr filter
 #' @export
 #'
@@ -97,14 +98,14 @@ get_date_breaks <- function(dates, threshold = 160) {
 line_plot_data <- function(data, value, startdate = data$Date[1], title) {
   if (!(value %in% names(data)))
     stop(value, " is not a valid column name of data")
-  
+
   if (!missing(startdate)) {
     # conflicts with "stats" package, ::: could be required
     data <- data %>%
       filter(Date >= startdate)
   }
   date.break <- get_date_breaks(data$Date)
-  
+
   p <- ggplot(data, aes(
     x = Date,
     y = !!sym(value),
@@ -119,7 +120,9 @@ line_plot_data <- function(data, value, startdate = data$Date[1], title) {
   #add title if present
   if (!missing(title))
     p <- p + labs(title = title)
-  p
+  pp <- p %>%
+    ggplotly(tooltip = c("x", "y"))
+  pp
 }
 
 #' Barplot function
@@ -136,6 +139,7 @@ line_plot_data <- function(data, value, startdate = data$Date[1], title) {
 #'
 #' @import dplyr
 #' @import ggplot2
+#' @importFrom plotly ggplotly
 #' @importFrom dplyr filter
 #' @export
 #'
@@ -148,21 +152,21 @@ line_plot_data <- function(data, value, startdate = data$Date[1], title) {
 bar_plot_data <- function(data, value, startdate = data$Date[1], rollm = FALSE, title) {
   if (!(value %in% names(data)))
     stop(value, " is not a valid column name of data")
-  
+
   if (!missing(startdate)) {
     # conflicts with "stats" package, ::: could be required
     data <- data %>%
       filter(Date >= startdate)
   }
   date.break <- get_date_breaks(data$Date)
-  
+
   p <- ggplot(data, aes(
     x = Date,
     y = !!sym(value),
     group = 1
   )) +
     geom_bar(stat = "identity", colour = .ColorBars)
-  
+
   if (rollm) {
     # use !sym() to parse rolled.value
     message("Add rolled mean for ", value)
@@ -175,10 +179,12 @@ bar_plot_data <- function(data, value, startdate = data$Date[1], rollm = FALSE,
     theme_plot()
   # add scales
   p <- scale_axes(p, date.break)
-  
+
   #add title if present
   if (!missing(title))
     p <- p + labs(title = title)
-  p
+  pp <- p %>%
+    ggplotly(tooltip = c("x", "y"))
+  pp
 }
 

renv.lock

@@ -61,6 +61,27 @@
       ],
       "Hash": "45f0398006e83a5b10b72a90663d8d8c"
     },
+    "Rcpp": {
+      "Package": "Rcpp",
+      "Version": "1.0.12",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "methods",
+        "utils"
+      ],
+      "Hash": "5ea2700d21e038ace58269ecdbeb9ec0"
+    },
+    "askpass": {
+      "Package": "askpass",
+      "Version": "1.2.0",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "sys"
+      ],
+      "Hash": "cad6cf7f1d5f6e906700b9d3e718c796"
+    },
     "base64enc": {
       "Package": "base64enc",
       "Version": "0.1-3",
@@ -173,6 +194,40 @@
       ],
       "Hash": "e8a1e41acf02548751f45c718d55aa6a"
     },
+    "crosstalk": {
+      "Package": "crosstalk",
+      "Version": "1.2.1",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "R6",
+        "htmltools",
+        "jsonlite",
+        "lazyeval"
+      ],
+      "Hash": "ab12c7b080a57475248a30f4db6298c0"
+    },
+    "curl": {
+      "Package": "curl",
+      "Version": "5.2.1",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "411ca2c03b1ce5f548345d2fc2685f7a"
+    },
+    "data.table": {
+      "Package": "data.table",
+      "Version": "1.15.4",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "methods"
+      ],
+      "Hash": "8ee9ac56ef633d0c7cab8b2ca87d683e"
+    },
     "desc": {
       "Package": "desc",
       "Version": "1.4.3",
@@ -396,6 +451,36 @@
       ],
       "Hash": "2d7b3857980e0e0d0a1fd6f11928ab0f"
     },
+    "htmlwidgets": {
+      "Package": "htmlwidgets",
+      "Version": "1.6.4",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "grDevices",
+        "htmltools",
+        "jsonlite",
+        "knitr",
+        "rmarkdown",
+        "yaml"
+      ],
+      "Hash": "04291cc45198225444a397606810ac37"
+    },
+    "httr": {
+      "Package": "httr",
+      "Version": "1.4.7",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "R6",
+        "curl",
+        "jsonlite",
+        "mime",
+        "openssl"
+      ],
+      "Hash": "ac107251d9d9fd72f0ca8049988f1d7f"
+    },
     "isoband": {
       "Package": "isoband",
       "Version": "0.2.7",
@@ -454,6 +539,17 @@
       ],
       "Hash": "b64ec208ac5bc1852b285f665d6368b3"
     },
+    "later": {
+      "Package": "later",
+      "Version": "1.3.2",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "Rcpp",
+        "rlang"
+      ],
+      "Hash": "a3e051d405326b8b0012377434c62b37"
+    },
     "lattice": {
       "Package": "lattice",
       "Version": "0.22-6",
@@ -469,6 +565,16 @@
       ],
       "Hash": "cc5ac1ba4c238c7ca9fa6a87ca11a7e2"
     },
+    "lazyeval": {
+      "Package": "lazyeval",
+      "Version": "0.2.2",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "d908914ae53b04d4c0c0fd72ecc35370"
+    },
     "lifecycle": {
       "Package": "lifecycle",
       "Version": "1.0.4",
@@ -568,6 +674,16 @@
       ],
       "Hash": "a623a2239e642806158bc4dc3f51565d"
     },
+    "openssl": {
+      "Package": "openssl",
+      "Version": "2.1.2",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "askpass"
+      ],
+      "Hash": "ea2475b073243d9d338aa8f086ce973e"
+    },
     "pillar": {
       "Package": "pillar",
       "Version": "1.9.0",
@@ -631,6 +747,38 @@
       ],
       "Hash": "876c618df5ae610be84356d5d7a5d124"
     },
+    "plotly": {
+      "Package": "plotly",
+      "Version": "4.10.4",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "RColorBrewer",
+        "base64enc",
+        "crosstalk",
+        "data.table",
+        "digest",
+        "dplyr",
+        "ggplot2",
+        "htmltools",
+        "htmlwidgets",
+        "httr",
+        "jsonlite",
+        "lazyeval",
+        "magrittr",
+        "promises",
+        "purrr",
+        "rlang",
+        "scales",
+        "tibble",
+        "tidyr",
+        "tools",
+        "vctrs",
+        "viridisLite"
+      ],
+      "Hash": "a1ac5c03ad5ad12b9d1597e00e23c3dd"
+    },
     "praise": {
       "Package": "praise",
       "Version": "1.0.0",
@@ -651,6 +799,22 @@
       ],
       "Hash": "0c90a7d71988856bad2a2a45dd871bb9"
     },
+    "promises": {
+      "Package": "promises",
+      "Version": "1.3.0",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "R6",
+        "Rcpp",
+        "fastmap",
+        "later",
+        "magrittr",
+        "rlang",
+        "stats"
+      ],
+      "Hash": "434cd5388a3979e74be5c219bcd6e77d"
+    },
     "ps": {
       "Package": "ps",
       "Version": "1.7.6",
@@ -815,6 +979,13 @@
       ],
       "Hash": "960e2ae9e09656611e0b8214ad543207"
     },
+    "sys": {
+      "Package": "sys",
+      "Version": "3.4.2",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Hash": "3a1be13d68d47a8cd0bfd74739ca1555"
+    },
     "testthat": {
       "Package": "testthat",
       "Version": "3.2.1.1",

tests/testthat/test-plots.R

@@ -8,15 +8,15 @@ data <- process_data(df)
 test_that("plot works", {
   pp <- line_plot_data(data, "Daily.Active")
 
-  expect_equal(class(pp), c("gg","ggplot"), 
+  expect_equal(class(pp), c("plotly", "htmlwidget"),
                label = "wrong plot class")
-  expect_equal(pp$data, data, label = 
-                 "data are different from input")
-  
+  # expect_equal(pp$data, data, label =
+  #                "data are different from input")
+
   pp <- bar_plot_data(data, "Daily.Active")
-  
-  expect_equal(class(pp), c("gg","ggplot"), 
+
+  expect_equal(class(pp), c("plotly", "htmlwidget"),
                label = "wrong plot class")
-  expect_equal(pp$data, data, 
-               label = "data are different from input") 
+  # expect_equal(pp$data, data,
+  #              label = "data are different from input")
 })