Bug fixes and minor updates.

leonawicz · May 29, 2021 · 8199dfe · 8199dfe
1 parent 469b62d
commit 8199dfe
Show file tree

Hide file tree

Showing 76 changed files with 8,111 additions and 733 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,10 @@ matrix:
   include:
    - r: release
      after_success:
-       - Rscript -e 'covr::codecov(function_exclusions = c("\\.onLoad$", "^mb_tl_complete$"), line_exclusions = list("R/novels.R" = 20:21, "R/api.R" = 81, "R/memory_alpha.R" = c(171, 196, 223), "R/memory_beta.R" = c(109, 134, 164), "R/fonts.R" = c(22:23, 26:27, 30:31)))'
+       - Rscript -e 'covr::codecov(function_exclusions = c("\\.onLoad$", "^mb_tl_complete$"), line_exclusions = list("R/novels.R" = 20:21, "R/api.R" = 81, "R/memory_alpha.R" = c(171, 196, 224), "R/memory_beta.R" = c(109, 134, 162), "R/fonts.R" = c(22:23, 26:27, 30:31)))'
    - r: devel
      r_build_args: --no-build-vignettes
      r_check_args: --ignore-vignettes --no-examples
    - r: oldrel
      r_build_args: --no-build-vignettes
      r_check_args: --ignore-vignettes --no-examples
-   - os: osx
-     r: release
-     before_install: ''
-     disable_homebrew: false
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: rtrek
-Version: 0.3.2
+Version: 0.3.3
 Title: Datasets and Functions Relating to Star Trek
 Description: Provides datasets related to the Star Trek fictional universe and functions for working with the data.
     The package also provides access to real world datasets based on the televised series and other related licensed media productions.
@@ -9,7 +9,7 @@ Description: Provides datasets related to the Star Trek fictional universe and f
     It also contains several local datasets covering a variety of topics. 
     The package also provides functions for working with data from other Star Trek-related 
     R data packages containing larger datasets not stored in 'rtrek'.
-Authors@R: person("Matthew", "Leonawicz", email = "matt_leonawicz@esource.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-9452-2771"))
+Authors@R: person("Matthew", "Leonawicz", email = "mfleonawicz@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-9452-2771"))
 License: MIT + file LICENSE
 Encoding: UTF-8
 LazyData: true

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# rtrek 0.3.3
+
+* Minor bug fix and documentation updates.
+
 # rtrek 0.3.2
 
 * Bug fixes related to website HTML updates.

