Skip to content

Commit

Permalink
Merge pull request #16 from petermeissner/cran_release
Browse files Browse the repository at this point in the history
Cran release
  • Loading branch information
petermeissner committed May 23, 2015
2 parents 7186d5d + 144aa20 commit 7902edf
Show file tree
Hide file tree
Showing 29 changed files with 312 additions and 346 deletions.
13 changes: 7 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: wikipediatrend
Title: Public Subject Attention via Wikipedia Page Access Statistics
Version: 1.1.0.9000498
Date: 2015-05-21
Version: 1.1.1
Date: 2015-05-22
Author: Peter Meissner [aut, cre], R Core team [ctb] ('wp_date()'
derived from base package's 'as.Date()')
Maintainer: Peter Meissner <retep.meissner@gmail.com>
Expand All @@ -10,15 +10,16 @@ Description: Public attention is an interesting field of study. The
virtually any subject but via page access statistics gathered
by website authors the subject of attention as well can be
studied. For the omnipresent Wikipedia those access statistics
are made available via stats.grok.se a server providing the
information as file dumps as well as as web API. This package
are made available via 'http://stats.grok.se' a server providing
the information as file dumps as well as as web API. This package
provides an easy to use, consistent and traffic minimizing
approach to make those data accessible within R.
License: GPL (>= 2)
Depends: R (>= 3.0.0)
Imports: jsonlite (>= 0.9.13), stringr (>= 0.6.2), rvest (>= 0.2.0),
httr (>= 0.6.1), RCurl (>= 1.8)
Suggests: testthat, knitr, ggplot2, devtools, dplyr, AnomalyDetection,
BreakoutDetection, magrittr
Suggests: testthat, knitr, ggplot2, devtools, dplyr, magrittr,
AnomalyDetection, BreakoutDetection,
BugReports: https://github.com/petermeissner/wikipediatrend/issues
VignetteBuilder: knitr
Additional_repositories: http://ghrr.github.io/drat
7 changes: 1 addition & 6 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,15 @@ S3method(wp_year,default)
export(prev_month_end)
export(prev_month_start)
export(wp_cache_file)
export(wp_cache_load)
export(wp_cache_reset)
export(wp_check_date_inputs)
export(wp_date)
export(wp_day)
export(wp_download_data)
export(wp_expand_ts)
export(wp_get_cache)
export(wp_http_header)
export(wp_jsons_to_df)
export(wp_linked_pages)
export(wp_load)
export(wp_month)
export(wp_save_cache)
export(wp_save)
export(wp_set_cache_file)
export(wp_set_print_options)
export(wp_trend)
Expand Down
37 changes: 21 additions & 16 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
NEWS wikipediatrend
===============================================================================
==========================================================================

version 1.1.0 // 2015-05-xx ...
-------------------------------------------------------------------------------
- feature: wp_trend() now tries to guess if page was supplied as title with
possible special characters or as (url-encoded) URL part and take care of
further processing
version 1.1.1 // 2015-05-23 ...
--------------------------------------------------------------------------

- adding ghrr as additional repo to comply with CRAN policies
- changing default forlder of cache file from home (~) to temp (basename(tempdir()))


version 1.1.0 // 2015-05-21 ...
--------------------------------------------------------------------------

- feature: caching has been overhauled

- feature: wp_trend() now tries to guess if page was supplied as title with possible special characters or as (url-encoded) URL part and take care of further processing

- bug-fix: special character support of the packages was lousy and preventing
the usage of articles of non-standard languages ( - especially on Windows)
* introduction of the wp_df class to allow for a print.wp_df that
a) shortens long strings on print
b) does not use format() (format() causes UTF-8 characters to be replaced
by "<U+xxxx>" strings (propably only))
* using a package specific write_utf8_csv() and read_utf8_csv() to be able to
store and cache data for articles with special character names
(even under Windows, write.csv() does not allow enforcing a specific
encoding)
b) does not use format() (format() causes UTF-8 characters to be replaced by "<U+xxxx>" strings (propably only))
* using a package specific write_utf8_csv() and read_utf8_csv() to be able to store and cache data for articles with special character names (even under Windows, write.csv() does not allow enforcing a specific encoding)

- bug-fix / backward compatibility: with version 1.0.0 old parameters for
wp_trend() were causing errors

- bug-fix: wp_cache_reset() would stop with an error if called twice in a row - fixed

version 1.0.0 // 2015-04-xx ...
-------------------------------------------------------------------------------

version 1.0.0 // 2015-04-01 ...
--------------------------------------------------------------------------

