Skip to content

Commit

Permalink
Last fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
abresler committed Feb 26, 2017
1 parent b517b02 commit 3fb92a3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .Rprofile
@@ -0,0 +1,2 @@
options(show.error.messages = TRUE)
options(scipen = 999999999)
2 changes: 1 addition & 1 deletion R/edgar_rf.R
Expand Up @@ -4415,7 +4415,7 @@ parse_cik_data <-
#' @param nest_data return a nested data frame \code{TRUE, FALSE}
#' @param assign_to_environment \code{true} assigns individual data frames to your environment
#' @param return_message \code{TRUE} return a message after data import
#' @import dplyr tidyr purrr stringr formattable readr lubridate XBRL curl
#' @import dplyr tidyr purrr stringr formattable readr lubridate XBRL curl jsonlite lazyeval
#' @importFrom jsonlite fromJSON
#' @export
#' @return where \code{nest_data} is \code{TRUE} a nested data_frame by asset,
Expand Down
7 changes: 4 additions & 3 deletions R/fred_api.R
Expand Up @@ -558,7 +558,7 @@ generate_fred_symbol_url <-
}

parse_json_fred <-
function(url,
function(url = "https://fred.stlouisfed.org/graph/graph-data.php?id=DGS10&transformation=",
convert_date_time = TRUE,
return_message = TRUE) {
json_data <-
Expand Down Expand Up @@ -741,6 +741,7 @@ get_data_fred_symbols <-
as_data_frame()
get_data_fred_symbol_safe <-
purrr::possibly(get_data_fred_symbol, data_frame)

all_data <-
1:nrow(df_options) %>%
map_df(function(x) {
Expand Down Expand Up @@ -872,11 +873,11 @@ plot_time_series <-

if ('nameSource' %in% names(data)) {
caption_text <-
list("Date from ",data$nameSource %>% unique, '\n', 'via FRED from fundManageR') %>%
list("Source data from ",data$nameSource %>% unique, '\n', 'via FRED from fundManageR') %>%
purrr::reduce(paste0)
} else {
caption_text <-
"Data from FRED via fundManageR"
"Sourced from FRED via fundManageR"
}

plot <-
Expand Down

0 comments on commit 3fb92a3

Please sign in to comment.