diff --git a/R/memory_alpha.R b/R/memory_alpha.R
@@ -214,7 +214,8 @@ ma_search <- function(text, browse = FALSE){
 #' @examples
 #' \dontrun{ma_image("File:Gowron_attempts_to_recruit_Worf.jpg")}
 ma_image <- function(url, file, keep = FALSE){
-  file0 <- gsub("^File:", "", url)
+  url <- gsub(",", "%2C", url)
+  file0 <- gsub("^File:|,", "", url)
   url2 <- xml2::read_html(ma_base_add(url)) %>%
     rvest::html_nodes("a img") %>%
     rvest::html_attr("src")

diff --git a/R/memory_beta.R b/R/memory_beta.R
@@ -152,7 +152,8 @@ mb_search <- function(text, browse = FALSE){
 #' @examples
 #' \dontrun{mb_image("File:DataBlaze.jpg")}
 mb_image <- function(url, file, keep = FALSE){
-  file0 <- gsub("^File:", "", url)
+  url <- gsub(",", "%2C", url)
+  file0 <- gsub("^File:|,", "", url)
   url2 <- xml2::read_html(mb_base_add(url)) %>%
     rvest::html_nodes("a img") %>%
     rvest::html_attr("src")

diff --git a/README.Rmd b/README.Rmd
@@ -13,7 +13,7 @@ knitr::opts_chunk$set(
 
 # rtrek <img src="man/figures/logo.png" style="margin-left:10px;margin-bottom:5px;" width="120" align="right">
 **Author:** [Matthew Leonawicz](https://github.com/leonawicz) <a href="https://orcid.org/0000-0001-9452-2771" target="orcid.widget">
-<image class="orcid" src="https://members.orcid.org/sites/default/files/vector_iD_icon.svg" height="16"></a>
+<img alt="ORCID logo" src="https://info.orcid.org/wp-content/uploads/2019/11/orcid_16x16.png" width="16" height="16" /></a>
 <br/>
 **License:** [MIT](https://opensource.org/licenses/MIT)<br/>
 
@@ -137,18 +137,12 @@ True (Trek) type fonts to style your Star Trek themed graphics text.
 
 ## Citation
 
-Matthew Leonawicz (2020). rtrek: Datasets and Functions Relating to Star Trek. R package version 0.3.2. https://CRAN.R-project.org/package=rtrek
+Matthew Leonawicz (2021). rtrek: Datasets and Functions Relating to Star Trek. R package version 0.3.3. https://CRAN.R-project.org/package=rtrek
 
 ## Contribute
 
 Contributions are welcome. Contribute through GitHub via pull request. Please create an issue first if it is regarding any substantive feature add or change.
 
-If you enjoy my open source R community contributions, please consider a donation :).
-
-* [Buy me a coffee in Ko-fi](https://ko-fi.com/leonawicz)
-* `leonawicz.crypto`
-* `mfl$payid.crypto.com`
-
 ---
 
 Please note that the `rtrek` project is released with a [Contributor Code of Conduct](https://github.com/leonawicz/rtrek/blob/master/CODE_OF_CONDUCT.md). By contributing to this project, you agree to abide by its terms.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 **Author:** [Matthew Leonawicz](https://github.com/leonawicz)
 <a href="https://orcid.org/0000-0001-9452-2771" target="orcid.widget">
-<image class="orcid" src="https://members.orcid.org/sites/default/files/vector_iD_icon.svg" height="16"></a>
+<img alt="ORCID logo" src="https://info.orcid.org/wp-content/uploads/2019/11/orcid_16x16.png" width="16" height="16" /></a>
 <br/> **License:** [MIT](https://opensource.org/licenses/MIT)<br/>
 
 [![Project Status: Active – The project has reached a stable, usable
@@ -140,9 +140,9 @@ Alpha:
 x <- ma_article("Spock")
 x
 #> # A tibble: 1 x 4
-#>   title content    metadata          categories       
-#>   <chr> <list>     <list>            <list>           
-#> 1 Spock <xml_ndst> <tibble [1 x 19]> <tibble [15 x 2]>
+#>   title content    metadata               categories           
+#>   <chr> <list>     <list>                 <list>               
+#> 1 Spock <xml_ndst> <tibble[,18] [1 x 18]> <tibble[,2] [14 x 2]>
 x$metadata[[1]]$Born
 #> [1] "January 6, 2230 (stardate 2230.06)|ShiKahr, Vulcan"
 ```
@@ -167,13 +167,13 @@ mb_timeline(2230)
 #> 
 #> $stories
 #> # A tibble: 5 x 11
-#>   title           title_url          colleciton   collection_url  section       context series     date      media     notes                                   image_url       
-#>   <chr>           <chr>              <chr>        <chr>           <chr>         <chr>   <chr>      <chr>     <chr>     <chr>                                   <chr>           
-#> 1 Burning Dreams  Burning_Dreams     <NA>         <NA>            Chapters 4 &~ <NA>    The Origi~ 2230      novel     <NA>                                    File:BurningDre~
-#> 2 Star Trek V: T~ Star_Trek_V:_The_~ <NA>         <NA>            Chapter 14    <NA>    The Origi~ 2230      movie no~ <NA>                                    File:TrekV.jpg  
-#> 3 IDW Star Trek,~ IDW_Star_Trek,_Is~ Star Trek (~ Star_Trek_(IDW) 2230 flashba~ <NA>    The Origi~ 2230      comic     Flashback to USS Kelvin and Keenser's ~ File:IDW_TOS_14~
-#> 4 Star Trek       Star_Trek_(2009)   <NA>         <NA>            Chapter 1 (s~ <NA>    The Origi~ 2230      movie no~ Depiction of Spock's birth, date taken~ File:Star_Trek_~
-#> 5 Sarek           Sarek_(novel)      <NA>         <NA>            Chapter 5     <NA>    The Origi~ 12 Novem~ novel     <NA>                                    File:Sarek_nove~
+#>   title            title_url           colleciton    collection_url  section      context series      date      media      notes                                       image_url        
+#>   <chr>            <chr>               <chr>         <chr>           <chr>        <chr>   <chr>       <chr>     <chr>      <chr>                                       <chr>            
+#> 1 Burning Dreams   Burning_Dreams      <NA>          <NA>            Chapters 4 ~ <NA>    The Origin~ 2230      novel      <NA>                                        File:BurningDrea~
+#> 2 Star Trek V: Th~ Star_Trek_V:_The_F~ <NA>          <NA>            Chapter 14   <NA>    The Origin~ 2230      movie nov~ <NA>                                        File:TrekV.jpg   
+#> 3 IDW Star Trek, ~ IDW_Star_Trek,_Iss~ Star Trek (I~ Star_Trek_(IDW) 2230 flashb~ <NA>    The Origin~ 2230      comic      Flashback to USS Kelvin and Keenser's join~ File:IDW_TOS_14_~
+#> 4 Star Trek        Star_Trek_(2009)    <NA>          <NA>            Chapter 1 (~ <NA>    The Origin~ 2230      movie nov~ Depiction of Spock's birth, date taken fro~ File:Star_Trek_f~
+#> 5 Sarek            Sarek_(novel)       <NA>          <NA>            Chapter 5    <NA>    The Origin~ 12 Novem~ novel      <NA>                                        File:Sarek_novel~
 ```
 
 Live long and prosper.
@@ -290,8 +290,8 @@ True (Trek) type fonts to style your Star Trek themed graphics text.
 
 ## Citation
 
-Matthew Leonawicz (2020). rtrek: Datasets and Functions Relating to Star
-Trek. R package version 0.3.2.
+Matthew Leonawicz (2021). rtrek: Datasets and Functions Relating to Star
+Trek. R package version 0.3.3.
 <https://CRAN.R-project.org/package=rtrek>
 
 ## Contribute
@@ -300,13 +300,6 @@ Contributions are welcome. Contribute through GitHub via pull request.
 Please create an issue first if it is regarding any substantive feature
 add or change.
 
-If you enjoy my open source R community contributions, please consider a
-donation :).
-
-  - [Buy me a coffee in Ko-fi](https://ko-fi.com/leonawicz)
-  - `leonawicz.crypto`
-  - `mfl$payid.crypto.com`
-
 -----
 
 Please note that the `rtrek` project is released with a [Contributor

diff --git a/codemeta.json b/codemeta.json
@@ -10,13 +10,13 @@
   "codeRepository": "https://github.com/leonawicz/rtrek",
   "issueTracker": "https://github.com/leonawicz/rtrek/issues",
   "license": "https://spdx.org/licenses/MIT",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.0.3 (2020-10-10)",
+  "runtimePlatform": "R version 4.0.5 (2021-03-31)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -28,7 +28,7 @@
       "@type": "Person",
       "givenName": "Matthew",
       "familyName": "Leonawicz",
-      "email": "matt_leonawicz@esource.com",
+      "email": "mfleonawicz@gmail.com",
       "@id": "https://orcid.org/0000-0001-9452-2771"
     }
   ],
@@ -37,7 +37,7 @@
       "@type": "Person",
       "givenName": "Matthew",
       "familyName": "Leonawicz",
-      "email": "matt_leonawicz@esource.com",
+      "email": "mfleonawicz@gmail.com",
       "@id": "https://orcid.org/0000-0001-9452-2771"
     }
   ],
@@ -311,7 +311,7 @@
   "copyrightHolder": {},
   "funder": {},
   "developmentStatus": "https://www.repostatus.org/",
-  "fileSize": "2246614.817KB",
+  "fileSize": "2246900.262KB",
   "keywords": [
     "r-package",
     "star-trek",

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,9 +1,8 @@
 ## Test environments
 
-* local Windows 10 install, R 4.0.3
-* Windows 10 (AppVeyor), R 4.0.3
+* local Windows 10 install, R 4.0.5
+* Windows 10 (AppVeyor), R 4.0.5
 * Ubuntu 16.04 (Travis CI), R-devel, R-release, R-oldrel
-* Mac OSX (Travis CI) R-release
 * win-builder (devel and release)
 * R-hub (various)
 
@@ -13,10 +12,4 @@
 
 ## This is an update release.
 
-* Fixed URL in Readme and resubmitted.
-
-## Downstream dependencies
-
-I have also run R CMD check on downstream dependencies of rtrek 
-(https://github.com/leonawicz/rtrek/blob/master/revdep/). 
-All packages passed.
+* Maintainer email address update.
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html