- api-change: option userAgent deleted: the default is to send information on
versions of R, wikipediatrend, curl as well as RCurl
Expand Down Expand Up @@ -59,7 +64,7 @@ rank, month
- bug-fix: wp_trend() now checks date inputs better for logical inconsistencies


version 0.2.0 // 2014-11-xx ...
-------------------------------------------------------------------------------
version 0.2.0 // 2014-11-01 ...
--------------------------------------------------------------------------

- first puplication on CRAN
13 changes: 10 additions & 3 deletions R/wp_cache.R
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
#' function for building default cache file name
#'
wp_cache_default <- function(){
paste0(
dirname(tempdir()),
"/wikipediatrend_cache.csv"
)
}

#' function for determining where downloaded information can be stored
#' @export
#'
wp_cache_file <- function(){
if( is.null(wp_cache$cachefile) ){
file <- paste0("~", "/", "wikipediatrend_cache.csv")
file <- wp_cache_default()
wp_cache$cachefile <- file
}else{
file <- wp_cache$cachefile
Expand Down Expand Up @@ -34,7 +43,6 @@ wp_cache_reset <- function(){
}

#' function for loading data in cache
#' @export
#'
wp_cache_load <- function(){
tmp <- wp_load(wp_cache_file())
Expand All @@ -50,7 +58,6 @@ wp_get_cache <- function(){
}

#' functio to save cache to file
#' @export
#'
wp_save_cache <- function(){
wp_save(wp_cache$cache, wp_cache_file())
Expand Down
1 change: 0 additions & 1 deletion R/wp_check_date_inputs.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#' @param from first date of timespan to check
#' @param to second date of timespan to check
#'
#' #@export
#'

wp_check_date_inputs <- function(from, to){
Expand Down
2 changes: 1 addition & 1 deletion R/wp_download_data.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' @param urls a vector of urls to be downloaded
#' @param wait the time to wait in seconds before downloading the next chunk (default=1)
#' #@export
#'

wp_download_data <- function(urls, wait=1){
# make http requests
Expand Down
1 change: 0 additions & 1 deletion R/wp_expand_ts.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#' @param by in which time unit expansion should take place: \code{"day"},
#' \code{"month"}, \code{"year"}
#'
#' #@export

wp_expand_ts <- function(from, to, by){
dates <- seq(wp_date(from), wp_date(to), by)
Expand Down
2 changes: 1 addition & 1 deletion R/wp_jsons_to_df.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#'
#' @param wp_json The results from server request in JSON format
#' @param page the name of the downloaded page
#' @export
#'


wp_jsons_to_df <- function(wp_json, page){
Expand Down
2 changes: 1 addition & 1 deletion R/wp_load_and_save.r
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ wp_load <- function(file=wp_cache_file()){
#'
#' @param res data retreived by \code{wp_trend()}
#' @param file where to save/cache results (defaults to \code{wp_cache_file()})
#'
#' @export
#'
#'

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Peter Meißner

# Last Update

2015-05-21
2015-05-22



Expand Down
4 changes: 2 additions & 2 deletions Readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ <h1>Author</h1>
</div>
<div id="last-update" class="section level1">
<h1>Last Update</h1>
<p>2015-05-21</p>
<p>2015-05-22</p>
</div>
<div id="status" class="section level1">
<h1>Status</h1>
<p><a href="https://travis-ci.org/petermeissner/wikipediatrend"><img src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5MCIgaGVpZ2h0PSIyMCI+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4Mj0iMCIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1vcGFjaXR5PSIuMSIvPjwvbGluZWFyR3JhZGllbnQ+PHJlY3Qgcng9IjMiIHdpZHRoPSI5MCIgaGVpZ2h0PSIyMCIgZmlsbD0iIzU1NSIvPjxyZWN0IHJ4PSIzIiB4PSIzNyIgd2lkdGg9IjUzIiBoZWlnaHQ9IjIwIiBmaWxsPSIjNGMxIi8+PHBhdGggZmlsbD0iIzRjMSIgZD0iTTM3IDBoNHYyMGgtNHoiLz48cmVjdCByeD0iMyIgd2lkdGg9IjkwIiBoZWlnaHQ9IjIwIiBmaWxsPSJ1cmwoI2EpIi8+PGcgZmlsbD0iI2ZmZiIgdGV4dC1hbmNob3I9Im1pZGRsZSIgZm9udC1mYW1pbHk9IkRlamFWdSBTYW5zLFZlcmRhbmEsR2VuZXZhLHNhbnMtc2VyaWYiIGZvbnQtc2l6ZT0iMTEiPjx0ZXh0IHg9IjE5LjUiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj5idWlsZDwvdGV4dD48dGV4dCB4PSIxOS41IiB5PSIxNCI+YnVpbGQ8L3RleHQ+PHRleHQgeD0iNjIuNSIgeT0iMTUiIGZpbGw9IiMwMTAxMDEiIGZpbGwtb3BhY2l0eT0iLjMiPnBhc3Npbmc8L3RleHQ+PHRleHQgeD0iNjIuNSIgeT0iMTQiPnBhc3Npbmc8L3RleHQ+PC9nPjwvc3ZnPg=="></a> <br> <a href="https://coveralls.io/r/petermeissner/wikipediatrend"><img src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5OSIgaGVpZ2h0PSIyMCI+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4Mj0iMCIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1vcGFjaXR5PSIuMSIvPjwvbGluZWFyR3JhZGllbnQ+PHJlY3Qgcng9IjMiIHdpZHRoPSI5OSIgaGVpZ2h0PSIyMCIgZmlsbD0iIzU1NSIvPjxyZWN0IHJ4PSIzIiB4PSI2MyIgd2lkdGg9IjM2IiBoZWlnaHQ9IjIwIiBmaWxsPSIjZTA1ZDQ0Ii8+PHBhdGggZmlsbD0iI2UwNWQ0NCIgZD0iTTYzIDBoNHYyMGgtNHoiLz48cmVjdCByeD0iMyIgd2lkdGg9Ijk5IiBoZWlnaHQ9IjIwIiBmaWxsPSJ1cmwoI2EpIi8+PGcgZmlsbD0iI2ZmZiIgdGV4dC1hbmNob3I9Im1pZGRsZSIgZm9udC1mYW1pbHk9IkRlamFWdSBTYW5zLFZlcmRhbmEsR2VuZXZhLHNhbnMtc2VyaWYiIGZvbnQtc2l6ZT0iMTEiPjx0ZXh0IHg9IjMyLjUiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj5jb3ZlcmFnZTwvdGV4dD48dGV4dCB4PSIzMi41IiB5PSIxNCI+Y292ZXJhZ2U8L3RleHQ+PHRleHQgeD0iODAiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj4zNiU8L3RleHQ+PHRleHQgeD0iODAiIHk9IjE0Ij4zNiU8L3RleHQ+PC9nPjwvc3ZnPg=="></a> <br> <a href="http://cranlogs.r-pkg.org/"><img src="data:image/svg+xml; charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDgiIGhlaWdodD0iMjAiPgogIDxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDI9IjAiIHkyPSIxMDAlIj4KICAgIDxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8bWFzayBpZD0iYSI+CiAgICA8cmVjdCB3aWR0aD0iMTA4IiBoZWlnaHQ9IjIwIiByeD0iMyIgZmlsbD0iI2ZmZiIvPgogIDwvbWFzaz4KICA8ZyBtYXNrPSJ1cmwoI2EpIj48cGF0aCBmaWxsPSIjNTU1IiBkPSJNMCAwaDcwdjIwSDB6Ii8+CiAgICA8cGF0aCBmaWxsPSIjMDA3ZWM2IiBkPSJNNzAgMGgzOHYyMEg3MHoiLz4KICAgIDxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik0wIDBoMTA4djIwSDB6Ii8+CiAgPC9nPgogIDxnIGZpbGw9IiNmZmYiIHRleHQtYW5jaG9yPSJtaWRkbGUiCiAgICAgZm9udC1mYW1pbHk9IkRlamFWdSBTYW5zLFZlcmRhbmEsR2VuZXZhLHNhbnMtc2VyaWYiIGZvbnQtc2l6ZT0iMTEiPgogICAgPHRleHQgeD0iMzYiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj4KICAgICAgZG93bmxvYWRzCiAgICA8L3RleHQ+CiAgICA8dGV4dCB4PSIzNiIgeT0iMTQiPgogICAgICBkb3dubG9hZHMKICAgIDwvdGV4dD4KICAgIDx0ZXh0IHg9Ijg4IiB5PSIxNSIgZmlsbD0iIzAxMDEwMSIgZmlsbC1vcGFjaXR5PSIuMyI+CiAgICAgIDE4ODkKICAgIDwvdGV4dD4KICAgIDx0ZXh0IHg9Ijg4IiB5PSIxNCI+CiAgICAgIDE4ODkKICAgIDwvdGV4dD4KICA8L2c+Cjwvc3ZnPg=="></a> <a href="http://cranlogs.r-pkg.org/"><img src="data:image/svg+xml; charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNDkiIGhlaWdodD0iMjAiPgogIDxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDI9IjAiIHkyPSIxMDAlIj4KICAgIDxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8bWFzayBpZD0iYSI+CiAgICA8cmVjdCB3aWR0aD0iMTQ5IiBoZWlnaHQ9IjIwIiByeD0iMyIgZmlsbD0iI2ZmZiIvPgogIDwvbWFzaz4KICA8ZyBtYXNrPSJ1cmwoI2EpIj48cGF0aCBmaWxsPSIjNTU1IiBkPSJNMCAwaDcwdjIwSDB6Ii8+CiAgICA8cGF0aCBmaWxsPSIjMDA3ZWM2IiBkPSJNNzAgMGg3OXYyMEg3MHoiLz4KICAgIDxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik0wIDBoMTQ5djIwSDB6Ii8+CiAgPC9nPgogIDxnIGZpbGw9IiNmZmYiIHRleHQtYW5jaG9yPSJtaWRkbGUiCiAgICAgZm9udC1mYW1pbHk9IkRlamFWdSBTYW5zLFZlcmRhbmEsR2VuZXZhLHNhbnMtc2VyaWYiIGZvbnQtc2l6ZT0iMTEiPgogICAgPHRleHQgeD0iMzYiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj4KICAgICAgZG93bmxvYWRzCiAgICA8L3RleHQ+CiAgICA8dGV4dCB4PSIzNiIgeT0iMTQiPgogICAgICBkb3dubG9hZHMKICAgIDwvdGV4dD4KICAgIDx0ZXh0IHg9IjEwOC41IiB5PSIxNSIgZmlsbD0iIzAxMDEwMSIgZmlsbC1vcGFjaXR5PSIuMyI+CiAgICAgIDM1Ny9tb250aAogICAgPC90ZXh0PgogICAgPHRleHQgeD0iMTA4LjUiIHk9IjE0Ij4KICAgICAgMzU3L21vbnRoCiAgICA8L3RleHQ+CiAgPC9nPgo8L3N2Zz4="></a></p>
<p><a href="https://travis-ci.org/petermeissner/wikipediatrend"><img src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5MCIgaGVpZ2h0PSIyMCI+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4Mj0iMCIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1vcGFjaXR5PSIuMSIvPjwvbGluZWFyR3JhZGllbnQ+PHJlY3Qgcng9IjMiIHdpZHRoPSI5MCIgaGVpZ2h0PSIyMCIgZmlsbD0iIzU1NSIvPjxyZWN0IHJ4PSIzIiB4PSIzNyIgd2lkdGg9IjUzIiBoZWlnaHQ9IjIwIiBmaWxsPSIjNGMxIi8+PHBhdGggZmlsbD0iIzRjMSIgZD0iTTM3IDBoNHYyMGgtNHoiLz48cmVjdCByeD0iMyIgd2lkdGg9IjkwIiBoZWlnaHQ9IjIwIiBmaWxsPSJ1cmwoI2EpIi8+PGcgZmlsbD0iI2ZmZiIgdGV4dC1hbmNob3I9Im1pZGRsZSIgZm9udC1mYW1pbHk9IkRlamFWdSBTYW5zLFZlcmRhbmEsR2VuZXZhLHNhbnMtc2VyaWYiIGZvbnQtc2l6ZT0iMTEiPjx0ZXh0IHg9IjE5LjUiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj5idWlsZDwvdGV4dD48dGV4dCB4PSIxOS41IiB5PSIxNCI+YnVpbGQ8L3RleHQ+PHRleHQgeD0iNjIuNSIgeT0iMTUiIGZpbGw9IiMwMTAxMDEiIGZpbGwtb3BhY2l0eT0iLjMiPnBhc3Npbmc8L3RleHQ+PHRleHQgeD0iNjIuNSIgeT0iMTQiPnBhc3Npbmc8L3RleHQ+PC9nPjwvc3ZnPg=="></a> <br> <a href="https://coveralls.io/r/petermeissner/wikipediatrend"><img src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5OSIgaGVpZ2h0PSIyMCI+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4Mj0iMCIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1vcGFjaXR5PSIuMSIvPjwvbGluZWFyR3JhZGllbnQ+PHJlY3Qgcng9IjMiIHdpZHRoPSI5OSIgaGVpZ2h0PSIyMCIgZmlsbD0iIzU1NSIvPjxyZWN0IHJ4PSIzIiB4PSI2MyIgd2lkdGg9IjM2IiBoZWlnaHQ9IjIwIiBmaWxsPSIjZTA1ZDQ0Ii8+PHBhdGggZmlsbD0iI2UwNWQ0NCIgZD0iTTYzIDBoNHYyMGgtNHoiLz48cmVjdCByeD0iMyIgd2lkdGg9Ijk5IiBoZWlnaHQ9IjIwIiBmaWxsPSJ1cmwoI2EpIi8+PGcgZmlsbD0iI2ZmZiIgdGV4dC1hbmNob3I9Im1pZGRsZSIgZm9udC1mYW1pbHk9IkRlamFWdSBTYW5zLFZlcmRhbmEsR2VuZXZhLHNhbnMtc2VyaWYiIGZvbnQtc2l6ZT0iMTEiPjx0ZXh0IHg9IjMyLjUiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj5jb3ZlcmFnZTwvdGV4dD48dGV4dCB4PSIzMi41IiB5PSIxNCI+Y292ZXJhZ2U8L3RleHQ+PHRleHQgeD0iODAiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj4zNiU8L3RleHQ+PHRleHQgeD0iODAiIHk9IjE0Ij4zNiU8L3RleHQ+PC9nPjwvc3ZnPg=="></a> <br> <a href="http://cranlogs.r-pkg.org/"><img src="data:image/svg+xml; charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDgiIGhlaWdodD0iMjAiPgogIDxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDI9IjAiIHkyPSIxMDAlIj4KICAgIDxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8bWFzayBpZD0iYSI+CiAgICA8cmVjdCB3aWR0aD0iMTA4IiBoZWlnaHQ9IjIwIiByeD0iMyIgZmlsbD0iI2ZmZiIvPgogIDwvbWFzaz4KICA8ZyBtYXNrPSJ1cmwoI2EpIj48cGF0aCBmaWxsPSIjNTU1IiBkPSJNMCAwaDcwdjIwSDB6Ii8+CiAgICA8cGF0aCBmaWxsPSIjMDA3ZWM2IiBkPSJNNzAgMGgzOHYyMEg3MHoiLz4KICAgIDxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik0wIDBoMTA4djIwSDB6Ii8+CiAgPC9nPgogIDxnIGZpbGw9IiNmZmYiIHRleHQtYW5jaG9yPSJtaWRkbGUiCiAgICAgZm9udC1mYW1pbHk9IkRlamFWdSBTYW5zLFZlcmRhbmEsR2VuZXZhLHNhbnMtc2VyaWYiIGZvbnQtc2l6ZT0iMTEiPgogICAgPHRleHQgeD0iMzYiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj4KICAgICAgZG93bmxvYWRzCiAgICA8L3RleHQ+CiAgICA8dGV4dCB4PSIzNiIgeT0iMTQiPgogICAgICBkb3dubG9hZHMKICAgIDwvdGV4dD4KICAgIDx0ZXh0IHg9Ijg4IiB5PSIxNSIgZmlsbD0iIzAxMDEwMSIgZmlsbC1vcGFjaXR5PSIuMyI+CiAgICAgIDE4OTUKICAgIDwvdGV4dD4KICAgIDx0ZXh0IHg9Ijg4IiB5PSIxNCI+CiAgICAgIDE4OTUKICAgIDwvdGV4dD4KICA8L2c+Cjwvc3ZnPg=="></a> <a href="http://cranlogs.r-pkg.org/"><img src="data:image/svg+xml; charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNDkiIGhlaWdodD0iMjAiPgogIDxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDI9IjAiIHkyPSIxMDAlIj4KICAgIDxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8bWFzayBpZD0iYSI+CiAgICA8cmVjdCB3aWR0aD0iMTQ5IiBoZWlnaHQ9IjIwIiByeD0iMyIgZmlsbD0iI2ZmZiIvPgogIDwvbWFzaz4KICA8ZyBtYXNrPSJ1cmwoI2EpIj48cGF0aCBmaWxsPSIjNTU1IiBkPSJNMCAwaDcwdjIwSDB6Ii8+CiAgICA8cGF0aCBmaWxsPSIjMDA3ZWM2IiBkPSJNNzAgMGg3OXYyMEg3MHoiLz4KICAgIDxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik0wIDBoMTQ5djIwSDB6Ii8+CiAgPC9nPgogIDxnIGZpbGw9IiNmZmYiIHRleHQtYW5jaG9yPSJtaWRkbGUiCiAgICAgZm9udC1mYW1pbHk9IkRlamFWdSBTYW5zLFZlcmRhbmEsR2VuZXZhLHNhbnMtc2VyaWYiIGZvbnQtc2l6ZT0iMTEiPgogICAgPHRleHQgeD0iMzYiIHk9IjE1IiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIj4KICAgICAgZG93bmxvYWRzCiAgICA8L3RleHQ+CiAgICA8dGV4dCB4PSIzNiIgeT0iMTQiPgogICAgICBkb3dubG9hZHMKICAgIDwvdGV4dD4KICAgIDx0ZXh0IHg9IjEwOC41IiB5PSIxNSIgZmlsbD0iIzAxMDEwMSIgZmlsbC1vcGFjaXR5PSIuMyI+CiAgICAgIDM0Mi9tb250aAogICAgPC90ZXh0PgogICAgPHRleHQgeD0iMTA4LjUiIHk9IjE0Ij4KICAgICAgMzQyL21vbnRoCiAgICA8L3RleHQ+CiAgPC9nPgo8L3N2Zz4="></a></p>
</div>
<div id="purpose" class="section level1">
<h1>Purpose</h1>
Expand Down
20 changes: 20 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Checking

- local Win7
- winbuild : http://win-builder.r-project.org/THTI37gay9b1/00check.log : http://win-builder.r-project.org/a3F8892M0us3/00check.log
- Travis (Ubuntu) : https://travis-ci.org/petermeissner/wikipediatrend



# Submission Comments and responses / actions taken

- Single-quote 'stats.grok.se': see the manual. Preferably give it correctly as 'http://stats.grok.se'.

-> done as requested


- Suggests or Enhances not in mainstream repositories: AnomalyDetection, BreakoutDetection

-> added the following to DESCRIPTION:
Additional_repositories: http://ghrr.github.io/drat

38 changes: 29 additions & 9 deletions inst/doc/using-wikipediatrend.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## ---- include=FALSE------------------------------------------------------
library(ggplot2)
update_geom_defaults("line", list(colour = "steelblue"))

## ---- message=F, eval=FALSE----------------------------------------------
# install.packages("wikipediatrend")

Expand Down Expand Up @@ -113,14 +117,22 @@ ggplot(page_views, aes(x=date, y=count, group=lang, color=lang)) +

## ---- include=F----------------------------------------------------------
if ( !require(AnomalyDetection) ){
devtools::install_github("twitter/AnomalyDetection")
install.packages(
"AnomalyDetection",
repos="http://ghrr.github.io/drat",
type="source"
)
library(AnomalyDetection)
}
library(dplyr)
library(ggplot2)

## ---- eval=FALSE---------------------------------------------------------
# devtools::install_github("twitter/AnomalyDetection")
# install.packages(
# "AnomalyDetection",
# repos="http://ghrr.github.io/drat",
# type="source"
# )
# library(AnomalyDetection)
# library(dplyr)
# library(ggplot2)
Expand Down Expand Up @@ -183,15 +195,23 @@ page_views_br_clean <-

## ---- include=FALSE------------------------------------------------------
if ( !require(BreakoutDetection) ){
devtools::install_github("twitter/BreakoutDetection")
install.packages(
"BreakoutDetection",
repos="http://ghrr.github.io/drat",
type="source"
)
library(BreakoutDetection)
}
library(dplyr)
library(ggplot2)
library(magrittr)

## ---- eval=FALSE---------------------------------------------------------
# devtools::install_github("twitter/BreakoutDetection")
# install.packages(
# "BreakoutDetection",
# repos="http://ghrr.github.io/drat",
# type="source"
# )
# library(BreakoutDetection)
# library(dplyr)
# library(ggplot2)
Expand All @@ -202,9 +222,9 @@ br <-
breakout(
page_views_br_clean,
min.size = 30,
plot=T,
method = 'multi',
percent=0.05
method = 'multi',
percent = 0.05,
plot = TRUE
)
br

Expand Down Expand Up @@ -240,9 +260,9 @@ spans <-
)
spans

## ------------------------------------------------------------------------
## ---- message=FALSE------------------------------------------------------
ggplot(page_views_clean, aes(x=date, y=count) ) +
geom_line(alpha=0.5) +
geom_line(alpha=0.5, color="steelblue") +
geom_line(aes(y=mcount), alpha=0.5, color="red2", size=1.2) +
theme_bw()

0 comments on commit 7902edf

Please sign in to comment.