diff --git a/.Rbuildignore b/.Rbuildignore index 431b392..a9a8d59 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,15 +1,24 @@ -^cran-comments\.md$ ^\.Rprofile$ \.Rproj$ ^\.Rproj\.user$ ^\.RData$ ^\.Rhistory$ + ^\.DS_Store$ +^.*\.DS_Store$ ^\.gitignore$ ^\.git$ -^\.httr-oauth$ -^\.twitter-oauth$ -^README.md$ + +^cran-comments\.md$ +^LICENSE$ + ^docs$ ^pkgdown$ -^_pkgdown\.yml$ +^_pkgdown\.yaml$ + +^\.httr-oauth$ +^\.twitter-oauth$ +^.*\.rds$ +^.*\.graphml$ +^.*\.csv$ +^.*\.pdf$ diff --git a/DESCRIPTION b/DESCRIPTION index ab541e6..f4212db 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,18 +1,18 @@ Package: vosonSML Version: 0.26.3 -Title: Tools for Collecting Social Media Data and Generating Networks for Analysis +Title: Collecting Social Media Data and Generating Networks for Analysis Description: A suite of tools for collecting and constructing networks from social media data. Provides easy-to-use functions for collecting data across popular platforms (Twitter, YouTube and Reddit) and generating different types of networks for analysis. Type: Package -Imports: tm, stringr, RCurl, bitops, rjson, igraph (>= 1.2.2), Hmisc, data.table, httpuv, - methods, httr, magrittr, dplyr (>= 0.7.8), rlang (>= 0.3.0.1), RedditExtractoR (>= 2.1.2), +Imports: tm, stringr, RCurl, igraph (>= 1.2.2), Hmisc, data.table, httpuv, methods, httr, + magrittr, dplyr (>= 0.7.8), rlang (>= 0.3.0.1), RedditExtractoR (>= 2.1.2), rtweet (>= 0.6.8) Depends: R (>= 3.2.0) Encoding: UTF-8 Author: Timothy Graham, Robert Ackland, Chung-hong Chan, Bryan Gertzel Maintainer: Bryan Gertzel -License: GPL (>= 3) + file LICENSE +License: GPL (>= 3) RoxygenNote: 6.1.1 NeedsCompilation: no URL: https://github.com/vosonlab/vosonSML diff --git a/NAMESPACE b/NAMESPACE index 76d8ecd..91682af 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -29,12 +29,10 @@ export(ImportData) export(LoadCredential) export(SaveCredential) import(RCurl) -import(bitops) import(data.table) import(httpuv) import(httr) import(methods) -import(rjson) import(tm) importFrom(Hmisc,escapeRegex) importFrom(RedditExtractoR,reddit_content) diff --git a/NEWS.md b/NEWS.md new file mode 100644 index 0000000..c3ed1a5 --- /dev/null +++ b/NEWS.md @@ -0,0 +1,36 @@ +# vosonSML 0.26.3 + +## Bug Fixes +- Fixed bugs in `Create.actor.reddit` that were incorrectly creating edges between + top-level commentors and thread authors from different threads. These bugs were only + observable in when collecting multiple reddit threads. + +## Minor Changes +- Improved output for `reddit` collection. Removed the progress bar and added a table + of results summarising the number of comments collected for each thread. +- Added to `twitter` collection output the users `twitter API` reset time. + +# vosonSML 0.26.2 + +## Bug Fixes +- Fixed a bug in `Create.actor.twitter` and `Create.bimodal.twitter` in which the vertices + dataframe provided to the `graph_from_data_frame` function as a contained duplicate names + raising an error. + +## Major Changes +- Revised and updated `roxygen` documentation and examples for all package functions. +- Updated all `Authenticate`, `Collect` and `Create` S3 methods to implement function routing + based on object class names. + +## Minor Changes +- Created a `pkgdown` web site for github hosted package documentation. +- Created a new hex sticker logo. + +# vosonSML 0.25.0 + +## Major Changes +- Replaced the `twitteR` twitter collection implementation with the `rtweet` package. +- A users `twitter` authentication token can now be cached in the `.twitter_oauth_token` file and + used for subsequent `twitter API` requests without re-authentication. A new authentication + token can be cached by deleting this file and using the re-using the parameter + `useCachedToken = TRUE`. diff --git a/R/vosonSML-package.R b/R/vosonSML-package.R index e41342c..64edae1 100644 --- a/R/vosonSML-package.R +++ b/R/vosonSML-package.R @@ -21,8 +21,6 @@ #' @author Created by Timothy Graham and Robert Ackland, with major contributions by Chung-hong Chan and Bryan Gertzel. #' @import tm #' @import RCurl -#' @import bitops -#' @import rjson #' @import data.table #' @import httpuv #' @import methods diff --git a/_pkgdown.yaml b/_pkgdown.yaml index 61a336f..3817f86 100644 --- a/_pkgdown.yaml +++ b/_pkgdown.yaml @@ -1,6 +1,6 @@ title: vosonSML url: http://vosonlab.github.io/vosonSML - + authors: Bryan Gertzel: href: "https://vosonlab.net" @@ -10,14 +10,20 @@ navbar: structure: left: - home + - news - reference right: github components: home: icon: fa-home fa-lg href: index.html + news: + icon: fa-newspaper-o + text: "News" + href: news/index.html reference: - text: Reference + icon: fa-cubes + text: "Reference" href: reference/index.html github: icon: fa-github fa-lg diff --git a/cran-comments.md b/cran-comments.md index 61e8245..33cf7b1 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,13 @@ +## Re-submission +In this version the following recommended fixes were made: + +* Omitted "Tools for" from the DESCRIPTION title. +* Omitted the LICENSE file from the DESCRIPTION and package build as there + are no additional license restrictions. + ## Test environments -* MacOS X, R 3.5.2 -* Windows 10, R 3.5.2 +* local MacOS X, R 3.5.1 +* local Windows 10, R 3.5.2 ## R CMD check results 0 errors | 0 warnings diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index eb14a78..4eeff85 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -37,6 +37,8 @@ + + @@ -83,7 +85,18 @@
  • - Reference + + + + News + +
    • +
  • + + + + Reference +
    • diff --git a/docs/authors.html b/docs/authors.html index 9f891cc..db1710d 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -37,6 +37,8 @@ + + @@ -83,7 +85,18 @@
  • - Reference + + + + News + +
    • +
  • + + + + Reference +
    • diff --git a/docs/extra.css b/docs/extra.css new file mode 100644 index 0000000..056bf35 --- /dev/null +++ b/docs/extra.css @@ -0,0 +1,24 @@ +h1, .h1 { + font-size: 2.8rem; +} + +h2, .h2 { + font-size: 2.2rem; +} + +h3, .h3 { + font-size: 1.9rem; +} + +h4, .h4, h5, .h5 { + font-size: 1.4rem; +} + +.contents h1, .contents h2 { + padding-top: 60px; + margin-top: -20px; +} + +.contents h2 { + padding-top: 30px; +} diff --git a/docs/index.html b/docs/index.html index 41e35d5..f08652e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -5,7 +5,7 @@ -Tools for Collecting Social Media Data and Generating Networks for Analysis • vosonSML +Collecting Social Media Data and Generating Networks for Analysis • vosonSML @@ -15,7 +15,8 @@ - + + @@ -52,7 +53,18 @@
  • - Reference + + + + News + +
    • +
  • + + + + Reference +
    • diff --git a/docs/reference/Authenticate.reddit.html b/docs/reference/Authenticate.reddit.html index a5a5f11..c22f221 100644 --- a/docs/reference/Authenticate.reddit.html +++ b/docs/reference/Authenticate.reddit.html @@ -37,6 +37,8 @@ + + @@ -85,7 +87,18 @@
  • - Reference + + + + News + +
    • +
  • + + + + Reference +
    • diff --git a/docs/reference/Authenticate.twitter.html b/docs/reference/Authenticate.twitter.html index e452576..b32542f 100644 --- a/docs/reference/Authenticate.twitter.html +++ b/docs/reference/Authenticate.twitter.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Authenticate.youtube.html b/docs/reference/Authenticate.youtube.html index 6b5e67b..5f7e754 100644 --- a/docs/reference/Authenticate.youtube.html +++ b/docs/reference/Authenticate.youtube.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Collect.html b/docs/reference/Collect.html index 22f74b9..603582d 100644 --- a/docs/reference/Collect.html +++ b/docs/reference/Collect.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Collect.reddit.html b/docs/reference/Collect.reddit.html index 0c12de5..437dd73 100644 --- a/docs/reference/Collect.reddit.html +++ b/docs/reference/Collect.reddit.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Collect.twitter.html b/docs/reference/Collect.twitter.html index f627367..af7e7d2 100644 --- a/docs/reference/Collect.twitter.html +++ b/docs/reference/Collect.twitter.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Collect.youtube.html b/docs/reference/Collect.youtube.html index 9446006..b68fa3a 100644 --- a/docs/reference/Collect.youtube.html +++ b/docs/reference/Collect.youtube.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Create.actor.reddit.html b/docs/reference/Create.actor.reddit.html index 3a88d75..afb5e46 100644 --- a/docs/reference/Create.actor.reddit.html +++ b/docs/reference/Create.actor.reddit.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Create.actor.twitter.html b/docs/reference/Create.actor.twitter.html index baae51b..f0dda73 100644 --- a/docs/reference/Create.actor.twitter.html +++ b/docs/reference/Create.actor.twitter.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Create.actor.youtube.html b/docs/reference/Create.actor.youtube.html index a54c550..5b44041 100644 --- a/docs/reference/Create.actor.youtube.html +++ b/docs/reference/Create.actor.youtube.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Create.bimodal.twitter.html b/docs/reference/Create.bimodal.twitter.html index 582fb04..d3d9c51 100644 --- a/docs/reference/Create.bimodal.twitter.html +++ b/docs/reference/Create.bimodal.twitter.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Create.html b/docs/reference/Create.html index cfb2188..3b39d43 100644 --- a/docs/reference/Create.html +++ b/docs/reference/Create.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/Create.semantic.twitter.html b/docs/reference/Create.semantic.twitter.html index f27f075..d38fe03 100644 --- a/docs/reference/Create.semantic.twitter.html +++ b/docs/reference/Create.semantic.twitter.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/index.html b/docs/reference/index.html index 9a9b723..b1591d4 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -37,6 +37,8 @@ + + @@ -83,7 +85,18 @@
  • - Reference + + + + News + +
    • +
  • + + + + Reference +
    • diff --git a/docs/reference/vosonSML-colon-colon-AddUserData.twitter.html b/docs/reference/vosonSML-colon-colon-AddUserData.twitter.html index f53a246..c729a81 100644 --- a/docs/reference/vosonSML-colon-colon-AddUserData.twitter.html +++ b/docs/reference/vosonSML-colon-colon-AddUserData.twitter.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/vosonSML-colon-colon-GetYoutubeVideoIDs.html b/docs/reference/vosonSML-colon-colon-GetYoutubeVideoIDs.html index b38ba5c..5cb0738 100644 --- a/docs/reference/vosonSML-colon-colon-GetYoutubeVideoIDs.html +++ b/docs/reference/vosonSML-colon-colon-GetYoutubeVideoIDs.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/vosonSML-colon-colon-ImportData.html b/docs/reference/vosonSML-colon-colon-ImportData.html index f2116ee..ff0c071 100644 --- a/docs/reference/vosonSML-colon-colon-ImportData.html +++ b/docs/reference/vosonSML-colon-colon-ImportData.html @@ -37,6 +37,8 @@ + + @@ -85,7 +87,18 @@
  • - Reference + + + + News + +
    • +
  • + + + + Reference +
    • diff --git a/docs/reference/vosonSML-colon-colon-SaveCredential.html b/docs/reference/vosonSML-colon-colon-SaveCredential.html index db1abb3..82a07fc 100644 --- a/docs/reference/vosonSML-colon-colon-SaveCredential.html +++ b/docs/reference/vosonSML-colon-colon-SaveCredential.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/docs/reference/vosonSML-package.html b/docs/reference/vosonSML-package.html index 07dc581..6997d15 100644 --- a/docs/reference/vosonSML-package.html +++ b/docs/reference/vosonSML-package.html @@ -37,6 +37,8 @@ + + Reference + + + + News + + +
  • + + + + Reference +
    • diff --git a/pkgdown/extra.css b/pkgdown/extra.css new file mode 100644 index 0000000..056bf35 --- /dev/null +++ b/pkgdown/extra.css @@ -0,0 +1,24 @@ +h1, .h1 { + font-size: 2.8rem; +} + +h2, .h2 { + font-size: 2.2rem; +} + +h3, .h3 { + font-size: 1.9rem; +} + +h4, .h4, h5, .h5 { + font-size: 1.4rem; +} + +.contents h1, .contents h2 { + padding-top: 60px; + margin-top: -20px; +} + +.contents h2 { + padding-top: 30px; +}