Firefox compatibility; visual tweaks

.Rbuildignore

@@ -1,13 +1,11 @@
 ^\.Rproj\.user$
 ^\.git$
 ^examples$
+^README\.md$
 ^shiny\.Rproj$
 ^shiny\.sh$
 ^shiny\.cmd$
 ^run\.R$
 ^\.gitignore$
 ^res$
-^man-roxygen$
-^\.travis\.yml$
-^staticdocs$
 ^tools$

.Rinstignore

@@ -1,2 +0,0 @@
-^tools$
-^Rmd$

.gitattributes

@@ -1 +0,0 @@
-/NEWS merge=union

.gitignore

@@ -6,5 +6,4 @@
 *.so
 /src-i386/
 /src-x86_64/
-shinyapps/
 README.html

.travis.yml

@@ -1,29 +0,0 @@
-# it is not really python, but there is no R support on Travis CI yet
-language: python
-
-# environment variables
-env:
-  - R_LIBS_USER=~/R R_MY_PKG="$(basename $TRAVIS_REPO_SLUG)"
-
-# install dependencies
-install:
-  - sudo apt-add-repository -y "deb http://cran.rstudio.com/bin/linux/ubuntu `lsb_release -cs`/"
-  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E084DAB9
-  - sudo apt-add-repository -y ppa:marutter/c2d4u
-  - sudo apt-get -qq update
-  - sudo apt-get -qq install r-base r-cran-shiny r-cran-cairo r-cran-markdown r-cran-knitr
-  - "[ ! -d ~/R ] && mkdir ~/R"
-  - echo "options(repos = c(CRAN = 'http://cran.rstudio.com'))" > ~/.Rprofile
-  - Rscript -e "install.packages(c('mime'), quiet = TRUE, repos = 'http://rforge.net')"
-  - Rscript -e "install.packages(c('xtable', 'R6'), quiet = TRUE)"
-  - Rscript -e "update.packages(instlib = '~/R', ask = FALSE, quiet = TRUE)"
-  - Rscript -e "install.packages('$R_MY_PKG', dep = TRUE, quiet = TRUE)"
-
-# run tests
-script:
-  - cd ..; rm -f *.tar.gz; R CMD build $R_MY_PKG
-  - R CMD check $R_MY_PKG*.tar.gz --no-manual
-
-after_failure:
-  - cat $R_MY_PKG.Rcheck/00install.out || true
-  - cat $R_MY_PKG.Rcheck/00check.log || true

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 0.10.2.1
-Date: 2014-08-19
+Version: 0.6.0.99
+Date: 2013-01-23
 Author: RStudio, Inc.
 Maintainer: Winston Chang <winston@rstudio.com>
 Description: Shiny makes it incredibly easy to build interactive web
@@ -11,55 +11,41 @@ Description: Shiny makes it incredibly easy to build interactive web
     beautiful, responsive, and powerful applications with minimal effort.
 License: GPL-3
 Depends:
-    R (>= 3.0.0)
+    R (>= 2.14.1)
 Imports:
+    stats,
     tools,
     utils,
-    httpuv (>= 1.2.2),
-    mime (>= 0.1.3),
+    datasets,
+    methods,
+    httpuv (>= 1.0.6.2),
+    caTools,
     RJSONIO,
     xtable,
-    digest,
-    htmltools (>= 0.2.6),
-    R6 (>= 2.0)
+    digest
 Suggests:
-    datasets,
-    Cairo (>= 1.5-5),
-    testthat,
-    knitr (>= 1.6),
-    markdown
-URL: http://shiny.rstudio.com
+    markdown,
+    Cairo,
+    testthat
+URL: http://www.rstudio.com/shiny/
 BugReports: https://github.com/rstudio/shiny/issues
 Collate:
-    'app.R'
-    'bootstrap-layout.R'
     'map.R'
-    'globals.R'
-    'utils.R'
-    'bootstrap.R'
-    'cache.R'
-    'fileupload.R'
-    'stack.R'
-    'graph.R'
-    'hooks.R'
-    'html-deps.R'
-    'htmltools.R'
-    'imageutils.R'
-    'jqueryui.R'
-    'middleware-shiny.R'
-    'middleware.R'
     'priorityqueue.R'
-    'progress.R'
-    'react.R'
-    'reactive-domains.R'
-    'reactives.R'
-    'run-url.R'
-    'server.R'
-    'shiny.R'
-    'shinyui.R'
-    'shinywrappers.R'
-    'showcase.R'
-    'slider.R'
+    'utils.R'
     'tar.R'
     'timer.R'
+    'tags.R'
+    'cache.R'
+    'graph.R'
+    'react.R'
+    'reactives.R'
+    'fileupload.R'
+    'shiny.R'
+    'shinywrappers.R'
+    'shinyui.R'
+    'slider.R'
+    'bootstrap.R'
+    'run-url.R'
+    'imageutils.R'
     'update-input.R'

NAMESPACE

@@ -1,5 +1,3 @@
-# Generated by roxygen2 (4.0.2): do not edit by hand
-
 S3method("$",reactivevalues)
 S3method("$",shinyoutput)
 S3method("$<-",reactivevalues)
@@ -13,35 +11,26 @@ S3method("[[",shinyoutput)
 S3method("[[<-",reactivevalues)
 S3method("[[<-",shinyoutput)
 S3method("names<-",reactivevalues)
+S3method(as.character,shiny.tag)
+S3method(as.character,shiny.tag.list)
 S3method(as.list,reactivevalues)
-S3method(as.shiny.appobj,character)
-S3method(as.shiny.appobj,list)
-S3method(as.shiny.appobj,shiny.appobj)
-S3method(as.tags,shiny.appobj)
-S3method(as.tags,shiny.render.function)
+S3method(format,shiny.tag)
+S3method(format,shiny.tag.list)
 S3method(names,reactivevalues)
-S3method(print,reactive)
-S3method(print,shiny.appobj)
-S3method(str,reactivevalues)
+S3method(print,shiny.tag)
+S3method(print,shiny.tag.list)
 export(HTML)
-export(Progress)
 export(a)
-export(absolutePanel)
 export(actionButton)
-export(actionLink)
 export(addResourcePath)
 export(animationOptions)
-export(as.shiny.appobj)
 export(basicPage)
 export(bootstrapPage)
 export(br)
 export(checkboxGroupInput)
 export(checkboxInput)
 export(code)
-export(column)
 export(conditionalPanel)
-export(createWebDependency)
-export(dataTableOutput)
 export(dateInput)
 export(dateRangeInput)
 export(div)
@@ -51,13 +40,6 @@ export(downloadLink)
 export(em)
 export(exprToFunction)
 export(fileInput)
-export(fixedPage)
-export(fixedPanel)
-export(fixedRow)
-export(flowLayout)
-export(fluidPage)
-export(fluidRow)
-export(getDefaultReactiveDomain)
 export(h1)
 export(h2)
 export(h3)
@@ -66,41 +48,19 @@ export(h5)
 export(h6)
 export(headerPanel)
 export(helpText)
-export(hr)
 export(htmlOutput)
-export(icon)
 export(imageOutput)
 export(img)
-export(incProgress)
 export(includeCSS)
 export(includeHTML)
 export(includeMarkdown)
 export(includeScript)
 export(includeText)
-export(inputPanel)
-export(installExprFunction)
 export(invalidateLater)
-export(is.reactive)
-export(is.reactivevalues)
-export(is.shiny.appobj)
-export(is.singleton)
 export(isolate)
-export(knit_print.html)
-export(knit_print.shiny.appobj)
-export(knit_print.shiny.render.function)
-export(knit_print.shiny.tag)
-export(knit_print.shiny.tag.list)
 export(mainPanel)
-export(makeReactiveBinding)
-export(markRenderFunction)
-export(maskReactiveContext)
-export(navbarMenu)
-export(navbarPage)
-export(navlistPanel)
-export(need)
 export(numericInput)
 export(observe)
-export(onReactiveDomainEnded)
 export(outputOptions)
 export(p)
 export(pageWithSidebar)
@@ -110,9 +70,7 @@ export(plotPNG)
 export(pre)
 export(radioButtons)
 export(reactive)
-export(reactiveFileReader)
 export(reactivePlot)
-export(reactivePoll)
 export(reactivePrint)
 export(reactiveTable)
 export(reactiveText)
@@ -120,9 +78,6 @@ export(reactiveTimer)
 export(reactiveUI)
 export(reactiveValues)
 export(reactiveValuesToList)
-export(registerInputHandler)
-export(removeInputHandler)
-export(renderDataTable)
 export(renderImage)
 export(renderPlot)
 export(renderPrint)
@@ -136,20 +91,13 @@ export(runGist)
 export(runGitHub)
 export(runUrl)
 export(selectInput)
-export(selectizeInput)
-export(serverInfo)
-export(setProgress)
-export(shinyApp)
-export(shinyAppDir)
 export(shinyServer)
 export(shinyUI)
 export(showReactLog)
-export(sidebarLayout)
 export(sidebarPanel)
 export(singleton)
 export(sliderInput)
 export(span)
-export(splitLayout)
 export(stopApp)
 export(strong)
 export(submitButton)
@@ -157,7 +105,6 @@ export(tabPanel)
 export(tableOutput)
 export(tabsetPanel)
 export(tag)
-export(tagAppendAttributes)
 export(tagAppendChild)
 export(tagAppendChildren)
 export(tagList)
@@ -165,7 +112,6 @@ export(tagSetChildren)
 export(tags)
 export(textInput)
 export(textOutput)
-export(titlePanel)
 export(uiOutput)
 export(updateCheckboxGroupInput)
 export(updateCheckboxInput)
@@ -174,23 +120,16 @@ export(updateDateRangeInput)
 export(updateNumericInput)
 export(updateRadioButtons)
 export(updateSelectInput)
-export(updateSelectizeInput)
 export(updateSliderInput)
 export(updateTabsetPanel)
 export(updateTextInput)
-export(validate)
 export(validateCssUnit)
 export(verbatimTextOutput)
-export(verticalLayout)
 export(wellPanel)
-export(withMathJax)
-export(withProgress)
-export(withReactiveDomain)
 export(withTags)
-import(R6)
+export(writeReactLog)
+import(RJSONIO)
+import(caTools)
 import(digest)
-import(htmltools)
 import(httpuv)
-import(mime)
 import(xtable)
-importFrom(RJSONIO,fromJSON)

NEWS

@@ -1,388 +1,6 @@
-shiny 0.10.2.1
+shiny 0.6.0.99
 --------------------------------------------------------------------------------
 
-* Changed some examples to use \donttest instead of \dontrun.
-
-shiny 0.10.2
---------------------------------------------------------------------------------
-
-* The minimal version of R required for the shiny package is 3.0.0 now.
-
-* Shiny apps can now consist of a single file, app.R, instead of ui.R and
-  server.R.
-
-* Upgraded DataTables from 1.9.4 to 1.10.2. This might be a breaking change if
-  you have customized the DataTables options in your apps. (More info:
-  https://github.com/rstudio/shiny/pull/558)
-
-* File uploading via `fileInput()` works for Internet Explorer 8 and 9 now. Note
-  IE8/9 do not support multiple files from a single file input. If you need to
-  upload multiple files, you have to use one file input for each file.
-
-* Switched away from reference classes to R6.
-
-* Reactive log performance has been greatly improved.
-
-* Added `Progress` and `withProgress`, to display the progress of computation
-  on the client browser.
-
-* Fixed #557: updateSelectizeInput(choices, server = TRUE) did not work when
-  `choices` is a character vector.
-
-* Searching in DataTables is case-insensitive and the search strings are not
-  treated as regular expressions by default now. If you want case-sensitive
-  searching or regular expressions, you can use the configuration options
-  `search$caseInsensitive` and `search$regex`, e.g. `renderDataTable(...,
-  options = list(search = list(caseInsensitve = FALSE, regex = TRUE)))`.
-
-* Added support for `htmltools::htmlDependency`'s new `attachment` parameter to
-  `renderUI`/`uiOutput`.
-
-* Exported `createWebDependency`. It takes an `htmltools::htmlDependency` object
-  and makes it available over Shiny's built-in web server.
-
-* Custom output bindings can now render `htmltools::htmlDependency` objects at
-  runtime using `Shiny.renderDependencies()`.
-
-* Fixes to rounding behavior of sliderInput. (#301, #502)
-
-shiny 0.10.1
---------------------------------------------------------------------------------
-
-* Added Unicode support for Windows. Shiny apps running on Windows must use the
-  UTF-8 encoding for ui.R and server.R (also the optional global.R) if they
-  contain non-ASCII characters. See this article for details and examples:
-  http://shiny.rstudio.com/gallery/unicode-characters.html (#516)
-
-* `runGitHub()` also allows the 'username/repo' syntax now, which is equivalent
-  to `runGitHub('repo', 'username')`. (#427)
-
-* `navbarPage()` now accepts a `windowTitle` parameter to set the web browser
-  page title to something other than the title displayed in the navbar.
-
-* Added an `inline` argument to `textOutput()`, `imageOutput()`, `plotOutput()`,
-  and `htmlOutput()`. When `inline = TRUE`, these outputs will be put in
-  `span()` instead of the default `div()`. This occurs automatically when these
-  outputs are created via the inline expressions (e.g. `r renderText(expr)`) in
-  R Markdown documents. See an R Markdown example at
-  http://shiny.rstudio.com/gallery/inline-output.html (#512)
-
-* Added support for option groups in the select/selectize inputs. When the
-  `choices` argument for `selectInput()`/`selectizeInput()` is a list of
-  sub-lists and any sub-list is of length greater than 1, the HTML tag
-  `<optgroup>` will be used. See an example at
-  http://shiny.rstudio.com/gallery/option-groups-for-selectize-input.html (#542)
-
-shiny 0.10.0
---------------------------------------------------------------------------------
-
-* BREAKING CHANGE: By default, observers now terminate themselves if they were
-  created during a session and that session ends. See ?domains for more details.
-
-* Shiny can now be used in R Markdown v2 documents, to create "Shiny Docs":
-  reports and presentations that combine narrative, statically computed output,
-  and fully dynamic inputs and outputs. For more info, including examples, see
-  http://rmarkdown.rstudio.com/authoring_shiny.html.
-
-* The `session` object that can be passed into a server function (e.g.
-  shinyServer(function(input, output, session) {...})) is now documented: see
-  `?session`.
-
-* Most inputs can now accept `NULL` label values to omit the label altogether.
-
-* New `actionLink` input control; like `actionButton`, but with the appearance
-  of a normal link.
-
-* `renderPlot` now calls `print` on its result if it's visible (i.e. no more
-  explicit `print()` required for ggplot2).
-
-* Introduced Shiny app objects (see `?shinyApp`). These essentially replace the
-  little-advertised ability for `runApp` to take a `list(ui=..., server=...)`
-  as the first argument instead of a directory (though that ability remains for
-  backward compatibility). Unlike those lists, Shiny app objects are tagged with
-  class `shiny.appobj` so they can be run simply by printing them.
-
-* Added `maskReactiveContext` function. It blocks the current reactive context,
-  to evaluate expressions that shouldn't use reactive sources directly. (This
-  should not be commonly needed.)
-
-* Added `flowLayout`, `splitLayout`, and `inputPanel` functions for putting UI
-  elements side by side. `flowLayout` lays out its children in a left-to-right,
-  top-to-bottom arrangement. `splitLayout` evenly divides its horizontal space
-  among its children (or unevenly divides if `cellWidths` argument is provided).
-  `inputPanel` is like `flowPanel`, but with a light grey background, and is
-  intended to be used to encapsulate small input controls wherever vertical
-  space is at a premium.
-
-* Added `serverInfo` to obtain info about the Shiny Server if the app is served
-  through it.
-
-* Added an `inline` argument (TRUE/FALSE) in `checkboxGroupInput()` and
-  `radioButtons()` to allow the horizontal layout (inline = TRUE) of checkboxes
-  or radio buttons. (Thanks, @saurfang, #481)
-
-* `sliderInput` and `selectizeInput`/`selectInput` now use a standard horizontal
-  size instead of filling up all available horizontal space. Pass `width="100%"`
-  explicitly for the old behavior.
-
-* Added the `updateSelectizeInput()` function to make it possible to process
-  searching on the server side (i.e. using R), which can be much faster than the
-  client side processing (i.e. using HTML and JavaScript). See the article at
-  http://shiny.rstudio.com/articles/selectize.html for a detailed introduction.
-
-* Fixed a bug of renderDataTable() when the data object only has 1 row and 1
-  column. (Thanks, ZJ Dai, #429)
-
-* `renderPrint` gained a new argument 'width' to control the width of the text
-  output, e.g. renderPrint({mtcars}, width = 40).
-
-* Fixed #220: the zip file for a directory created by some programs may not have
-  the directory name as its first entry, in which case runUrl() can fail. (#220)
-
-* `runGitHub()` can also take a value of the form "username/repo" in its first
-  argument, e.g. both runGitHub("shiny_example", "rstudio") and
-  runGitHub("rstudio/shiny_example") are valid ways to run the GitHub repo.
-
-shiny 0.9.1
---------------------------------------------------------------------------------
-
-* Fixed warning 'Error in Context$new : could not find function "loadMethod"'
-  that was happening to dependent packages on "R CMD check".
-
-shiny 0.9.0
---------------------------------------------------------------------------------
-
-* BREAKING CHANGE: Added a `host` parameter to runApp() and runExample(),
-  which defaults to the shiny.host option if it is non-NULL, or "127.0.0.1"
-  otherwise. This means that by default, Shiny applications can only be
-  accessed on the same machine from which they are served. To allow other
-  clients to connect, as in previous versions of Shiny, use "0.0.0.0"
-  (or the IP address of one of your network interfaces, if you care to be
-  explicit about it).
-
-* Added a new function `selectizeInput()` to use the JavaScript library
-  selectize.js (https://github.com/brianreavis/selectize.js), which extends
-  the basic select input in many aspects.
-
-* The `selectInput()` function also gained a new argument `selectize = TRUE`
-  to makes use of selectize.js by default. If you want to revert back to the
-  original select input, you have to call selectInput(..., selectize = FALSE).
-
-* Added Showcase mode, which displays the R code for an app right in the app
-  itself. You can invoke Showcase mode by passing `display.mode="showcase"`
-  to the `runApp()` function. Or, if an app is designed to run in Showcase
-  mode by default, add a DESCRIPTION file in the app dir with Title, Author,
-  and License fields; with "Type: Shiny"; and with "DisplayMode: Showcase".
-
-* Upgraded to Bootstrap 2.3.2 and jQuery 1.11.0.
-
-* Make `tags$head()` and `singleton()` behave correctly when used with
-  `renderUI()` and `uiOutput()`. Previously, "hoisting content to the head"
-  and "only rendering items a single time" were features that worked only
-  when the page was initially loading, not in dynamic rendering.
-
-* Files are now sourced with the `keep.source` option, to help with debugging
-  and profiling.
-
-* Support user-defined input parsers for data coming in from JavaScript using
-  the parseShinyInput method.
-
-* Fixed the bug #299: renderDataTable() can deal with 0-row data frames now.
-  (reported by Harlan Harris)
-
-* Added `navbarPage()` and `navbarMenu()` functions to create applications
-  with multiple top level panels.
-
-* Added `navlistPanel()` function to create layouts with a a bootstrap
-  navlist on the left and tabPanels on the right
-
-* Added `type` parameter to `tabsetPanel()` to enable the use of pill
-  style tabs in addition to the standard ones.
-
-* Added `position` paramter to `tabsetPanel()` to enable positioning of tabs
-  above, below, left, or right of tab content.
-
-* Added `fluidPage()` and `fixedPage()` functions as well as related row and
-  column layout functions for creating arbitrary bootstrap grid layouts.
-
-* Added `hr()` builder function for creating horizontal rules.
-
-* Automatically concatenate duplicate attributes in tag definitions
-
-* Added `responsive` parameter to page building functions for opting-out of
-  bootstrap responsive css.
-
-* Added `theme` parameter to page building functions for specifying alternate
-  bootstrap css styles.
-
-* Added `icon()` function for embedding icons from the
-  [font awesome](http://fontawesome.io/) icon library
-
-* Added `makeReactiveBinding` function to turn a "regular" variable into a
-  reactive one (i.e. reading the variable makes the current reactive context
-  dependent on it, and setting the variable is a source of reactivity).
-
-* Added a function `withMathJax()` to include the MathJax library in an app.
-
-* The argument `selected` in checkboxGroupInput(), selectInput(), and
-  radioButtons() refers to the value(s) instead of the name(s) of the
-  argument `choices` now. For example, the value of the `selected` argument
-  in selectInput(..., choices = c('Label 1' = 'x1', 'Label 2' = 'x2'),
-  selected = 'Label 2') must be updated to 'x2', although names/labels will
-  be automatically converted to values internally for backward
-  compatibility. The same change applies to updateCheckboxGroupInput(),
-  updateSelectInput(), and updateRadioButtons() as well. (#340)
-
-* Now it is possible to only update the value of a checkbox group, select input,
-  or radio buttons using the `selected` argument without providing the
-  `choices` argument in updateCheckboxGroupInput(), updateSelectInput(), and
-  updateRadioButtons(), respectively. (#340)
-
-* Added `absolutePanel` and `fixedPanel` functions for creating absolute-
-  and fixed-position panels. They can be easily made user-draggable by
-  specifying `draggable = TRUE`.
-
-* For the `options` argument of the function `renderDataTable()`, we can
-  pass literal JavaScript code to the DataTables library via `I()`. This
-  makes it possible to use any JavaScript object in the options, e.g. a
-  JavaScript function (which is not supported in JSON). See
-  `?renderDataTable` for details and examples.
-
-* DataTables also works under IE8 now.
-
-* Fixed a bug in DataTables pagination when searching is turned on, which
-  caused failures for matrices as well as empty rows when displaying data
-  frames using renderDataTable().
-
-* The `options` argument in `renderDataTable()` can also take a function
-  that returns a list. This makes it possible to use reactive values in the
-  options. (#392)
-
-* `renderDataTable()` respects more DataTables options now: (1) either
-  bPaginate = FALSE or iDisplayLength = -1 will disable pagination (i.e. all
-  rows are returned from the data); besides, this means we can also use -1
-  in the length menu, e.g. aLengthMenu = list(c(10, 30, -1), list(10, 30,
-  'All')); (2) we can disable searching for individual columns through the
-  bSearchable option, e.g. aoColumns = list(list(bSearchable = FALSE),
-  list(bSearchable = TRUE),...) (the search box for the first column is
-  hidden); (3) we can turn off searching entirely (for both global searching
-  and individual columns) using the option bFilter = FALSE.
-
-* Added an argument `callback` in `renderDataTable()` so that a custom
-  JavaScript function can be applied to the DataTable object. This makes it
-  much easier to use DataTables plug-ins.
-
-* For numeric columns in a DataTable, the search boxes support lower and
-  upper bounds now: a search query of the form "lower,upper" (without
-  quotes) indicates the limits [lower, upper]. For a column X, this means
-  the rows corresponding to X >= lower & X <= upper are returned. If we omit
-  either the lower limit or the upper limit, only the other limit will be
-  used, e.g. ",upper" means X <= upper.
-
-* `updateNumericInput(value)` tries to preserve numeric precision by avoiding
-  scientific notation when possible, e.g. 102145 is no longer rounded to
-  1.0214e+05 = 102140. (Thanks, Martin Loos. #401)
-
-* `sliderInput()` no longer treats a label wrapped in HTML() as plain text,
-  e.g. the label in sliderInput(..., label = HTML('<em>A Label</em>')) will
-  not be escaped any more. (#119)
-
-* Fixed #306: the trailing slash in a path could fail `addResourcePath()`
-  under Windows. (Thanks, ZJ Dai)
-
-* Dots are now legal characters for inputId/outputId. (Thanks, Kevin
-  Lindquist. #358)
-
-shiny 0.8.0
---------------------------------------------------------------------------------
-
-* Debug hooks are registered on all user-provided functions and (reactive)
-  expressions (e.g., in renderPlot()), which makes it possible to set
-  breakpoints in these functions using the latest version of the RStudio
-  IDE, and the RStudio visual debugging tools can be used to debug Shiny
-  apps. Internally, the registration is done via installExprFunction(),
-  which is a new function introduced in this version to replace
-  exprToFunction() so that the registration can be automatically done.
-
-* Added a new function renderDataTable() to display tables using the
-  JavaScript library DataTables. It includes basic features like pagination,
-  searching (global search or search by individual columns), sorting (by
-  single or multiple columns). All these features are implemented on the R
-  side; for example, we can use R regular expressions for searching.
-  Besides, it also uses the Bootstrap CSS style. See the full
-  documentation and examples in the tutorial:
-  http://rstudio.github.io/shiny/tutorial/#datatables
-
-* Added a new option `shiny.error` which can take a function as an error
-  handler. It is called when an error occurs in an app (in user-provided
-  code), e.g., after we set options(shiny.error = recover), we can enter a
-  specified environment in the call stack to debug our code after an error
-  occurs.
-
-* The argument `launch.browser` in runApp() can also be a function,
-  which takes the URL of the shiny app as its input value.
-
-* runApp() uses a random port between 3000 and 8000 instead of 8100 now. It
-  will try up to 20 ports in case certain ports are not available.
-
-* Fixed a bug for conditional panels: the value `input.id` in the condition
-  was not correctly retrieved when the input widget had a type, such as
-  numericInput(). (reported by Jason Bryer)
-
-* Fixed two bugs in plotOutput(); clickId and hoverId did not give correct
-  coordinates in Firefox, or when the axis limits of the plot were changed.
-  (reported by Chris Warth and Greg D)
-
-* The minimal required version for the httpuv package was increased to 1.2
-  (on CRAN now).
-
-
-shiny 0.7.0
---------------------------------------------------------------------------------
-
-* Stopped sending websocket subprotocol. This fixes a compatibility issue with
-  Google Chrome 30.
-
-* The `input` and `output` objects are now also accessible via `session$input`
-  and `session$output`.
-
-* Added click and hover events for static plots; see `?plotOutput` for details.
-
-* Added optional logging of the execution states of a reactive program, and
-  tools for visualizing the log data. To use, start a new R session and call
-  `options(shiny.reactlog=TRUE)`. Then launch a Shiny app and interact with it.
-  Press Ctrl+F3 (or for Mac, Cmd+F3) in the browser to launch an interactive
-  visualization of the reactivity that has occurred. See `?showReactLog` for
-  more information.
-
-* Added `includeScript()` and `includeCSS()` functions.
-
-* Reactive expressions now have class="reactive" attribute. Also added
-  `is.reactive()` and `is.reactivevalues()` functions.
-
-* New `stopApp()` function, which stops an app and returns a value to the caller
-  of `runApp()`.
-
-* Added the `shiny.usecairo` option, which can be used to tell Shiny not to use
-  Cairo for PNG output even when it is installed. (Defaults to `TRUE`.)
-
-* Speed increases for `selectInput()` and `radioButtons()`, and their
-  corresponding updater functions, for when they have many options.
-
-* Added `tagSetChildren()` and `tagAppendChildren()` functions.
-
-* The HTTP request object that created the websocket is now accessible from the
-  `session` object, as `session$request`. This is a Rook-like request
-  environment that can be used to access HTTP headers, among other things.
-  (Note: When running in a Shiny Server environment, the request will reflect
-  the proxy HTTP request that was made from the Shiny Server process to the R
-  process, not the request that was made from the web browser to Shiny Server.)
-
-* Fix `getComputedStyle` issue, for IE8 browser compatibility (#196). Note:
-  Shiny Server is still required for IE8/9 compatibility.
-
-* Add shiny.sharedSecret option, to require the HTTP header Shiny-Shared-Secret
-  to be set to the given value.
 
 shiny 0.6.0
 --------------------------------------------------------------------------------
@@ -608,7 +226,7 @@ shiny 0.1.8
 * Fix issue #27: Warnings cause reactive functions to stop executing.
 * The server.R and ui.R filenames are now case insensitive.
 * Add `wellPanel` function for creating inset areas on the page.
-* Add `bootstrapPage` function for creating new Bootstrap based
+* Add `bootstrapPage` function for creating new Twitter Bootstrap based
   layouts from scratch.
 
 
@@ -670,11 +288,11 @@ shiny 0.1.3
   creating custom input controls
 * Add `step` parameter to numericInput
 * Read names of input using `names(input)`
-* Access snapshot of input as a list using `as.list(input)`
+* Access snapshot of input as a list using `as.list(input)` 
 * Fix issue #10: Plots in tabsets not rendered
 
 
 shiny 0.1.2
 --------------------------------------------------------------------------------
 
-Initial private beta release!
+Initial private beta release!

R/app.R

@@ -1,361 +0,0 @@
-# TODO: Subapp global.R
-
-#' Create a Shiny app object
-#'
-#' These functions create Shiny app objects from either an explicit UI/server
-#' pair (\code{shinyApp}), or by passing the path of a directory that
-#' contains a Shiny app (\code{shinyAppDir}). You generally shouldn't need to
-#' use these functions to create/run applications; they are intended for
-#' interoperability purposes, such as embedding Shiny apps inside a \pkg{knitr}
-#' document.
-#'
-#' @param ui The UI definition of the app (for example, a call to
-#'   \code{fluidPage()} with nested controls)
-#' @param server A server function
-#' @param onStart A function that will be called before the app is actually run.
-#'   This is only needed for \code{shinyAppObj}, since in the \code{shinyAppDir}
-#'   case, a \code{global.R} file can be used for this purpose.
-#' @param options Named options that should be passed to the `runApp` call. You
-#'   can also specify \code{width} and \code{height} parameters which provide a
-#'   hint to the embedding environment about the ideal height/width for the app.
-#' @param uiPattern A regular expression that will be applied to each \code{GET}
-#'   request to determine whether the \code{ui} should be used to handle the
-#'   request. Note that the entire request path must match the regular
-#'   expression in order for the match to be considered successful.
-#' @return An object that represents the app. Printing the object will run the
-#'   app.
-#'
-#' @examples
-#' \donttest{
-#' shinyApp(
-#'   ui = fluidPage(
-#'     numericInput("n", "n", 1),
-#'     plotOutput("plot")
-#'   ),
-#'   server = function(input, output) {
-#'     output$plot <- renderPlot( plot(head(cars, input$n)) )
-#'   },
-#'   options=list(launch.browser = rstudio::viewer)
-#' )
-#'
-#' shinyAppDir(system.file("examples/01_hello", package="shiny"))
-#' }
-#'
-#' @export
-shinyApp <- function(ui=NULL, server=NULL, onStart=NULL, options=list(),
-                     uiPattern="/") {
-  if (is.null(server)) {
-    stop("`server` missing from shinyApp")
-  }
-
-  # Ensure that the entire path is a match
-  uiPattern <- sprintf("^%s$", uiPattern)
-
-  httpHandler <- uiHttpHandler(ui, uiPattern)
-
-  serverFuncSource <- function() {
-    server
-  }
-
-  structure(
-    list(
-      httpHandler = httpHandler,
-      serverFuncSource = serverFuncSource,
-      onStart = onStart,
-      options = options),
-    class = "shiny.appobj"
-  )
-}
-
-#' @rdname shinyApp
-#' @param appDir Path to directory that contains a Shiny app (i.e. a server.R
-#'   file and either ui.R or www/index.html)
-#' @export
-shinyAppDir <- function(appDir, options=list()) {
-  if (!file_test('-d', appDir)) {
-    stop("No Shiny application exists at the path \"", appDir, "\"")
-  }
-
-  # In case it's a relative path, convert to absolute (so we're not adversely
-  # affected by future changes to the path)
-  appDir <- normalizePath(appDir, mustWork = TRUE)
-
-  if (file.exists.ci(appDir, "server.R")) {
-    shinyAppDir_serverR(appDir, options = options)
-  } else if (file.exists.ci(appDir, "app.R")) {
-    shinyAppDir_appR(appDir, options = options)
-  } else {
-    stop("App dir must contain either app.R or server.R.")
-  }
-}
-
-# This reads in an app dir in the case that there's a server.R (and ui.R/www)
-# present, and returns a shiny.appobj.
-shinyAppDir_serverR <- function(appDir, options=list()) {
-  # Most of the complexity here comes from needing to hot-reload if the .R files
-  # change on disk, or are created, or are removed.
-
-  # uiHandlerSource is a function that returns an HTTP handler for serving up
-  # ui.R as a webpage. The "cachedFuncWithFile" call makes sure that the closure
-  # we're creating here only gets executed when ui.R's contents change.
-  uiHandlerSource <- cachedFuncWithFile(appDir, "ui.R", case.sensitive = FALSE,
-    function(uiR) {
-      if (file.exists(uiR)) {
-        # If ui.R contains a call to shinyUI (which sets .globals$ui), use that.
-        # If not, then take the last expression that's returned from ui.R.
-        .globals$ui <- NULL
-        on.exit(.globals$ui <- NULL, add = FALSE)
-        ui <- sourceUTF8(uiR, local = new.env(parent = globalenv()))$value
-        if (!is.null(.globals$ui)) {
-          ui <- .globals$ui[[1]]
-        }
-        return(uiHttpHandler(ui))
-      } else {
-        return(function(req) NULL)
-      }
-    }
-  )
-  uiHandler <- function(req) {
-    uiHandlerSource()(req)
-  }
-
-  wwwDir <- file.path.ci(appDir, "www")
-  fallbackWWWDir <- system.file("www-dir", package = "shiny")
-  serverSource <- cachedFuncWithFile(appDir, "server.R", case.sensitive = FALSE,
-    function(serverR) {
-      # If server.R contains a call to shinyServer (which sets .globals$server),
-      # use that. If not, then take the last expression that's returned from
-      # server.R.
-      .globals$server <- NULL
-      on.exit(.globals$server <- NULL, add = TRUE)
-      result <- sourceUTF8(serverR, local = new.env(parent = globalenv()))$value
-      if (!is.null(.globals$server)) {
-        result <- .globals$server[[1]]
-      }
-      return(result)
-    }
-  )
-
-  # This function stands in for the server function, and reloads the
-  # real server function as necessary whenever server.R changes
-  serverFuncSource <- function() {
-    serverFunction <- serverSource()
-    if (is.null(serverFunction)) {
-      return(function(input, output) NULL)
-    } else if (is.function(serverFunction)) {
-      # This is what we normally expect; run the server function
-      return(serverFunction)
-    } else {
-      stop("server.R returned an object of unexpected type: ",
-        typeof(serverFunction))
-    }
-  }
-
-  oldwd <- NULL
-  onStart <- function() {
-    oldwd <<- getwd()
-    setwd(appDir)
-    if (file.exists(file.path.ci(appDir, "global.R")))
-      sourceUTF8(file.path.ci(appDir, "global.R"))
-  }
-  onEnd <- function() {
-    setwd(oldwd)
-  }
-
-  structure(
-    list(
-      httpHandler = joinHandlers(c(uiHandler, wwwDir, fallbackWWWDir)),
-      serverFuncSource = serverFuncSource,
-      onStart = onStart,
-      onEnd = onEnd,
-      options = options),
-    class = "shiny.appobj"
-  )
-}
-
-# This reads in an app dir in the case that there's a app.R present, and returns
-# a shiny.appobj.
-shinyAppDir_appR <- function(appDir, options=list()) {
-  fullpath <- file.path.ci(appDir, "app.R")
-
-  # This sources app.R and caches the content. When appObj() is called but
-  # app.R hasn't changed, it won't re-source the file. But if called and
-  # app.R has changed, it'll re-source the file and return the result.
-  appObj <- cachedFuncWithFile(appDir, "app.R", case.sensitive = FALSE,
-    function(appR) {
-      result <- sourceUTF8(fullpath, local = new.env(parent = globalenv()))$value
-
-      if (!is.shiny.appobj(result))
-        stop("app.R did not return a shiny.appobj object.")
-
-      return(result)
-    }
-  )
-
-  # A function that invokes the http handler from the appObj in app.R, but
-  # since this uses appObj(), it only re-sources the file when it changes.
-  dynHttpHandler <- function(...) {
-    appObj()$httpHandler(...)
-  }
-
-  dynServerFuncSource <- function(...) {
-    appObj()$serverFuncSource(...)
-  }
-
-  wwwDir <- file.path.ci(appDir, "www")
-  fallbackWWWDir <- system.file("www-dir", package = "shiny")
-
-  oldwd <- NULL
-  onStart <- function() {
-    oldwd <<- getwd()
-    setwd(appDir)
-  }
-  onEnd <- function() {
-    setwd(oldwd)
-  }
-
-  structure(
-    list(
-      httpHandler = joinHandlers(c(dynHttpHandler, wwwDir, fallbackWWWDir)),
-      serverFuncSource = dynServerFuncSource,
-      onStart = onStart,
-      onEnd = onEnd,
-      options = options
-    ),
-    class = "shiny.appobj"
-  )
-}
-
-
-#' @rdname shinyApp
-#' @param x Object to convert to a Shiny app.
-#' @export
-as.shiny.appobj <- function(x) {
-  UseMethod("as.shiny.appobj", x)
-}
-
-#' @rdname shinyApp
-#' @export
-as.shiny.appobj.shiny.appobj <- function(x) {
-  x
-}
-
-#' @rdname shinyApp
-#' @export
-as.shiny.appobj.list <- function(x) {
-  shinyApp(ui = x$ui, server = x$server)
-}
-
-#' @rdname shinyApp
-#' @export
-as.shiny.appobj.character <- function(x) {
-  shinyAppDir(x)
-}
-
-#' @rdname shinyApp
-#' @export
-is.shiny.appobj <- function(x) {
-  inherits(x, "shiny.appobj")
-}
-
-#' @rdname shinyApp
-#' @param ... Additional parameters to be passed to print.
-#' @export
-print.shiny.appobj <- function(x, ...) {
-  opts <- x$options %OR% list()
-  opts <- opts[names(opts) %in%
-      c("port", "launch.browser", "host", "quiet", "display.mode")]
-
-  args <- c(list(x), opts)
-
-  do.call(runApp, args)
-}
-
-#' @rdname shinyApp
-#' @method as.tags shiny.appobj
-#' @export
-as.tags.shiny.appobj <- function(x, ...) {
-  # jcheng 06/06/2014: Unfortunate copy/paste between this function and
-  # knit_print.shiny.appobj, but I am trying to make the most conservative
-  # change possible due to upcoming release.
-  opts <- x$options %OR% list()
-  width <- if (is.null(opts$width)) "100%" else opts$width
-  height <- if (is.null(opts$height)) "400" else opts$height
-
-  path <- addSubApp(x)
-  tags$iframe(src=path, width=width, height=height, class="shiny-frame")
-}
-
-#' Knitr S3 methods
-#'
-#' These S3 methods are necessary to help Shiny applications and UI chunks embed
-#' themselves in knitr/rmarkdown documents.
-#'
-#' @name knitr_methods
-#' @param x Object to knit_print
-#' @param ... Additional knit_print arguments
-NULL
-
-# If there's an R Markdown runtime option set but it isn't set to Shiny, then
-# return a warning indicating the runtime is inappropriate for this object.
-# Returns NULL in all other cases.
-shiny_rmd_warning <- function() {
-  runtime <- knitr::opts_knit$get("rmarkdown.runtime")
-  if (!is.null(runtime) && runtime != "shiny")
-    # note that the RStudio IDE checks for this specific string to detect Shiny
-    # applications in static document
-    list(structure(
-      "Shiny application in a static R Markdown document",
-      class = "rmd_warning"))
-  else
-    NULL
-}
-
-#' @rdname knitr_methods
-#' @export
-knit_print.shiny.appobj <- function(x, ...) {
-  opts <- x$options %OR% list()
-  width <- if (is.null(opts$width)) "100%" else opts$width
-  height <- if (is.null(opts$height)) "400" else opts$height
-
-  runtime <- knitr::opts_knit$get("rmarkdown.runtime")
-  if (!is.null(runtime) && runtime != "shiny") {
-    # If not rendering to a Shiny document, create a box exactly the same
-    # dimensions as the Shiny app would have had (so the document continues to
-    # flow as it would have with the app), and display a diagnostic message
-    width <- validateCssUnit(width)
-    height <- validateCssUnit(height)
-    output <- tags$div(
-      style=paste("width:", width, "; height:", height, "; text-align: center;",
-                  "box-sizing: border-box;", "-moz-box-sizing: border-box;",
-                  "-webkit-box-sizing: border-box;"),
-      class="muted well",
-      "Shiny applications not supported in static R Markdown documents")
-  }
-  else {
-    path <- addSubApp(x)
-    output <- tags$iframe(src=path, width=width, height=height,
-                          class="shiny-frame")
-  }
-
-  # If embedded Shiny apps ever have JS/CSS dependencies (like pym.js) we'll
-  # need to grab those and put them in meta, like in knit_print.shiny.tag. But
-  # for now it's not an issue, so just return the HTML and warning.
-
-  knitr::asis_output(htmlPreserve(format(output, indent=FALSE)),
-                     meta = shiny_rmd_warning(), cacheable = FALSE)
-}
-
-# Let us use a nicer syntax in knitr chunks than literally
-# calling output$value <- renderFoo(...) and fooOutput().
-#' @rdname knitr_methods
-#' @param inline Whether the object is printed inline.
-#' @export
-knit_print.shiny.render.function <- function(x, ..., inline = FALSE) {
-  x <- htmltools::as.tags(x, inline = inline)
-  output <- knitr::knit_print(tagList(x))
-  attr(output, "knit_cacheable") <- FALSE
-  attr(output, "knit_meta") <- append(attr(output, "knit_meta"),
-                                      shiny_rmd_warning())
-  output
-}

R/bootstrap-layout.R

@@ -1,421 +0,0 @@
-
-#' Create a page with fluid layout
-#'
-#' Functions for creating fluid page layouts. A fluid page layout consists of
-#' rows which in turn include columns. Rows exist for the purpose of making sure
-#' their elements appear on the same line (if the browser has adequate width).
-#' Columns exist for the purpose of defining how much horizontal space within a
-#' 12-unit wide grid it's elements should occupy. Fluid pages scale their
-#' components in realtime to fill all available browser width.
-#'
-#' @param ... Elements to include within the page
-#' @param title The browser window title (defaults to the host URL of the page).
-#'   Can also be set as a side effect of the \code{\link{titlePanel}} function.
-#' @param responsive \code{TRUE} to use responsive layout (automatically adapt
-#'   and resize page elements based on the size of the viewing device)
-#' @param theme Alternative Bootstrap stylesheet (normally a css file within the
-#'   www directory). For example, to use the theme located at
-#'   \code{www/bootstrap.css} you would use \code{theme = "bootstrap.css"}.
-#'
-#' @return A UI defintion that can be passed to the \link{shinyUI} function.
-#'
-#' @details To create a fluid page use the \code{fluidPage} function and include
-#'   instances of \code{fluidRow} and \code{\link{column}} within it. As an
-#'   alternative to low-level row and column functions you can also use
-#'   higher-level layout functions like \code{\link{sidebarLayout}}.
-#'
-#' @note See the
-#'   \href{https://github.com/rstudio/shiny/wiki/Shiny-Application-Layout-Guide}{
-#'    Shiny-Application-Layout-Guide} for additional details on laying out fluid
-#'   pages.
-#'
-#' @seealso \code{\link{column}}, \code{\link{sidebarLayout}}
-#'
-#' @examples
-#' shinyUI(fluidPage(
-#'
-#'   # Application title
-#'   titlePanel("Hello Shiny!"),
-#'
-#'   sidebarLayout(
-#'
-#'     # Sidebar with a slider input
-#'     sidebarPanel(
-#'       sliderInput("obs",
-#'                   "Number of observations:",
-#'                   min = 0,
-#'                   max = 1000,
-#'                   value = 500)
-#'     ),
-#'
-#'     # Show a plot of the generated distribution
-#'     mainPanel(
-#'       plotOutput("distPlot")
-#'     )
-#'   )
-#' ))
-#'
-#' shinyUI(fluidPage(
-#'   title = "Hello Shiny!",
-#'   fluidRow(
-#'     column(width = 4,
-#'       "4"
-#'     ),
-#'     column(width = 3, offset = 2,
-#'       "3 offset 2"
-#'     )
-#'   )
-#' ))
-#'
-#' @rdname fluidPage
-#' @export
-fluidPage <- function(..., title = NULL, responsive = TRUE, theme = NULL) {
-  bootstrapPage(div(class = "container-fluid", ...),
-                title = title,
-                responsive = responsive,
-                theme = theme)
-}
-
-
-#' @rdname fluidPage
-#' @export
-fluidRow <- function(...) {
-  div(class = "row-fluid", ...)
-}
-
-#' Create a page with a fixed layout
-#'
-#' Functions for creating fixed page layouts. A fixed page layout consists of
-#' rows which in turn include columns. Rows exist for the purpose of making sure
-#' their elements appear on the same line (if the browser has adequate width).
-#' Columns exist for the purpose of defining how much horizontal space within a
-#' 12-unit wide grid it's elements should occupy. Fixed pages limit their width
-#' to 940 pixels on a typical display, and 724px or 1170px on smaller and larger
-#' displays respectively.
-#'
-#' @param ... Elements to include within the container
-#' @param title The browser window title (defaults to the host URL of the page)
-#' @param responsive \code{TRUE} to use responsive layout (automatically adapt
-#'   and resize page elements based on the size of the viewing device)
-#' @param theme Alternative Bootstrap stylesheet (normally a css file within the
-#'   www directory). For example, to use the theme located at
-#'   \code{www/bootstrap.css} you would use \code{theme = "bootstrap.css"}.
-#'
-#' @return A UI defintion that can be passed to the \link{shinyUI} function.
-#'
-#' @details To create a fixed page use the \code{fixedPage} function and include
-#'   instances of \code{fixedRow} and \code{\link{column}} within it. Note that
-#'   unlike \code{\link{fluidPage}}, fixed pages cannot make use of higher-level
-#'   layout functions like \code{sidebarLayout}, rather, all layout must be done
-#'   with \code{fixedRow} and \code{column}.
-#'
-#' @note See the
-#'   \href{https://github.com/rstudio/shiny/wiki/Shiny-Application-Layout-Guide}{
-#'   Shiny Application Layout Guide} for additional details on laying out fixed
-#'   pages.
-#'
-#' @seealso \code{\link{column}}
-#'
-#' @examples
-#' shinyUI(fixedPage(
-#'   title = "Hello, Shiny!",
-#'   fixedRow(
-#'     column(width = 4,
-#'       "4"
-#'     ),
-#'     column(width = 3, offset = 2,
-#'       "3 offset 2"
-#'     )
-#'   )
-#' ))
-#'
-#' @rdname fixedPage
-#' @export
-fixedPage <- function(..., title = NULL, responsive = TRUE, theme = NULL) {
-  bootstrapPage(div(class = "container", ...),
-                title = title,
-                responsive = responsive,
-                theme = theme)
-}
-
-#' @rdname fixedPage
-#' @export
-fixedRow <- function(...) {
-  div(class = "row", ...)
-}
-
-
-#' Create a column within a UI definition
-#'
-#' Create a column for use within a  \code{\link{fluidRow}} or
-#' \code{\link{fixedRow}}
-#'
-#' @param width The grid width of the column (must be between 1 and 12)
-#' @param ... Elements to include within the column
-#' @param offset The number of columns to offset this column from the end of the
-#'   previous column.
-#'
-#' @return A column that can be included within a
-#'   \code{\link{fluidRow}} or \code{\link{fixedRow}}.
-#'
-#'
-#' @seealso \code{\link{fluidRow}}, \code{\link{fixedRow}}.
-#'
-#' @examples
-#' fluidRow(
-#'   column(4,
-#'     sliderInput("obs", "Number of observations:",
-#'                 min = 1, max = 1000, value = 500)
-#'   ),
-#'   column(8,
-#'     plotOutput("distPlot")
-#'   )
-#' )
-#'
-#' fluidRow(
-#'   column(width = 4,
-#'     "4"
-#'   ),
-#'   column(width = 3, offset = 2,
-#'     "3 offset 2"
-#'   )
-#' )
-#' @export
-column <- function(width, ..., offset = 0) {
-
-  if (!is.numeric(width) || (width < 1) || (width > 12))
-    stop("column width must be between 1 and 12")
-
-  colClass <- paste0("span", width)
-  if (offset > 0)
-    colClass <- paste0(colClass, " offset", offset)
-  div(class = colClass, ...)
-}
-
-
-#' Create a panel containing an application title.
-#'
-#' @param title An application title to display
-#' @param windowTitle The title that should be displayed by the browser window.
-#'
-#' @details Calling this function has the side effect of including a
-#'   \code{title} tag within the head. You can also specify a page title
-#'   explicitly using the `title` parameter of the top-level page function.
-#'
-#'
-#' @examples
-#' titlePanel("Hello Shiny!")
-#'
-#' @export
-titlePanel <- function(title, windowTitle=title) {
-  tagList(
-    tags$head(tags$title(windowTitle)),
-    h2(style = "padding: 10px 0px;", title)
-  )
-}
-
-#' Layout a sidebar and main area
-#'
-#' Create a layout with a sidebar and main area. The sidebar is displayed with a
-#' distinct background color and typically contains input controls. The main
-#' area occupies 2/3 of the horizontal width and typically contains outputs.
-#'
-#' @param sidebarPanel The \link{sidebarPanel} containing input controls
-#' @param mainPanel The \link{mainPanel} containing outputs
-#' @param position The position of the sidebar relative to the main area ("left"
-#'   or "right")
-#' @param fluid \code{TRUE} to use fluid layout; \code{FALSE} to use fixed
-#'   layout.
-#'
-#' @examples
-#' # Define UI
-#' shinyUI(fluidPage(
-#'
-#'   # Application title
-#'   titlePanel("Hello Shiny!"),
-#'
-#'   sidebarLayout(
-#'
-#'     # Sidebar with a slider input
-#'     sidebarPanel(
-#'       sliderInput("obs",
-#'                   "Number of observations:",
-#'                   min = 0,
-#'                   max = 1000,
-#'                   value = 500)
-#'     ),
-#'
-#'     # Show a plot of the generated distribution
-#'     mainPanel(
-#'       plotOutput("distPlot")
-#'     )
-#'   )
-#' ))
-#'
-#' @export
-sidebarLayout <- function(sidebarPanel,
-                          mainPanel,
-                          position = c("left", "right"),
-                          fluid = TRUE) {
-
-  # determine the order
-  position <- match.arg(position)
-  if (position == "left") {
-    firstPanel <- sidebarPanel
-    secondPanel <- mainPanel
-  }
-  else if (position == "right") {
-    firstPanel <- mainPanel
-    secondPanel <- sidebarPanel
-  }
-
-  # return as as row
-  if (fluid)
-    fluidRow(firstPanel, secondPanel)
-  else
-    fixedRow(firstPanel, secondPanel)
-}
-
-#' Lay out UI elements vertically
-#'
-#' Create a container that includes one or more rows of content (each element
-#' passed to the container will appear on it's own line in the UI)
-#'
-#' @param ... Elements to include within the container
-#' @param fluid \code{TRUE} to use fluid layout; \code{FALSE} to use fixed
-#'   layout.
-#'
-#' @seealso \code{\link{fluidPage}}, \code{\link{flowLayout}}
-#'
-#' @examples
-#' shinyUI(fluidPage(
-#'   verticalLayout(
-#'     a(href="http://example.com/link1", "Link One"),
-#'     a(href="http://example.com/link2", "Link Two"),
-#'     a(href="http://example.com/link3", "Link Three")
-#'   )
-#' ))
-#' @export
-verticalLayout <- function(..., fluid = TRUE) {
-  lapply(list(...), function(row) {
-    col <- column(12, row)
-    if (fluid)
-      fluidRow(col)
-    else
-      fixedRow(col)
-  })
-}
-
-#' Flow layout
-#'
-#' Lays out elements in a left-to-right, top-to-bottom arrangement. The elements
-#' on a given row will be top-aligned with each other. This layout will not work
-#' well with elements that have a percentage-based width (e.g. `plotOutput` at
-#' its default setting of `width = "100%"`).
-#'
-#' @param ... Unnamed arguments will become child elements of the layout. Named
-#'   arguments will become HTML attributes on the outermost tag.
-#' @param cellArgs Any additional attributes that should be used for each cell
-#'   of the layout.
-#'
-#' @seealso \code{\link{verticalLayout}}
-#'
-#' @examples
-#' flowLayout(
-#'   numericInput("rows", "How many rows?", 5),
-#'   selectInput("letter", "Which letter?", LETTERS),
-#'   sliderInput("value", "What value?", 0, 100, 50)
-#' )
-#' @export
-flowLayout <- function(..., cellArgs = list()) {
-
-  children <- list(...)
-  childIdx <- !nzchar(names(children) %OR% character(length(children)))
-  attribs <- children[!childIdx]
-  children <- children[childIdx]
-
-  do.call(tags$div, c(list(class = "shiny-flow-layout"),
-    attribs,
-    lapply(children, function(x) {
-      do.call(tags$div, c(cellArgs, list(x)))
-    })
-  ))
-}
-
-#' Input panel
-#'
-#' A \code{\link{flowLayout}} with a grey border and light grey background,
-#' suitable for wrapping inputs.
-#'
-#' @param ... Input controls or other HTML elements.
-#'
-#' @export
-inputPanel <- function(...) {
-  div(class = "shiny-input-panel",
-    flowLayout(...)
-  )
-}
-
-#' Split layout
-#'
-#' Lays out elements horizontally, dividing the available horizontal space into
-#' equal parts (by default).
-#'
-#' @param ... Unnamed arguments will become child elements of the layout. Named
-#'   arguments will become HTML attributes on the outermost tag.
-#' @param cellWidths Character or numeric vector indicating the widths of the
-#'   individual cells. Recycling will be used if needed. Character values will
-#'   be interpreted as CSS lengths (see \code{\link{validateCssUnit}}), numeric
-#'   values as pixels.
-#' @param cellArgs Any additional attributes that should be used for each cell
-#'   of the layout.
-#'
-#' @examples
-#' # Equal sizing
-#' splitLayout(
-#'   plotOutput("plot1"),
-#'   plotOutput("plot2")
-#' )
-#'
-#' # Custom widths
-#' splitLayout(cellWidths = c("25%", "75%"),
-#'   plotOutput("plot1"),
-#'   plotOutput("plot2")
-#' )
-#'
-#' # All cells at 300 pixels wide, with cell padding
-#' # and a border around everything
-#' splitLayout(
-#'   style = "border: 1px solid silver;",
-#'   cellWidths = 300,
-#'   cellArgs = list(style = "padding: 6px"),
-#'   plotOutput("plot1"),
-#'   plotOutput("plot2"),
-#'   plotOutput("plot3")
-#' )
-#' @export
-splitLayout <- function(..., cellWidths = NULL, cellArgs = list()) {
-
-  children <- list(...)
-  childIdx <- !nzchar(names(children) %OR% character(length(children)))
-  attribs <- children[!childIdx]
-  children <- children[childIdx]
-  count <- length(children)
-
-  if (length(cellWidths) == 0 || is.na(cellWidths)) {
-    cellWidths <- sprintf("%.3f%%", 100 / count)
-  }
-  cellWidths <- rep(cellWidths, length.out = count)
-  cellWidths <- sapply(cellWidths, validateCssUnit)
-
-  do.call(tags$div, c(list(class = "shiny-split-layout"),
-    attribs,
-    mapply(children, cellWidths, FUN = function(x, w) {
-      do.call(tags$div, c(
-        list(style = sprintf("width: %s;", w)),
-        cellArgs,
-        list(x)
-      ))
-    }, SIMPLIFY = FALSE)
-  ))
-}

R/cache.R

@@ -1,26 +1,29 @@
-# A context object for tracking a cache that needs to be dirtied when a set of
-# files changes on disk. Each time the cache is dirtied, the set of files is
+# A context object for tracking a cache that needs to be dirtied when a set of 
+# files changes on disk. Each time the cache is dirtied, the set of files is 
 # cleared. Therefore, the set of files needs to be re-built each time the cached
 # code executes. This approach allows for dynamic dependency graphs.
-CacheContext <- R6Class(
+CacheContext <- setRefClass(
   'CacheContext',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    .dirty = TRUE,
-    # List of functions that return TRUE if dirty
-    .tests = list(),
-
+  fields = list(
+    .dirty = 'logical',
+    .tests = 'list'
+  ),
+  methods = list(
+    initialize = function() {
+      .dirty <<- TRUE
+      # List of functions that return TRUE if dirty
+      .tests <<- list()
+    },
     addDependencyFile = function(file) {
       if (.dirty)
         return()
-
+      
       file <- normalizePath(file)
 
       mtime <- file.info(file)$mtime
       .tests <<- c(.tests, function() {
         newMtime <- try(file.info(file)$mtime, silent=TRUE)
-        if (inherits(newMtime, 'try-error'))
+        if (is(newMtime, 'try-error'))
           return(TRUE)
         return(!identical(mtime, newMtime))
       })
@@ -34,14 +37,14 @@ CacheContext <- R6Class(
     isDirty = function() {
       if (.dirty)
         return(TRUE)
-
+      
       for (test in .tests) {
         if (test()) {
           forceDirty()
           return(TRUE)
         }
       }
-
+      
       return(FALSE)
     },
     reset = function() {
@@ -50,9 +53,9 @@ CacheContext <- R6Class(
     },
     with = function(func) {
       oldCC <- .currentCacheContext$cc
-      .currentCacheContext$cc <- self
+      .currentCacheContext$cc <- .self
       on.exit(.currentCacheContext$cc <- oldCC)
-
+      
       return(func())
     }
   )
@@ -60,18 +63,18 @@ CacheContext <- R6Class(
 
 .currentCacheContext <- new.env()
 
-# Indicates to Shiny that the given file path is part of the dependency graph
+# Indicates to Shiny that the given file path is part of the dependency graph 
 # for whatever is currently executing (so far, only ui.R). By default, ui.R only
 # gets re-executed when it is detected to have changed; this function allows the
 # caller to indicate that it should also re-execute if the given file changes.
-#
+# 
 # If NULL or NA is given as the argument, then ui.R will re-execute next time.
 dependsOnFile <- function(filepath) {
   if (is.null(.currentCacheContext$cc))
     return()
-
+  
   if (is.null(filepath) || is.na(filepath))
     .currentCacheContext$cc$forceDirty()
   else
     .currentCacheContext$cc$addDependencyFile(filepath)
-}
+}

R/fileupload.R

@@ -1,38 +1,37 @@
 # For HTML5-capable browsers, file uploads happen through a series of requests.
-#
+# 
 # 1. Client tells server that one or more files are about to be uploaded; the
 #    server responds with a "job ID" that the client should use for the rest of
 #    the upload.
-#
+#    
 # 2. For each file (sequentially):
 #    a. Client tells server the name, size, and type of the file.
 #    b. Client sends server a small-ish blob of data.
 #    c. Repeat 2b until the entire file has been uploaded.
 #    d. Client tells server that the current file is done.
-#
+#    
 # 3. Repeat 2 until all files have been uploaded.
-#
+# 
 # 4. Client tells server that all files have been uploaded, along with the
 #    input ID that this data should be associated with.
-#
+# 
 # Unfortunately this approach will not work for browsers that don't support
 # HTML5 File API, but the fallback approach we would like to use (multipart
 # form upload, i.e. traditional HTTP POST-based file upload) doesn't work with
 # the websockets package's HTTP server at the moment.
 
-FileUploadOperation <- R6Class(
+FileUploadOperation <- setRefClass(
   'FileUploadOperation',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    .parent = NULL,
-    .id = character(0),
-    .files = data.frame(),
-    .dir = character(0),
-    .currentFileInfo = list(),
-    .currentFileData = NULL,
-    .pendingFileInfos = list(),
-
+  fields = list(
+    .parent = 'ANY',
+    .id = 'character',
+    .files = 'data.frame',
+    .dir = 'character',
+    .currentFileInfo = 'list',
+    .currentFileData = 'ANY',
+    .pendingFileInfos = 'list'
+  ),
+  methods = list(
     initialize = function(parent, id, dir, fileInfos) {
       .parent <<- parent
       .id <<- id
@@ -55,12 +54,12 @@ FileUploadOperation <- R6Class(
       filename <- file.path(.dir, as.character(length(.files$name)))
       row <- data.frame(name=file$name, size=file$size, type=file$type,
                         datapath=filename, stringsAsFactors=FALSE)
-
+      
       if (length(.files$name) == 0)
         .files <<- row
       else
         .files <<- rbind(.files, row)
-
+      
       .currentFileData <<- file(filename, open='wb')
     },
     fileChunk = function(rawdata) {
@@ -78,27 +77,24 @@ FileUploadOperation <- R6Class(
   )
 )
 
-#' @include map.R
-FileUploadContext <- R6Class(
+FileUploadContext <- setRefClass(
   'FileUploadContext',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    .basedir = character(0),
-    .operations = 'Map',
-
+  fields = list(
+    .basedir = 'character',
+    .operations = 'Map'
+  ),
+  methods = list(
     initialize = function(dir=tempdir()) {
       .basedir <<- dir
-      .operations <<- Map$new()
     },
     createUploadOperation = function(fileInfos) {
       while (TRUE) {
-        id <- paste(as.raw(p_runif(12, min=0, max=0xFF)), collapse='')
+        id <- paste(as.raw(runif(12, min=0, max=0xFF)), collapse='')
         dir <- file.path(.basedir, id)
         if (!dir.create(dir))
           next
-
-        op <- FileUploadOperation$new(self, id, dir, fileInfos)
+        
+        op <- FileUploadOperation$new(.self, id, dir, fileInfos)
         .operations$set(id, op)
         return(id)
       }

R/globals.R

@@ -1,9 +0,0 @@
-# A scope where we can put mutable global state
-.globals <- new.env(parent = emptyenv())
-
-.onLoad <- function(libname, pkgname) {
-  # R's lazy-loading package scheme causes the private seed to be cached in the
-  # package itself, making our PRNG completely deterministic. This line resets
-  # the private seed during load.
-  withPrivateSeed(reinitializeSeed())
-}

R/graph.R

@@ -1,40 +1,8 @@
+#' @export
 writeReactLog <- function(file=stdout()) {
-  cat(RJSONIO::toJSON(.graphStack$as_list(), pretty=TRUE), file=file)
+  cat(RJSONIO::toJSON(.graphEnv$log, pretty=TRUE), file=file)
 }
 
-#' Reactive Log Visualizer
-#'
-#' Provides an interactive browser-based tool for visualizing reactive
-#' dependencies and execution in your application.
-#'
-#' To use the reactive log visualizer, start with a fresh R session and
-#' run the command \code{options(shiny.reactlog=TRUE)}; then launch your
-#' application in the usual way (e.g. using \code{\link{runApp}}). At
-#' any time you can hit Ctrl+F3 (or for Mac users, Command+F3) in your
-#' web browser to launch the reactive log visualization.
-#'
-#' The reactive log visualization only includes reactive activity up
-#' until the time the report was loaded. If you want to see more recent
-#' activity, refresh the browser.
-#'
-#' Note that Shiny does not distinguish between reactive dependencies
-#' that "belong" to one Shiny user session versus another, so the
-#' visualization will include all reactive activity that has taken place
-#' in the process, not just for a particular application or session.
-#'
-#' As an alternative to pressing Ctrl/Command+F3--for example, if you
-#' are using reactives outside of the context of a Shiny
-#' application--you can run the \code{showReactLog} function, which will
-#' generate the reactive log visualization as a static HTML file and
-#' launch it in your default browser. In this case, refreshing your
-#' browser will not load new activity into the report; you will need to
-#' call \code{showReactLog()} explicitly.
-#'
-#' For security and performance reasons, do not enable
-#' \code{shiny.reactlog} in production environments. When the option is
-#' enabled, it's possible for any user of your app to see at least some
-#' of the source code of your reactive expressions and observers.
-#'
 #' @export
 showReactLog <- function() {
   browseURL(renderReactLog())
@@ -54,50 +22,52 @@ renderReactLog <- function() {
   return(file)
 }
 
-.graphAppend <- function(logEntry, domain = getDefaultReactiveDomain()) {
-  if (isTRUE(getOption('shiny.reactlog')))
-    .graphStack$push(logEntry)
-
-  if (!is.null(domain)) {
-    domain$reactlog(logEntry)
-  }
+.graphAppend <- function(logEntry) {
+  if (isTRUE(getOption('shiny.reactlog', FALSE)))
+    .graphEnv$log <- c(.graphEnv$log, list(logEntry))
 }
 
 .graphDependsOn <- function(id, label) {
-  .graphAppend(list(action='dep', id=id, dependsOn=label))
+  if (isTRUE(getOption('shiny.reactlog', FALSE)))
+    .graphAppend(list(action='dep', id=id, dependsOn=label))
 }
 
 .graphDependsOnId <- function(id, dependee) {
-  .graphAppend(list(action='depId', id=id, dependsOn=dependee))
+  if (isTRUE(getOption('shiny.reactlog', FALSE)))
+    .graphAppend(list(action='depId', id=id, dependsOn=dependee))
 }
 
-.graphCreateContext <- function(id, label, type, prevId, domain) {
-  .graphAppend(list(
-    action='ctx', id=id, label=paste(label, collapse='\n'),
-    srcref=attr(label, "srcref"), srcfile=attr(label, "srcfile"),
-    type=type, prevId=prevId
-  ), domain = domain)
+.graphCreateContext <- function(id, label, type, prevId) {
+  if (isTRUE(getOption('shiny.reactlog', FALSE)))
+    .graphAppend(list(
+      action='ctx', id=id, label=paste(label, collapse='\n'), type=type, prevId=prevId
+    ))
 }
 
 .graphEnterContext <- function(id) {
-  .graphAppend(list(action='enter', id=id))
+  if (isTRUE(getOption('shiny.reactlog', FALSE)))
+    .graphAppend(list(action='enter', id=id))
 }
 
 .graphExitContext <- function(id) {
-  .graphAppend(list(action='exit', id=id))
+  if (isTRUE(getOption('shiny.reactlog', FALSE)))
+    .graphAppend(list(action='exit', id=id))
 }
 
 .graphValueChange <- function(label, value) {
-  .graphAppend(list(
-    action = 'valueChange',
-    id = label,
-    value = paste(capture.output(str(value)), collapse='\n')
-  ))
+  if (isTRUE(getOption('shiny.reactlog', FALSE))) {
+    .graphAppend(list(
+      action = 'valueChange',
+      id = label,
+      value = paste(capture.output(str(value)), collapse='\n')
+    ))
+  }
 }
 
-.graphInvalidate <- function(id, domain) {
-  .graphAppend(list(action='invalidate', id=id), domain)
+.graphInvalidate <- function(id) {
+  if (isTRUE(getOption('shiny.reactlog', FALSE)))
+    .graphAppend(list(action='invalidate', id=id))
 }
 
-#' @include stack.R
-.graphStack <- Stack$new()
+.graphEnv <- new.env()
+.graphEnv$log <- list()

R/hooks.R

@@ -1,24 +0,0 @@
-
-
-# Call an application hook. Application hooks are provided so that front ends
-# can know when a Shiny application is running:
-#
-# shiny.onAppStart -- called when an application begins running
-# shiny.onAppStop -- called when an appliation stops
-#
-# Both hooks are passed the url where the application is accessible (appUrl).
-# Note that the appUrl can be NULL if the application was run on a UNIX domain
-# socket rather than a TCP/IP port/
-callAppHook <- function(name, appUrl) {
-  for (hook in getHooksList(paste0("shiny.", name)))
-    hook(appUrl)
-}
-
-# The value for getHook can be a single function or a list of functions,
-# This function ensures that the result can always be processed as a list
-getHooksList <- function(name) {
-  hooks <- getHook(name)
-  if (!is.list(hooks))
-    hooks <- list(hooks)
-  hooks
-}

R/html-deps.R

@@ -1,29 +0,0 @@
-#' Create a web dependency
-#'
-#' Ensure that a file-based HTML dependency (from the htmltools package) can be
-#' served over Shiny's HTTP server. This function works by using
-#' \code{\link{addResourcePath}} to map the HTML dependency's directory to a
-#' URL.
-#'
-#' @param dependency A single HTML dependency object, created using
-#'   \code{\link{htmlDependency}}. If the \code{src} value is named, then
-#'   \code{href} and/or \code{file} names must be present.
-#'
-#' @return A single HTML dependency object that has an \code{href}-named element
-#'   in its \code{src}.
-#' @export
-createWebDependency <- function(dependency) {
-  if (is.null(dependency))
-    return(NULL)
-
-  if (!inherits(dependency, "html_dependency"))
-    stop("Unexpected non-html_dependency type")
-
-  if (is.null(dependency$src$href)) {
-    prefix <- paste(dependency$name, "-", dependency$version, sep = "")
-    addResourcePath(prefix, dependency$src$file)
-    dependency$src$href <- prefix
-  }
-
-  return(dependency)
-}

R/htmltools.R

@@ -1,7 +0,0 @@
-#' @export a br code div em h1 h2 h3 h4 h5 h6 hr HTML img p pre span strong
-#' @export includeCSS includeHTML includeMarkdown includeScript includeText
-#' @export is.singleton singleton
-#' @export tag tagAppendAttributes tagAppendChild tagAppendChildren tagList tags tagSetChildren withTags
-#' @export validateCssUnit
-#' @export knit_print.html knit_print.shiny.tag knit_print.shiny.tag.list
-NULL

R/imageutils.R

@@ -34,25 +34,23 @@ plotPNG <- function(func, filename=tempfile(fileext='.png'),
   # Finally, if neither quartz nor Cairo, use png().
   if (capabilities("aqua")) {
     pngfun <- png
-  } else if ((getOption('shiny.usecairo') %OR% TRUE) &&
+  } else if (getOption('shiny.usecairo', TRUE) &&
              nchar(system.file(package = "Cairo"))) {
-    pngfun <- Cairo::CairoPNG
+    # Workaround for issue #140: Cairo ignores res and dpi settings. Need to
+    # use regular png function.
+    if (res == 72) {
+      pngfun <- Cairo::CairoPNG
+    } else {
+      pngfun <- png
+    }
   } else {
     pngfun <- png
   }
 
-  pngfun(filename=filename, width=width, height=height, res=res, ...)
-  # Call plot.new() so that even if no plotting operations are performed at
-  # least we have a blank background. N.B. we need to set the margin to 0
-  # temporarily before plot.new() because when the plot size is small (e.g.
-  # 200x50), we will get an error "figure margin too large", which is triggered
-  # by plot.new() with the default (large) margin. However, this does not
-  # guarantee user's code in func() will not trigger the error -- they may have
-  # to set par(mar = smaller_value) before they draw base graphics.
-  op <- par(mar = rep(0, 4))
-  tryCatch(plot.new(), finally = par(op))
-  dv <- dev.cur()
-  tryCatch(shinyCallingHandlers(func()), finally = dev.off(dv))
+  do.call(pngfun, c(filename=filename, width=width, height=height, res=res, list(...)))
+  tryCatch(
+    func(),
+    finally=dev.off())
 
   filename
 }

R/jqueryui.R

@@ -1,104 +0,0 @@
-#' Panel with absolute positioning
-#'
-#' Creates a panel whose contents are absolutely positioned.
-#'
-#' The \code{absolutePanel} function creates a \code{<div>} tag whose CSS
-#' position is set to \code{absolute} (or fixed if \code{fixed = TRUE}). The way
-#' absolute positioning works in HTML is that absolute coordinates are specified
-#' relative to its nearest parent element whose position is not set to
-#' \code{static} (which is the default), and if no such parent is found, then
-#' relative to the page borders. If you're not sure what that means, just keep
-#' in mind that you may get strange results if you use \code{absolutePanel} from
-#' inside of certain types of panels.
-#'
-#' The \code{fixedPanel} function is the same as \code{absolutePanel} with
-#' \code{fixed = TRUE}.
-#'
-#' The position (\code{top}, \code{left}, \code{right}, \code{bottom}) and size
-#' (\code{width}, \code{height}) parameters are all optional, but you should
-#' specify exactly two of \code{top}, \code{bottom}, and \code{height} and
-#' exactly two of \code{left}, \code{right}, and \code{width} for predictable
-#' results.
-#'
-#' Like most other distance parameters in Shiny, the position and size
-#' parameters take a number (interpreted as pixels) or a valid CSS size string,
-#' such as \code{"100px"} (100 pixels) or \code{"25\%"}.
-#'
-#' For arcane HTML reasons, to have the panel fill the page or parent you should
-#' specify \code{0} for \code{top}, \code{left}, \code{right}, and \code{bottom}
-#' rather than the more obvious \code{width = "100\%"} and \code{height =
-#' "100\%"}.
-#'
-#' @param ... Attributes (named arguments) or children (unnamed arguments) that
-#'   should be included in the panel.
-#'
-#' @param top Distance between the top of the panel, and the top of the page or
-#'   parent container.
-#' @param left Distance between the left side of the panel, and the left of the
-#'   page or parent container.
-#' @param right Distance between the right side of the panel, and the right of
-#'   the page or parent container.
-#' @param bottom Distance between the bottom of the panel, and the bottom of the
-#'   page or parent container.
-#' @param width Width of the panel.
-#' @param height Height of the panel.
-#' @param draggable If \code{TRUE}, allows the user to move the panel by
-#'   clicking and dragging.
-#' @param fixed Positions the panel relative to the browser window and prevents
-#'   it from being scrolled with the rest of the page.
-#' @param cursor The type of cursor that should appear when the user mouses over
-#'   the panel. Use \code{"move"} for a north-east-south-west icon,
-#'   \code{"default"} for the usual cursor arrow, or \code{"inherit"} for the
-#'   usual cursor behavior (including changing to an I-beam when the cursor is
-#'   over text). The default is \code{"auto"}, which is equivalent to
-#'   \code{ifelse(draggable, "move", "inherit")}.
-#' @return An HTML element or list of elements.
-#'
-#' @export
-absolutePanel <- function(...,
-                          top = NULL, left = NULL, right = NULL, bottom = NULL,
-                          width = NULL, height = NULL,
-                          draggable = FALSE, fixed = FALSE,
-                          cursor = c('auto', 'move', 'default', 'inherit')) {
-  cssProps <- list(
-    top = top,
-    left = left,
-    right = right,
-    bottom = bottom,
-    width = width,
-    height = height
-  )
-  cssProps <- cssProps[!sapply(cssProps, is.null)]
-  cssProps <- sapply(cssProps, validateCssUnit)
-  cssProps[['position']] <- ifelse(fixed, 'fixed', 'absolute')
-  cssProps[['cursor']] <- match.arg(cursor)
-  if (identical(cssProps[['cursor']], 'auto'))
-    cssProps[['cursor']] <- ifelse(draggable, 'move', 'inherit')
-
-  style <- paste(paste(names(cssProps), cssProps, sep = ':', collapse = ';'), ';', sep='')
-  divTag <- tags$div(style=style, ...)
-  if (isTRUE(draggable)) {
-    divTag <- tagAppendAttributes(divTag, class='draggable')
-    return(tagList(
-      # IMPORTANT NOTE: If you update jqueryui, make sure you DON'T include the datepicker,
-      # as it collides with our bootstrap datepicker!
-      singleton(tags$head(tags$script(src='shared/jqueryui/1.10.4/jquery-ui.min.js'))),
-      divTag,
-      tags$script('$(".draggable").draggable();')
-    ))
-  } else {
-    return(divTag)
-  }
-}
-
-#' @rdname absolutePanel
-#' @export
-fixedPanel <- function(...,
-                       top = NULL, left = NULL, right = NULL, bottom = NULL,
-                       width = NULL, height = NULL,
-                       draggable = FALSE,
-                       cursor = c('move', 'default', 'inherit')) {
-  absolutePanel(..., top=top, left=left, right=right, bottom=bottom,
-                width=width, height=height, draggable=draggable, cursor=cursor,
-                fixed=TRUE)
-}

R/map.R

@@ -9,65 +9,62 @@
 # Remove of unknown key does nothing
 # Setting a key twice always results in last-one-wins
 # /TESTS
-Map <- R6Class(
+Map <- setRefClass(
   'Map',
-  portable = FALSE,
-  public = list(
+  fields = list(
+    .env = 'environment'
+  ),
+  methods = list(
     initialize = function() {
-      private$env <- new.env(parent=emptyenv())
+      .env <<- new.env(parent=emptyenv())
     },
     get = function(key) {
-      env[[key]]
+      if (.self$containsKey(key))
+        return(base::get(key, pos=.env, inherits=FALSE))
+      else
+        return(NULL)
     },
     set = function(key, value) {
-      env[[key]] <- value
-      value
+      assign(key, value, pos=.env, inherits=FALSE)
+      return(value)
     },
     mset = function(...) {
       args <- list(...)
-      if (length(args) == 0)
-        return()
-
-      arg_names <- names(args)
-      if (is.null(arg_names) || any(!nzchar(arg_names)))
-        stop("All elements must be named")
-
-      list2env(args, envir = env)
+      for (key in names(args))
+        set(key, args[[key]])
+      return()
     },
     remove = function(key) {
-      if (!self$containsKey(key))
-        return(NULL)
-
-      result <- env[[key]]
-      rm(list=key, envir=env, inherits=FALSE)
-      result
+      if (.self$containsKey(key)) {
+        result <- .self$get(key)
+        rm(list = key, pos=.env, inherits=FALSE)
+        return(result)
+      }
+      return(NULL)
     },
     containsKey = function(key) {
-      exists(key, envir=env, inherits=FALSE)
+      exists(key, where=.env, inherits=FALSE)
     },
     keys = function() {
-      # Sadly, this is much faster than ls(), because it doesn't sort the keys.
-      names(as.list(env, all.names=TRUE))
+      ls(envir=.env, all.names=TRUE)
     },
     values = function() {
-      as.list(env, all.names=TRUE)
+      mget(.self$keys(), envir=.env, inherits=FALSE)
     },
     clear = function() {
-      private$env <- new.env(parent=emptyenv())
+      .env <<- new.env(parent=emptyenv())
       invisible(NULL)
     },
     size = function() {
-      length(env)
+      length(.env)
     }
-  ),
-
-  private = list(
-    env = 'environment'
   )
 )
 
 as.list.Map <- function(map) {
-  map$values()
+  sapply(map$keys(),
+         map$get,
+         simplify=FALSE)
 }
 length.Map <- function(map) {
   map$size()

R/middleware-shiny.R

@@ -1,71 +0,0 @@
-#' @include globals.R
-NULL
-
-reactLogHandler <- function(req) {
-  if (!identical(req$PATH_INFO, '/reactlog'))
-    return(NULL)
-
-  if (!isTRUE(getOption('shiny.reactlog'))) {
-    return(NULL)
-  }
-
-  return(httpResponse(
-    status=200,
-    content=list(file=renderReactLog(), owned=TRUE)
-  ))
-}
-
-sessionHandler <- function(req) {
-  path <- req$PATH_INFO
-  if (is.null(path))
-    return(NULL)
-
-  matches <- regmatches(path, regexec('^(/session/([0-9a-f]+))(/.*)$', path))
-  if (length(matches[[1]]) == 0)
-    return(NULL)
-
-  session <- matches[[1]][3]
-  subpath <- matches[[1]][4]
-
-  shinysession <- appsByToken$get(session)
-  if (is.null(shinysession))
-    return(NULL)
-
-  subreq <- as.environment(as.list(req, all.names=TRUE))
-  subreq$PATH_INFO <- subpath
-  subreq$SCRIPT_NAME <- paste(subreq$SCRIPT_NAME, matches[[1]][2], sep='')
-
-  return(shinysession$handleRequest(subreq))
-}
-
-dynamicHandler <- function(filePath, dependencyFiles=filePath) {
-  lastKnownTimestamps <- NA
-  metaHandler <- function(req) NULL
-
-  if (!file.exists(filePath))
-    return(metaHandler)
-
-  cacheContext <- CacheContext$new()
-
-  return (function(req) {
-    # Check if we need to rebuild
-    if (cacheContext$isDirty()) {
-      cacheContext$reset()
-      for (dep in dependencyFiles)
-        cacheContext$addDependencyFile(dep)
-
-      clearClients()
-      if (file.exists(filePath)) {
-        local({
-          cacheContext$with(function() {
-            sys.source(filePath, envir=new.env(parent=globalenv()), keep.source=TRUE)
-          })
-        })
-      }
-      metaHandler <<- joinHandlers(.globals$clients)
-      clearClients()
-    }
-
-    return(metaHandler(req))
-  })
-}

R/middleware.R

@@ -1,361 +0,0 @@
-# This file contains a general toolkit for routing and combining bits of
-# HTTP-handling logic. It is similar in spirit to Rook (and Rack, and WSGI, and
-# Connect, and...) but adds cascading and routing.
-#
-# This file is called "middleware" because that's the term used for these bits
-# of logic in these other frameworks. However, our code uses the word "handler"
-# so we'll stick to that for the rest of this document; just know that they're
-# basically the same concept.
-#
-# ## Intro to handlers
-#
-# A **handler** (or sometimes, **httpHandler**) is a function that takes a
-# `req` parameter--a request object as described in the Rook specification--and
-# returns `NULL`, or an `httpResponse`.
-#
-## ------------------------------------------------------------------------
-httpResponse <- function(status = 200,
-                         content_type = "text/html; charset=UTF-8",
-                         content = "",
-                         headers = list()) {
-  # Make sure it's a list, not a vector
-  headers <- as.list(headers)
-  if (is.null(headers$`X-UA-Compatible`))
-    headers$`X-UA-Compatible` <- "chrome=1"
-  resp <- list(status = status, content_type = content_type, content = content,
-               headers = headers)
-  class(resp) <- 'httpResponse'
-  return(resp)
-}
-
-#
-# You can think of a web application as being simply an aggregation of these
-# functions, each of which performs one kind of duty. Each handler in turn gets
-# a look at the request and can decide whether it knows how to handle it. If
-# so, it returns an `httpResponse` and processing terminates; if not, it
-# returns `NULL` and the next handler gets to execute. If the final handler
-# returns `NULL`, a 404 response should be returned.
-#
-# We have a similar construct for websockets: **websocket handlers** or
-# **wsHandlers**. These take a single `ws` argument which is the websocket
-# connection that was just opened, and they can either return `TRUE` if they
-# are handling the connection, and `NULL` to pass responsibility on to the next
-# wsHandler.
-#
-# ### Combining handlers
-#
-# Since it's so common for httpHandlers to be invoked in this "cascading"
-# fashion, we'll introduce a function that takes zero or more handlers and
-# returns a single handler. And while we're at it, making a directory of static
-# content available is such a common thing to do, we'll allow strings
-# representing paths to be used instead of handlers; any such strings we
-# encounter will be converted into `staticHandler` objects.
-#
-## ------------------------------------------------------------------------
-joinHandlers <- function(handlers) {
-  # Zero handlers; return a null handler
-  if (length(handlers) == 0)
-    return(function(req) NULL)
-
-  # Just one handler (function)? Return it.
-  if (is.function(handlers))
-    return(handlers)
-
-  handlers <- lapply(handlers, function(h) {
-    if (is.character(h))
-      return(staticHandler(h))
-    else
-      return(h)
-  })
-
-  # Filter out NULL
-  handlers <- handlers[!sapply(handlers, is.null)]
-
-  if (length(handlers) == 0)
-    return(function(req) NULL)
-  if (length(handlers) == 1)
-    return(handlers[[1]])
-
-  function(req) {
-    for (handler in handlers) {
-      response <- handler(req)
-      if (!is.null(response))
-        return(response)
-    }
-    return(NULL)
-  }
-}
-
-#
-# Note that we don't have an equivalent of `joinHandlers` for wsHandlers. It's
-# easy to imagine it, we just haven't needed one.
-#
-# ### Handler routing
-#
-# Handlers do not have a built-in notion of routing. Conceptually, given a list
-# of handlers, all the handlers are peers and they all get to see every request
-# (well, up until the point that a handler returns a response).
-#
-# You could implement routing in each handler by checking the request's
-# `PATH_INFO` field, but since it's such a common need, let's make it simple by
-# introducing a `routeHandler` function. This is a handler
-# [decorator](http://en.wikipedia.org/wiki/Decorator_pattern) and it's
-# responsible for 1) filtering out requests that don't match the given route,
-# and 2) temporarily modifying the request object to take the matched part of
-# the route off of the `PATH_INFO` (and add it to the end of `SCRIPT_NAME`).
-# This way, the handler doesn't need to figure out about what part of its URL
-# path has already been matched via routing.
-#
-# (BTW, it's safe for `routeHandler` calls to nest.)
-#
-## ------------------------------------------------------------------------
-routeHandler <- function(prefix, handler) {
-  force(prefix)
-  force(handler)
-
-  if (identical("", prefix))
-    return(handler)
-
-  if (length(prefix) != 1 || !isTRUE(grepl("^/[^\\]+$", prefix))) {
-    stop("Invalid URL prefix \"", prefix, "\"")
-  }
-
-  pathPattern <- paste("^\\Q", prefix, "\\E/", sep = "")
-  function(req) {
-    if (isTRUE(grepl(pathPattern, req$PATH_INFO))) {
-      origScript <- req$SCRIPT_NAME
-      origPath <- req$PATH_INFO
-      on.exit({
-        req$SCRIPT_NAME <- origScript
-        req$PATH_INFO <- origPath
-      }, add = TRUE)
-      pathInfo <- substr(req$PATH_INFO, nchar(prefix)+1, nchar(req$PATH_INFO))
-      req$SCRIPT_NAME <- paste(req$SCRIPT_NAME, prefix, sep = "")
-      req$PATH_INFO <- pathInfo
-      return(handler(req))
-    } else {
-      return(NULL)
-    }
-  }
-}
-
-#
-# We have a version for websocket handlers as well. Pity about the copy/paste
-# job.
-#
-## ------------------------------------------------------------------------
-routeWSHandler <- function(prefix, wshandler) {
-  force(prefix)
-  force(wshandler)
-
-  if (identical("", prefix))
-    return(wshandler)
-
-  if (length(prefix) != 1 || !isTRUE(grepl("^/[^\\]+$", prefix))) {
-    stop("Invalid URL prefix \"", prefix, "\"")
-  }
-
-  pathPattern <- paste("^\\Q", prefix, "\\E/", sep = "")
-  function(ws) {
-    req <- ws$request
-    if (isTRUE(grepl(pathPattern, req$PATH_INFO))) {
-      origScript <- req$SCRIPT_NAME
-      origPath <- req$PATH_INFO
-      on.exit({
-        req$SCRIPT_NAME <- origScript
-        req$PATH_INFO <- origPath
-      }, add = TRUE)
-      pathInfo <- substr(req$PATH_INFO, nchar(prefix)+1, nchar(req$PATH_INFO))
-      req$SCRIPT_NAME <- paste(req$SCRIPT_NAME, prefix, sep = "")
-      req$PATH_INFO <- pathInfo
-      return(wshandler(ws))
-    } else {
-      return(NULL)
-    }
-  }
-}
-
-#
-# ### Handler implementations
-#
-# Now let's actually write some handlers. Note that these functions aren't
-# *themselves* handlers, you call them and they *return* a handler. Handler
-# factory functions, if you will.
-#
-# Here's one that serves up static assets from a directory.
-#
-## ------------------------------------------------------------------------
-staticHandler <- function(root) {
-  force(root)
-  return(function(req) {
-    if (!identical(req$REQUEST_METHOD, 'GET'))
-      return(NULL)
-
-    path <- req$PATH_INFO
-
-    if (is.null(path))
-      return(httpResponse(400, content="<h1>Bad Request</h1>"))
-
-    if (path == '/')
-      path <- '/index.html'
-
-    abs.path <- resolve(root, path)
-    if (is.null(abs.path))
-      return(NULL)
-
-    ext <- tools::file_ext(abs.path)
-    content.type <- getContentType(ext)
-    response.content <- readBin(abs.path, 'raw', n=file.info(abs.path)$size)
-    return(httpResponse(200, content.type, response.content))
-  })
-}
-
-#
-# ## Handler manager
-#
-# The handler manager gives you a place to register handlers (of both http and
-# websocket varieties) and provides an httpuv-compatible set of callbacks for
-# invoking them.
-#
-# Create one of these, make zero or more calls to `addHandler` and
-# `addWSHandler` methods (order matters--first one wins!), and then pass the
-# return value of `createHttpuvApp` to httpuv's `startServer` function.
-#
-## ------------------------------------------------------------------------
-HandlerList <- R6Class("HandlerList",
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    handlers = list(),
-
-    add = function(handler, key, tail = FALSE) {
-      if (!is.null(handlers[[key]]))
-        stop("Key ", key, " already in use")
-      newList <- structure(names=key, list(handler))
-
-      if (length(handlers) == 0)
-        handlers <<- newList
-      else if (tail)
-        handlers <<- c(handlers, newList)
-      else
-        handlers <<- c(newList, handlers)
-    },
-    remove = function(key) {
-      handlers[key] <<- NULL
-    },
-    clear = function() {
-      handlers <<- list()
-    },
-    invoke = function(...) {
-      for (handler in handlers) {
-        result <- handler(...)
-        if (!is.null(result))
-          return(result)
-      }
-      return(NULL)
-    }
-  )
-)
-
-HandlerManager <- R6Class("HandlerManager",
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    handlers = "HandlerList",
-    wsHandlers = "HandlerList",
-
-    initialize = function() {
-      handlers <<- HandlerList$new()
-      wsHandlers <<- HandlerList$new()
-    },
-
-    addHandler = function(handler, key, tail = FALSE) {
-      handlers$add(handler, key, tail)
-    },
-    removeHandler = function(key) {
-      handlers$remove(key)
-    },
-    addWSHandler = function(wsHandler, key, tail = FALSE) {
-      wsHandlers$add(wsHandler, key, tail)
-    },
-    removeWSHandler = function(key) {
-      wsHandlers$remove(key)
-    },
-    clear = function() {
-      handlers$clear()
-      wsHandlers$clear()
-    },
-    createHttpuvApp = function() {
-      list(
-        onHeaders = function(req) {
-          maxSize <- getOption('shiny.maxRequestSize') %OR% (5 * 1024 * 1024)
-          if (maxSize <= 0)
-            return(NULL)
-
-          reqSize <- 0
-          if (length(req$CONTENT_LENGTH) > 0)
-            reqSize <- as.numeric(req$CONTENT_LENGTH)
-          else if (length(req$HTTP_TRANSFER_ENCODING) > 0)
-            reqSize <- Inf
-
-          if (reqSize > maxSize) {
-            return(list(status = 413L,
-              headers = list(
-                'Content-Type' = 'text/plain'
-              ),
-              body = 'Maximum upload size exceeded'))
-          }
-          else {
-            return(NULL)
-          }
-        },
-        call = .httpServer(
-          function (req) {
-            return(handlers$invoke(req))
-          },
-          getOption('shiny.sharedSecret')
-        ),
-        onWSOpen = function(ws) {
-          return(wsHandlers$invoke(ws))
-        }
-      )
-    },
-    .httpServer = function(handler, sharedSecret) {
-      filter <- getOption('shiny.http.response.filter')
-      if (is.null(filter))
-        filter <- function(req, response) response
-
-      function(req) {
-        if (!is.null(sharedSecret)
-          && !identical(sharedSecret, req$HTTP_SHINY_SHARED_SECRET)) {
-          return(list(status=403,
-            body='<h1>403 Forbidden</h1><p>Shared secret mismatch</p>',
-            headers=list('Content-Type' = 'text/html')))
-        }
-
-        response <- handler(req)
-        if (is.null(response))
-          response <- httpResponse(404, content="<h1>Not Found</h1>")
-
-        if (inherits(response, "httpResponse")) {
-          headers <- as.list(response$headers)
-          headers$'Content-Type' <- response$content_type
-
-          response <- filter(req, response)
-          return(list(status=response$status,
-            body=response$content,
-            headers=headers))
-        } else {
-          # Assume it's a Rook-compatible response
-          return(response)
-        }
-      }
-    }
-  )
-)
-
-#
-# ## Next steps
-#
-# See server.R and middleware-shiny.R to see actual implementation and usage of
-# handlers in the context of Shiny.

R/priorityqueue.R

@@ -4,24 +4,20 @@
 # elements have the same priority, they are served according to their order in
 # the queue." (http://en.wikipedia.org/wiki/Priority_queue)
 
-PriorityQueue <- R6Class(
+PriorityQueue <- setRefClass(
   'PriorityQueue',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
+  fields = list(
     # Keys are priorities, values are subqueues (implemented as list)
     .itemsByPriority = 'Map',
     # Sorted vector (largest first)
-    .priorities = numeric(0),
-
-    initialize = function() {
-      .itemsByPriority <<- Map$new()
-    },
-    # Enqueue an item, with the given priority level (must be integer). Higher
+    .priorities = 'numeric'  
+  ),
+  methods = list(
+    # Enqueue an item, with the given priority level (must be integer). Higher 
     # priority numbers are dequeued earlier than lower.
     enqueue = function(item, priority) {
       priority <- normalizePriority(priority)
-
+      
       if (!(priority %in% .priorities)) {
         .priorities <<- c(.priorities, priority)
         .priorities <<- sort(.priorities, decreasing=TRUE)
@@ -34,14 +30,14 @@ PriorityQueue <- R6Class(
       }
       return(invisible())
     },
-    # Retrieve a single item by 1) priority number (highest first) and then 2)
-    # insertion order (first in, first out). If there are no items to be
+    # Retrieve a single item by 1) priority number (highest first) and then 2) 
+    # insertion order (first in, first out). If there are no items to be 
     # dequeued, then NULL is returned. If it is necessary to distinguish between
     # a NULL value and the empty case, call isEmpty() before dequeue().
     dequeue = function() {
       if (length(.priorities) == 0)
         return(NULL)
-
+      
       maxPriority <- .priorities[[1]]
       items <- .itemsByPriority$get(.key(maxPriority))
       firstItem <- items[[1]]
@@ -71,17 +67,17 @@ PriorityQueue <- R6Class(
 )
 
 normalizePriority <- function(priority) {
-
+  
   if (is.null(priority))
     priority <- 0
-
+  
   # Cast integers to numeric to prevent any inconsistencies
   if (is.integer(priority))
     priority <- as.numeric(priority)
-
+  
   if (!is.numeric(priority))
     stop('priority must be an integer or numeric')
-
+  
   # Check length
   if (length(priority) == 0) {
     warning('Zero-length priority vector was passed; using 0')
@@ -90,7 +86,7 @@ normalizePriority <- function(priority) {
     warning('Priority has length > 1 and only the first element will be used')
     priority <- priority[1]
   }
-
+  
   # NA == 0
   if (is.na(priority))
     priority <- 0

R/progress.R

@@ -1,276 +0,0 @@
-#' Reporting progress (object-oriented API)
-#'
-#' Reports progress to the user during long-running operations.
-#'
-#' This package exposes two distinct programming APIs for working with
-#' progress. \code{\link{withProgress}} and \code{\link{setProgress}}
-#' together provide a simple function-based interface, while the
-#' \code{Progress} reference class provides an object-oriented API.
-#'
-#' Instantiating a \code{Progress} object causes a progress panel to be
-#' created, and it will be displayed the first time the \code{set}
-#' method is called. Calling \code{close} will cause the progress panel
-#' to be removed.
-#'
-#' \strong{Methods}
-#'   \describe{
-#'     \item{\code{initialize(session, min = 0, max = 1)}}{
-#'       Creates a new progress panel (but does not display it).
-#'     }
-#'     \item{\code{set(value = NULL, message = NULL, detail = NULL)}}{
-#'       Updates the progress panel. When called the first time, the
-#'       progress panel is displayed.
-#'     }
-#'     \item{\code{inc(amount = 0.1, message = NULL, detail = NULL)}}{
-#'       Like \code{set}, this updates the progress panel. The difference is
-#'       that \code{inc} increases the progress bar by \code{amount}, instead
-#'       of setting it to a specific value.
-#'     }
-#'     \item{\code{close()}}{
-#'       Removes the progress panel. Future calls to \code{set} and
-#'       \code{close} will be ignored.
-#'     }
-#'   }
-#'
-#' @param session The Shiny session object, as provided by
-#'   \code{shinyServer} to the server function.
-#' @param min The value that represents the starting point of the
-#'   progress bar. Must be less tham \code{max}.
-#' @param max The value that represents the end of the progress bar.
-#'   Must be greater than \code{min}.
-#' @param message A single-element character vector; the message to be
-#'   displayed to the user, or \code{NULL} to hide the current message
-#'   (if any).
-#' @param detail A single-element character vector; the detail message
-#'   to be displayed to the user, or \code{NULL} to hide the current
-#'   detail message (if any). The detail message will be shown with a
-#'   de-emphasized appearance relative to \code{message}.
-#' @param value A numeric value at which to set
-#'   the progress bar, relative to \code{min} and \code{max}.
-#'   \code{NULL} hides the progress bar, if it is currently visible.
-#' @param amount Single-element numeric vector; the value at which to set
-#'   the progress bar, relative to \code{min} and \code{max}.
-#'   \code{NULL} hides the progress bar, if it is currently visible.
-#' @param amount For the \code{inc()} method, a numeric value to increment the
-#'   progress bar.
-#'
-#' @examples
-#' \dontrun{
-#' # server.R
-#' shinyServer(function(input, output, session) {
-#'   output$plot <- renderPlot({
-#'     progress <- shiny::Progress$new(session, min=1, max=15)
-#'     on.exit(progress$close())
-#'
-#'     progress$set(message = 'Calculation in progress',
-#'                  detail = 'This may take a while...')
-#'
-#'     for (i in 1:15) {
-#'       progress$set(value = i)
-#'       Sys.sleep(0.5)
-#'     }
-#'     plot(cars)
-#'   })
-#' })
-#' }
-#' @seealso \code{\link{withProgress}}
-#' @format NULL
-#' @usage NULL
-#' @export
-Progress <- R6Class(
-  'Progress',
-  portable = TRUE,
-  public = list(
-
-    initialize = function(session = getDefaultReactiveDomain(), min = 0, max = 1) {
-      # A hacky check to make sure the session object is indeed a session object.
-      if (is.null(session$onFlush)) stop("'session' is not a session object.")
-
-      private$session <- session
-      private$id <- paste(as.character(as.raw(runif(8, min=0, max=255))), collapse='')
-      private$min <- min
-      private$max <- max
-      private$value <- NULL
-      private$closed <- FALSE
-
-      session$sendProgress('open', list(id = private$id))
-    },
-
-    set = function(value = NULL, message = NULL, detail = NULL) {
-      if (private$closed) {
-        warning("Attempting to set progress, but progress already closed.")
-        return()
-      }
-
-      if (is.null(value) || is.na(value)) {
-        value <- NULL
-      } else {
-        value <- min(1, max(0, (value - private$min) / (private$max - private$min)))
-      }
-
-      private$value <- value
-
-      data <- dropNulls(list(
-        id = private$id,
-        message = message,
-        detail = detail,
-        value = value
-      ))
-
-       private$session$sendProgress('update', data)
-    },
-
-    inc = function(amount = 0.1, message = NULL, detail = NULL) {
-      value <- min(private$value + amount, private$max)
-      self$set(value, message, detail)
-    },
-
-    getMin = function() private$min,
-
-    getMax = function() private$max,
-
-    getValue = function() private$value,
-
-    close = function() {
-      if (private$closed) {
-        warning("Attempting to close progress, but progress already closed.")
-        return()
-      }
-
-      private$session$sendProgress('close', list(id = private$id))
-      private$closed <- TRUE
-    }
-  ),
-
-  private = list(
-    session = 'environment',
-    id = character(0),
-    min = numeric(0),
-    max = numeric(0),
-    value = NULL,
-    closed = logical(0)
-  )
-)
-
-#' Reporting progress (functional API)
-#'
-#' Reports progress to the user during long-running operations.
-#'
-#' This package exposes two distinct programming APIs for working with progress.
-#' Using \code{withProgress} with \code{incProgress} or \code{setProgress}
-#' provide a simple function-based interface, while the \code{\link{Progress}}
-#' reference class provides an object-oriented API.
-#'
-#' Use \code{withProgress} to wrap the scope of your work; doing so will cause a
-#' new progress panel to be created, and it will be displayed the first time
-#' \code{incProgress} or \code{setProgress} are called. When \code{withProgress}
-#' exits, the corresponding progress panel will be removed.
-#'
-#' The \code{incProgress} function increments the status bar by a specified
-#' amount, whereas the \code{setProgress} function sets it to a specific value,
-#' and can also set the text displayed.
-#'
-#' Generally, \code{withProgress}/\code{incProgress}/\code{setProgress} should
-#' be sufficient; the exception is if the work to be done is asynchronous (this
-#' is not common) or otherwise cannot be encapsulated by a single scope. In that
-#' case, you can use the \code{Progress} reference class.
-#'
-#' @param session The Shiny session object, as provided by \code{shinyServer} to
-#'   the server function. The default is to automatically find the session by
-#'   using the current reactive domain.
-#' @param expr The work to be done. This expression should contain calls to
-#'   \code{setProgress}.
-#' @param min The value that represents the starting point of the progress bar.
-#'   Must be less tham \code{max}. Default is 0.
-#' @param max The value that represents the end of the progress bar. Must be
-#'   greater than \code{min}. Default is 1.
-#' @param amount For \code{incProgress}, the amount to increment the status bar.
-#'   Default is 0.1.
-#' @param env The environment in which \code{expr} should be evaluated.
-#' @param quoted Whether \code{expr} is a quoted expression (this is not
-#'   common).
-#' @param message A single-element character vector; the message to be displayed
-#'   to the user, or \code{NULL} to hide the current message (if any).
-#' @param detail A single-element character vector; the detail message to be
-#'   displayed to the user, or \code{NULL} to hide the current detail message
-#'   (if any). The detail message will be shown with a de-emphasized appearance
-#'   relative to \code{message}.
-#' @param value Single-element numeric vector; the value at which to set the
-#'   progress bar, relative to \code{min} and \code{max}. \code{NULL} hides the
-#'   progress bar, if it is currently visible.
-#'
-#' @examples
-#' \dontrun{
-#' # server.R
-#' shinyServer(function(input, output) {
-#'   output$plot <- renderPlot({
-#'     withProgress(message = 'Calculation in progress',
-#'                  detail = 'This may take a while...', value = 0, {
-#'       for (i in 1:15) {
-#'         incProgress(1/15)
-#'         Sys.sleep(0.25)
-#'       }
-#'     })
-#'     plot(cars)
-#'   })
-#' })
-#' }
-#' @seealso \code{\link{Progress}}
-#' @rdname withProgress
-#' @export
-withProgress <- function(expr, min = 0, max = 1,
-                         value = min + (max - min) * 0.1,
-                         message = NULL, detail = NULL,
-                         session = getDefaultReactiveDomain(),
-                         env = parent.frame(), quoted = FALSE) {
-
-  if (!quoted)
-    expr <- substitute(expr)
-
-  p <- Progress$new(session, min = min, max = max)
-
-  session$progressStack$push(p)
-  on.exit({
-    session$progressStack$pop()
-    p$close()
-  })
-
-  p$set(value, message, detail)
-
-  eval(expr, env)
-}
-
-#' @rdname withProgress
-#' @export
-setProgress <- function(value = NULL, message = NULL, detail = NULL,
-                        session = getDefaultReactiveDomain()) {
-
-  # A hacky check to make sure the session object is indeed a session object.
-  if (is.null(session$onFlush)) stop("'session' is not a session object.")
-
-  if (session$progressStack$size() == 0) {
-    warning('setProgress was called outside of withProgress; ignoring')
-    return()
-  }
-
-  session$progressStack$peek()$set(value, message, detail)
-  invisible()
-}
-
-#' @rdname withProgress
-#' @export
-incProgress <- function(amount = 0.1, message = NULL, detail = NULL,
-                        session = getDefaultReactiveDomain()) {
-
-  # A hacky check to make sure the session object is indeed a session object.
-  if (is.null(session$onFlush)) stop("'session' is not a session object.")
-
-  if (session$progressStack$size() == 0) {
-    warning('incProgress was called outside of withProgress; ignoring')
-    return()
-  }
-
-  p <- session$progressStack$peek()
-  p$inc(amount, message, detail)
-  invisible()
-}

R/react.R

@@ -1,31 +1,27 @@
-Context <- R6Class(
+Context <- setRefClass(
   'Context',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    id = character(0),
-    .label = character(0),      # For debug purposes
-    .invalidated = FALSE,
-    .invalidateCallbacks = list(),
-    .flushCallbacks = list(),
-    .domain = NULL,
-
-    initialize = function(domain, label='', type='other', prevId='') {
+  fields = list(
+    id = 'character',
+    .label = 'character',      # For debug purposes
+    .invalidated = 'logical',
+    .invalidateCallbacks = 'list',
+    .flushCallbacks = 'list'
+  ),
+  methods = list(
+    initialize = function(label='', type='other', prevId='') {
       id <<- .getReactiveEnvironment()$nextId()
+      .invalidated <<- FALSE
+      .invalidateCallbacks <<- list()
+      .flushCallbacks <<- list()
       .label <<- label
-      .domain <<- domain
-      .graphCreateContext(id, label, type, prevId, domain)
+      .graphCreateContext(id, label, type, prevId)
     },
     run = function(func) {
       "Run the provided function under this context."
-      withReactiveDomain(.domain, {
-        env <- .getReactiveEnvironment()
-        .graphEnterContext(id)
-        tryCatch(
-          env$runWith(self, func),
-          finally = .graphExitContext(id)
-        )
-      })
+      env <- .getReactiveEnvironment()
+      .graphEnterContext(id)
+      on.exit(.graphExitContext(id))
+      env$runWith(.self, func)
     },
     invalidate = function() {
       "Invalidate this context. It will immediately call the callbacks
@@ -34,11 +30,10 @@ Context <- R6Class(
         return()
       .invalidated <<- TRUE
 
-      .graphInvalidate(id, .domain)
+      .graphInvalidate(id)
       lapply(.invalidateCallbacks, function(func) {
         func()
       })
-      .invalidateCallbacks <<- list()
       NULL
     },
     onInvalidate = function(func) {
@@ -54,7 +49,7 @@ Context <- R6Class(
     addPendingFlush = function(priority) {
       "Tell the reactive environment that this context should be flushed the
         next time flushReact() called."
-      .getReactiveEnvironment()$addPendingFlush(self, priority)
+      .getReactiveEnvironment()$addPendingFlush(.self, priority)
     },
     onFlush = function(func) {
       "Register a function to be called when this context is flushed."
@@ -75,18 +70,20 @@ Context <- R6Class(
   )
 )
 
-ReactiveEnvironment <- R6Class(
+ReactiveEnvironment <- setRefClass(
   'ReactiveEnvironment',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    .currentContext = NULL,
-    .nextId = 0L,
+  fields = list(
+    .currentContext = 'ANY',
+    .nextId = 'integer',
     .pendingFlush = 'PriorityQueue',
-    .inFlush = FALSE,
-
+    .inFlush = 'logical'
+  ),
+  methods = list(
     initialize = function() {
+      .currentContext <<- NULL
+      .nextId <<- 0L
       .pendingFlush <<- PriorityQueue$new()
+      .inFlush <<- FALSE
     },
     nextId = function() {
       .nextId <<- .nextId + 1L
@@ -94,13 +91,9 @@ ReactiveEnvironment <- R6Class(
     },
     currentContext = function() {
       if (is.null(.currentContext)) {
-        if (isTRUE(getOption('shiny.suppressMissingContextError'))) {
-          return(getDummyContext())
-        } else {
-          stop('Operation not allowed without an active reactive context. ',
-               '(You tried to do something that can only be done from inside a ',
-               'reactive expression or observer.)')
-        }
+        stop('Operation not allowed without an active reactive context. ',
+             '(You tried to do something that can only be done from inside a ',
+             'reactive function.)')
       }
       return(.currentContext)
     },
@@ -108,7 +101,7 @@ ReactiveEnvironment <- R6Class(
       old.ctx <- .currentContext
       .currentContext <<- ctx
       on.exit(.currentContext <<- old.ctx)
-      shinyCallingHandlers(func())
+      func()
     },
     addPendingFlush = function(ctx, priority) {
       .pendingFlush$enqueue(ctx, priority)
@@ -127,14 +120,10 @@ ReactiveEnvironment <- R6Class(
   )
 )
 
-.getReactiveEnvironment <- local({
-  reactiveEnvironment <- NULL
-  function() {
-    if (is.null(reactiveEnvironment))
-      reactiveEnvironment <<- ReactiveEnvironment$new()
-    return(reactiveEnvironment)
-  }
-})
+.reactiveEnvironment <- ReactiveEnvironment$new()
+.getReactiveEnvironment <- function() {
+  .reactiveEnvironment
+}
 
 # Causes any pending invalidations to run.
 flushReact <- function() {
@@ -146,15 +135,3 @@ flushReact <- function() {
 getCurrentContext <- function() {
   .getReactiveEnvironment()$currentContext()
 }
-
-getDummyContext <- function() {}
-local({
-  dummyContext <- NULL
-  getDummyContext <<- function() {
-    if (is.null(dummyContext)) {
-      dummyContext <<- Context$new(getDefaultReactiveDomain(), '[none]',
-        type='isolate')
-    }
-    return(dummyContext)
-  }
-})

R/reactive-domains.R

@@ -1,253 +0,0 @@
-#' @include globals.R
-NULL
-
-#
-# Over the last few months we've seen a number of cases where it'd be helpful
-# for objects that are instantiated within a Shiny app to know what Shiny
-# session they are "owned" by. I put "owned" in quotes because there isn't a
-# built-in notion of object ownership in Shiny today, any more than there is a
-# notion of one object owning another in R.
-#
-# But it's intuitive to everyone, I think, that the outputs for a session are
-# owned by that session, and any logic that is executed as part of the output
-# is done on behalf of that session. And it seems like in the vast majority of
-# cases, observers that are created inside a shinyServer function (i.e. one per
-# session) are also intuitively owned by the session that's starting up.
-#
-# This notion of ownership is important/helpful for a few scenarios that have
-# come up in recent months:
-#
-# 1. The showcase mode that Jonathan implemented recently highlights
-# observers/reactives as they execute. In order for sessions to only receive
-# highlights for their own code execution, we need to know which sessions own
-# which observers. 2. We've seen a number of apps crash out when observers
-# outlive their sessions and then try to do things with their sessions (the
-# most common error message was something like "Can't write to a closed
-# websocket", but we now silently ignore writes to closed websockets). It'd be
-# convenient for the default behavior of observers to be that they don't
-# outlive their parent sessions. 3. The reactive log visualizer currently
-# visualizes all reactivity in the process; it would be great if by default it
-# only visualized the current session. 4. When an observer has an error, it
-# would be great to be able to send the error to the session so it can do its
-# own handling (such as sending the error info to the client so the user can be
-# notified). 5. Shiny Server Pro wants to show the admin how much time is being
-# spent servicing each session.
-#
-# So what are the rules for establishing ownership?
-#
-# 1. Define the "current domain" as a global variable whose value will own any
-# newly created observer (by default). A domain is a reference class or
-# environment that contains the functions `onEnded(callback)`, `isEnded()`, and
-# `reactlog(logEntry)`.
-#
-## ------------------------------------------------------------------------
-createMockDomain <- function() {
-  callbacks <- list()
-  ended <- FALSE
-  domain <- new.env(parent = emptyenv())
-  domain$onEnded <- function(callback) {
-    callbacks <<- c(callbacks, callback)
-  }
-  domain$isEnded <- function() {
-    ended
-  }
-  domain$reactlog <- function(logEntry) NULL
-  domain$end <- function() {
-    if (!ended) {
-      ended <<- TRUE
-      lapply(callbacks, do.call, list())
-    }
-    invisible()
-  }
-  return(domain)
-}
-
-#
-# 2. The initial value of "current domain" is null.
-#
-## ------------------------------------------------------------------------
-.globals$domain <- NULL
-
-#
-# 3. Objects that can be owned include observers, reactive expressions,
-# invalidateLater instances, reactiveTimer instances. Whenever one of these is
-# created, by default its owner will be the current domain.
-#
-## ------------------------------------------------------------------------
-
-#' @name domains
-#' @rdname domains
-#' @export
-getDefaultReactiveDomain <- function() {
-  .globals$domain
-}
-
-#
-# 4. While a session is being created and the shinyServer function is executed,
-# the current domain is set to the new session. When the shinyServer function
-# is done executing, the previous value of the current domain is restored. This
-# is made foolproof using a `withReactiveDomain` function.
-#
-## ------------------------------------------------------------------------
-
-#' @rdname domains
-#' @export
-withReactiveDomain <- function(domain, expr) {
-  oldValue <- .globals$domain
-  .globals$domain <- domain
-  on.exit(.globals$domain <- oldValue)
-
-  expr
-}
-
-#
-# 5. While an observer or reactive expression is executing, the current domain
-# is set to the owner of the observer. When the observer completes, the
-# previous value of the current domain is restored.
-#
-# 6. Note that once created, an observer/reactive expression belongs to the
-# same domain forever, regardless of how many times it is invalidated and
-# re-executed, and regardless of what caused the invalidation to happen.
-#
-# 7. When a session ends, any observers that it owns are suspended, any
-# invalidateLater/reactiveTimers are stopped.
-#
-## ------------------------------------------------------------------------
-
-#' @rdname domains
-#' @export
-onReactiveDomainEnded <- function(domain, callback, failIfNull = FALSE) {
-  if (is.null(domain)) {
-    if (isTRUE(failIfNull))
-      stop("onReactiveDomainEnded called with null domain and failIfNull=TRUE")
-    else
-      return()
-  }
-  domain$onEnded(callback)
-}
-
-#
-# 8. If an uncaught error occurs while executing an observer, the session gets
-# a chance to handle it. I suppose the default behavior would be to send the
-# message to the client if possible, and then perhaps end the session (or not,
-# I could argue either way).
-#
-# The basic idea here is inspired by Node.js domains, which you can think of as
-# a way to track execution contexts across callback- or listener-oriented
-# asynchronous code. They use it to unify error handling code across a graph of
-# related objects. Our domains will be to unify both lifetime and error
-# handling across a graph of related reactive primitives.
-#
-# (You could imagine that as a client update is being processed, the session
-# associated with that client would become the current domain. IIRC this is how
-# showcase mode is implemented today. I don't think this would cover any cases
-# not covered by rule 5 above, and the absence of rule 5 would leave cases that
-# this rule would not cover.)
-#
-# Pitfalls/open issues:
-#
-# 1. Our current approach has the issue of observers staying alive longer than
-# they ought to. This proposal introduces the opposite risk: that
-# observers/invalidateLater/reactiveTimer instances, having implicitly been
-# assigned a parent, are suspended/disposed earlier than they ought to have
-# been. I find this especially worrisome for invalidateLater/reactiveTimer,
-# which will often be called in a reactive expression, and thus execute under
-# unpredictable circumstances. Perhaps those should continue to accept an
-# explicit "session=" parameter that the user is warned about if they don't
-# provide a value.
-#
-# 2. Are there situations where it is ambiguous what the right thing to do is,
-# and we should warn/error to ask the user to provide a domain explicitly?
-#
-## ------------------------------------------------------------------------
-
-#' Reactive domains
-#'
-#' Reactive domains are a mechanism for establishing ownership over reactive
-#' primitives (like reactive expressions and observers), even if the set of
-#' reactive primitives is dynamically created. This is useful for lifetime
-#' management (i.e. destroying observers when the Shiny session that created
-#' them ends) and error handling.
-#'
-#' At any given time, there can be either a single "default" reactive domain
-#' object, or none (i.e. the reactive domain object is \code{NULL}). You can
-#' access the current default reactive domain by calling
-#' \code{getDefaultReactiveDomain}.
-#'
-#' Unless you specify otherwise, newly created observers and reactive
-#' expressions will be assigned to the current default domain (if any). You can
-#' override this assignment by providing an explicit \code{domain} argument to
-#' \code{\link{reactive}} or \code{\link{observe}}.
-#'
-#' For advanced usage, it's possible to override the default domain using
-#' \code{withReactiveDomain}. The \code{domain} argument will be made the
-#' default domain while \code{expr} is evaluated.
-#'
-#' Implementers of new reactive primitives can use \code{onReactiveDomainEnded}
-#' as a convenience function for registering callbacks. If the reactive domain
-#' is \code{NULL} and \code{failIfNull} is \code{FALSE}, then the callback will
-#' never be invoked.
-#'
-#' @name domains
-#' @param domain A valid domain object (for example, a Shiny session), or
-#'   \code{NULL}
-#' @param expr An expression to evaluate under \code{domain}
-#' @param callback A callback function to be invoked
-#' @param failIfNull If \code{TRUE} then an error is given if the \code{domain}
-#'   is \code{NULL}
-NULL
-
-#
-# Example 1
-# ---
-# ```
-# obs1 <- observe({
-# })
-# shinyServer(function(input, output) {
-#   obs2 <- observe({
-#     obs3 <- observe({
-#     })
-#   })
-# })
-# # obs1 would have no domain, obs2 and obs3 would be owned by the session
-# ```
-#
-# Example 2
-# ---
-# ```
-# globalValues <- reactiveValues(broadcast="")
-# shinyServer(function(input, output) {
-#   sessionValues <- reactiveValues()
-#   output$messageOutput <- renderText({
-#     globalValues$broadcast
-#     obs1 <- observe({...})
-#   })
-#   observe({
-#     if (input$goButton == 0) return()
-#     isolate( globalValues$broadcast <- input$messageInput )
-#   })
-# })
-# # The observer behind messageOutput would be owned by the session,
-# # as would all the many instances of obs1 that were created.
-# ```
-# ---
-#
-# Example 3
-# ---
-# ```
-# rexpr1 <- reactive({
-#   invalidateLater(1000)
-#   obs1 <- observe({...})
-# })
-# observeSomething <- function() {
-#   obs2 <- observe({...})
-# })
-# shinyServer(function(input, output) {
-#   obs3 <- observe({
-#     observeSomething()
-#     rexpr1()
-#   })
-# })
-# # rexpr1, the invalidateLater call, and obs1 would all have no owner;
-# # obs2 and obs3 would be owned by the session.
-# ```

R/reactives.R

@@ -1,16 +1,9 @@
-#' @include utils.R
-NULL
-
-Dependents <- R6Class(
+Dependents <- setRefClass(
   'Dependents',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    .dependents = 'Map',
-
-    initialize = function() {
-      .dependents <<- Map$new()
-    },
+  fields = list(
+    .dependents = 'Map'
+  ),
+  methods = list(
     register = function(depId=NULL, depLabel=NULL) {
       ctx <- .getReactiveEnvironment()$currentContext()
       if (!.dependents$containsKey(ctx$id)) {
@@ -18,7 +11,7 @@ Dependents <- R6Class(
         ctx$onInvalidate(function() {
           .dependents$remove(ctx$id)
         })
-
+        
         if (!is.null(depId) && nchar(depId) > 0)
           .graphDependsOnId(ctx$id, depId)
         if (!is.null(depLabel))
@@ -40,12 +33,11 @@ Dependents <- R6Class(
 
 # ReactiveValues ------------------------------------------------------------
 
-ReactiveValues <- R6Class(
+ReactiveValues <- setRefClass(
   'ReactiveValues',
-  portable = FALSE,
-  public = list(
+  fields = list(
     # For debug purposes
-    .label = character(0),
+    .label = 'character',
     .values = 'environment',
     .dependents = 'environment',
     # Dependents for the list of all names, including hidden
@@ -53,17 +45,14 @@ ReactiveValues <- R6Class(
     # Dependents for all values, including hidden
     .allValuesDeps = 'Dependents',
     # Dependents for all values
-    .valuesDeps = 'Dependents',
-
+    .valuesDeps = 'Dependents'
+  ),
+  methods = list(
     initialize = function() {
-      .label <<- paste('reactiveValues',
-                       p_randomInt(1000, 10000),
+      .label <<- paste('reactiveValues', runif(1, min=1000, max=9999),
                        sep="")
       .values <<- new.env(parent=emptyenv())
       .dependents <<- new.env(parent=emptyenv())
-      .namesDeps <<- Dependents$new()
-      .allValuesDeps <<- Dependents$new()
-      .valuesDeps <<- Dependents$new()
     },
     get = function(key) {
       ctx <- .getReactiveEnvironment()$currentContext()
@@ -75,7 +64,7 @@ ReactiveValues <- R6Class(
           rm(list=dep.key, pos=.dependents, inherits=FALSE)
         })
       }
-
+      
       if (!exists(key, where=.values, inherits=FALSE))
         NULL
       else
@@ -121,7 +110,7 @@ ReactiveValues <- R6Class(
     mset = function(lst) {
       lapply(base::names(lst),
              function(name) {
-               self$set(name, lst[[name]])
+               .self$set(name, lst[[name]])
              })
     },
     names = function() {
@@ -184,7 +173,7 @@ ReactiveValues <- R6Class(
 #' @param ... Objects that will be added to the reactivevalues object. All of
 #'   these objects must be named.
 #'
-#' @seealso \code{\link{isolate}} and \code{\link{is.reactivevalues}}.
+#' @seealso \code{\link{isolate}}.
 #'
 #' @export
 reactiveValues <- function(...) {
@@ -199,6 +188,9 @@ reactiveValues <- function(...) {
   values
 }
 
+# Register the S3 class so that it can be used for a field in a Reference Class
+setOldClass("reactivevalues")
+
 # Create a reactivevalues object
 #
 # @param values A ReactiveValues object
@@ -207,24 +199,15 @@ reactiveValues <- function(...) {
   structure(list(impl=values), class='reactivevalues', readonly=readonly)
 }
 
-#' Checks whether an object is a reactivevalues object
-#'
-#' Checks whether its argument is a reactivevalues object.
-#'
-#' @param x The object to test.
-#' @seealso \code{\link{reactiveValues}}.
-#' @export
-is.reactivevalues <- function(x) inherits(x, 'reactivevalues')
-
-#' @export
+#' @S3method $ reactivevalues
 `$.reactivevalues` <- function(x, name) {
   .subset2(x, 'impl')$get(name)
 }
 
-#' @export
+#' @S3method [[ reactivevalues
 `[[.reactivevalues` <- `$.reactivevalues`
 
-#' @export
+#' @S3method $<- reactivevalues
 `$<-.reactivevalues` <- function(x, name, value) {
   if (attr(x, 'readonly')) {
     stop("Attempted to assign value to a read-only reactivevalues object")
@@ -236,30 +219,30 @@ is.reactivevalues <- function(x) inherits(x, 'reactivevalues')
   }
 }
 
-#' @export
+#' @S3method [[<- reactivevalues
 `[[<-.reactivevalues` <- `$<-.reactivevalues`
 
-#' @export
+#' @S3method [ reactivevalues
 `[.reactivevalues` <- function(values, name) {
   stop("Single-bracket indexing of reactivevalues object is not allowed.")
 }
 
-#' @export
+#' @S3method [<- reactivevalues
 `[<-.reactivevalues` <- function(values, name, value) {
   stop("Single-bracket indexing of reactivevalues object is not allowed.")
 }
 
-#' @export
+#' @S3method names reactivevalues
 names.reactivevalues <- function(x) {
   .subset2(x, 'impl')$names()
 }
 
-#' @export
+#' @S3method names<- reactivevalues
 `names<-.reactivevalues` <- function(x, value) {
   stop("Can't assign names to reactivevalues object")
 }
 
-#' @export
+#' @S3method as.list reactivevalues
 as.list.reactivevalues <- function(x, all.names=FALSE, ...) {
   shinyDeprecated("reactiveValuesToList",
     msg = paste("'as.list.reactivevalues' is deprecated. ",
@@ -301,46 +284,31 @@ reactiveValuesToList <- function(x, all.names=FALSE) {
   .subset2(x, 'impl')$toList(all.names)
 }
 
-# This function is needed because str() on a reactivevalues object will call
-# [[.reactivevalues(), which will give an error when it tries to access
-# x[['impl']].
-#' @export
-str.reactivevalues <- function(object, indent.str = " ", ...) {
-  str(unclass(object), indent.str = indent.str, ...)
-  # Need to manually print out the class field,
-  cat(indent.str, '- attr(*, "class")=', sep = "")
-  str(class(object))
-}
-
 # Observable ----------------------------------------------------------------
 
-Observable <- R6Class(
+Observable <- setRefClass(
   'Observable',
-  portable = FALSE,
-  public = list(
+  fields = list(
     .func = 'function',
-    .label = character(0),
-    .domain = NULL,
+    .label = 'character',
     .dependents = 'Dependents',
-    .invalidated = logical(0),
-    .running = logical(0),
-    .value = NULL,
-    .visible = logical(0),
-    .execCount = integer(0),
-    .mostRecentCtxId = character(0),
-
-    initialize = function(func, label = deparse(substitute(func)),
-                          domain = getDefaultReactiveDomain()) {
+    .invalidated = 'logical',
+    .running = 'logical',
+    .value = 'ANY',
+    .visible = 'logical',
+    .execCount = 'integer',
+    .mostRecentCtxId = 'character'
+  ),
+  methods = list(
+    initialize = function(func, label=deparse(substitute(func))) {
       if (length(formals(func)) > 0)
         stop("Can't make a reactive expression from a function that takes one ",
              "or more parameters; only functions without parameters can be ",
              "reactive.")
       .func <<- func
-      .label <<- label
-      .domain <<- domain
-      .dependents <<- Dependents$new()
       .invalidated <<- TRUE
       .running <<- FALSE
+      .label <<- label
       .execCount <<- 0L
       .mostRecentCtxId <<- ""
     },
@@ -348,11 +316,11 @@ Observable <- R6Class(
       .dependents$register()
 
       if (.invalidated || .running) {
-        self$.updateValue()
+        .self$.updateValue()
       }
 
       .graphDependsOnId(getCurrentContext()$id, .mostRecentCtxId)
-
+      
       if (identical(class(.value), 'try-error'))
         stop(attr(.value, 'condition'))
 
@@ -362,8 +330,7 @@ Observable <- R6Class(
         invisible(.value)
     },
     .updateValue = function() {
-      ctx <- Context$new(.domain, .label, type = 'observable',
-                         prevId = .mostRecentCtxId)
+      ctx <- Context$new(.label, type='observable', prevId=.mostRecentCtxId)
       .mostRecentCtxId <<- ctx$id
       ctx$onInvalidate(function() {
         .invalidated <<- TRUE
@@ -378,7 +345,7 @@ Observable <- R6Class(
       on.exit(.running <<- wasRunning)
 
       ctx$run(function() {
-        result <- withVisible(try(shinyCallingHandlers(.func()), silent=TRUE))
+        result <- withVisible(try(.func(), silent=FALSE))
         .visible <<- result$visible
         .value <<- result$value
       })
@@ -402,8 +369,7 @@ Observable <- R6Class(
 #' See the \href{http://rstudio.github.com/shiny/tutorial/}{Shiny tutorial} for
 #' more information about reactive expressions.
 #'
-#' @param x For \code{reactive}, an expression (quoted or unquoted). For
-#'   \code{is.reactive}, an object to test.
+#' @param x An expression (quoted or unquoted).
 #' @param env The parent environment for the reactive expression. By default, this
 #'   is the calling environment, the same as when defining an ordinary
 #'   non-reactive expression.
@@ -411,8 +377,6 @@ Observable <- R6Class(
 #'   This is useful when you want to use an expression that is stored in a
 #'   variable; to do so, it must be quoted with `quote()`.
 #' @param label A label for the reactive expression, useful for debugging.
-#' @param domain See \link{domains}.
-#' @return a function, wrapped in a S3 class "reactive"
 #'
 #' @examples
 #' values <- reactiveValues(A=1)
@@ -434,35 +398,19 @@ Observable <- R6Class(
 #' isolate(reactiveD())
 #'
 #' @export
-reactive <- function(x, env = parent.frame(), quoted = FALSE, label = NULL,
-                     domain = getDefaultReactiveDomain()) {
+reactive <- function(x, env = parent.frame(), quoted = FALSE, label = NULL) {
   fun <- exprToFunction(x, env, quoted)
-  # Attach a label and a reference to the original user source for debugging
   if (is.null(label))
     label <- sprintf('reactive(%s)', paste(deparse(body(fun)), collapse='\n'))
-  srcref <- attr(substitute(x), "srcref")
-  if (length(srcref) >= 2) attr(label, "srcref") <- srcref[[2]]
-  attr(label, "srcfile") <- srcFileOfRef(srcref[[1]])
-  o <- Observable$new(fun, label, domain)
-  registerDebugHook(".func", o, "Reactive")
-  structure(o$getValue, observable = o, class = "reactive")
-}
 
-#' @export
-print.reactive <- function(x, ...) {
-  label <- attr(x, "observable")$.label
-  cat(label, "\n")
+  Observable$new(fun, label)$getValue
 }
 
-#' @export
-#' @rdname reactive
-is.reactive <- function(x) inherits(x, "reactive")
-
 # Return the number of times that a reactive expression or observer has been run
 execCount <- function(x) {
-  if (is.reactive(x))
-    return(attr(x, "observable")$.execCount)
-  else if (inherits(x, 'Observer'))
+  if (is.function(x))
+    return(environment(x)$.execCount)
+  else if (is(x, 'Observer'))
     return(x$.execCount)
   else
     stop('Unexpected argument to execCount')
@@ -470,47 +418,37 @@ execCount <- function(x) {
 
 # Observer ------------------------------------------------------------------
 
-Observer <- R6Class(
+Observer <- setRefClass(
   'Observer',
-  portable = FALSE,
-  public = list(
+  fields = list(
     .func = 'function',
-    .label = character(0),
-    .domain = 'ANY',
-    .priority = numeric(0),
-    .autoDestroy = logical(0),
-    .invalidateCallbacks = list(),
-    .execCount = integer(0),
+    .label = 'character',
+    .priority = 'numeric',
+    .invalidateCallbacks = 'list',
+    .execCount = 'integer',
     .onResume = 'function',
-    .suspended = logical(0),
-    .destroyed = logical(0),
-    .prevId = character(0),
-
-    initialize = function(func, label, suspended = FALSE, priority = 0,
-                          domain = getDefaultReactiveDomain(),
-                          autoDestroy = TRUE) {
+    .suspended = 'logical',
+    .prevId = 'character'
+  ),
+  methods = list(
+    initialize = function(func, label, suspended = FALSE, priority = 0) {
       if (length(formals(func)) > 0)
         stop("Can't make an observer from a function that takes parameters; ",
              "only functions without parameters can be reactive.")
 
       .func <<- func
       .label <<- label
-      .domain <<- domain
-      .autoDestroy <<- autoDestroy
       .priority <<- normalizePriority(priority)
       .execCount <<- 0L
       .suspended <<- suspended
       .onResume <<- function() NULL
-      .destroyed <<- FALSE
       .prevId <<- ''
 
-      onReactiveDomainEnded(.domain, self$.onDomainEnded)
-
       # Defer the first running of this until flushReact is called
       .createContext()$invalidate()
     },
     .createContext = function() {
-      ctx <- Context$new(.domain, .label, type='observer', prevId=.prevId)
+      ctx <- Context$new(.label, type='observer', prevId=.prevId)
       .prevId <<- ctx$id
 
       ctx$onInvalidate(function() {
@@ -522,18 +460,17 @@ Observer <- R6Class(
         continue <- function() {
           ctx$addPendingFlush(.priority)
         }
-
+        
         if (.suspended == FALSE)
           continue()
         else
           .onResume <<- continue
       })
-
+      
       ctx$onFlush(function() {
-        if (!.destroyed)
-          run()
+        run()
       })
-
+      
       return(ctx)
     },
     run = function() {
@@ -554,17 +491,6 @@ Observer <- R6Class(
       which case the priority change will be effective upon resume."
       .priority <<- normalizePriority(priority)
     },
-    setAutoDestroy = function(autoDestroy) {
-      "Sets whether this observer should be automatically destroyed when its
-      domain (if any) ends. If autoDestroy is TRUE and the domain already
-      ended, then destroy() is called immediately."
-      oldValue <- .autoDestroy
-      .autoDestroy <<- autoDestroy
-      if (!is.null(.domain) && .domain$isEnded()) {
-        destroy()
-      }
-      invisible(oldValue)
-    },
     suspend = function() {
       "Causes this observer to stop scheduling flushes (re-executions) in
       response to invalidations. If the observer was invalidated prior to this
@@ -583,48 +509,31 @@ Observer <- R6Class(
         .onResume <<- function() NULL
       }
       invisible()
-    },
-    destroy = function() {
-      "Prevents this observer from ever executing again (even if a flush has
-      already been scheduled)."
-
-      suspend()
-      .destroyed <<- TRUE
-    },
-    .onDomainEnded = function() {
-      if (isTRUE(.autoDestroy)) {
-        destroy()
-      }
     }
   )
 )
 
 #' Create a reactive observer
-#'
+#' 
 #' Creates an observer from the given expression.
-#'
-#' An observer is like a reactive expression in that it can read reactive values
-#' and call reactive expressions, and will automatically re-execute when those
-#' dependencies change. But unlike reactive expressions, it doesn't yield a
-#' result and can't be used as an input to other reactive expressions. Thus,
-#' observers are only useful for their side effects (for example, performing
-#' I/O).
-#'
-#' Another contrast between reactive expressions and observers is their
-#' execution strategy. Reactive expressions use lazy evaluation; that is, when
-#' their dependencies change, they don't re-execute right away but rather wait
-#' until they are called by someone else. Indeed, if they are not called then
-#' they will never re-execute. In contrast, observers use eager evaluation; as
-#' soon as their dependencies change, they schedule themselves to re-execute.
-#'
-#' Starting with Shiny 0.10.0, observers are automatically destroyed by default
-#' when the \link[=domains]{domain} that owns them ends (e.g. when a Shiny session
-#' ends).
-#'
-#' @param x An expression (quoted or unquoted). Any return value will be
-#'   ignored.
-#' @param env The parent environment for the reactive expression. By default,
-#'   this is the calling environment, the same as when defining an ordinary
+#' 
+#' An observer is like a reactive
+#' expression in that it can read reactive values and call reactive expressions, and
+#' will automatically re-execute when those dependencies change. But unlike 
+#' reactive expressions, it doesn't yield a result and can't be used as an input 
+#' to other reactive expressions. Thus, observers are only useful for their side 
+#' effects (for example, performing I/O).
+#' 
+#' Another contrast between reactive expressions and observers is their execution
+#' strategy. Reactive expressions use lazy evaluation; that is, when their
+#' dependencies change, they don't re-execute right away but rather wait until
+#' they are called by someone else. Indeed, if they are not called then they
+#' will never re-execute. In contrast, observers use eager evaluation; as soon
+#' as their dependencies change, they schedule themselves to re-execute.
+#' 
+#' @param x An expression (quoted or unquoted). Any return value will be ignored.
+#' @param env The parent environment for the reactive expression. By default, this
+#'   is the calling environment, the same as when defining an ordinary
 #'   non-reactive expression.
 #' @param quoted Is the expression quoted? By default, this is \code{FALSE}.
 #'   This is useful when you want to use an expression that is stored in a
@@ -634,17 +543,14 @@ Observer <- R6Class(
 #'   If \code{FALSE} (the default), start in a non-suspended state.
 #' @param priority An integer or numeric that controls the priority with which
 #'   this observer should be executed. An observer with a given priority level
-#'   will always execute sooner than all observers with a lower priority level.
+#'   will always execute sooner than all observers with a lower priority level. 
 #'   Positive, negative, and zero values are allowed.
-#' @param domain See \link{domains}.
-#' @param autoDestroy If \code{TRUE} (the default), the observer will be
-#'   automatically destroyed when its domain (if any) ends.
-#' @return An observer reference class object. This object has the following
+#' @return An observer reference class object. This object has the following 
 #'   methods:
 #'   \describe{
 #'     \item{\code{suspend()}}{
 #'       Causes this observer to stop scheduling flushes (re-executions) in
-#'       response to invalidations. If the observer was invalidated prior to
+#'       response to invalidations. If the observer was invalidated prior to 
 #'       this call but it has not re-executed yet then that re-execution will
 #'       still occur, because the flush is already scheduled.
 #'     }
@@ -653,21 +559,12 @@ Observer <- R6Class(
 #'       invalidations. If the observer was invalidated while suspended, then it
 #'       will schedule itself for re-execution.
 #'     }
-#'     \item{\code{destroy()}}{
-#'       Stops the observer from executing ever again, even if it is currently
-#'       scheduled for re-execution.
-#'     }
 #'     \item{\code{setPriority(priority = 0)}}{
-#'       Change this observer's priority. Note that if the observer is currently
+#'       Change this observer's priority. Note that if the observer is currently 
 #'       invalidated, then the change in priority will not take effect until the
-#'       next invalidation--unless the observer is also currently suspended, in
+#'       next invalidation--unless the observer is also currently suspended, in 
 #'       which case the priority change will be effective upon resume.
 #'     }
-#'     \item{\code{setAutoDestroy(autoDestroy)}}{
-#'       Sets whether this observer should be automatically destroyed when its
-#'       domain (if any) ends. If autoDestroy is TRUE and the domain already
-#'       ended, then destroy() is called immediately."
-#'     }
 #'     \item{\code{onInvalidate(callback)}}{
 #'       Register a callback function to run when this observer is invalidated.
 #'       No arguments will be provided to the callback function when it is
@@ -695,115 +592,41 @@ Observer <- R6Class(
 #'
 #' @export
 observe <- function(x, env=parent.frame(), quoted=FALSE, label=NULL,
-                    suspended=FALSE, priority=0,
-                    domain=getDefaultReactiveDomain(), autoDestroy = TRUE) {
+                    suspended=FALSE, priority=0) {
 
   fun <- exprToFunction(x, env, quoted)
   if (is.null(label))
     label <- sprintf('observe(%s)', paste(deparse(body(fun)), collapse='\n'))
 
-  o <- Observer$new(fun, label=label, suspended=suspended, priority=priority,
-                    domain=domain, autoDestroy=autoDestroy)
-  registerDebugHook(".func", o, "Observer")
-  invisible(o)
+  invisible(Observer$new(
+    fun, label=label, suspended=suspended, priority=priority))
 }
 
-#' Make a reactive variable
-#'
-#' Turns a normal variable into a reactive variable, that is, one that has
-#' reactive semantics when assigned or read in the usual ways. The variable may
-#' already exist; if so, its value will be used as the initial value of the
-#' reactive variable (or \code{NULL} if the variable did not exist).
-#'
-#' @param symbol A character string indicating the name of the variable that
-#'   should be made reactive
-#' @param env The environment that will contain the reactive variable
-#'
-#' @return None.
-#'
-#' @examples
-#' \dontrun{
-#' a <- 10
-#' makeReactiveBinding("a")
-#' b <- reactive(a * -1)
-#' observe(print(b()))
-#' a <- 20
-#' }
-#' @export
-makeReactiveBinding <- function(symbol, env = parent.frame()) {
-  if (exists(symbol, where = env, inherits = FALSE)) {
-    initialValue <- get(symbol, pos = env, inherits = FALSE)
-    rm(list = symbol, pos = env, inherits = FALSE)
-  }
-  else
-    initialValue <- NULL
-  values <- reactiveValues(value = initialValue)
-  makeActiveBinding(symbol, env=env, fun=function(v) {
-    if (missing(v))
-      values$value
-    else
-      values$value <- v
-  })
-
-  invisible()
-}
-
-# `%<-reactive%` <- function(name, value) {
-#   sym <- deparse(substitute(name))
-#   assign(sym, value, pos = parent.frame())
-#   makeReactiveBinding(sym, env=parent.frame())
-#   invisible(NULL)
-# }
-
-# Causes flushReact to be called every time an expression is
-# entered into the top-level prompt
-setAutoflush <- local({
-  callbackId <- NULL
-
-  function(enable) {
-    if (xor(is.null(callbackId), isTRUE(enable))) {
-      return(invisible())
-    }
-
-    if (isTRUE(enable)) {
-      callbackId <<- addTaskCallback(function(expr, value, ok, visible) {
-        timerCallbacks$executeElapsed()
-        flushReact()
-        return(TRUE)
-      })
-    } else {
-      removeTaskCallback(callbackId)
-      callbackId <<- NULL
-    }
-    invisible()
-  }
-})
-
 # ---------------------------------------------------------------------------
 
 #' Timer
-#'
-#' Creates a reactive timer with the given interval. A reactive timer is like a
+#' 
+#' Creates a reactive timer with the given interval. A reactive timer is like a 
 #' reactive value, except reactive values are triggered when they are set, while
 #' reactive timers are triggered simply by the passage of time.
-#'
-#' \link[=reactive]{Reactive expressions} and observers that want to be
-#' invalidated by the timer need to call the timer function that
-#' \code{reactiveTimer} returns, even if the current time value is not actually
+#' 
+#' \link[=reactive]{Reactive expressions} and observers that want to be 
+#' invalidated by the timer need to call the timer function that 
+#' \code{reactiveTimer} returns, even if the current time value is not actually 
 #' needed.
-#'
+#' 
 #' See \code{\link{invalidateLater}} as a safer and simpler alternative.
-#'
+#' 
 #' @param intervalMs How often to fire, in milliseconds
 #' @param session A session object. This is needed to cancel any scheduled
 #'   invalidations after a user has ended the session. If \code{NULL}, then
 #'   this invalidation will not be tied to any session, and so it will still
 #'   occur.
-#' @return A no-parameter function that can be called from a reactive context,
-#'   in order to cause that context to be invalidated the next time the timer
-#'   interval elapses. Calling the returned function also happens to yield the
+#' @return A no-parameter function that can be called from a reactive context, 
+#'   in order to cause that context to be invalidated the next time the timer 
+#'   interval elapses. Calling the returned function also happens to yield the 
 #'   current time (as in \code{\link{Sys.time}}).
-#' @seealso \code{\link{invalidateLater}}
+#' @seealso invalidateLater
 #'
 #' @examples
 #' \dontrun{
@@ -868,17 +691,9 @@ reactiveTimer <- function(intervalMs=1000, session) {
 }
 
 #' Scheduled Invalidation
-#'
-#' Schedules the current reactive context to be invalidated in the given number
+#' 
+#' Schedules the current reactive context to be invalidated in the given number 
 #' of milliseconds.
-#'
-#' If this is placed within an observer or reactive expression, that object will
-#' be invalidated (and re-execute) after the interval has passed. The
-#' re-execution will reset the invalidation flag, so in a typical use case, the
-#' object will keep re-executing and waiting for the specified interval. It's
-#' possible to stop this cycle by adding conditional logic that prevents the
-#' \code{invalidateLater} from being run.
-#'
 #' @param millis Approximate milliseconds to wait before invalidating the
 #'   current reactive context.
 #' @param session A session object. This is needed to cancel any scheduled
@@ -886,8 +701,6 @@ reactiveTimer <- function(intervalMs=1000, session) {
 #'   this invalidation will not be tied to any session, and so it will still
 #'   occur.
 #'
-#' @seealso \code{\link{reactiveTimer}} is a slightly less safe alternative.
-#'
 #' @examples
 #' \dontrun{
 #' shinyServer(function(input, output, session) {
@@ -930,181 +743,19 @@ invalidateLater <- function(millis, session) {
   invisible()
 }
 
-coerceToFunc <- function(x) {
-  force(x);
-  if (is.function(x))
-    return(x)
-  else
-    return(function() x)
-}
-
-#' Reactive polling
-#'
-#' Used to create a reactive data source, which works by periodically polling a
-#' non-reactive data source.
-#'
-#' \code{reactivePoll} works by pairing a relatively cheap "check" function with
-#' a more expensive value retrieval function. The check function will be
-#' executed periodically and should always return a consistent value until the
-#' data changes. When the check function returns a different value, then the
-#' value retrieval function will be used to re-populate the data.
-#'
-#' Note that the check function doesn't return \code{TRUE} or \code{FALSE} to
-#' indicate whether the underlying data has changed. Rather, the check function
-#' indicates change by returning a different value from the previous time it was
-#' called.
-#'
-#' For example, \code{reactivePoll} is used to implement
-#' \code{reactiveFileReader} by pairing a check function that simply returns the
-#' last modified timestamp of a file, and a value retrieval function that
-#' actually reads the contents of the file.
-#'
-#' As another example, one might read a relational database table reactively by
-#' using a check function that does \code{SELECT MAX(timestamp) FROM table} and
-#' a value retrieval function that does \code{SELECT * FROM table}.
-#'
-#' The \code{intervalMillis}, \code{checkFunc}, and \code{valueFunc} functions
-#' will be executed in a reactive context; therefore, they may read reactive
-#' values and reactive expressions.
-#'
-#' @param intervalMillis Approximate number of milliseconds to wait between
-#'   calls to \code{checkFunc}. This can be either a numeric value, or a
-#'   function that returns a numeric value.
-#' @param session The user session to associate this file reader with, or
-#'   \code{NULL} if none. If non-null, the reader will automatically stop when
-#'   the session ends.
-#' @param checkFunc A relatively cheap function whose values over time will be
-#'   tested for equality; inequality indicates that the underlying value has
-#'   changed and needs to be invalidated and re-read using \code{valueFunc}. See
-#'   Details.
-#' @param valueFunc A function that calculates the underlying value. See
-#'   Details.
-#'
-#' @return A reactive expression that returns the result of \code{valueFunc},
-#'   and invalidates when \code{checkFunc} changes.
-#'
-#' @seealso \code{\link{reactiveFileReader}}
-#'
-#' @examples
-#' \dontrun{
-#' # Assume the existence of readTimestamp and readValue functions
-#' shinyServer(function(input, output, session) {
-#'   data <- reactivePoll(1000, session, readTimestamp, readValue)
-#'   output$dataTable <- renderTable({
-#'     data()
-#'   })
-#' })
-#' }
-#'
-#' @export
-reactivePoll <- function(intervalMillis, session, checkFunc, valueFunc) {
-  intervalMillis <- coerceToFunc(intervalMillis)
-
-  rv <- reactiveValues(cookie = isolate(checkFunc()))
-
-  observe({
-    rv$cookie <- checkFunc()
-    invalidateLater(intervalMillis(), session)
-  })
-
-  # TODO: what to use for a label?
-  re <- reactive({
-    rv$cookie
-
-    valueFunc()
-
-  }, label = NULL)
-
-  return(re)
-}
-
-#' Reactive file reader
-#'
-#' Given a file path and read function, returns a reactive data source for the
-#' contents of the file.
-#'
-#' \code{reactiveFileReader} works by periodically checking the file's last
-#' modified time; if it has changed, then the file is re-read and any reactive
-#' dependents are invalidated.
-#'
-#' The \code{intervalMillis}, \code{filePath}, and \code{readFunc} functions
-#' will each be executed in a reactive context; therefore, they may read
-#' reactive values and reactive expressions.
-#'
-#' @param intervalMillis Approximate number of milliseconds to wait between
-#'   checks of the file's last modified time. This can be a numeric value, or a
-#'   function that returns a numeric value.
-#' @param session The user session to associate this file reader with, or
-#'   \code{NULL} if none. If non-null, the reader will automatically stop when
-#'   the session ends.
-#' @param filePath The file path to poll against and to pass to \code{readFunc}.
-#'   This can either be a single-element character vector, or a function that
-#'   returns one.
-#' @param readFunc The function to use to read the file; must expect the first
-#'   argument to be the file path to read. The return value of this function is
-#'   used as the value of the reactive file reader.
-#' @param ... Any additional arguments to pass to \code{readFunc} whenever it is
-#'   invoked.
-#'
-#' @return A reactive expression that returns the contents of the file, and
-#'   automatically invalidates when the file changes on disk (as determined by
-#'   last modified time).
-#'
-#' @seealso \code{\link{reactivePoll}}
-#'
-#' @examples
-#' \dontrun{
-#' # Per-session reactive file reader
-#' shinyServer(function(input, output, session)) {
-#'   fileData <- reactiveFileReader(1000, session, 'data.csv', read.csv)
-#'
-#'   output$data <- renderTable({
-#'     fileData()
-#'   })
-#' }
-#'
-#' # Cross-session reactive file reader. In this example, all sessions share
-#' # the same reader, so read.csv only gets executed once no matter how many
-#' # user sessions are connected.
-#' fileData <- reactiveFileReader(1000, session, 'data.csv', read.csv)
-#' shinyServer(function(input, output, session)) {
-#'   output$data <- renderTable({
-#'     fileData()
-#'   })
-#' }
-#' }
-#'
-#' @export
-reactiveFileReader <- function(intervalMillis, session, filePath, readFunc, ...) {
-  filePath <- coerceToFunc(filePath)
-  extraArgs <- list(...)
-
-  reactivePoll(
-    intervalMillis, session,
-    function() {
-      path <- filePath()
-      info <- file.info(path)
-      return(paste(path, info$mtime, info$size))
-    },
-    function() {
-      do.call(readFunc, c(filePath(), extraArgs))
-    }
-  )
-}
-
 #' Create a non-reactive scope for an expression
-#'
-#' Executes the given expression in a scope where reactive values or expression
-#' can be read, but they cannot cause the reactive scope of the caller to be
+#' 
+#' Executes the given expression in a scope where reactive values or expression 
+#' can be read, but they cannot cause the reactive scope of the caller to be 
 #' re-evaluated when they change.
-#'
-#' Ordinarily, the simple act of reading a reactive value causes a relationship
-#' to be established between the caller and the reactive value, where a change
-#' to the reactive value will cause the caller to re-execute. (The same applies
-#' for the act of getting a reactive expression's value.) The \code{isolate}
+#' 
+#' Ordinarily, the simple act of reading a reactive value causes a relationship 
+#' to be established between the caller and the reactive value, where a change 
+#' to the reactive value will cause the caller to re-execute. (The same applies 
+#' for the act of getting a reactive expression's value.) The \code{isolate} 
 #' function lets you read a reactive value or expression without establishing this
 #' relationship.
-#'
+#' 
 #' The expression given to \code{isolate()} is evaluated in the calling
 #' environment. This means that if you assign a variable inside the
 #' \code{isolate()}, its value will be visible outside of the \code{isolate()}.
@@ -1116,20 +767,20 @@ reactiveFileReader <- function(intervalMillis, session, filePath, readFunc, ...)
 #' calls to the reactive expression with \code{isolate()}.
 #'
 #' @param expr An expression that can access reactive values or expressions.
-#'
+#' 
 #' @examples
 #' \dontrun{
 #' observe({
 #'   input$saveButton  # Do take a dependency on input$saveButton
-#'
+#'   
 #'   # isolate a simple expression
 #'   data <- get(isolate(input$dataset))  # No dependency on input$dataset
 #'   writeToDatabase(data)
 #' })
-#'
+#' 
 #' observe({
 #'   input$saveButton  # Do take a dependency on input$saveButton
-#'
+#'   
 #'   # isolate a whole block
 #'   data <- isolate({
 #'     a <- input$valueA   # No dependency on input$valueA or input$valueB
@@ -1164,28 +815,9 @@ reactiveFileReader <- function(intervalMillis, session, filePath, readFunc, ...)
 #'
 #' @export
 isolate <- function(expr) {
-  ctx <- Context$new(getDefaultReactiveDomain(), '[isolate]', type='isolate')
-  on.exit(ctx$invalidate())
+  ctx <- Context$new('[isolate]', type='isolate')
   ctx$run(function() {
     expr
   })
-}
-
-#' Evaluate an expression without a reactive context
-#'
-#' Temporarily blocks the current reactive context and evaluates the given
-#' expression. Any attempt to directly access reactive values or expressions in
-#' \code{expr} will give the same results as doing it at the top-level (by
-#' default, an error).
-#'
-#' @param expr An expression to evaluate.
-#' @return The value of \code{expr}.
-#'
-#' @seealso \code{\link{isolate}}
-#'
-#' @export
-maskReactiveContext <- function(expr) {
-  .getReactiveEnvironment()$runWith(NULL, function() {
-    expr
-  })
+  ctx$invalidate()
 }

R/run-url.R

@@ -1,31 +1,124 @@
+#' Run a Shiny application from https://gist.github.com
+#'
+#' Download and launch a Shiny application that is hosted on GitHub as a gist.
+#'
+#' @param gist The identifier of the gist. For example, if the gist is
+#'   https://gist.github.com/jcheng5/3239667, then \code{3239667},
+#'   \code{'3239667'}, and \code{'https://gist.github.com/jcheng5/3239667'}
+#'   are all valid values.
+#' @param port The TCP port that the application should listen on. Defaults to
+#'   port 8100.
+#' @param launch.browser If true, the system's default web browser will be
+#'   launched automatically after the app is started. Defaults to true in
+#'   interactive sessions only.
+#'
+#' @examples
+#' \dontrun{
+#' runGist(3239667)
+#' runGist("https://gist.github.com/jcheng5/3239667")
+#'
+#' # Old URL format without username
+#' runGist("https://gist.github.com/3239667")
+#' }
+#'
+#' @export
+runGist <- function(gist,
+                    port=8100L,
+                    launch.browser=getOption('shiny.launch.browser',
+                                             interactive())) {
+
+  gistUrl <- if (is.numeric(gist) || grepl('^[0-9a-f]+$', gist)) {
+    sprintf('https://gist.github.com/%s/download', gist)
+  } else if(grepl('^https://gist.github.com/([^/]+/)?([0-9a-f]+)$', gist)) {
+    paste(gist, '/download', sep='')
+  } else {
+    stop('Unrecognized gist identifier format')
+  }
+
+  runUrl(gistUrl, filetype=".tar.gz", subdir=NULL, port=port,
+    launch.browser=launch.browser)
+}
+
+
+#' Run a Shiny application from a GitHub repository
+#'
+#' Download and launch a Shiny application that is hosted in a GitHub repository.
+#'
+#' @param repo Name of the repository
+#' @param username GitHub username
+#' @param ref Desired git reference. Could be a commit, tag, or branch
+#'   name. Defaults to \code{"master"}.
+#' @param subdir A subdirectory in the repository that contains the app. By
+#'   default, this function will run an app from the top level of the repo, but
+#'   you can use a path such as `\code{"inst/shinyapp"}.
+#' @param port The TCP port that the application should listen on. Defaults to
+#'   port 8100.
+#' @param launch.browser If true, the system's default web browser will be
+#'   launched automatically after the app is started. Defaults to true in
+#'   interactive sessions only.
+#'
+#' @examples
+#' \dontrun{
+#' runGitHub("shiny_example", "rstudio")
+#'
+#' # Can run an app from a subdirectory in the repo
+#' runGitHub("shiny_example", "rstudio", subdir = "inst/shinyapp/")
+#' }
+#'
+#' @export
+runGitHub <- function(repo, username = getOption("github.user"),
+  ref = "master", subdir = NULL, port = 8100,
+  launch.browser = getOption('shiny.launch.browser', interactive())) {
+
+  if (is.null(ref)) {
+    stop("Must specify either a ref. ")
+  }
+
+  message("Downloading github repo(s) ",
+    paste(repo, ref, sep = "/", collapse = ", "),
+    " from ",
+    paste(username, collapse = ", "))
+  name <- paste(username, "-", repo, sep = "")
+
+  url <- paste("https://github.com/", username, "/", repo, "/archive/",
+    ref, ".tar.gz", sep = "")
+
+  runUrl(url, subdir=subdir, port=port, launch.browser=launch.browser)
+}
+
+
 #' Run a Shiny application from a URL
 #'
-#' \code{runUrl()} downloads and launches a Shiny application that is hosted at
-#' a downloadable URL. The Shiny application must be saved in a .zip, .tar, or
-#' .tar.gz file. The Shiny application files must be contained in the root
-#' directory or a subdirectory in the archive. For example, the files might be
-#' \code{myapp/server.r} and \code{myapp/ui.r}. The functions \code{runGitHub()}
-#' and \code{runGist()} are based on \code{runUrl()}, using URL's from GitHub
-#' (\url{https://github.com}) and GitHub gists (\url{https://gist.github.com}),
-#' respectively.
+#' Download and launch a Shiny application that is hosted at a downloadable
+#' URL. The Shiny application must be saved in a .zip, .tar, or .tar.gz file.
+#' The Shiny application files must be contained in a subdirectory in the
+#' archive. For example, the files might be \code{myapp/server.r} and
+#' \code{myapp/ui.r}.
+#'
 #' @param url URL of the application.
 #' @param filetype The file type (\code{".zip"}, \code{".tar"}, or
 #'   \code{".tar.gz"}. Defaults to the file extension taken from the url.
 #' @param subdir A subdirectory in the repository that contains the app. By
 #'   default, this function will run an app from the top level of the repo, but
 #'   you can use a path such as `\code{"inst/shinyapp"}.
-#' @param ... Other arguments to be passed to \code{\link{runApp}()}, such as
-#'   \code{port} and \code{launch.browser}.
-#' @export
+#' @param port The TCP port that the application should listen on. Defaults to
+#'   port 8100.
+#' @param launch.browser If true, the system's default web browser will be
+#'   launched automatically after the app is started. Defaults to true in
+#'   interactive sessions only.
+#'
 #' @examples
-#' \donttest{
+#' \dontrun{
 #' runUrl('https://github.com/rstudio/shiny_example/archive/master.tar.gz')
 #'
 #' # Can run an app from a subdirectory in the archive
 #' runUrl("https://github.com/rstudio/shiny_example/archive/master.zip",
 #'  subdir = "inst/shinyapp/")
 #' }
-runUrl <- function(url, filetype = NULL, subdir = NULL, ...) {
+#'
+#' @export
+runUrl <- function(url, filetype = NULL, subdir = NULL, port = 8100,
+  launch.browser = getOption('shiny.launch.browser', interactive())) {
 
   if (!is.null(subdir) && ".." %in% strsplit(subdir, '/')[[1]])
     stop("'..' not allowed in subdir")
@@ -44,8 +137,6 @@ runUrl <- function(url, filetype = NULL, subdir = NULL, ...) {
 
   message("Downloading ", url)
   filePath <- tempfile('shinyapp', fileext=fileext)
-  fileDir  <- tempfile('shinyapp')
-  dir.create(fileDir, showWarnings = FALSE)
   if (download(url, filePath, mode = "wb", quiet = TRUE) != 0)
     stop("Failed to download URL ", url)
   on.exit(unlink(filePath))
@@ -57,78 +148,17 @@ runUrl <- function(url, filetype = NULL, subdir = NULL, ...) {
     #   2) If the internal untar implementation is used, it chokes on the 'g'
     #      type flag that github uses (to stash their commit hash info).
     # By using our own forked/modified untar2 we sidestep both issues.
-    first <- untar2(filePath, list=TRUE)[1]
-    untar2(filePath, exdir = fileDir)
+    dirname <- untar2(filePath, list=TRUE)[1]
+    untar2(filePath, exdir = dirname(filePath))
 
   } else if (fileext == ".zip") {
-    first <- as.character(unzip(filePath, list=TRUE)$Name)[1]
-    unzip(filePath, exdir = fileDir)
-  }
-  on.exit(unlink(fileDir, recursive = TRUE), add = TRUE)
-
-  appdir <- file.path(fileDir, first)
-  if (!file_test('-d', appdir)) appdir <- dirname(appdir)
-
-  if (!is.null(subdir)) appdir <- file.path(appdir, subdir)
-  runApp(appdir, ...)
-}
-
-#' @rdname runUrl
-#' @param gist The identifier of the gist. For example, if the gist is
-#'   https://gist.github.com/jcheng5/3239667, then \code{3239667},
-#'   \code{'3239667'}, and \code{'https://gist.github.com/jcheng5/3239667'} are
-#'   all valid values.
-#' @export
-#' @examples
-#' \donttest{
-#' runGist(3239667)
-#' runGist("https://gist.github.com/jcheng5/3239667")
-#'
-#' # Old URL format without username
-#' runGist("https://gist.github.com/3239667")
-#' }
-#'
-runGist <- function(gist, ...) {
-
-  gistUrl <- if (is.numeric(gist) || grepl('^[0-9a-f]+$', gist)) {
-    sprintf('https://gist.github.com/%s/download', gist)
-  } else if(grepl('^https://gist.github.com/([^/]+/)?([0-9a-f]+)$', gist)) {
-    paste(gist, '/download', sep='')
-  } else {
-    stop('Unrecognized gist identifier format')
+    dirname <- as.character(unzip(filePath, list=TRUE)$Name[1])
+    unzip(filePath, exdir = dirname(filePath))
   }
 
-  runUrl(gistUrl, filetype=".tar.gz", ...)
-}
-
-
-#' @rdname runUrl
-#' @param repo Name of the repository.
-#' @param username GitHub username. If \code{repo} is of the form
-#'   \code{"username/repo"}, \code{username} will be taken from \code{repo}.
-#' @param ref Desired git reference. Could be a commit, tag, or branch name.
-#'   Defaults to \code{"master"}.
-#' @export
-#' @examples
-#' \donttest{
-#' runGitHub("shiny_example", "rstudio")
-#' # or runGitHub("rstudio/shiny_example")
-#'
-#' # Can run an app from a subdirectory in the repo
-#' runGitHub("shiny_example", "rstudio", subdir = "inst/shinyapp/")
-#' }
-runGitHub <- function(repo, username = getOption("github.user"),
-                      ref = "master", subdir = NULL, ...) {
-
-  if (grepl('/', repo)) {
-    res <- strsplit(repo, '/')[[1]]
-    if (length(res) != 2) stop("'repo' must be of the form 'username/repo'")
-    username <- res[1]
-    repo     <- res[2]
-  }
-
-  url <- paste("https://github.com/", username, "/", repo, "/archive/",
-               ref, ".tar.gz", sep = "")
-
-  runUrl(url, subdir=subdir, ...)
+  appdir <- file.path(dirname(filePath), dirname)
+  on.exit(unlink(appdir, recursive = TRUE), add = TRUE)
+
+  appsubdir <- ifelse(is.null(subdir), appdir, file.path(appdir, subdir))
+  runApp(appsubdir, port=port, launch.browser=launch.browser)
 }

R/server.R

@@ -1,800 +0,0 @@
-#' @include globals.R
-
-appsByToken <- Map$new()
-
-# Create a map for input handlers and register the defaults.
-inputHandlers <- Map$new()
-
-#' Register an Input Handler
-#'
-#' Adds an input handler for data of this type. When called, Shiny will use the
-#' function provided to refine the data passed back from the client (after being
-#' deserialized by RJSONIO) before making it available in the \code{input}
-#' variable of the \code{server.R} file.
-#'
-#' This function will register the handler for the duration of the R process
-#' (unless Shiny is explicitly reloaded). For that reason, the \code{type} used
-#' should be very specific to this package to minimize the risk of colliding
-#' with another Shiny package which might use this data type name. We recommend
-#' the format of "packageName.widgetName".
-#'
-#' Currently Shiny registers the following handlers: \code{shiny.matrix},
-#' \code{shiny.number}, and \code{shiny.date}.
-#'
-#' The \code{type} of a custom Shiny Input widget will be deduced using the
-#' \code{getType()} JavaScript function on the registered Shiny inputBinding.
-#' @param type The type for which the handler should be added -- should be a
-#' single-element character vector.
-#' @param fun The handler function. This is the function that will be used to
-#'   parse the data delivered from the client before it is available in the
-#'   \code{input} variable. The function will be called with the following three
-#'   parameters:
-#'    \enumerate{
-#'      \item{The value of this input as provided by the client, deserialized
-#'      using RJSONIO.}
-#'      \item{The \code{shinysession} in which the input exists.}
-#'      \item{The name of the input.}
-#'    }
-#' @param force If \code{TRUE}, will overwrite any existing handler without
-#' warning. If \code{FALSE}, will throw an error if this class already has
-#' a handler defined.
-#' @examples
-#' \dontrun{
-#' # Register an input handler which rounds a input number to the nearest integer
-#' registerInputHandler("mypackage.validint", function(x, shinysession, name) {
-#'   if (is.null(x)) return(NA)
-#'   round(x)
-#' })
-#'
-#' ## On the Javascript side, the associated input binding must have a corresponding getType method:
-#' getType: function(el) {
-#'   return "mypackage.validint";
-#' }
-#'
-#' }
-#' @seealso \code{\link{removeInputHandler}}
-#' @export
-registerInputHandler <- function(type, fun, force=FALSE){
-  if (inputHandlers$containsKey(type) && !force){
-    stop("There is already an input handler for type: ", type)
-  }
-  inputHandlers$set(type, fun)
-}
-
-#' Deregister an Input Handler
-#'
-#' Removes an Input Handler. Rather than using the previously specified handler
-#' for data of this type, the default RJSONIO serialization will be used.
-#'
-#' @param type The type for which handlers should be removed.
-#' @return The handler previously associated with this \code{type}, if one
-#'   existed. Otherwise, \code{NULL}.
-#' @seealso \code{\link{registerInputHandler}}
-#' @export
-removeInputHandler <- function(type){
-  inputHandlers$remove(type)
-}
-
-# Takes a list-of-lists and returns a matrix. The lists
-# must all be the same length. NULL is replaced by NA.
-registerInputHandler("shiny.matrix", function(data, ...) {
-  if (length(data) == 0)
-    return(matrix(nrow=0, ncol=0))
-
-  m <- matrix(unlist(lapply(data, function(x) {
-    sapply(x, function(y) {
-      ifelse(is.null(y), NA, y)
-    })
-  })), nrow = length(data[[1]]), ncol = length(data))
-  return(m)
-})
-
-registerInputHandler("shiny.number", function(val, ...){
-  ifelse(is.null(val), NA, val)
-})
-
-registerInputHandler("shiny.date", function(val, ...){
-  # First replace NULLs with NA, then convert to Date vector
-  datelist <- ifelse(lapply(val, is.null), NA, val)
-  as.Date(unlist(datelist))
-})
-
-registerInputHandler("shiny.action", function(val, ...) {
-  # mark up the action button value with a special class so we can recognize it later
-  class(val) <- c(class(val), "shinyActionButtonValue")
-  val
-})
-
-# Provide a character representation of the WS that can be used
-# as a key in a Map.
-wsToKey <- function(WS) {
-  as.character(WS$socket)
-}
-
-.globals$clients <- function(req) NULL
-
-
-clearClients <- function() {
-  .globals$clients <- function(req) NULL
-}
-
-
-registerClient <- function(client) {
-  .globals$clients <- append(.globals$clients, client)
-}
-
-
-.globals$resources <- list()
-
-.globals$showcaseDefault <- 0
-
-.globals$showcaseOverride <- FALSE
-
-#' Resource Publishing
-#'
-#' Adds a directory of static resources to Shiny's web server, with the given
-#' path prefix. Primarily intended for package authors to make supporting
-#' JavaScript/CSS files available to their components.
-#'
-#' @param prefix The URL prefix (without slashes). Valid characters are a-z,
-#'   A-Z, 0-9, hyphen, period, and underscore; and must begin with a-z or A-Z.
-#'   For example, a value of 'foo' means that any request paths that begin with
-#'   '/foo' will be mapped to the given directory.
-#' @param directoryPath The directory that contains the static resources to be
-#'   served.
-#'
-#' @details You can call \code{addResourcePath} multiple times for a given
-#'   \code{prefix}; only the most recent value will be retained. If the
-#'   normalized \code{directoryPath} is different than the directory that's
-#'   currently mapped to the \code{prefix}, a warning will be issued.
-#'
-#' @seealso \code{\link{singleton}}
-#'
-#' @examples
-#' addResourcePath('datasets', system.file('data', package='datasets'))
-#'
-#' @export
-addResourcePath <- function(prefix, directoryPath) {
-  prefix <- prefix[1]
-  if (!grepl('^[a-z][a-z0-9\\-_.]*$', prefix, ignore.case=TRUE, perl=TRUE)) {
-    stop("addResourcePath called with invalid prefix; please see documentation")
-  }
-
-  if (prefix %in% c('shared')) {
-    stop("addResourcePath called with the reserved prefix '", prefix, "'; ",
-         "please use a different prefix")
-  }
-
-  directoryPath <- normalizePath(directoryPath, mustWork=TRUE)
-
-  existing <- .globals$resources[[prefix]]
-
-  .globals$resources[[prefix]] <- list(directoryPath=directoryPath,
-                                       func=staticHandler(directoryPath))
-}
-
-resourcePathHandler <- function(req) {
-  if (!identical(req$REQUEST_METHOD, 'GET'))
-    return(NULL)
-
-  path <- req$PATH_INFO
-
-  match <- regexpr('^/([^/]+)/', path, perl=TRUE)
-  if (match == -1)
-    return(NULL)
-  len <- attr(match, 'capture.length')
-  prefix <- substr(path, 2, 2 + len - 1)
-
-  resInfo <- .globals$resources[[prefix]]
-  if (is.null(resInfo))
-    return(NULL)
-
-  suffix <- substr(path, 2 + len, nchar(path))
-
-  subreq <- as.environment(as.list(req, all.names=TRUE))
-  subreq$PATH_INFO <- suffix
-  subreq$SCRIPT_NAME <- paste(subreq$SCRIPT_NAME, substr(path, 1, 2 + len), sep='')
-
-  return(resInfo$func(subreq))
-}
-
-#' Define Server Functionality
-#'
-#' Defines the server-side logic of the Shiny application. This generally
-#' involves creating functions that map user inputs to various kinds of output.
-#'
-#' @param func The server function for this application. See the details section
-#'   for more information.
-#'
-#' @details
-#' Call \code{shinyServer} from your application's \code{server.R} file, passing
-#' in a "server function" that provides the server-side logic of your
-#' application.
-#'
-#' The server function will be called when each client (web browser) first loads
-#' the Shiny application's page. It must take an \code{input} and an
-#' \code{output} parameter. Any return value will be ignored. It also takes an
-#' optional \code{session} parameter, which is used when greater control is
-#' needed.
-#'
-#' See the \href{http://rstudio.github.com/shiny/tutorial/}{tutorial} for more
-#' on how to write a server function.
-#'
-#' @examples
-#' \dontrun{
-#' # A very simple Shiny app that takes a message from the user
-#' # and outputs an uppercase version of it.
-#' shinyServer(function(input, output, session) {
-#'   output$uppercase <- renderText({
-#'     toupper(input$message)
-#'   })
-#' })
-#' }
-#'
-#' @export
-shinyServer <- function(func) {
-  .globals$server <- list(func)
-  invisible(func)
-}
-
-decodeMessage <- function(data) {
-  readInt <- function(pos) {
-    packBits(rawToBits(data[pos:(pos+3)]), type='integer')
-  }
-
-  if (readInt(1) != 0x01020202L) {
-    # use native encoding for the message
-    nativeData <- iconv(rawToChar(data), 'UTF-8')
-    return(fromJSON(nativeData, asText=TRUE, simplify=FALSE))
-  }
-
-  i <- 5
-  parts <- list()
-  while (i <= length(data)) {
-    length <- readInt(i)
-    i <- i + 4
-    if (length != 0)
-      parts <- append(parts, list(data[i:(i+length-1)]))
-    else
-      parts <- append(parts, list(raw(0)))
-    i <- i + length
-  }
-
-  mainMessage <- decodeMessage(parts[[1]])
-  mainMessage$blobs <- parts[2:length(parts)]
-  return(mainMessage)
-}
-
-createAppHandlers <- function(httpHandlers, serverFuncSource) {
-  appvars <- new.env()
-  appvars$server <- NULL
-
-  sys.www.root <- system.file('www', package='shiny')
-
-  # This value, if non-NULL, must be present on all HTTP and WebSocket
-  # requests as the Shiny-Shared-Secret header or else access will be
-  # denied (403 response for HTTP, and instant close for websocket).
-  sharedSecret <- getOption('shiny.sharedSecret')
-
-  appHandlers <- list(
-    http = joinHandlers(c(
-      sessionHandler,
-      httpHandlers,
-      sys.www.root,
-      resourcePathHandler,
-      reactLogHandler)),
-    ws = function(ws) {
-      if (!is.null(sharedSecret)
-          && !identical(sharedSecret, ws$request$HTTP_SHINY_SHARED_SECRET)) {
-        ws$close()
-        return(TRUE)
-      }
-
-      shinysession <- ShinySession$new(ws)
-      appsByToken$set(shinysession$token, shinysession)
-      shinysession$setShowcase(.globals$showcaseDefault)
-
-      ws$onMessage(function(binary, msg) {
-        # To ease transition from websockets-based code. Should remove once we're stable.
-        if (is.character(msg))
-          msg <- charToRaw(msg)
-
-        if (isTRUE(getOption('shiny.trace'))) {
-          if (binary)
-            message("RECV ", '$$binary data$$')
-          else
-            message("RECV ", rawToChar(msg))
-        }
-
-        if (identical(charToRaw("\003\xe9"), msg))
-          return()
-
-        msg <- decodeMessage(msg)
-
-        # Do our own list simplifying here. sapply/simplify2array give names to
-        # character vectors, which is rarely what we want.
-        if (!is.null(msg$data)) {
-          for (name in names(msg$data)) {
-            val <- msg$data[[name]]
-
-            splitName <- strsplit(name, ':')[[1]]
-            if (length(splitName) > 1) {
-              msg$data[[name]] <- NULL
-
-              if (!inputHandlers$containsKey(splitName[[2]])){
-                # No input handler registered for this type
-                stop("No handler registered for for type ", name)
-              }
-
-              msg$data[[ splitName[[1]] ]] <-
-                  inputHandlers$get(splitName[[2]])(
-                      val,
-                      shinysession,
-                      splitName[[1]] )
-            }
-            else if (is.list(val) && is.null(names(val))) {
-              val_flat <- unlist(val, recursive = TRUE)
-
-              if (is.null(val_flat)) {
-                # This is to assign NULL instead of deleting the item
-                msg$data[name] <- list(NULL)
-              } else {
-                msg$data[[name]] <- val_flat
-              }
-            }
-          }
-        }
-
-        switch(
-          msg$method,
-          init = {
-
-            serverFunc <- serverFuncSource()
-            if (!identicalFunctionBodies(serverFunc, appvars$server)) {
-              appvars$server <- serverFunc
-              if (!is.null(appvars$server))
-              {
-                # Tag this function as the Shiny server function. A debugger may use this
-                # tag to give this function special treatment.
-                # It's very important that it's appvars$server itself and NOT a copy that
-                # is invoked, otherwise new breakpoints won't be picked up.
-                attr(appvars$server, "shinyServerFunction") <- TRUE
-                registerDebugHook("server", appvars, "Server Function")
-              }
-            }
-
-            # Check for switching into/out of showcase mode
-            if (.globals$showcaseOverride &&
-                exists(".clientdata_url_search", where = msg$data)) {
-              mode <- showcaseModeOfQuerystring(msg$data$.clientdata_url_search)
-              if (!is.null(mode))
-                shinysession$setShowcase(mode)
-            }
-
-            shinysession$manageInputs(msg$data)
-
-            # The client tells us what singletons were rendered into
-            # the initial page
-            if (!is.null(msg$data$.clientdata_singletons)) {
-              shinysession$singletons <<- strsplit(
-                msg$data$.clientdata_singletons, ',')[[1]]
-            }
-
-            local({
-              args <- list(
-                input=shinysession$input,
-                output=.createOutputWriter(shinysession))
-
-              # The clientData and session arguments are optional; check if
-              # each exists
-              if ('clientData' %in% names(formals(serverFunc)))
-                args$clientData <- shinysession$clientData
-
-              if ('session' %in% names(formals(serverFunc)))
-                args$session <- shinysession$session
-
-              withReactiveDomain(shinysession$session, {
-                do.call(appvars$server, args)
-              })
-            })
-          },
-          update = {
-            shinysession$manageInputs(msg$data)
-          },
-          shinysession$dispatch(msg)
-        )
-        shinysession$manageHiddenOutputs()
-
-        if (exists(".shiny__stdout", globalenv()) &&
-            exists("HTTP_GUID", ws$request)) {
-          # safe to assume we're in shiny-server
-          shiny_stdout <- get(".shiny__stdout", globalenv())
-
-          # eNter a flushReact
-          writeLines(paste("_n_flushReact ", get("HTTP_GUID", ws$request),
-                           " @ ", sprintf("%.3f", as.numeric(Sys.time())),
-                           sep=""), con=shiny_stdout)
-          flush(shiny_stdout)
-
-          flushReact()
-
-          # eXit a flushReact
-          writeLines(paste("_x_flushReact ", get("HTTP_GUID", ws$request),
-                           " @ ", sprintf("%.3f", as.numeric(Sys.time())),
-                           sep=""), con=shiny_stdout)
-          flush(shiny_stdout)
-        } else {
-          flushReact()
-        }
-        lapply(appsByToken$values(), function(shinysession) {
-          shinysession$flushOutput()
-          NULL
-        })
-      })
-
-      ws$onClose(function() {
-        shinysession$close()
-        appsByToken$remove(shinysession$token)
-      })
-
-      return(TRUE)
-    }
-  )
-  return(appHandlers)
-}
-
-getEffectiveBody <- function(func) {
-  # Note: NULL values are OK. isS4(NULL) returns FALSE, body(NULL)
-  # returns NULL.
-  if (isS4(func) && class(func) == "functionWithTrace")
-    body(func@original)
-  else
-    body(func)
-}
-
-identicalFunctionBodies <- function(a, b) {
-  identical(getEffectiveBody(a), getEffectiveBody(b))
-}
-
-handlerManager <- HandlerManager$new()
-
-addSubApp <- function(appObj, autoRemove = TRUE) {
-  path <- createUniqueId(16, "/app")
-  appHandlers <- createAppHandlers(appObj$httpHandler, appObj$serverFuncSource)
-
-  # remove the leading / from the path so a relative path is returned
-  # (needed for the case where the root URL for the Shiny app isn't /, such
-  # as portmapped URLs)
-  finalPath <- paste(
-    substr(path, 2, nchar(path)),
-    "/?w=", workerId(),
-    "&__subapp__=1",
-    sep="")
-  handlerManager$addHandler(routeHandler(path, appHandlers$http), finalPath)
-  handlerManager$addWSHandler(routeWSHandler(path, appHandlers$ws), finalPath)
-
-  if (autoRemove) {
-    # If a session is currently active, remove this subapp automatically when
-    # the current session ends
-    onReactiveDomainEnded(getDefaultReactiveDomain(), function() {
-      removeSubApp(finalPath)
-    })
-  }
-
-  return(finalPath)
-}
-
-removeSubApp <- function(path) {
-  handlerManager$removeHandler(path)
-  handlerManager$removeWSHandler(path)
-}
-
-startApp <- function(appObj, port, host, quiet) {
-  appHandlers <- createAppHandlers(appObj$httpHandler, appObj$serverFuncSource)
-  handlerManager$addHandler(appHandlers$http, "/", tail = TRUE)
-  handlerManager$addWSHandler(appHandlers$ws, "/", tail = TRUE)
-
-  if (is.numeric(port) || is.integer(port)) {
-    if (!quiet) {
-      message('\n', 'Listening on http://', host, ':', port)
-    }
-    return(startServer(host, port, handlerManager$createHttpuvApp()))
-  } else if (is.character(port)) {
-    if (!quiet) {
-      message('\n', 'Listening on domain socket ', port)
-    }
-    mask <- attr(port, 'mask')
-    return(startPipeServer(port, mask, handlerManager$createHttpuvApp()))
-  }
-}
-
-# Run an application that was created by \code{\link{startApp}}. This
-# function should normally be called in a \code{while(TRUE)} loop.
-serviceApp <- function() {
-  if (timerCallbacks$executeElapsed()) {
-    for (shinysession in appsByToken$values()) {
-      shinysession$manageHiddenOutputs()
-    }
-
-    flushReact()
-
-    for (shinysession in appsByToken$values()) {
-      shinysession$flushOutput()
-    }
-  }
-
-  # If this R session is interactive, then call service() with a short timeout
-  # to keep the session responsive to user input
-  maxTimeout <- ifelse(interactive(), 100, 1000)
-
-  timeout <- max(1, min(maxTimeout, timerCallbacks$timeToNextEvent()))
-  service(timeout)
-}
-
-.shinyServerMinVersion <- '0.3.4'
-
-#' Run Shiny Application
-#'
-#' Runs a Shiny application. This function normally does not return; interrupt
-#' R to stop the application (usually by pressing Ctrl+C or Esc).
-#'
-#' The host parameter was introduced in Shiny 0.9.0. Its default value of
-#' \code{"127.0.0.1"} means that, contrary to previous versions of Shiny, only
-#' the current machine can access locally hosted Shiny apps. To allow other
-#' clients to connect, use the value \code{"0.0.0.0"} instead (which was the
-#' value that was hard-coded into Shiny in 0.8.0 and earlier).
-#'
-#' @param appDir The directory of the application. Should contain
-#'   \code{server.R}, plus, either \code{ui.R} or a \code{www} directory that
-#'   contains the file \code{index.html}. Defaults to the working directory.
-#' @param port The TCP port that the application should listen on. Defaults to
-#'   choosing a random port.
-#' @param launch.browser If true, the system's default web browser will be
-#'   launched automatically after the app is started. Defaults to true in
-#'   interactive sessions only. This value of this parameter can also be a
-#'   function to call with the application's URL.
-#' @param host The IPv4 address that the application should listen on. Defaults
-#'   to the \code{shiny.host} option, if set, or \code{"127.0.0.1"} if not. See
-#'   Details.
-#' @param workerId Can generally be ignored. Exists to help some editions of
-#'   Shiny Server Pro route requests to the correct process.
-#' @param quiet Should Shiny status messages be shown? Defaults to FALSE.
-#' @param display.mode The mode in which to display the application. If set to
-#'   the value \code{"showcase"}, shows application code and metadata from a
-#'   \code{DESCRIPTION} file in the application directory alongside the
-#'   application. If set to \code{"normal"}, displays the application normally.
-#'   Defaults to \code{"auto"}, which displays the application in the mode
-#'   given in its \code{DESCRIPTION} file, if any.
-#'
-#' @examples
-#' \dontrun{
-#' # Start app in the current working directory
-#' runApp()
-#'
-#' # Start app in a subdirectory called myapp
-#' runApp("myapp")
-#' }
-#'
-#' \donttest{
-#' # Apps can be run without a server.r and ui.r file
-#' runApp(list(
-#'   ui = bootstrapPage(
-#'     numericInput('n', 'Number of obs', 100),
-#'     plotOutput('plot')
-#'   ),
-#'   server = function(input, output) {
-#'     output$plot <- renderPlot({ hist(runif(input$n)) })
-#'   }
-#' ))
-#' }
-#' @export
-runApp <- function(appDir=getwd(),
-                   port=NULL,
-                   launch.browser=getOption('shiny.launch.browser',
-                                            interactive()),
-                   host=getOption('shiny.host', '127.0.0.1'),
-                   workerId="", quiet=FALSE,
-                   display.mode=c("auto", "normal", "showcase")) {
-  on.exit({
-    handlerManager$clear()
-  }, add = TRUE)
-
-
-  if (is.null(host) || is.na(host))
-    host <- '0.0.0.0'
-
-  # Make warnings print immediately
-  ops <- options(warn = 1)
-  on.exit(options(ops), add = TRUE)
-
-  workerId(workerId)
-
-  if (nzchar(Sys.getenv('SHINY_PORT'))) {
-    # If SHINY_PORT is set, we're running under Shiny Server. Check the version
-    # to make sure it is compatible. Older versions of Shiny Server don't set
-    # SHINY_SERVER_VERSION, those will return "" which is considered less than
-    # any valid version.
-    ver <- Sys.getenv('SHINY_SERVER_VERSION')
-    if (compareVersion(ver, .shinyServerMinVersion) < 0) {
-      warning('Shiny Server v', .shinyServerMinVersion,
-              ' or later is required; please upgrade!')
-    }
-  }
-
-  # Showcase mode is disabled by default; it must be explicitly enabled in
-  # either the DESCRIPTION file for directory-based apps, or via
-  # the display.mode parameter. The latter takes precedence.
-  setShowcaseDefault(0)
-
-  # If appDir specifies a path, and display mode is specified in the
-  # DESCRIPTION file at that path, apply it here.
-  if (is.character(appDir)) {
-    desc <- file.path.ci(appDir, "DESCRIPTION")
-    if (file.exists(desc)) {
-      con <- file(desc, encoding = checkEncoding(desc))
-      on.exit(close(con), add = TRUE)
-      settings <- read.dcf(con)
-      if ("DisplayMode" %in% colnames(settings)) {
-        mode <- settings[1,"DisplayMode"]
-        if (mode == "Showcase") {
-          setShowcaseDefault(1)
-        }
-      }
-    }
-  }
-
-  # If display mode is specified as an argument, apply it (overriding the
-  # value specified in DESCRIPTION, if any).
-  display.mode <- match.arg(display.mode)
-  if (display.mode == "normal")
-    setShowcaseDefault(0)
-  else if (display.mode == "showcase")
-    setShowcaseDefault(1)
-
-  require(shiny)
-
-  # determine port if we need to
-  if (is.null(port)) {
-
-    # Try up to 20 random ports. If we don't succeed just plow ahead
-    # with the final value we tried, and let the "real" startServer
-    # somewhere down the line fail and throw the error to the user.
-    #
-    # If we (think we) succeed, save the value as .globals$lastPort,
-    # and try that first next time the user wants a random port.
-
-    for (i in 1:20) {
-      if (!is.null(.globals$lastPort)) {
-        port <- .globals$lastPort
-        .globals$lastPort <- NULL
-      }
-      else {
-        # Try up to 20 random ports
-        port <- p_randomInt(3000, 8000)
-      }
-
-      # Test port to see if we can use it
-      tmp <- try(startServer(host, port, list()), silent=TRUE)
-      if (!inherits(tmp, 'try-error')) {
-        stopServer(tmp)
-        .globals$lastPort <- port
-        break
-      }
-    }
-  }
-
-  appParts <- as.shiny.appobj(appDir)
-  if (!is.null(appParts$onStart))
-    appParts$onStart()
-  if (!is.null(appParts$onEnd))
-    on.exit(appParts$onEnd(), add = TRUE)
-
-  server <- startApp(appParts, port, host, quiet)
-
-  on.exit({
-    stopServer(server)
-  }, add = TRUE)
-
-  if (!is.character(port)) {
-    # http://0.0.0.0/ doesn't work on QtWebKit (i.e. RStudio viewer)
-    browseHost <- if (identical(host, "0.0.0.0")) "127.0.0.1" else host
-
-    appUrl <- paste("http://", browseHost, ":", port, sep="")
-    if (is.function(launch.browser))
-      launch.browser(appUrl)
-    else if (launch.browser)
-      utils::browseURL(appUrl)
-  } else {
-    appUrl <- NULL
-  }
-
-  # call application hooks
-  callAppHook("onAppStart", appUrl)
-  on.exit({
-    callAppHook("onAppStop", appUrl)
-  }, add = TRUE)
-
-  .globals$retval <- NULL
-  .globals$stopped <- FALSE
-  shinyCallingHandlers(
-    while (!.globals$stopped) {
-      serviceApp()
-      Sys.sleep(0.001)
-    }
-  )
-
-  return(.globals$retval)
-}
-
-#' Stop the currently running Shiny app
-#'
-#' Stops the currently running Shiny app, returning control to the caller of
-#' \code{\link{runApp}}.
-#'
-#' @param returnValue The value that should be returned from
-#'   \code{\link{runApp}}.
-#'
-#' @export
-stopApp <- function(returnValue = NULL) {
-  .globals$retval <- returnValue
-  .globals$stopped <- TRUE
-  httpuv::interrupt()
-}
-
-#' Run Shiny Example Applications
-#'
-#' Launch Shiny example applications, and optionally, your system's web browser.
-#'
-#' @param example The name of the example to run, or \code{NA} (the default) to
-#'   list the available examples.
-#' @param port The TCP port that the application should listen on. Defaults to
-#'   choosing a random port.
-#' @param launch.browser If true, the system's default web browser will be
-#'   launched automatically after the app is started. Defaults to true in
-#'   interactive sessions only.
-#' @param host The IPv4 address that the application should listen on. Defaults
-#'   to the \code{shiny.host} option, if set, or \code{"127.0.0.1"} if not.
-#' @param display.mode The mode in which to display the example. Defaults to
-#'   \code{showcase}, but may be set to \code{normal} to see the example without
-#'   code or commentary.
-#'
-#' @examples
-#' \donttest{
-#' # List all available examples
-#' runExample()
-#'
-#' # Run one of the examples
-#' runExample("01_hello")
-#'
-#' # Print the directory containing the code for all examples
-#' system.file("examples", package="shiny")
-#' }
-#' @export
-runExample <- function(example=NA,
-                       port=NULL,
-                       launch.browser=getOption('shiny.launch.browser',
-                                                interactive()),
-                       host=getOption('shiny.host', '127.0.0.1'),
-                       display.mode=c("auto", "normal", "showcase")) {
-  examplesDir <- system.file('examples', package='shiny')
-  dir <- resolve(examplesDir, example)
-  if (is.null(dir)) {
-    if (is.na(example)) {
-      errFun <- message
-      errMsg <- ''
-    }
-    else {
-      errFun <- stop
-      errMsg <- paste('Example', example, 'does not exist. ')
-    }
-
-    errFun(errMsg,
-           'Valid examples are "',
-           paste(list.files(examplesDir), collapse='", "'),
-           '"')
-  }
-  else {
-    runApp(dir, port = port, host = host, launch.browser = launch.browser,
-           display.mode = display.mode)
-  }
-}

R/shinyui.R

@@ -1,81 +1,189 @@
-#' @include globals.R
-NULL
 
-#' Load the MathJax library and typeset math expressions
-#'
-#' This function adds MathJax to the page and typeset the math expressions (if
-#' found) in the content \code{...}. It only needs to be called once in an app
-#' unless the content is rendered \emph{after} the page is loaded, e.g. via
-#' \code{\link{renderUI}}, in which case we have to call it explicitly every
-#' time we write math expressions to the output.
-#' @param ... any HTML elements to apply MathJax to
 #' @export
-#' @examples withMathJax(helpText("Some math here $$\\alpha+\\beta$$"))
-#' # now we can just write "static" content without withMathJax()
-#' div("more math here $$\\sqrt{2}$$")
-withMathJax <- function(...) {
-  path <- 'https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
-  tagList(
-    tags$head(
-      singleton(tags$script(src = path, type = 'text/javascript'))
-    ),
-    ...,
-    tags$script(HTML('MathJax.Hub.Queue(["Typeset", MathJax.Hub]);'))
-  )
+p <- function(...) tags$p(...)
+
+#' @export
+h1 <- function(...) tags$h1(...)
+
+#' @export
+h2 <- function(...) tags$h2(...)
+
+#' @export
+h3 <- function(...) tags$h3(...)
+
+#' @export
+h4 <- function(...) tags$h4(...)
+
+#' @export
+h5 <- function(...) tags$h5(...)
+
+#' @export
+h6 <- function(...) tags$h6(...)
+
+#' @export
+a <- function(...) tags$a(...)
+
+#' @export
+br <- function(...) tags$br(...)
+
+#' @export
+div <- function(...) tags$div(...)
+
+#' @export
+span <- function(...) tags$span(...)
+
+#' @export
+pre <- function(...) tags$pre(...)
+
+#' @export
+code <- function(...) tags$code(...)
+
+#' @export
+img <- function(...) tags$img(...)
+
+#' @export
+strong <- function(...) tags$strong(...)
+
+#' @export
+em <- function(...) tags$em(...)
+
+#' Include Content From a File
+#' 
+#' Include HTML, text, or rendered Markdown into a \link[=shinyUI]{Shiny UI}.
+#' 
+#' These functions provide a convenient way to include an extensive amount of 
+#' HTML, textual, Markdown, CSS, or JavaScript content, rather than using a
+#' large literal R string.
+#' 
+#' @note \code{includeText} escapes its contents, but does no other processing. 
+#'   This means that hard breaks and multiple spaces will be rendered as they 
+#'   usually are in HTML: as a single space character. If you are looking for 
+#'   preformatted text, wrap the call with \code{\link{pre}}, or consider using 
+#'   \code{includeMarkdown} instead.
+#'   
+#' @note The \code{includeMarkdown} function requires the \code{markdown} 
+#'   package.
+#'   
+#' @param path The path of the file to be included. It is highly recommended to 
+#'   use a relative path (the base path being the Shiny application directory), 
+#'   not an absolute path.
+#'   
+#' @rdname include
+#' @export
+includeHTML <- function(path) {
+  dependsOnFile(path)
+  lines <- readLines(path, warn=FALSE, encoding='UTF-8')
+  return(HTML(paste(lines, collapse='\r\n')))
 }
 
-renderPage <- function(ui, connection, showcase=0) {
+#' @rdname include
+#' @export
+includeText <- function(path) {
+  dependsOnFile(path)
+  lines <- readLines(path, warn=FALSE, encoding='UTF-8')
+  return(paste(lines, collapse='\r\n'))
+}
 
-  if (showcase > 0)
-    ui <- tagList(tags$head(showcaseHead()), ui)
+#' @rdname include
+#' @export
+includeMarkdown <- function(path) {
+  if (!require(markdown))
+    stop("Markdown package is not installed")
+  
+  dependsOnFile(path)
+  html <- markdown::markdownToHTML(path, fragment.only=TRUE)
+  Encoding(html) <- 'UTF-8'
+  return(HTML(html))
+}
 
-  result <- renderTags(ui)
+#' @param ... Any additional attributes to be applied to the generated tag.
+#' @rdname include
+#' @export
+includeCSS <- function(path, ...) {
+  dependsOnFile(path)
+  lines <- readLines(path, warn=FALSE, encoding='UTF-8')
+  args <- list(...)
+  if (is.null(args$type))
+    args$type <- 'text/css'
+  return(do.call(tags$style,
+                 c(list(HTML(paste(lines, collapse='\r\n'))), args)))
+}
 
-  deps <- c(
-    list(
-      htmlDependency("json2", "2014.02.04", c(href="shared"), script = "json2-min.js"),
-      htmlDependency("jquery", "1.11.0", c(href="shared"), script = "jquery.js"),
-      htmlDependency("shiny", packageVersion("shiny"), c(href="shared"),
-        script = "shiny.js", stylesheet = "shiny.css")
-    ),
-    result$dependencies
-  )
-  deps <- resolveDependencies(deps)
-  deps <- lapply(deps, createWebDependency)
-  depStr <- paste(sapply(deps, function(dep) {
-    sprintf("%s[%s]", dep$name, dep$version)
-  }), collapse = ";")
-  depHtml <- renderDependencies(deps, "href")
+#' @rdname include
+#' @export
+includeScript <- function(path, ...) {
+  dependsOnFile(path)
+  lines <- readLines(path, warn=FALSE, encoding='UTF-8')
+  return(tags$script(HTML(paste(lines, collapse='\r\n')), ...))
+}
 
+
+#' Include Content Only Once
+#' 
+#' Use \code{singleton} to wrap contents (tag, text, HTML, or lists) that should
+#' be included in the generated document only once, yet may appear in the 
+#' document-generating code more than once. Only the first appearance of the 
+#' content (in document order) will be used. Useful for custom components that 
+#' have JavaScript files or stylesheets.
+#' 
+#' @param x A \code{\link{tag}}, text, \code{\link{HTML}}, or list.
+#'
+#' @export
+singleton <- function(x) {
+  class(x) <- c(class(x), 'shiny.singleton')
+  return(x)
+}
+
+renderPage <- function(ui, connection) {
+  
+  # provide a filter so we can intercept head tag requests
+  context <- new.env()
+  context$head <- character()
+  context$singletons <- character()
+  context$filter <- function(content) {
+    if (inherits(content, 'shiny.singleton')) {
+      sig <- digest(content, algo='sha1')
+      if (sig %in% context$singletons)
+        return(FALSE)
+      context$singletons <- c(sig, context$singletons)
+    }
+    
+    if (isTag(content) && identical(content$name, "head")) {
+      textConn <- textConnection(NULL, "w") 
+      textConnWriter <- function(text) cat(text, file = textConn)
+      tagWrite(content$children, textConnWriter, 1, context)
+      context$head <- append(context$head, textConnectionValue(textConn))
+      close(textConn)
+      return (FALSE)
+    }
+    else {
+      return (TRUE)
+    }
+  }
+  
+  # write ui HTML to a character vector
+  textConn <- textConnection(NULL, "w") 
+  tagWrite(ui, function(text) cat(text, file = textConn), 0, context)
+  uiHTML <- textConnectionValue(textConn)
+  close(textConn)
+ 
   # write preamble
   writeLines(c('<!DOCTYPE html>',
                '<html>',
                '<head>',
                '  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>',
-               sprintf('  <script type="application/shiny-singletons">%s</script>',
-                       paste(result$singletons, collapse = ',')
-               ),
-               sprintf('  <script type="application/html-dependencies">%s</script>',
-                       depStr
-               ),
-               depHtml
-              ),
-              con = connection)
-  writeLines(c(result$head,
+               '  <script src="shared/jquery.js" type="text/javascript"></script>',
+               '  <script src="shared/shiny.js" type="text/javascript"></script>',
+               '  <link rel="stylesheet" type="text/css" href="shared/shiny.css"/>',
+               context$head,
                '</head>',
-               '<body>',
+               '<body>', 
                recursive=TRUE),
              con = connection)
-
-  if (showcase > 0) {
-    # in showcase mode, emit containing elements and app HTML
-    writeLines(as.character(showcaseBody(result$html)),
-               con = connection)
-  } else {
-    # in normal mode, write UI html directly to connection
-    writeLines(result$html, con = connection)
-  }
-
+  
+  # write UI html to connection
+  writeLines(uiHTML, con = connection)
+  
   # write end document
   writeLines(c('</body>',
                '</html>'),
@@ -83,55 +191,62 @@ renderPage <- function(ui, connection, showcase=0) {
 }
 
 #' Create a Shiny UI handler
-#'
-#' Historically this function was used in ui.R files to register a user
-#' interface with Shiny. It is no longer required; simply ensure that the last
-#' expression to be returned from ui.R is a user interface. This function is
-#' kept for backwards compatibility with older applications. It returns the
-#' value that is passed to it.
-#'
-#' @param ui A user interace definition
-#' @return The user interface definition, without modifications or side effects.
+#' 
+#' Register a UI handler by providing a UI definition (created with e.g. 
+#' \link{pageWithSidebar}) and web server path (typically "/", the default
+#' value).
+#' 
+#' @param ui A user-interace definition
+#' @param path The web server path to server the UI from
+#' @return Called for its side-effect of registering a UI handler
+#' 
+#' @examples
+#' el <- div(HTML("I like <u>turtles</u>"))
+#' cat(as.character(el))
+#'   
+#' @examples
+#' # Define UI
+#' shinyUI(pageWithSidebar(
+#'   
+#'   # Application title
+#'   headerPanel("Hello Shiny!"),
+#'   
+#'   # Sidebar with a slider input
+#'   sidebarPanel(
+#'     sliderInput("obs", 
+#'                 "Number of observations:", 
+#'                 min = 0, 
+#'                 max = 1000, 
+#'                 value = 500)
+#'   ),
+#'   
+#'   # Show a plot of the generated distribution
+#'   mainPanel(
+#'     plotOutput("distPlot")
+#'   )
+#' ))
 #'
 #' @export
-shinyUI <- function(ui) {
-  .globals$ui <- list(ui)
-  ui
-}
-
-uiHttpHandler <- function(ui, uiPattern = "^/$") {
-
+shinyUI <- function(ui, path='/') {
+  
   force(ui)
+  
+  registerClient({
+    
+    function(req) {
+      if (!identical(req$REQUEST_METHOD, 'GET'))
+        return(NULL)
 
-  function(req) {
-    if (!identical(req$REQUEST_METHOD, 'GET'))
-      return(NULL)
-
-    if (!isTRUE(grepl(uiPattern, req$PATH_INFO)))
-      return(NULL)
-
-    textConn <- textConnection(NULL, "w")
-    on.exit(close(textConn))
-
-    showcaseMode <- .globals$showcaseDefault
-    if (.globals$showcaseOverride) {
-      mode <- showcaseModeOfReq(req)
-      if (!is.null(mode))
-        showcaseMode <- mode
+      if (req$PATH_INFO != path)
+        return(NULL)
+      
+      textConn <- textConnection(NULL, "w") 
+      on.exit(close(textConn))
+      
+      renderPage(ui, textConn)
+      html <- paste(textConnectionValue(textConn), collapse='\n')
+      return(httpResponse(200, content=html))
     }
-    uiValue <- if (is.function(ui)) {
-      if (length(formals(ui)) > 0)
-        ui(req)
-      else
-        ui()
-    } else {
-      ui
-    }
-    if (is.null(uiValue))
-      return(NULL)
-
-    renderPage(uiValue, textConn, showcaseMode)
-    html <- paste(textConnectionValue(textConn), collapse='\n')
-    return(httpResponse(200, content=enc2utf8(html)))
-  }
+  })
 }
+

R/shinywrappers.R

@@ -1,48 +1,13 @@
-globalVariables('func')
-
-#' Mark a function as a render function
-#'
-#' Should be called by implementers of \code{renderXXX} functions in order to
-#' mark their return values as Shiny render functions, and to provide a hint to
-#' Shiny regarding what UI function is most commonly used with this type of
-#' render function. This can be used in R Markdown documents to create complete
-#' output widgets out of just the render function.
-#'
-#' @param uiFunc A function that renders Shiny UI. Must take a single argument:
-#'   an output ID.
-#' @param renderFunc A function that is suitable for assigning to a Shiny output
-#'   slot.
-#' @return The \code{renderFunc} function, with annotations.
-#'
-#' @export
-markRenderFunction <- function(uiFunc, renderFunc) {
-  structure(renderFunc,
-            class      = c("shiny.render.function", "function"),
-            outputFunc = uiFunc)
-}
-
-useRenderFunction <- function(renderFunc, inline = FALSE) {
-  outputFunction <- attr(renderFunc, "outputFunc")
-  id <- createUniqueId(8, "out")
-  o <- getDefaultReactiveDomain()$output
-  if (!is.null(o))
-    o[[id]] <- renderFunc
-  if (is.logical(formals(outputFunction)[["inline"]])) {
-    outputFunction(id, inline = inline)
-  } else outputFunction(id)
-}
-
-#' @export
-#' @method as.tags shiny.render.function
-as.tags.shiny.render.function <- function(x, ..., inline = FALSE) {
-  useRenderFunction(x, inline = inline)
-}
+suppressPackageStartupMessages({
+  library(caTools)
+  library(xtable)
+})
 
 #' Plot Output
-#'
-#' Renders a reactive plot that is suitable for assigning to an \code{output}
+#' 
+#' Renders a reactive plot that is suitable for assigning to an \code{output} 
 #' slot.
-#'
+#' 
 #' The corresponding HTML output tag should be \code{div} or \code{img} and have
 #' the CSS class name \code{shiny-plot-output}.
 #'
@@ -50,35 +15,39 @@ as.tags.shiny.render.function <- function(x, ..., inline = FALSE) {
 #'   the output, see \code{\link{plotPNG}}.
 #'
 #' @param expr An expression that generates a plot.
-#' @param width,height The width/height of the rendered plot, in pixels; or
-#'   \code{'auto'} to use the \code{offsetWidth}/\code{offsetHeight} of the HTML
-#'   element that is bound to this plot. You can also pass in a function that
-#'   returns the width/height in pixels or \code{'auto'}; in the body of the
-#'   function you may reference reactive values and functions. When rendering an
-#'   inline plot, you must provide numeric values (in pixels) to both
-#'   \code{width} and \code{height}.
+#' @param width The width of the rendered plot, in pixels; or \code{'auto'} to 
+#'   use the \code{offsetWidth} of the HTML element that is bound to this plot. 
+#'   You can also pass in a function that returns the width in pixels or 
+#'   \code{'auto'}; in the body of the function you may reference reactive 
+#'   values and functions.
+#' @param height The height of the rendered plot, in pixels; or \code{'auto'} to
+#'   use the \code{offsetHeight} of the HTML element that is bound to this plot.
+#'   You can also pass in a function that returns the width in pixels or 
+#'   \code{'auto'}; in the body of the function you may reference reactive 
+#'   values and functions.
 #' @param res Resolution of resulting plot, in pixels per inch. This value is
 #'   passed to \code{\link{png}}. Note that this affects the resolution of PNG
 #'   rendering in R; it won't change the actual ppi of the browser.
-#' @param ... Arguments to be passed through to \code{\link[grDevices]{png}}.
+#' @param ... Arguments to be passed through to \code{\link[grDevices]{png}}. 
 #'   These can be used to set the width, height, background color, etc.
 #' @param env The environment in which to evaluate \code{expr}.
 #' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
 #'   is useful if you want to save an expression in a variable.
 #' @param func A function that generates a plot (deprecated; use \code{expr}
 #'   instead).
-#'
+#'   
 #' @export
 renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
                        env=parent.frame(), quoted=FALSE, func=NULL) {
   if (!is.null(func)) {
     shinyDeprecated(msg="renderPlot: argument 'func' is deprecated. Please use 'expr' instead.")
   } else {
-    installExprFunction(expr, "func", env, quoted)
+    func <- exprToFunction(expr, env, quoted)
   }
 
-  args <- list(...)
 
+  args <- list(...)
+  
   if (is.function(width))
     widthWrapper <- reactive({ width() })
   else
@@ -89,28 +58,21 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
   else
     heightWrapper <- NULL
 
-  # If renderPlot isn't going to adapt to the height of the div, then the
-  # div needs to adapt to the height of renderPlot. By default, plotOutput
-  # sets the height to 400px, so to make it adapt we need to override it
-  # with NULL.
-  outputFunc <- plotOutput
-  if (!identical(height, 'auto')) formals(outputFunc)['height'] <- list(NULL)
-
-  return(markRenderFunction(outputFunc, function(shinysession, name, ...) {
+  return(function(shinysession, name, ...) {
     if (!is.null(widthWrapper))
       width <- widthWrapper()
     if (!is.null(heightWrapper))
       height <- heightWrapper()
-
+    
     # Note that these are reactive calls. A change to the width and height
-    # will inherently cause a reactive plot to redraw (unless width and
+    # will inherently cause a reactive plot to redraw (unless width and 
     # height were explicitly specified).
     prefix <- 'output_'
     if (width == 'auto')
       width <- shinysession$clientData[[paste(prefix, name, '_width', sep='')]];
     if (height == 'auto')
       height <- shinysession$clientData[[paste(prefix, name, '_height', sep='')]];
-
+    
     if (is.null(width) || is.null(height) || width <= 0 || height <= 0)
       return(NULL)
 
@@ -119,63 +81,20 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
     if (is.null(pixelratio))
       pixelratio <- 1
 
-    coordmap <- NULL
-    plotFunc <- function() {
-      # Actually perform the plotting
-      result <- withVisible(func())
-      if (result$visible) {
-        # Use capture.output to squelch printing to the actual console; we
-        # are only interested in plot output
-        capture.output(print(result$value))
-      }
-
-      # Now capture some graphics device info before we close it
-      usrCoords <- par('usr')
-      usrBounds <- usrCoords
-      if (par('xlog')) {
-        usrBounds[c(1,2)] <- 10 ^ usrBounds[c(1,2)]
-      }
-      if (par('ylog')) {
-        usrBounds[c(3,4)] <- 10 ^ usrBounds[c(3,4)]
-      }
-
-      coordmap <<- list(
-        usr = c(
-          left = usrCoords[1],
-          right = usrCoords[2],
-          bottom = usrCoords[3],
-          top = usrCoords[4]
-        ),
-        # The bounds of the plot area, in DOM pixels
-        bounds = c(
-          left = grconvertX(usrBounds[1], 'user', 'nfc') * width,
-          right = grconvertX(usrBounds[2], 'user', 'nfc') * width,
-          bottom = (1-grconvertY(usrBounds[3], 'user', 'nfc')) * height,
-          top = (1-grconvertY(usrBounds[4], 'user', 'nfc')) * height
-        ),
-        log = c(
-          x = par('xlog'),
-          y = par('ylog')
-        ),
-        pixelratio = pixelratio
-      )
-    }
-
-    outfile <- do.call(plotPNG, c(plotFunc, width=width*pixelratio,
+    outfile <- do.call(plotPNG, c(func, width=width*pixelratio,
                                   height=height*pixelratio, res=res*pixelratio, args))
     on.exit(unlink(outfile))
-
+    
     # Return a list of attributes for the img
     return(list(
       src=shinysession$fileUrl(name, outfile, contentType='image/png'),
-      width=width, height=height, coordmap=coordmap
-    ))
-  }))
+      width=width, height=height))
+  })
 }
 
 #' Image file output
 #'
-#' Renders a reactive image that is suitable for assigning to an \code{output}
+#' Renders a reactive image that is suitable for assigning to an \code{output} 
 #' slot.
 #'
 #' The expression \code{expr} must return a list containing the attributes for
@@ -201,7 +120,7 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
 #' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
 #'   is useful if you want to save an expression in a variable.
 #' @param deleteFile Should the file in \code{func()$src} be deleted after
-#'   it is sent to the client browser? Generally speaking, if the image is a
+#'   it is sent to the client browser? Genrrally speaking, if the image is a
 #'   temp file generated within \code{func}, then this should be \code{TRUE};
 #'   if the image is not a temp file, this should be \code{FALSE}.
 #'
@@ -263,9 +182,9 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
 #' }
 renderImage <- function(expr, env=parent.frame(), quoted=FALSE,
                         deleteFile=TRUE) {
-  installExprFunction(expr, "func", env, quoted)
+  func <- exprToFunction(expr, env, quoted)
 
-  return(markRenderFunction(imageOutput, function(shinysession, name, ...) {
+  return(function(shinysession, name, ...) {
     imageinfo <- func()
     # Should the file be deleted after being sent? If .deleteFile not set or if
     # TRUE, then delete; otherwise don't delete.
@@ -286,114 +205,115 @@ renderImage <- function(expr, env=parent.frame(), quoted=FALSE,
     # Return a list with src, and other img attributes
     c(src = shinysession$fileUrl(name, file=imageinfo$src, contentType=contentType),
       extra_attr)
-  }))
+  })
 }
 
 
 #' Table Output
-#'
-#' Creates a reactive table that is suitable for assigning to an \code{output}
+#' 
+#' Creates a reactive table that is suitable for assigning to an \code{output} 
 #' slot.
-#'
+#' 
 #' The corresponding HTML output tag should be \code{div} and have the CSS class
 #' name \code{shiny-html-output}.
-#'
-#' @param expr An expression that returns an R object that can be used with
+#' 
+#' @param expr An expression that returns an R object that can be used with 
 #'   \code{\link[xtable]{xtable}}.
 #' @param ... Arguments to be passed through to \code{\link[xtable]{xtable}} and
 #'   \code{\link[xtable]{print.xtable}}.
 #' @param env The environment in which to evaluate \code{expr}.
 #' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
 #'   is useful if you want to save an expression in a variable.
-#' @param func A function that returns an R object that can be used with
+#' @param func A function that returns an R object that can be used with 
 #'   \code{\link[xtable]{xtable}} (deprecated; use \code{expr} instead).
-#'
+#'   
 #' @export
 renderTable <- function(expr, ..., env=parent.frame(), quoted=FALSE, func=NULL) {
   if (!is.null(func)) {
     shinyDeprecated(msg="renderTable: argument 'func' is deprecated. Please use 'expr' instead.")
   } else {
-    installExprFunction(expr, "func", env, quoted)
+    func <- exprToFunction(expr, env, quoted)
   }
 
-  markRenderFunction(tableOutput, function() {
-    classNames <- getOption('shiny.table.class') %OR% 'data table table-bordered table-condensed'
+  function() {
+    classNames <- getOption('shiny.table.class', 'data table table-bordered table-condensed')
     data <- func()
 
     if (is.null(data) || identical(data, data.frame()))
       return("")
-
+    
     return(paste(
       capture.output(
-        print(xtable(data, ...),
-              type='html',
+        print(xtable(data, ...), 
+              type='html', 
               html.table.attributes=paste('class="',
                                           htmlEscape(classNames, TRUE),
                                           '"',
                                           sep=''), ...)),
       collapse="\n"))
-  })
+  }
 }
 
 #' Printable Output
-#'
-#' Makes a reactive version of the given function that captures any printed
-#' output, and also captures its printable result (unless
-#' \code{\link{invisible}}), into a string. The resulting function is suitable
+#' 
+#' Makes a reactive version of the given function that captures any printed 
+#' output, and also captures its printable result (unless 
+#' \code{\link{invisible}}), into a string. The resulting function is suitable 
 #' for assigning to an  \code{output} slot.
-#'
-#' The corresponding HTML output tag can be anything (though \code{pre} is
+#' 
+#' The corresponding HTML output tag can be anything (though \code{pre} is 
 #' recommended if you need a monospace font and whitespace preserved) and should
 #' have the CSS class name \code{shiny-text-output}.
-#'
-#' The result of executing \code{func} will be printed inside a
+#' 
+#' The result of executing \code{func} will be printed inside a 
 #' \code{\link[utils]{capture.output}} call.
-#'
-#' Note that unlike most other Shiny output functions, if the given function
-#' returns \code{NULL} then \code{NULL} will actually be visible in the output.
+#' 
+#' Note that unlike most other Shiny output functions, if the given function 
+#' returns \code{NULL} then \code{NULL} will actually be visible in the output. 
 #' To display nothing, make your function return \code{\link{invisible}()}.
-#'
-#' @param expr An expression that may print output and/or return a printable R
+#' 
+#' @param expr An expression that may print output and/or return a printable R 
 #'   object.
 #' @param env The environment in which to evaluate \code{expr}.
 #' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
-#' @param func A function that may print output and/or return a printable R
+#' @param func A function that may print output and/or return a printable R 
 #'   object (deprecated; use \code{expr} instead).
-#' @param width The value for \code{\link{options}('width')}.
-#' @seealso \code{\link{renderText}} for displaying the value returned from a
+#'   
+#' @seealso \code{\link{renderText}} for displaying the value returned from a 
 #'   function, instead of the printed output.
 #'
 #' @example res/text-example.R
-#'
+#'   
 #' @export
-renderPrint <- function(expr, env = parent.frame(), quoted = FALSE, func = NULL,
-                        width = getOption('width')) {
+renderPrint <- function(expr, env=parent.frame(), quoted=FALSE, func=NULL) {
   if (!is.null(func)) {
     shinyDeprecated(msg="renderPrint: argument 'func' is deprecated. Please use 'expr' instead.")
   } else {
-    installExprFunction(expr, "func", env, quoted)
+    func <- exprToFunction(expr, env, quoted)
   }
 
-  markRenderFunction(verbatimTextOutput, function() {
-    op <- options(width = width)
-    on.exit(options(op), add = TRUE)
-    paste(capture.output(func()), collapse = "\n")
-  })
+  function() {
+    return(paste(capture.output({
+      result <- withVisible(func())
+      if (result$visible)
+        print(result$value)
+    }), collapse="\n"))
+  }
 }
 
 #' Text Output
-#'
-#' Makes a reactive version of the given function that also uses
-#' \code{\link[base]{cat}} to turn its result into a single-element character
+#' 
+#' Makes a reactive version of the given function that also uses 
+#' \code{\link[base]{cat}} to turn its result into a single-element character 
 #' vector.
-#'
-#' The corresponding HTML output tag can be anything (though \code{pre} is
+#' 
+#' The corresponding HTML output tag can be anything (though \code{pre} is 
 #' recommended if you need a monospace font and whitespace preserved) and should
 #' have the CSS class name \code{shiny-text-output}.
-#'
-#' The result of executing \code{func} will passed to \code{cat}, inside a
+#' 
+#' The result of executing \code{func} will passed to \code{cat}, inside a 
 #' \code{\link[utils]{capture.output}} call.
-#'
+#' 
 #' @param expr An expression that returns an R object that can be used as an
 #'   argument to \code{cat}.
 #' @param env The environment in which to evaluate \code{expr}.
@@ -401,50 +321,50 @@ renderPrint <- function(expr, env = parent.frame(), quoted = FALSE, func = NULL,
 #'   is useful if you want to save an expression in a variable.
 #' @param func A function that returns an R object that can be used as an
 #'   argument to \code{cat}.(deprecated; use \code{expr} instead).
-#'
+#'   
 #' @seealso \code{\link{renderPrint}} for capturing the print output of a
 #'   function, rather than the returned text value.
 #'
 #' @example res/text-example.R
-#'
+#'   
 #' @export
 renderText <- function(expr, env=parent.frame(), quoted=FALSE, func=NULL) {
   if (!is.null(func)) {
     shinyDeprecated(msg="renderText: argument 'func' is deprecated. Please use 'expr' instead.")
   } else {
-    installExprFunction(expr, "func", env, quoted)
+    func <- exprToFunction(expr, env, quoted)
   }
 
-  markRenderFunction(textOutput, function() {
+  function() {
     value <- func()
     return(paste(capture.output(cat(value)), collapse="\n"))
-  })
+  }
 }
 
 #' UI Output
-#'
+#' 
 #' \bold{Experimental feature.} Makes a reactive version of a function that
 #' generates HTML using the Shiny UI library.
-#'
+#' 
 #' The corresponding HTML output tag should be \code{div} and have the CSS class
 #' name \code{shiny-html-output} (or use \code{\link{uiOutput}}).
-#'
-#' @param expr An expression that returns a Shiny tag object, \code{\link{HTML}},
+#' 
+#' @param expr An expression that returns a Shiny tag object, \code{\link{HTML}}, 
 #'   or a list of such objects.
 #' @param env The environment in which to evaluate \code{expr}.
 #' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
 #'   is useful if you want to save an expression in a variable.
-#' @param func A function that returns a Shiny tag object, \code{\link{HTML}},
+#' @param func A function that returns a Shiny tag object, \code{\link{HTML}}, 
 #'   or a list of such objects (deprecated; use \code{expr} instead).
-#'
+#'   
 #' @seealso conditionalPanel
-#'
+#'   
 #' @export
 #' @examples
 #' \dontrun{
 #'   output$moreControls <- renderUI({
 #'     list(
-#'
+#'       
 #'     )
 #'   })
 #' }
@@ -452,54 +372,42 @@ renderUI <- function(expr, env=parent.frame(), quoted=FALSE, func=NULL) {
   if (!is.null(func)) {
     shinyDeprecated(msg="renderUI: argument 'func' is deprecated. Please use 'expr' instead.")
   } else {
-    installExprFunction(expr, "func", env, quoted)
+    func <- exprToFunction(expr, env, quoted)
   }
 
-  markRenderFunction(uiOutput, function(shinysession, name, ...) {
+  function() {
     result <- func()
     if (is.null(result) || length(result) == 0)
       return(NULL)
-
-    result <- takeSingletons(result, shinysession$singletons, desingleton=FALSE)$ui
-    result <- surroundSingletons(result)
-    dependencies <- lapply(resolveDependencies(findDependencies(result)),
-      createWebDependency)
-    names(dependencies) <- NULL
-
-    # renderTags returns a list with head, singletons, and html
-    output <- list(
-      html = doRenderTags(result),
-      deps = dependencies
-    )
-
-    return(output)
-  })
+    # Wrap result in tagList in case it is an ordinary list
+    return(as.character(tagList(result)))
+  }
 }
 
 #' File Downloads
-#'
+#' 
 #' Allows content from the Shiny application to be made available to the user as
-#' file downloads (for example, downloading the currently visible data as a CSV
-#' file). Both filename and contents can be calculated dynamically at the time
-#' the user initiates the download. Assign the return value to a slot on
-#' \code{output} in your server function, and in the UI use
+#' file downloads (for example, downloading the currently visible data as a CSV 
+#' file). Both filename and contents can be calculated dynamically at the time 
+#' the user initiates the download. Assign the return value to a slot on 
+#' \code{output} in your server function, and in the UI use 
 #' \code{\link{downloadButton}} or \code{\link{downloadLink}} to make the
 #' download available.
-#'
-#' @param filename A string of the filename, including extension, that the
-#'   user's web browser should default to when downloading the file; or a
-#'   function that returns such a string. (Reactive values and functions may be
+#' 
+#' @param filename A string of the filename, including extension, that the 
+#'   user's web browser should default to when downloading the file; or a 
+#'   function that returns such a string. (Reactive values and functions may be 
 #'   used from this function.)
-#' @param content A function that takes a single argument \code{file} that is a
+#' @param content A function that takes a single argument \code{file} that is a 
 #'   file path (string) of a nonexistent temp file, and writes the content to
 #'   that file path. (Reactive values and functions may be used from this
 #'   function.)
-#' @param contentType A string of the download's
-#'   \href{http://en.wikipedia.org/wiki/Internet_media_type}{content type}, for
-#'   example \code{"text/csv"} or \code{"image/png"}. If \code{NULL} or
-#'   \code{NA}, the content type will be guessed based on the filename
+#' @param contentType A string of the download's 
+#'   \href{http://en.wikipedia.org/wiki/Internet_media_type}{content type}, for 
+#'   example \code{"text/csv"} or \code{"image/png"}. If \code{NULL} or 
+#'   \code{NA}, the content type will be guessed based on the filename 
 #'   extension, or \code{application/octet-stream} if the extension is unknown.
-#'
+#'   
 #' @examples
 #' \dontrun{
 #' # In server.R:
@@ -511,105 +419,18 @@ renderUI <- function(expr, env=parent.frame(), quoted=FALSE, func=NULL) {
 #'     write.csv(data, file)
 #'   }
 #' )
-#'
+#' 
 #' # In ui.R:
 #' downloadLink('downloadData', 'Download')
 #' }
-#'
+#' 
 #' @export
 downloadHandler <- function(filename, content, contentType=NA) {
-  return(markRenderFunction(downloadButton, function(shinysession, name, ...) {
+  return(function(shinysession, name, ...) {
     shinysession$registerDownload(name, filename, contentType, content)
-  }))
-}
-
-#' Table output with the JavaScript library DataTables
-#'
-#' Makes a reactive version of the given function that returns a data frame (or
-#' matrix), which will be rendered with the DataTables library. Paging,
-#' searching, filtering, and sorting can be done on the R side using Shiny as
-#' the server infrastructure.
-#'
-#' For the \code{options} argument, the character elements that have the class
-#' \code{"AsIs"} (usually returned from \code{\link{I}()}) will be evaluated in
-#' JavaScript. This is useful when the type of the option value is not supported
-#' in JSON, e.g., a JavaScript function, which can be obtained by evaluating a
-#' character string.
-#' @param expr An expression that returns a data frame or a matrix.
-#' @param options A list of initialization options to be passed to DataTables,
-#'   or a function to return such a list.
-#' @param searchDelay The delay for searching, in milliseconds (to avoid too
-#'   frequent search requests).
-#' @param callback A JavaScript function to be applied to the DataTable object.
-#'   This is useful for DataTables plug-ins, which often require the DataTable
-#'   instance to be available (\url{http://datatables.net/extensions/}).
-#' @references \url{http://datatables.net}
-#' @export
-#' @inheritParams renderPlot
-#' @examples  # pass a callback function to DataTables using I()
-#' renderDataTable(iris,
-#'   options = list(
-#'     pageLength = 5,
-#'     initComplete = I("function(settings, json) {alert('Done.');}")
-#'   )
-#' )
-renderDataTable <- function(expr, options = NULL, searchDelay = 500,
-                            callback = 'function(oTable) {}',
-                            env = parent.frame(), quoted = FALSE) {
-  installExprFunction(expr, "func", env, quoted)
-
-  markRenderFunction(dataTableOutput, function(shinysession, name, ...) {
-    if (is.function(options)) options <- options()
-    options <- checkDT9(options)
-    res <- checkAsIs(options)
-    data <- func()
-    if (length(dim(data)) != 2) return() # expects a rectangular data object
-    action <- shinysession$registerDataObj(name, data, dataTablesJSON)
-    list(
-      colnames = colnames(data), action = action, options = res$options,
-      evalOptions = if (length(res$eval)) I(res$eval), searchDelay = searchDelay,
-      callback = paste(callback, collapse = '\n')
-    )
   })
 }
 
-# a data frame containing the DataTables 1.9 and 1.10 names
-DT10Names <- function() {
-  rbind(
-    read.table(system.file('www/shared/datatables/upgrade1.10.txt', package = 'shiny'),
-               stringsAsFactors = FALSE),
-    c('aoColumns', 'Removed')  # looks like an omission on the upgrade guide
-  )
-}
-
-# check DataTables 1.9.x options, and give instructions for upgrading to 1.10.x
-checkDT9 <- function(options) {
-  nms <- names(options)
-  if (length(nms) == 0L) return(options)
-  DT10 <- DT10Names()
-  # e.g. the top level option name for oLanguage.sSearch should be oLanguage
-  i <- nms %in% gsub('[.].*', '', DT10[, 1])
-  if (!any(i)) return(options)  # did not see old option names, ready to go!
-  msg <- paste(
-    'shiny (>= 0.10.2) has upgraded DataTables from 1.9.4 to 1.10.2, ',
-    'and DataTables 1.10.x uses different parameter names with 1.9.x. ',
-    'Please follow the upgrade guide https://datatables.net/upgrade/1.10-convert',
-    ' to change your DataTables parameter names:\n\n',
-    paste(formatUL(nms[i]), collapse = '\n'), '\n', sep = ''
-  )
-  j <- gsub('[.].*', '', DT10[, 1]) %in% nms
-  # I cannot help you upgrade automatically in these cases, so I have to stop
-  if (any(grepl('[.]', DT10[j, 1])) || any(grepl('[.]', DT10[j, 2]))) stop(msg)
-  warning(msg)
-  nms10 <- DT10[match(nms[i], DT10[, 1]), 2]
-  if (any(nms10 == 'Removed')) stop(
-    "These parameters have been removed in DataTables 1.10.x:\n\n",
-    paste(formatUL(nms[i][nms10 == 'Removed']), collapse = '\n'),
-    "\n\n", msg
-  )
-  names(options)[i] <- nms10
-  options
-}
 
 # Deprecated functions ------------------------------------------------------
 

R/showcase.R

@@ -1,164 +0,0 @@
-#' @include globals.R
-NULL
-
-# Given the name of a license, return the appropriate link HTML for the
-# license, which may just be the name of the license if the name is
-# unrecognized.
-#
-# Recognizes the 'standard' set of licenses used for R packages
-# (see http://cran.r-project.org/doc/manuals/R-exts.html)
-licenseLink <- function(licenseName) {
-  licenses <- list(
-    "GPL-2" = "https://gnu.org/licenses/gpl-2.0.txt",
-    "GPL-3" = "https://gnu.org/licenses/gpl-3.0.txt",
-    "LGPL-3" = "https://www.gnu.org/licenses/lgpl-3.0.txt",
-    "LGPL-2" = "http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt",
-    "LGPL-2.1" = "http://www.gnu.org/licenses/lgpl-2.1.txt",
-    "AGPL-3" = "http://www.gnu.org/licenses/agpl-3.0.txt",
-    "Artistic-2.0" = "http://www.r-project.org/Licenses/Artistic-2.0",
-    "BSD_2_clause" = "http://www.r-project.org/Licenses/BSD_2_clause",
-    "BSD_3_clause" = "http://www.r-project.org/Licenses/BSD_3_clause",
-    "MIT" = "http://www.r-project.org/Licenses/MIT")
-  if (exists(licenseName, where = licenses)) {
-    tags$a(href=licenses[[licenseName]], licenseName)
-  } else {
-    licenseName
-  }
-}
-
-# Returns tags containing showcase directives intended for the <HEAD> of the
-# document.
-showcaseHead <- function() {
-
-  deps  <- list(
-    htmlDependency("jqueryui", "1.10.4", c(href="shared/jqueryui/1.10.4"),
-      script = "jquery-ui.min.js"),
-    htmlDependency("showdown", "0.3.1", c(href="shared/showdown/compressed"),
-      script = "showdown.js"),
-    htmlDependency("font-awesome", "4.0.3", c(href="shared/font-awesome"),
-      stylesheet = "css/font-awesome.min.css"),
-    htmlDependency("highlight.js", "6.2", c(href="shared/highlight"),
-      script = "highlight.pack.js")
-  )
-
-  mdfile <- file.path.ci(getwd(), 'Readme.md')
-  html <- with(tags, tagList(
-    script(src="shared/shiny-showcase.js"),
-    link(rel="stylesheet", type="text/css",
-         href="shared/highlight/rstudio.css"),
-    link(rel="stylesheet", type="text/css",
-         href="shared/shiny-showcase.css"),
-    if (file.exists(mdfile))
-      script(type="text/markdown", id="showcase-markdown-content",
-        paste(readUTF8(mdfile), collapse="\n"))
-    else ""
-  ))
-
-  return(attachDependencies(html, deps))
-}
-
-# Returns tags containing the application metadata (title and author) in
-# showcase mode.
-appMetadata <- function(desc) {
-  cols <- colnames(desc)
-  if ("Title" %in% cols)
-    with(tags, h4(class="muted shiny-showcase-apptitle", desc[1,"Title"],
-      if ("Author" %in% cols) small(
-        br(), "by",
-        if ("AuthorUrl" %in% cols)
-          a(href=desc[1,"AuthorUrl"], class="shiny-showcase-appauthor",
-            desc[1,"Author"])
-        else
-          desc[1,"Author"],
-        if ("AuthorEmail" %in% cols)
-          a(href=paste("mailto:", desc[1,"AuthorEmail"], sep = ''),
-            class="shiny-showcase-appauthoreemail",
-            desc[1,"AuthorEmail"])
-        else "")
-      else ""))
-  else ""
-}
-
-# Returns tags containing the application's code in Bootstrap-style tabs in
-# showcase mode.
-showcaseCodeTabs <- function(codeLicense) {
-  rFiles <- list.files(pattern = "\\.[rR]$")
-  with(tags, div(id="showcase-code-tabs",
-    a(id="showcase-code-position-toggle",
-      class="btn btn-default btn-small",
-      onclick="toggleCodePosition()",
-      i(class="fa fa-level-up", "show with app")),
-    ul(class="nav nav-tabs",
-       lapply(rFiles, function(rFile) {
-         li(class=if (tolower(rFile) %in% c("app.r", "server.r")) "active" else "",
-            a(href=paste("#", gsub(".", "_", rFile, fixed=TRUE),
-                         "_code", sep=""),
-              "data-toggle"="tab", rFile))
-       })),
-    div(class="tab-content", id="showcase-code-content",
-        lapply(rFiles, function(rFile) {
-          div(class=paste("tab-pane",
-                          if (tolower(rFile) %in% c("app.r", "server.r")) " active"
-                          else "",
-                          sep=""),
-              id=paste(gsub(".", "_", rFile, fixed=TRUE),
-                       "_code", sep=""),
-              pre(class="shiny-code",
-                  # we need to prevent the indentation of <code> ... </code>
-                  HTML(format(tags$code(
-                    class="language-r",
-                    paste(readUTF8(file.path.ci(getwd(), rFile)), collapse="\n")
-                  ), indent = FALSE))))
-        })),
-    codeLicense))
-}
-
-# Returns tags containing the showcase application information (readme and
-# code).
-showcaseAppInfo <- function() {
-  descfile <- file.path.ci(getwd(), "DESCRIPTION")
-  hasDesc <- file.exists(descfile)
-  readmemd <- file.path.ci(getwd(), "Readme.md")
-  hasReadme <- file.exists(readmemd)
-  if (hasDesc) {
-    con <- textConnection(readUTF8(descfile))
-    on.exit(close(con), add = TRUE)
-    desc <- read.dcf(con)
-  }
-  with(tags,
-    div(class="container-fluid shiny-code-container well",
-        id="showcase-well",
-        div(class="row-fluid",
-          if (hasDesc || hasReadme) {
-            div(id="showcase-app-metadata", class="span4",
-                if (hasDesc) appMetadata(desc) else "",
-                if (hasReadme) div(id="readme-md"))
-          } else "",
-          div(id="showcase-code-inline",
-              class=if (hasReadme || hasDesc) "span8" else "span10 offset1",
-              showcaseCodeTabs(
-                if (hasDesc && "License" %in% colnames(desc)) {
-                  small(class="showcase-code-license muted",
-                        "Code license: ",
-                        licenseLink(desc[1,"License"]))
-                } else "")))))
-}
-
-
-# Returns the body of the showcase document, given the HTML it should wrap.
-showcaseBody <- function(htmlBody) {
-  with(tags, tagList(
-    table(id="showcase-app-code",
-          tr(td(id="showcase-app-container",
-                class="showcase-app-container-expanded",
-                HTML(htmlBody),
-             td(id="showcase-sxs-code",
-                class="showcase-sxs-code-collapsed")))),
-    showcaseAppInfo()))
-}
-
-# Sets the defaults for showcase mode (for app boot).
-setShowcaseDefault <- function(showcaseDefault) {
-  .globals$showcaseDefault <- showcaseDefault
-  .globals$showcaseOverride <- as.logical(showcaseDefault)
-}

R/slider.R

@@ -3,17 +3,19 @@ hasDecimals <- function(value) {
   return (!identical(value, truncatedValue))
 }
 
-#' @rdname sliderInput
-#'
+#' Animation Options
+#' 
+#' Creates an options object for customizing animations for \link{sliderInput}.
+#' 
 #' @param interval The interval, in milliseconds, between each animation step.
-#' @param loop \code{TRUE} to automatically restart the animation when it
+#' @param loop \code{TRUE} to automatically restart the animation when it 
 #'   reaches the end.
-#' @param playButton Specifies the appearance of the play button. Valid values
-#'   are a one-element character vector (for a simple text label), an HTML tag
-#'   or list of tags (using \code{\link{tag}} and friends), or raw HTML (using
+#' @param playButton Specifies the appearance of the play button. Valid values 
+#'   are a one-element character vector (for a simple text label), an HTML tag 
+#'   or list of tags (using \code{\link{tag}} and friends), or raw HTML (using 
 #'   \code{\link{HTML}}).
 #' @param pauseButton Similar to \code{playButton}, but for the pause button.
-#'
+#'   
 #' @export
 animationOptions <- function(interval=1000,
                              loop=FALSE,
@@ -28,35 +30,35 @@ animationOptions <- function(interval=1000,
 # Create a new slider control (list of slider input element and the script
 # tag used to configure it). This is a lower level control that should
 # be wrapped in an "input" construct (e.g. sliderInput in bootstrap.R)
-#
+# 
 # this is a wrapper for: https://github.com/egorkhmelev/jslider
-# (www/shared/slider contains js, css, and img dependencies)
+# (www/shared/slider contains js, css, and img dependencies) 
 slider <- function(inputId, min, max, value, step = NULL, ...,
                    round=FALSE, format='#,##0.#####', locale='us',
-                   ticks=TRUE, animate=FALSE, width=NULL) {
+                   ticks=TRUE, animate=FALSE) {
   # validate inputId
   inputId <- as.character(inputId)
   if (!is.character(inputId))
     stop("inputId not specified")
-
+    
   # validate numeric inputs
-  if (!is.numeric(value) || !is.numeric(min) || !is.numeric(max))
+  if (!is.numeric(value) || !is.numeric(min) || !is.numeric(max)) 
     stop("min, max, and value must all be numeric values")
-  else if (min(value) < min)
-    stop(paste("slider initial value", value,
+  else if (min(value) < min) 
+    stop(paste("slider initial value", value, 
                "is less than the specified minimum"))
-  else if (max(value) > max)
-    stop(paste("slider initial value", value,
+  else if (max(value) > max) 
+    stop(paste("slider initial value", value, 
                "is greater than the specified maximum"))
-  else if (min > max)
+  else if (min > max) 
     stop(paste("slider maximum is greater than minimum"))
   else if (!is.null(step)) {
-    if (!is.numeric(step))
+    if (!is.numeric(step)) 
       stop("step is not a numeric value")
-    if (step > (max - min))
+    if (step > (max - min)) 
       stop("step is greater than range")
   }
-
+  
   # step
   range <- max - min
   if (is.null(step)) {
@@ -66,7 +68,7 @@ slider <- function(inputId, min, max, value, step = NULL, ...,
     else
       step = 1
   }
-
+  
   # Default state is to not have ticks
   if (identical(ticks, TRUE)) {
     # Automatic ticks
@@ -97,36 +99,25 @@ slider <- function(inputId, min, max, value, step = NULL, ...,
   else {
     ticks <- NULL
   }
-
+  
   # build slider
-  dep <- htmlDependency("jslider", "1", c(href="shared/slider"),
-    script = "js/jquery.slider.min.js",
-    stylesheet = "css/jquery.slider.min.css"
-  )
-  sliderFragment <- list(
-    attachDependencies(
-      tags$input(
-        id=inputId, type="slider",
-        name=inputId, value=paste(value, collapse=';'), class="jslider",
-        'data-from'=min, 'data-to'=max, 'data-step'=step,
-        'data-skin'='plastic', 'data-round'=round, 'data-locale'=locale,
-        'data-format'=format, 'data-scale'=ticks,
-        'data-smooth'=FALSE,
-        'data-width'=validateCssUnit(width)
-      ),
-      dep
-    )
-  )
+  sliderFragment <- list(tags$input(
+    id=inputId, type="slider", 
+    name=inputId, value=paste(value, collapse=';'), class="jslider",
+    'data-from'=min, 'data-to'=max, 'data-step'=step,
+    'data-skin'='plastic', 'data-round'=round, 'data-locale'=locale,
+    'data-format'=format, 'data-scale'=ticks,
+    'data-smooth'=FALSE))
 
   if (identical(animate, TRUE))
     animate <- animationOptions()
-
+  
   if (!is.null(animate) && !identical(animate, FALSE)) {
     if (is.null(animate$playButton))
       animate$playButton <- 'Play'
     if (is.null(animate$pauseButton))
       animate$pauseButton <- 'Pause'
-
+    
     sliderFragment[[length(sliderFragment)+1]] <-
       tags$div(class='slider-animate-container',
                tags$a(href='#',
@@ -137,6 +128,6 @@ slider <- function(inputId, min, max, value, step = NULL, ...,
                       tags$span(class='play', animate$playButton),
                       tags$span(class='pause', animate$pauseButton)))
   }
-
-  return(tagList(sliderFragment))
+  
+  return(sliderFragment)
 }

R/stack.R

@@ -1,70 +0,0 @@
-# A Stack object backed by a list. The backing list will grow or shrink as
-# the stack changes in size.
-Stack <- R6Class(
-  'Stack',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-
-    initialize = function(init = 20L) {
-      # init is the initial size of the list. It is also used as the minimum
-      # size of the list as it shrinks.
-      private$stack <- vector("list", init)
-      private$init <- init
-    },
-
-    push = function(..., .list = NULL) {
-      args <- c(list(...), .list)
-      new_size <- count + length(args)
-
-      # Grow if needed; double in size
-      while (new_size > length(stack)) {
-        stack[length(stack) * 2] <<- list(NULL)
-      }
-      stack[count + seq_along(args)] <<- args
-      count <<- new_size
-
-      invisible(self)
-    },
-
-    pop = function() {
-      if (count == 0L)
-        return(NULL)
-
-      value <- stack[[count]]
-      stack[count] <<- list(NULL)
-      count <<- count - 1L
-
-      # Shrink list if < 1/4 of the list is used, down to a minimum size of `init`
-      len <- length(stack)
-      if (len > init && count < len/4) {
-        new_len <- max(init, ceiling(len/2))
-        stack <<- stack[seq_len(new_len)]
-      }
-
-      value
-    },
-
-    peek = function() {
-      if (count == 0L)
-        return(NULL)
-      stack[[count]]
-    },
-
-    size = function() {
-      count
-    },
-
-    # Return the entire stack as a list, where the first item in the list is the
-    # oldest item in the stack, and the last item is the most recently added.
-    as_list = function() {
-      stack[seq_len(count)]
-    }
-  ),
-
-  private = list(
-    stack = NULL,   # A list that holds the items
-    count = 0L,     # Current number of items in the stack
-    init = 20L      # Initial and minimum size of the stack
-  )
-)

R/tags.R

@@ -0,0 +1,402 @@
+
+
+htmlEscape <- local({
+  .htmlSpecials <- list(
+    `&` = '&amp;',
+    `<` = '&lt;',
+    `>` = '&gt;'
+  )
+  .htmlSpecialsPattern <- paste(names(.htmlSpecials), collapse='|')
+  .htmlSpecialsAttrib <- c(
+    .htmlSpecials,
+    `'` = '&#39;',
+    `"` = '&quot;',
+    `\r` = '&#13;',
+    `\n` = '&#10;'
+  )
+  .htmlSpecialsPatternAttrib <- paste(names(.htmlSpecialsAttrib), collapse='|')
+  
+  function(text, attribute=TRUE) {
+    pattern <- if(attribute)
+      .htmlSpecialsPatternAttrib 
+    else
+      .htmlSpecialsPattern
+    
+    # Short circuit in the common case that there's nothing to escape
+    if (!grepl(pattern, text))
+      return(text)
+    
+    specials <- if(attribute)
+      .htmlSpecialsAttrib
+    else
+      .htmlSpecials
+    
+    for (chr in names(specials)) {
+      text <- gsub(chr, specials[[chr]], text, fixed=TRUE)
+    }
+    
+    return(text)
+  }
+})
+
+isTag <- function(x) {
+  inherits(x, "shiny.tag")
+}
+
+#' @S3method print shiny.tag
+print.shiny.tag <- function(x, ...) {
+  print(as.character(x), ...)
+}
+
+#' @S3method format shiny.tag
+format.shiny.tag <- function(x, ...) {
+  as.character.shiny.tag(x)
+}
+
+#' @S3method as.character shiny.tag
+as.character.shiny.tag <- function(x, ...) {
+  f = file()
+  on.exit(close(f))
+  textWriter <- function(text) {
+    cat(text, file=f)
+  }
+  tagWrite(x, textWriter)
+  return(HTML(paste(readLines(f, warn=FALSE), collapse='\n')))
+}
+
+#' @S3method print shiny.tag.list
+print.shiny.tag.list <- print.shiny.tag
+
+#' @S3method format shiny.tag.list
+format.shiny.tag.list <- format.shiny.tag
+
+#' @S3method as.character shiny.tag.list
+as.character.shiny.tag.list <- as.character.shiny.tag
+
+normalizeText <- function(text) {
+  if (!is.null(attr(text, "html")))
+    text
+  else
+    htmlEscape(text, attribute=FALSE)
+  
+}
+
+#' @export
+tagList <- function(...) {
+  lst <- list(...)
+  class(lst) <- c("shiny.tag.list", "list")
+  return(lst)
+}
+
+#' @export
+tagAppendChild <- function(tag, child) {
+  tag$children[[length(tag$children)+1]] <- child
+  tag
+}
+
+#' @export
+tagAppendChildren <- function(tag, ..., list = NULL) {
+  tag$children <- c(tag$children, c(list(...), list))
+  tag
+}
+
+#' @export
+tagSetChildren <- function(tag, ..., list = NULL) {
+  tag$children <- c(list(...), list)
+  tag
+}
+
+#' @export
+tag <- function(`_tag_name`, varArgs) {
+  # Get arg names; if not a named list, use vector of empty strings
+  varArgsNames <- names(varArgs)
+  if (is.null(varArgsNames))
+    varArgsNames <- character(length=length(varArgs))
+
+  # Named arguments become attribs, dropping NULL values
+  named_idx <- nzchar(varArgsNames)
+  attribs <- dropNulls(varArgs[named_idx])
+  
+  # Unnamed arguments are flattened and added as children.
+  # Use unname() to remove the names attribute from the list, which would
+  # consist of empty strings anyway.
+  children <- flattenTags(unname(varArgs[!named_idx]))
+
+  # Return tag data structure
+  structure(
+    list(name = `_tag_name`,
+         attribs = attribs,
+         children = children),
+    class = "shiny.tag"
+  )
+}
+
+tagWrite <- function(tag, textWriter, indent=0, context = NULL, eol = "\n") {
+  
+  # optionally process a list of tags
+  if (!isTag(tag) && is.list(tag)) {
+    sapply(tag, function(t) tagWrite(t, textWriter, indent, context))
+    return (NULL)
+  }
+  
+  # first call optional filter -- exit function if it returns false
+  if (!is.null(context) && !is.null(context$filter) && !context$filter(tag))
+    return (NULL)
+  
+  # compute indent text
+  indentText <- paste(rep(" ", indent*2), collapse="")
+  
+  # Check if it's just text (may either be plain-text or HTML)
+  if (is.character(tag)) {
+    textWriter(paste(indentText, normalizeText(tag), eol, sep=""))
+    return (NULL)
+  }
+  
+  # write tag name
+  textWriter(paste(indentText, "<", tag$name, sep=""))
+  
+  # write attributes
+  for (attrib in names(tag$attribs)) {
+    attribValue <- tag$attribs[[attrib]]
+    if (!is.na(attribValue)) {
+      if (is.logical(attribValue))
+        attribValue <- tolower(attribValue)
+      text <- htmlEscape(attribValue, attribute=TRUE) 
+      textWriter(paste(" ", attrib,"=\"", text, "\"", sep=""))
+    }
+    else {
+      textWriter(paste(" ", attrib, sep=""))
+    }
+  }
+  
+  # write any children
+  if (length(tag$children) > 0) {
+    textWriter(">")
+    
+    # special case for a single child text node (skip newlines and indentation)
+    if ((length(tag$children) == 1) && is.character(tag$children[[1]]) ) {
+      tagWrite(tag$children[[1]], textWriter, 0, context, "")
+      textWriter(paste("</", tag$name, ">", eol, sep=""))
+    }
+    else {
+      textWriter("\n")
+      for (child in tag$children)
+        tagWrite(child, textWriter, indent+1, context)
+      textWriter(paste(indentText, "</", tag$name, ">", eol, sep=""))
+    }
+  }
+  else {
+    # only self-close void elements 
+    # (see: http://dev.w3.org/html5/spec/single-page.html#void-elements)
+    if (tag$name %in% c("area", "base", "br", "col", "command", "embed", "hr", 
+                        "img", "input", "keygen", "link", "meta", "param",
+                        "source", "track", "wbr")) {
+      textWriter(paste("/>", eol, sep=""))
+    }
+    else {
+      textWriter(paste("></", tag$name, ">", eol, sep=""))
+    }
+  }
+}
+
+
+# environment used to store all available tags
+#' @export
+tags <- list(
+  a = function(...) tag("a", list(...)),
+  abbr = function(...) tag("abbr", list(...)),
+  address = function(...) tag("address", list(...)),
+  area = function(...) tag("area", list(...)),
+  article = function(...) tag("article", list(...)),
+  aside = function(...) tag("aside", list(...)),
+  audio = function(...) tag("audio", list(...)),
+  b = function(...) tag("b", list(...)),
+  base = function(...) tag("base", list(...)),
+  bdi = function(...) tag("bdi", list(...)),
+  bdo = function(...) tag("bdo", list(...)),
+  blockquote = function(...) tag("blockquote", list(...)),
+  body = function(...) tag("body", list(...)),
+  br = function(...) tag("br", list(...)),
+  button = function(...) tag("button", list(...)),
+  canvas = function(...) tag("canvas", list(...)),
+  caption = function(...) tag("caption", list(...)),
+  cite = function(...) tag("cite", list(...)),
+  code = function(...) tag("code", list(...)),
+  col = function(...) tag("col", list(...)),
+  colgroup = function(...) tag("colgroup", list(...)),
+  command = function(...) tag("command", list(...)),
+  data = function(...) tag("data", list(...)),
+  datalist = function(...) tag("datalist", list(...)),
+  dd = function(...) tag("dd", list(...)),
+  del = function(...) tag("del", list(...)),
+  details = function(...) tag("details", list(...)),
+  dfn = function(...) tag("dfn", list(...)),
+  div = function(...) tag("div", list(...)),
+  dl = function(...) tag("dl", list(...)),
+  dt = function(...) tag("dt", list(...)),
+  em = function(...) tag("em", list(...)),
+  embed = function(...) tag("embed", list(...)),
+  eventsource = function(...) tag("eventsource", list(...)),
+  fieldset = function(...) tag("fieldset", list(...)),
+  figcaption = function(...) tag("figcaption", list(...)),
+  figure = function(...) tag("figure", list(...)),
+  footer = function(...) tag("footer", list(...)),
+  form = function(...) tag("form", list(...)),
+  h1 = function(...) tag("h1", list(...)),
+  h2 = function(...) tag("h2", list(...)),
+  h3 = function(...) tag("h3", list(...)),
+  h4 = function(...) tag("h4", list(...)),
+  h5 = function(...) tag("h5", list(...)),
+  h6 = function(...) tag("h6", list(...)),
+  head = function(...) tag("head", list(...)),
+  header = function(...) tag("header", list(...)),
+  hgroup = function(...) tag("hgroup", list(...)),
+  hr = function(...) tag("hr", list(...)),
+  html = function(...) tag("html", list(...)),
+  i = function(...) tag("i", list(...)),
+  iframe = function(...) tag("iframe", list(...)),
+  img = function(...) tag("img", list(...)),
+  input = function(...) tag("input", list(...)),
+  ins = function(...) tag("ins", list(...)),
+  kbd = function(...) tag("kbd", list(...)),
+  keygen = function(...) tag("keygen", list(...)),
+  label = function(...) tag("label", list(...)),
+  legend = function(...) tag("legend", list(...)),
+  li = function(...) tag("li", list(...)),
+  link = function(...) tag("link", list(...)),
+  mark = function(...) tag("mark", list(...)),
+  map = function(...) tag("map", list(...)),
+  menu = function(...) tag("menu", list(...)),
+  meta = function(...) tag("meta", list(...)),
+  meter = function(...) tag("meter", list(...)),
+  nav = function(...) tag("nav", list(...)),
+  noscript = function(...) tag("noscript", list(...)),
+  object = function(...) tag("object", list(...)),
+  ol = function(...) tag("ol", list(...)),
+  optgroup = function(...) tag("optgroup", list(...)),
+  option = function(...) tag("option", list(...)),
+  output = function(...) tag("output", list(...)),
+  p = function(...) tag("p", list(...)),
+  param = function(...) tag("param", list(...)),
+  pre = function(...) tag("pre", list(...)),
+  progress = function(...) tag("progress", list(...)),
+  q = function(...) tag("q", list(...)),
+  ruby = function(...) tag("ruby", list(...)),
+  rp = function(...) tag("rp", list(...)),
+  rt = function(...) tag("rt", list(...)),
+  s = function(...) tag("s", list(...)),
+  samp = function(...) tag("samp", list(...)),
+  script = function(...) tag("script", list(...)),
+  section = function(...) tag("section", list(...)),
+  select = function(...) tag("select", list(...)),
+  small = function(...) tag("small", list(...)),
+  source = function(...) tag("source", list(...)),
+  span = function(...) tag("span", list(...)),
+  strong = function(...) tag("strong", list(...)),
+  style = function(...) tag("style", list(...)),
+  sub = function(...) tag("sub", list(...)),
+  summary = function(...) tag("summary", list(...)),
+  sup = function(...) tag("sup", list(...)),
+  table = function(...) tag("table", list(...)),
+  tbody = function(...) tag("tbody", list(...)),
+  td = function(...) tag("td", list(...)),
+  textarea = function(...) tag("textarea", list(...)),
+  tfoot = function(...) tag("tfoot", list(...)),
+  th = function(...) tag("th", list(...)),
+  thead = function(...) tag("thead", list(...)),
+  time = function(...) tag("time", list(...)),
+  title = function(...) tag("title", list(...)),
+  tr = function(...) tag("tr", list(...)),
+  track = function(...) tag("track", list(...)),
+  u = function(...) tag("u", list(...)),
+  ul = function(...) tag("ul", list(...)),
+  var = function(...) tag("var", list(...)),
+  video = function(...) tag("video", list(...)),
+  wbr = function(...) tag("wbr", list(...))
+)
+
+#' Mark Characters as HTML
+#' 
+#' Marks the given text as HTML, which means the \link{tag} functions will know
+#' not to perform HTML escaping on it.
+#' 
+#' @param text The text value to mark with HTML
+#' @param ... Any additional values to be converted to character and
+#'   concatenated together
+#' @return The same value, but marked as HTML.
+#' 
+#' @examples
+#' el <- div(HTML("I like <u>turtles</u>"))
+#' cat(as.character(el))
+#'   
+#' @export
+HTML <- function(text, ...) {
+  htmlText <- c(text, as.character(list(...)))
+  htmlText <- paste(htmlText, collapse=" ")
+  attr(htmlText, "html") <- TRUE
+  htmlText
+}
+
+#' Evaluate an expression using the \code{tags}
+#'
+#' This function makes it simpler to write HTML-generating code. Instead of
+#' needing to specify \code{tags} each time a tag function is used, as in
+#' \code{tags$div()} and \code{tags$p()}, code inside \code{withTags} is
+#' evaluated with \code{tags} searched first, so you can simply use
+#' \code{div()} and \code{p()}.
+#'
+#' If your code uses an object which happens to have the same name as an
+#' HTML tag function, such as \code{source()} or \code{summary()}, it will call
+#' the tag function. To call the intended (non-tags function), specify the
+#' namespace, as in \code{base::source()} or \code{base::summary()}.
+#'
+#' @param code A set of tags.
+#'
+#' @examples
+#' # Using tags$ each time
+#' tags$div(class = "myclass",
+#'   tags$h3("header"),
+#'   tags$p("text")
+#' )
+#'
+#' # Equivalent to above, but using withTags
+#' withTags(
+#'   div(class = "myclass",
+#'     h3("header"),
+#'     p("text")
+#'   )
+#' )
+#'
+#'
+#' @export
+withTags <- function(code) {
+  eval(substitute(code), envir = as.list(tags), enclos = parent.frame())
+}
+
+
+# Given a list of tags, lists, and other items, return a flat list, where the
+# items from the inner, nested lists are pulled to the top level, recursively.
+flattenTags <- function(x) {
+  if (isTag(x)) {
+    # For tags, wrap them into a list (which will be unwrapped by caller)
+    list(x)
+  } else if (is.list(x)) {
+    if (length(x) == 0) {
+      # Empty lists are simply returned
+      x
+    } else {
+      # For items that are lists (but not tags), recurse
+      unlist(lapply(x, flattenTags), recursive = FALSE)
+    }
+
+  } else if (is.character(x)){
+    # This will preserve attributes if x is a character with attribute,
+    # like what HTML() produces
+    list(x)
+
+  } else {
+    # For other items, coerce to character and wrap them into a list (which
+    # will be unwrapped by caller). Note that this will strip attributes.
+    list(as.character(x))
+  }
+}

R/tar.R

@@ -141,7 +141,7 @@ untar2 <- function(tarfile, files = NULL, list = FALSE, exdir = ".")
                             warning(gettextf("failed to copy %s to %s", sQuote(name2), sQuote(name)), domain = NA)
                     }
                 } else {
-                    if(isWindows()) {
+                    if(.Platform$OS.type == "windows") {
                         ## this will not work for links to dirs
                         from <- file.path(dirname(name), name2)
                         if (!file.copy(from, name))

R/timer.R

@@ -4,17 +4,16 @@ now <- function() {
   as.numeric(Sys.time()) * 1000
 }
 
-TimerCallbacks <- R6Class(
+TimerCallbacks <- setRefClass(
   'TimerCallbacks',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    .nextId = 0L,
+  fields = list(
+    .nextId = 'integer',
     .funcs = 'Map',
-    .times = data.frame(),
-
+    .times = 'data.frame'
+  ),
+  methods = list(
     initialize = function() {
-      .funcs <<- Map$new()
+      .nextId <<- 0L
     },
     clear = function() {
       .nextId <<- 0L
@@ -24,17 +23,17 @@ TimerCallbacks <- R6Class(
     schedule = function(millis, func) {
       id <- .nextId
       .nextId <<- .nextId + 1L
-
+      
       t <- now()
-
+      
       # TODO: Horribly inefficient, use a heap instead
       .times <<- rbind(.times, data.frame(time=t+millis,
                                           scheduled=t,
                                           id=id))
       .times <<- .times[order(.times$time),]
-
+      
       .funcs$set(as.character(id), func)
-
+      
       return(id)
     },
     timeToNextEvent = function() {
@@ -47,18 +46,18 @@ TimerCallbacks <- R6Class(
       elapsed <- .times$time < now()
       result <- .times[elapsed,]
       .times <<- .times[!elapsed,]
-
+      
       # TODO: Examine scheduled column to check if any funny business
       #       has occurred with the system clock (e.g. if scheduled
       #       is later than now())
-
+      
       return(result)
     },
     executeElapsed = function() {
       elapsed <- takeElapsed()
       if (length(elapsed) == 0)
         return(FALSE)
-
+      
       for (id in elapsed$id) {
         thisFunc <- .funcs$remove(as.character(id))
         # TODO: Catch exception, and...?

R/update-input.R

@@ -118,7 +118,7 @@ updateSliderInput <- updateTextInput
 #' }
 #' @export
 updateDateInput <- function(session, inputId, label = NULL, value = NULL,
-                            min = NULL, max = NULL) {
+    min = NULL, max = NULL) {
 
   # If value is a date object, convert it to a string with yyyy-mm-dd format
   # Same for min and max
@@ -163,8 +163,8 @@ updateDateInput <- function(session, inputId, label = NULL, value = NULL,
 #' }
 #' @export
 updateDateRangeInput <- function(session, inputId, label = NULL,
-                                 start = NULL, end = NULL, min = NULL,
-                                 max = NULL) {
+    start = NULL, end = NULL, min = NULL, max = NULL) {
+
   # Make sure start and end are strings, not date objects. This is for
   # consistency across different locales.
   if (inherits(start, "Date"))  start <- format(start, '%Y-%m-%d')
@@ -186,12 +186,10 @@ updateDateRangeInput <- function(session, inputId, label = NULL,
 #'
 #' @param session The \code{session} object passed to function given to
 #'   \code{shinyServer}.
-#' @param inputId The id of the \code{tabsetPanel}, \code{navlistPanel},
-#' or \code{navbarPage} object.
+#' @param inputId The id of the tabset panel object.
 #' @param selected The name of the tab to make active.
 #'
-#' @seealso \code{\link{tabsetPanel}}, \code{\link{navlistPanel}},
-#' \code{\link{navbarPage}}
+#' @seealso \code{\link{tabsetPanel}}
 #'
 #' @examples
 #' \dontrun{
@@ -202,7 +200,7 @@ updateDateRangeInput <- function(session, inputId, label = NULL,
 #'     x_even <- input$controller %% 2 == 0
 #'
 #'     # Change the selected tab.
-#'     # Note that the tabset container must have been created with an 'id' argument
+#'     # Note that the tabsetPanel must have been created with an 'id' argument
 #'     if (x_even) {
 #'       updateTabsetPanel(session, "inTabset", selected = "panel2")
 #'     } else {
@@ -249,35 +247,17 @@ updateTabsetPanel <- function(session, inputId, selected = NULL) {
 updateNumericInput <- function(session, inputId, label = NULL, value = NULL,
     min = NULL, max = NULL, step = NULL) {
 
-  message <- dropNulls(list(
-    label = label, value = formatNoSci(value),
-    min = formatNoSci(min), max = formatNoSci(max), step = formatNoSci(step)
-  ))
+  message <- dropNulls(list(label=label, value=value, min=min, max=max, step=step))
   session$sendInputMessage(inputId, message)
 }
 
-updateInputOptions <- function(session, inputId, label = NULL, choices = NULL,
-                               selected = NULL, inline = FALSE,
-                               type = 'checkbox') {
-
-  choices <- choicesWithNames(choices)
-  if (!is.null(selected))
-    selected <- validateSelected(selected, choices, inputId)
-
-  options <- if (length(choices))
-    format(tagList(
-      generateOptions(inputId, choices, selected, inline, type = type)
-    ))
-
-  message <- dropNulls(list(label = label, options = options, value = selected))
-
-  session$sendInputMessage(inputId, message)
-}
 
 #' Change the value of a checkbox group input on the client
 #'
 #' @template update-input
-#' @inheritParams checkboxGroupInput
+#' @param choices A named vector or named list of options. For each item, the
+#'   name will be used as the label, and the value will be used as the value.
+#' @param selected A vector or list of options which will be selected.
 #'
 #' @seealso \code{\link{checkboxGroupInput}}
 #'
@@ -303,23 +283,38 @@ updateInputOptions <- function(session, inputId, label = NULL, choices = NULL,
 #'     updateCheckboxGroupInput(session, "inCheckboxGroup2",
 #'       label = paste("checkboxgroup label", x),
 #'       choices = cb_options,
-#'       selected = sprintf("option-%d-2", x)
+#'       selected = sprintf("option label %d 2", x)
 #'     )
 #'   })
 #' })
 #' }
 #' @export
 updateCheckboxGroupInput <- function(session, inputId, label = NULL,
-                                     choices = NULL, selected = NULL,
-                                     inline = FALSE) {
-  updateInputOptions(session, inputId, label, choices, selected, inline)
+  choices = NULL, selected = NULL) {
+
+  choices <- choicesWithNames(choices)
+
+  options <- mapply(choices, names(choices),
+    SIMPLIFY = FALSE, USE.NAMES = FALSE,
+    FUN = function(value, name) {
+      list(value = value,
+           label = name,
+           checked = name %in% selected)
+    }
+  )
+
+  message <- dropNulls(list(label = label, options = options))
+
+  session$sendInputMessage(inputId, message)
 }
 
 
 #' Change the value of a radio input on the client
 #'
 #' @template update-input
-#' @inheritParams radioButtons
+#' @param choices A named vector or named list of options. For each item, the
+#'   name will be used as the label, and the value will be used as the value.
+#' @param selected A vector or list of options which will be selected.
 #'
 #' @seealso \code{\link{radioButtons}}
 #'
@@ -343,24 +338,21 @@ updateCheckboxGroupInput <- function(session, inputId, label = NULL,
 #'     updateRadioButtons(session, "inRadio2",
 #'       label = paste("Radio label", x),
 #'       choices = r_options,
-#'       selected = sprintf("option-%d-2", x)
+#'       selected = sprintf("option label %d 2", x)
 #'     )
 #'   })
 #' })
 #' }
 #' @export
-updateRadioButtons <- function(session, inputId, label = NULL, choices = NULL,
-                               selected = NULL, inline = FALSE) {
-  # you must select at least one radio button
-  if (is.null(selected) && !is.null(choices)) selected <- choices[[1]]
-  updateInputOptions(session, inputId, label, choices, selected, inline, type = 'radio')
-}
+updateRadioButtons <- updateCheckboxGroupInput
 
 
 #' Change the value of a select input on the client
 #'
 #' @template update-input
-#' @inheritParams selectInput
+#' @param choices A named vector or named list of options. For each item, the
+#'   name will be used as the label, and the value will be used as the value.
+#' @param selected A vector or list of options which will be selected.
 #'
 #' @seealso \code{\link{selectInput}}
 #'
@@ -387,94 +379,27 @@ updateRadioButtons <- function(session, inputId, label = NULL, choices = NULL,
 #'     updateSelectInput(session, "inSelect2",
 #'       label = paste("Select label", x),
 #'       choices = s_options,
-#'       selected = sprintf("option-%d-2", x)
+#'       selected = sprintf("option label %d 2", x)
 #'     )
 #'   })
 #' })
 #' }
 #' @export
 updateSelectInput <- function(session, inputId, label = NULL, choices = NULL,
-                              selected = NULL) {
+    selected = NULL) {
+
   choices <- choicesWithNames(choices)
-  if (!is.null(selected))
-    selected <- validateSelected(selected, choices, inputId)
-  options <- if (length(choices)) selectOptions(choices, selected)
-  message <- dropNulls(list(label = label, options = options, value = selected))
+
+  options <- mapply(choices, names(choices),
+    SIMPLIFY = FALSE, USE.NAMES = FALSE,
+    FUN = function(value, name) {
+      list(value = value,
+           label = name,
+           selected = name %in% selected)
+    }
+  )
+
+  message <- dropNulls(list(label = label, options = options))
+
   session$sendInputMessage(inputId, message)
 }
-
-#' @rdname updateSelectInput
-#' @inheritParams selectizeInput
-#' @param server whether to store \code{choices} on the server side, and load
-#'   the select options dynamically on searching, instead of writing all
-#'   \code{choices} into the page at once (i.e., only use the client-side
-#'   version of \pkg{selectize.js})
-#' @export
-updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
-                                 selected = NULL, options = list(),
-                                 server = FALSE) {
-  if (length(options)) {
-    res <- checkAsIs(options)
-    cfg <- tags$script(
-      type = 'application/json',
-      `data-for` = inputId,
-      `data-eval` = if (length(res$eval)) HTML(toJSON(res$eval)),
-      HTML(toJSON(res$options))
-    )
-    session$sendInputMessage(inputId, list(config = as.character(cfg)))
-  }
-  if (!server) {
-    return(updateSelectInput(session, inputId, label, choices, selected))
-  }
-  # in the server mode, the choices are not available before we type, so we
-  # cannot really pre-select any options, but here we insert the `selected`
-  # options into selectize forcibly
-  value <- unname(selected)
-  selected <- choicesWithNames(selected)
-  message <- dropNulls(list(
-    label = label,
-    value = value,
-    selected = if (length(selected)) {
-      columnToRowData(list(label = names(selected), value = selected))
-    },
-    url = session$registerDataObj(inputId, choices, selectizeJSON)
-  ))
-  session$sendInputMessage(inputId, message)
-}
-
-selectizeJSON <- function(data, req) {
-  query <- parseQueryString(req$QUERY_STRING)
-  # extract the query variables, conjunction (and/or), search string, maximum options
-  var <- unlist(fromJSON(query$field, asText = TRUE))
-  cjn <- if (query$conju == 'and') all else any
-  # all keywords in lower-case, for case-insensitive matching
-  key <- unique(strsplit(tolower(query$query), '\\s+')[[1]])
-  if (identical(key, '')) key <- character(0)
-  mop <- query$maxop
-
-  # convert a single vector to a data frame so it returns {label: , value: }
-  # later in JSON; other objects return arbitrary JSON {x: , y: , foo: , ...}
-  data <- if (is.atomic(data)) {
-    data.frame(label = names(choicesWithNames(data)), value = data,
-               stringsAsFactors = FALSE)
-  } else as.data.frame(data, stringsAsFactors = FALSE)
-
-  # start searching for keywords in all specified columns
-  idx <- logical(nrow(data))
-  if (length(key)) for (v in var) {
-    matches <- do.call(
-      cbind,
-      lapply(key, function(k) {
-        grepl(k, tolower(as.character(data[[v]])), fixed = TRUE)
-      })
-    )
-    # merge column matches using OR, and match multiple keywords in one column
-    # using the conjunction setting (AND or OR)
-    idx <- idx | apply(matches, 1, cjn)
-  }
-  # only return the first n rows (n = maximum options in configuration)
-  idx <- head(which(idx), mop)
-  data <- data[idx, ]
-
-  httpResponse(200, 'application/json', toJSON(columnToRowData(data)))
-}

R/utils.R

@@ -1,17 +1,13 @@
-#' @include globals.R
-#' @include map.R
-NULL
-
 #' Make a random number generator repeatable
-#'
-#' Given a function that generates random data, returns a wrapped version of
+#' 
+#' Given a function that generates random data, returns a wrapped version of 
 #' that function that always uses the same seed when called. The seed to use can
 #' be passed in explicitly if desired; otherwise, a random number is used.
-#'
+#' 
 #' @param rngfunc The function that is affected by the R session's seed.
 #' @param seed The seed to set every time the resulting function is called.
 #' @return A repeatable version of the function that was passed in.
-#'
+#'   
 #' @note When called, the returned function attempts to preserve the R session's
 #'   current seed by snapshotting and restoring
 #'   \code{\link[base]{.Random.seed}}.
@@ -23,11 +19,11 @@ NULL
 #' rnormA(3)  # [1]  1.8285879 -0.7468041 -0.4639111
 #' rnormA(5)  # [1]  1.8285879 -0.7468041 -0.4639111 -1.6510126 -1.4686924
 #' rnormB(5)  # [1] -0.7946034  0.2568374 -0.6567597  1.2451387 -0.8375699
-#'
+#' 
 #' @export
 repeatable <- function(rngfunc, seed = runif(1, 0, .Machine$integer.max)) {
   force(seed)
-
+  
   function(...) {
     # When we exit, restore the seed to its original state
     if (exists('.Random.seed', where=globalenv())) {
@@ -37,94 +33,15 @@ repeatable <- function(rngfunc, seed = runif(1, 0, .Machine$integer.max)) {
     else {
       on.exit(rm('.Random.seed', pos=globalenv()))
     }
-
+    
     set.seed(seed)
-
-    rngfunc(...)
+    
+    do.call(rngfunc, list(...))
   }
 }
 
-# Temporarily set x in env to value, evaluate expr, and
-# then restore x to its original state
-withTemporary <- function(env, x, value, expr, unset = FALSE) {
-
-  if (exists(x, envir = env, inherits = FALSE)) {
-    oldValue <- get(x, envir = env, inherits = FALSE)
-    on.exit(
-      assign(x, oldValue, envir = env, inherits = FALSE),
-      add = TRUE)
-  } else {
-    on.exit(
-      rm(list = x, envir = env, inherits = FALSE),
-      add = TRUE
-    )
-  }
-
-  if (!missing(value) && !isTRUE(unset))
-    assign(x, value, envir = env, inherits = FALSE)
-  else {
-    if (exists(x, envir = env, inherits = FALSE))
-      rm(list = x, envir = env, inherits = FALSE)
-  }
-  force(expr)
-}
-
-.globals$ownSeed <- NULL
-# Evaluate an expression using Shiny's own private stream of
-# randomness (not affected by set.seed).
-withPrivateSeed <- function(expr) {
-  withTemporary(.GlobalEnv, ".Random.seed",
-    .globals$ownSeed, unset=is.null(.globals$ownSeed), {
-      tryCatch({
-        expr
-      }, finally = {
-        .globals$ownSeed <- getExists('.Random.seed', 'numeric', globalenv())
-      })
-    }
-  )
-}
-
-# a homemade version of set.seed(NULL) for backward compatibility with R 2.15.x
-reinitializeSeed <- if (getRversion() >= '3.0.0') {
-  function() set.seed(NULL)
-} else function() {
-  if (exists('.Random.seed', globalenv()))
-    rm(list = '.Random.seed', pos = globalenv())
-  stats::runif(1)  # generate any random numbers so R can reinitialize the seed
-}
-
-# Version of runif that runs with private seed
-p_runif <- function(...) {
-  withPrivateSeed(runif(...))
-}
-
-# Version of sample that runs with private seed
-p_sample <- function(...) {
-  withPrivateSeed(sample(...))
-}
-
-# Return a random integral value in the range [min, max).
-# If only one argument is passed, then min=0 and max=argument.
-randomInt <- function(min, max) {
-  if (missing(max)) {
-    max <- min
-    min <- 0
-  }
-  if (min < 0 || max <= min)
-    stop("Invalid min/max values")
-
-  min + sample(max-min, 1)-1
-}
-
-p_randomInt <- function(...) {
-  withPrivateSeed(randomInt(...))
-}
-
 `%OR%` <- function(x, y) {
-  if (is.null(x) || isTRUE(is.na(x)))
-    y
-  else
-    x
+  ifelse(is.null(x) || is.na(x), y, x)
 }
 
 `%AND%` <- function(x, y) {
@@ -143,135 +60,6 @@ dropNulls <- function(x) {
   x[!vapply(x, is.null, FUN.VALUE=logical(1))]
 }
 
-nullOrEmpty <- function(x) {
-  is.null(x) || length(x) == 0
-}
-# Given a vector or list, drop all the NULL items in it
-dropNullsOrEmpty <- function(x) {
-  x[!vapply(x, nullOrEmpty, FUN.VALUE=logical(1))]
-}
-
-# Combine dir and (file)name into a file path. If a file already exists with a
-# name differing only by case, then use it instead.
-file.path.ci <- function(...) {
-  result <- find.file.ci(...)
-  if (!is.null(result))
-    return(result)
-
-  # If not found, return the file path that was given to us.
-  return(file.path(...))
-}
-
-# Does a particular file exist? Case-insensitive for filename, case-sensitive
-# for path (on platforms with case-sensitive file system).
-file.exists.ci <- function(...) {
-  !is.null(find.file.ci(...))
-}
-
-# Look for a file, case-insensitive for filename, case-sensitive for path (on
-# platforms with case-sensitive filesystem). If found, return the path to the
-# file, with the correct case. If not found, return NULL.
-find.file.ci <- function(...) {
-  default <- file.path(...)
-  if (length(default) > 1)
-    stop("find.file.ci can only check for one file at a time.")
-  if (file.exists(default))
-    return(default)
-
-  dir <- dirname(default)
-  name <- basename(default)
-
-  # If we got here, then we'll check for a directory with the exact case, and a
-  # name with any case.
-  all_files <- list.files(dir, all.files=TRUE, full.names=TRUE,
-                          include.dirs=TRUE)
-  match_idx <- tolower(name) == tolower(basename(all_files))
-  matches <- all_files[match_idx]
-  if (length(matches) == 0)
-    return(NULL)
-
-  return(matches[1])
-}
-
-# Attempt to join a path and relative path, and turn the result into a
-# (normalized) absolute path. The result will only be returned if it is an
-# existing file/directory and is a descendant of dir.
-#
-# Example:
-# resolve("/Users/jcheng", "shiny")  # "/Users/jcheng/shiny"
-# resolve("/Users/jcheng", "./shiny")  # "/Users/jcheng/shiny"
-# resolve("/Users/jcheng", "shiny/../shiny/")  # "/Users/jcheng/shiny"
-# resolve("/Users/jcheng", ".")  # NULL
-# resolve("/Users/jcheng", "..")  # NULL
-# resolve("/Users/jcheng", "shiny/..")  # NULL
-resolve <- function(dir, relpath) {
-  abs.path <- file.path(dir, relpath)
-  if (!file.exists(abs.path))
-    return(NULL)
-  abs.path <- normalizePath(abs.path, winslash='/', mustWork=TRUE)
-  dir <- normalizePath(dir, winslash='/', mustWork=TRUE)
-  # trim the possible trailing slash under Windows (#306)
-  if (isWindows()) dir <- sub('/$', '', dir)
-  if (nchar(abs.path) <= nchar(dir) + 1)
-    return(NULL)
-  if (substr(abs.path, 1, nchar(dir)) != dir ||
-      substr(abs.path, nchar(dir)+1, nchar(dir)+1) != '/') {
-    return(NULL)
-  }
-  return(abs.path)
-}
-
-isWindows <- function() .Platform$OS.type == 'windows'
-
-# This is a wrapper for download.file and has the same interface.
-# The only difference is that, if the protocol is https, it changes the
-# download settings, depending on platform.
-download <- function(url, ...) {
-  # First, check protocol. If http or https, check platform:
-  if (grepl('^https?://', url)) {
-
-    # If Windows, call setInternet2, then use download.file with defaults.
-    if (isWindows()) {
-      # If we directly use setInternet2, R CMD CHECK gives a Note on Mac/Linux
-      mySI2 <- `::`(utils, 'setInternet2')
-      # Store initial settings
-      internet2_start <- mySI2(NA)
-      on.exit(mySI2(internet2_start))
-
-      # Needed for https
-      mySI2(TRUE)
-      download.file(url, ...)
-
-    } else {
-      # If non-Windows, check for curl/wget/lynx, then call download.file with
-      # appropriate method.
-
-      if (nzchar(Sys.which("wget")[1])) {
-        method <- "wget"
-      } else if (nzchar(Sys.which("curl")[1])) {
-        method <- "curl"
-
-        # curl needs to add a -L option to follow redirects.
-        # Save the original options and restore when we exit.
-        orig_extra_options <- getOption("download.file.extra")
-        on.exit(options(download.file.extra = orig_extra_options))
-
-        options(download.file.extra = paste("-L", orig_extra_options))
-
-      } else if (nzchar(Sys.which("lynx")[1])) {
-        method <- "lynx"
-      } else {
-        stop("no download method found")
-      }
-
-      download.file(url, method = method, ...)
-    }
-
-  } else {
-    download.file(url, ...)
-  }
-}
-
 knownContentTypes <- Map$new()
 knownContentTypes$mset(
   html='text/html; charset=UTF-8',
@@ -327,14 +115,14 @@ makeFunction <- function(args = pairlist(), body, env = parent.frame()) {
   eval(call("function", args, body), env)
 }
 
-#' Convert an expression to a function
+#' Convert an expression or quoted expression to a function
 #'
 #' This is to be called from another function, because it will attempt to get
 #' an unquoted expression from two calls back.
 #'
 #' If expr is a quoted expression, then this just converts it to a function.
 #' If expr is a function, then this simply returns expr (and prints a
-#'   deprecation message).
+#'   deprecation message.
 #' If expr was a non-quoted expression from two calls back, then this will
 #'   quote the original expression and convert it to a function.
 #
@@ -342,8 +130,6 @@ makeFunction <- function(args = pairlist(), body, env = parent.frame()) {
 #' @param env The desired environment for the function. Defaults to the
 #'   calling environment two steps back.
 #' @param quoted Is the expression quoted?
-#' @param caller_offset If specified, the offset in the callstack of the
-#'   functiont to be treated as the caller.
 #'
 #' @examples
 #' # Example of a new renderer, similar to renderText
@@ -379,19 +165,18 @@ makeFunction <- function(args = pairlist(), body, env = parent.frame()) {
 #' # "text, text, text"
 #'
 #' @export
-exprToFunction <- function(expr, env=parent.frame(2), quoted=FALSE,
-                           caller_offset=1) {
+exprToFunction <- function(expr, env=parent.frame(2), quoted=FALSE) {
   # Get the quoted expr from two calls back
-  expr_sub <- eval(substitute(substitute(expr)), parent.frame(caller_offset))
+  expr_sub <- eval(substitute(substitute(expr)), parent.frame())
 
   # Check if expr is a function, making sure not to evaluate expr, in case it
   # is actually an unquoted expression.
   # If expr is a single token, then indexing with [[ will error; if it has multiple
   # tokens, then [[ works. In the former case it will be a name object; in the
   # latter, it will be a language object.
-  if (!is.null(expr_sub) && !is.name(expr_sub) && expr_sub[[1]] == as.name('function')) {
+  if (!is.name(expr_sub) && expr_sub[[1]] == as.name('function')) {
     # Get name of function that called this function
-    called_fun <- sys.call(-1 * caller_offset)[[1]]
+    called_fun <- sys.call(-1)[[1]]
 
     shinyDeprecated(msg = paste("Passing functions to '", called_fun,
       "' is deprecated. Please use expressions instead. See ?", called_fun,
@@ -408,49 +193,11 @@ exprToFunction <- function(expr, env=parent.frame(2), quoted=FALSE,
   }
 }
 
-#' Install an expression as a function
-#'
-#' Installs an expression in the given environment as a function, and registers
-#' debug hooks so that breakpoints may be set in the function.
-#'
-#' This function can replace \code{exprToFunction} as follows: we may use
-#' \code{func <- exprToFunction(expr)} if we do not want the debug hooks, or
-#' \code{installExprFunction(expr, "func")} if we do. Both approaches create a
-#' function named \code{func} in the current environment.
-#'
-#' @seealso Wraps \code{\link{exprToFunction}}; see that method's documentation
-#'   for more documentation and examples.
-#'
-#' @param expr A quoted or unquoted expression
-#' @param name The name the function should be given
-#' @param eval.env The desired environment for the function. Defaults to the
-#'   calling environment two steps back.
-#' @param quoted Is the expression quoted?
-#' @param assign.env The environment in which the function should be assigned.
-#' @param label A label for the object to be shown in the debugger. Defaults to
-#'   the name of the calling function.
-#'
-#' @export
-installExprFunction <- function(expr, name, eval.env = parent.frame(2),
-                                quoted = FALSE,
-                                assign.env = parent.frame(1),
-                                label = as.character(sys.call(-1)[[1]])) {
-  func <- exprToFunction(expr, eval.env, quoted, 2)
-  assign(name, func, envir = assign.env)
-  registerDebugHook(name, assign.env, label)
-}
-
 #' Parse a GET query string from a URL
 #'
 #' Returns a named character vector of key-value pairs.
 #'
 #' @param str The query string. It can have a leading \code{"?"} or not.
-#' @param nested Whether to parse the query string of as a nested list when it
-#'   contains pairs of square brackets \code{[]}. For example, the query
-#'   \samp{a[i1][j1]=x&b[i1][j1]=y&b[i2][j1]=z} will be parsed as \code{list(a =
-#'   list(i1 = list(j1 = 'x')), b = list(i1 = list(j1 = 'y'), i2 = list(j1 =
-#'   'z')))} when \code{nested = TRUE}, and \code{list(`a[i1][j1]` = 'x',
-#'   `b[i1][j1]` = 'y', `b[i2][j1]` = 'z')} when \code{nested = FALSE}.
 #' @export
 #' @examples
 #' parseQueryString("?foo=1&bar=b%20a%20r")
@@ -476,7 +223,7 @@ installExprFunction <- function(expr, name, eval.env = parent.frame(2),
 #' })
 #' }
 #'
-parseQueryString <- function(str, nested = FALSE) {
+parseQueryString <- function(str) {
   if (is.null(str) || nchar(str) == 0)
     return(list())
 
@@ -496,38 +243,10 @@ parseQueryString <- function(str, nested = FALSE) {
   keys   <- gsub('+', ' ', keys,   fixed = TRUE)
   values <- gsub('+', ' ', values, fixed = TRUE)
 
-  keys   <- vapply(keys,   URLdecode, character(1), USE.NAMES = FALSE)
-  values <- vapply(values, URLdecode, character(1), USE.NAMES = FALSE)
+  keys   <- vapply(keys,   function(x) URLdecode(x), FUN.VALUE = character(1))
+  values <- vapply(values, function(x) URLdecode(x), FUN.VALUE = character(1))
 
-  res <- setNames(as.list(values), keys)
-  if (!nested) return(res)
-
-  # Make a nested list from a query of the form ?a[1][1]=x11&a[1][2]=x12&...
-  for (i in grep('\\[.+\\]', keys)) {
-    k <- strsplit(keys[i], '[][]')[[1L]]  # split by [ or ]
-    res <- assignNestedList(res, k[k != ''], values[i])
-    res[[keys[i]]] <- NULL    # remove res[['a[1][1]']]
-  }
-  res
-}
-
-# Assign value to the bottom element of the list x using recursive indices idx
-assignNestedList <- function(x = list(), idx, value) {
-  for (i in seq_along(idx)) {
-    sub <- idx[seq_len(i)]
-    if (is.null(x[[sub]])) x[[sub]] <- list()
-  }
-  x[[idx]] <- value
-  x
-}
-
-# decide what to do in case of errors; it is customizable using the shiny.error
-# option (e.g. we can set options(shiny.error = recover))
-shinyCallingHandlers <- function(expr) {
-  withCallingHandlers(expr, error = function(e) {
-    handle <- getOption('shiny.error')
-    if (is.function(handle)) handle()
-  })
+  setNames(as.list(values), keys)
 }
 
 #' Print message for deprecated functions in Shiny
@@ -540,7 +259,7 @@ shinyCallingHandlers <- function(expr) {
 shinyDeprecated <- function(new=NULL, msg=NULL,
                             old=as.character(sys.call(sys.parent()))[1L]) {
 
-  if (getOption("shiny.deprecation.messages") %OR% TRUE == FALSE)
+  if (getOption("shiny.deprecation.messages", default=TRUE) == FALSE)
     return(invisible())
 
   if (is.null(msg)) {
@@ -553,39 +272,15 @@ shinyDeprecated <- function(new=NULL, msg=NULL,
   message(msg)
 }
 
-#' Register a function with the debugger (if one is active).
-#'
-#' Call this function after exprToFunction to give any active debugger a hook
-#' to set and clear breakpoints in the function. A debugger may implement
-#' registerShinyDebugHook to receive callbacks when Shiny functions are
-#' instantiated at runtime.
-#'
-#' @param name Name of the field or object containing the function.
-#' @param where The reference object or environment containing the function.
-#' @param label A label to display on the function in the debugger.
-#' @noRd
-registerDebugHook <- function(name, where, label) {
-  if (exists("registerShinyDebugHook", mode = "function")) {
-    registerShinyDebugHook <- get("registerShinyDebugHook", mode = "function")
-    params <- new.env(parent = emptyenv())
-    params$name <- name
-    params$where <- where
-    params$label <- label
-    registerShinyDebugHook(params)
-  }
-}
-
-Callbacks <- R6Class(
+Callbacks <- setRefClass(
   'Callbacks',
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    .nextId = integer(0),
-    .callbacks = 'Map',
-
+  fields = list(
+    .nextId = 'integer',
+    .callbacks = 'Map'
+  ),
+  methods = list(
     initialize = function() {
       .nextId <<- as.integer(.Machine$integer.max)
-      .callbacks <<- Map$new()
     },
     register = function(callback) {
       id <- as.character(.nextId)
@@ -597,453 +292,19 @@ Callbacks <- R6Class(
     },
     invoke = function(..., onError=NULL) {
       for (callback in .callbacks$values()) {
-        if (is.null(onError)) {
-          callback(...)
-        } else {
-          tryCatch(callback(...), error = onError)
-        }
+        tryCatch(
+          do.call(callback, list(...)),
+          error = function(e) {
+            if (is.null(onError))
+              stop(e)
+            else
+              onError(e)
+          }
+        )
       }
     },
     count = function() {
       .callbacks$size()
     }
   )
-)
-
-# convert a data frame to JSON as required by DataTables request
-dataTablesJSON <- function(data, req) {
-  n <- nrow(data)
-  q <- parseQueryString(req$QUERY_STRING, nested = TRUE)
-  ci <- q$search[['caseInsensitive']] == 'true'
-
-  # global searching
-  i <- seq_len(n)
-  if (q$search[['value']] != '') {
-    i0 <- apply(data, 2, function(x) {
-      grep2(q$search[['value']], as.character(x),
-            fixed = q$search[['regex']] == 'false', ignore.case = ci)
-    })
-    i <- intersect(i, unique(unlist(i0)))
-  }
-
-  # search by columns
-  if (length(i)) for (j in names(q$columns)) {
-    col <- q$columns[[j]]
-    # if the j-th column is not searchable or the search string is "", skip it
-    if (col[['searchable']] != 'true') next
-    if ((k <- col[['search']][['value']]) == '') next
-    j <- as.integer(j)
-    dj <- data[, j + 1]
-    r  <- commaToRange(k)
-    ij <- if (length(r) == 2 && is.numeric(dj)) {
-      which(dj >= r[1] & dj <= r[2])
-    } else {
-      grep2(k, as.character(dj), fixed = col[['search']][['regex']] == 'false',
-            ignore.case = ci)
-    }
-    i <- intersect(ij, i)
-    if (length(i) == 0) break
-  }
-  if (length(i) != n) data <- data[i, , drop = FALSE]
-
-  # sorting
-  oList <- list()
-  for (ord in q$order) {
-    k <- ord[['column']]  # which column to sort
-    d <- ord[['dir']]     # direction asc/desc
-    if (q$columns[[k]][['orderable']] != 'true') next
-    col <- data[, as.integer(k) + 1]
-    oList[[length(oList) + 1]] <- (if (d == 'asc') identity else `-`)(
-      if (is.numeric(col)) col else xtfrm(col)
-    )
-  }
-  if (length(oList)) {
-    i <- do.call(order, oList)
-    data <- data[i, , drop = FALSE]
-  }
-  # paging
-  if (q$length != '-1') {
-    i <- seq(as.integer(q$start) + 1L, length.out = as.integer(q$length))
-    i <- i[i <= nrow(data)]
-    fdata <- data[i, , drop = FALSE]  # filtered data
-  } else fdata <- data
-
-  fdata <- unname(as.matrix(fdata))
-  # WAT: toJSON(list(x = matrix(nrow = 0, ncol = 1))) => {"x": } (#299)
-  if (nrow(fdata) == 0) fdata <- list()
-  # WAT: toJSON(list(x = matrix(1:2))) => {x: [ [1], [2] ]}, however,
-  # toJSON(list(x = matrix(1))) => {x: [ 1 ]} (loss of dimension, #429)
-  if (length(fdata) && all(dim(fdata) == 1)) fdata <- list(list(fdata[1, 1]))
-
-  res <- toJSON(list(
-    draw = q$draw,
-    recordsTotal = n,
-    recordsFiltered = nrow(data),
-    data = fdata
-  ))
-  httpResponse(200, 'application/json', res)
-}
-
-# when both ignore.case and fixed are TRUE, we use grep(ignore.case = FALSE,
-# fixed = TRUE) to do lower-case matching of pattern on x
-grep2 <- function(pattern, x, ignore.case = FALSE, fixed = FALSE, ...) {
-  if (fixed && ignore.case) {
-    pattern <- tolower(pattern)
-    x <- tolower(x)
-    ignore.case <- FALSE
-  }
-  # when the user types in the search box, the regular expression may not be
-  # complete before it is sent to the server, in which case we do not search
-  if (!fixed && inherits(try(grep(pattern, ''), silent = TRUE), 'try-error'))
-    return(seq_along(x))
-  grep(pattern, x, ignore.case = ignore.case, fixed = fixed, ...)
-}
-
-getExists <- function(x, mode, envir = parent.frame()) {
-  if (exists(x, envir = envir, mode = mode, inherits = FALSE))
-    get(x, envir = envir, mode = mode, inherits = FALSE)
-}
-
-# convert a string of the form "lower,upper" to c(lower, upper)
-commaToRange <- function(string) {
-  if (!grepl(',', string)) return()
-  r <- strsplit(string, ',')[[1]]
-  if (length(r) > 2) return()
-  if (length(r) == 1) r <- c(r, '')  # lower,
-  r <- as.numeric(r)
-  if (is.na(r[1])) r[1] <- -Inf
-  if (is.na(r[2])) r[2] <- Inf
-  r
-}
-
-# for options passed to DataTables/Selectize/..., the options of the class AsIs
-# will be evaluated as literal JavaScript code
-checkAsIs <- function(options) {
-  evalOptions <- if (length(options)) {
-    nms <- names(options)
-    if (length(nms) == 0L || any(nms == '')) stop("'options' must be a named list")
-    i <- unlist(lapply(options, function(x) {
-      is.character(x) && inherits(x, 'AsIs')
-    }))
-    if (any(i)) {
-      # must convert to character, otherwise toJSON() turns it to an array []
-      options[i] <- lapply(options[i], paste, collapse = '\n')
-      nms[i]  # options of these names will be evaluated in JS
-    }
-  }
-  list(options = options, eval = evalOptions)
-}
-
-srcrefFromShinyCall <- function(expr) {
-  srcrefs <- attr(expr, "srcref")
-  num_exprs <- length(srcrefs)
-  if (num_exprs < 1)
-    return(NULL)
-  c(srcrefs[[1]][1], srcrefs[[1]][2],
-    srcrefs[[num_exprs]][3], srcrefs[[num_exprs]][4],
-    srcrefs[[1]][5], srcrefs[[num_exprs]][6])
-}
-
-# Indicates whether the given querystring should cause the associated request
-# to be handled in showcase mode. Returns the showcase mode if set, or NULL
-# if no showcase mode is set.
-showcaseModeOfQuerystring <- function(querystring) {
-  if (nchar(querystring) > 0) {
-    qs <- parseQueryString(querystring)
-    if (exists("showcase", where = qs)) {
-      return(as.numeric(qs$showcase))
-    }
-  }
-  return(NULL)
-}
-
-showcaseModeOfReq <- function(req) {
-  showcaseModeOfQuerystring(req$QUERY_STRING)
-}
-
-# Returns (just) the filename containing the given source reference, or an
-# empty string if the source reference doesn't include file information.
-srcFileOfRef <- function(srcref) {
-  fileEnv <- attr(srcref, "srcfile")
-  # The 'srcfile' attribute should be a non-null environment containing the
-  # variable 'filename', which gives the full path to the source file.
-  if (!is.null(fileEnv) &&
-      is.environment(fileEnv) &&
-      exists("filename", where = fileEnv))
-    basename(fileEnv[["filename"]])
-  else
-    ""
-}
-
-# Format a number without sci notation, and keep as many digits as possible (do
-# we really need to go beyond 15 digits?)
-formatNoSci <- function(x) {
-  if (is.null(x)) return(NULL)
-  format(x, scientific = FALSE, digits = 15)
-}
-
-# Returns a function that calls the given func and caches the result for
-# subsequent calls, unless the given file's mtime changes.
-cachedFuncWithFile <- function(dir, file, func, case.sensitive = FALSE) {
-  dir <- normalizePath(dir, mustWork=TRUE)
-  mtime <- NA
-  value <- NULL
-  function(...) {
-    fname <- if (case.sensitive)
-      file.path(dir, file)
-    else
-      file.path.ci(dir, file)
-
-    now <- file.info(fname)$mtime
-    if (!identical(mtime, now)) {
-      value <<- func(fname, ...)
-      mtime <<- now
-    }
-    value
-  }
-}
-
-# turn column-based data to row-based data (mainly for JSON), e.g. data.frame(x
-# = 1:10, y = 10:1) ==> list(list(x = 1, y = 10), list(x = 2, y = 9), ...)
-columnToRowData <- function(data) {
-  do.call(
-    mapply, c(
-      list(FUN = function(...) list(...), SIMPLIFY = FALSE, USE.NAMES = FALSE),
-      as.list(data)
-    )
-  )
-}
-
-#' Validate input values and other conditions
-#'
-#' For an output rendering function (e.g. \code{\link{renderPlot}()}), you may
-#' need to check that certain input values are available and valid before you
-#' can render the output. \code{validate} gives you a convenient mechanism for
-#' doing so.
-#'
-#' The \code{validate} function takes any number of (unnamed) arguments, each of
-#' which represents a condition to test. If any of the conditions represent
-#' failure, then a special type of error is signaled which stops execution. If
-#' this error is not handled by application-specific code, it is displayed to
-#' the user by Shiny.
-#'
-#' An easy way to provide arguments to \code{validate} is to use the \code{need}
-#' function, which takes an expression and a string; if the expression is
-#' considered a failure, then the string will be used as the error message. The
-#' \code{need} function considers its expression to be a failure if it is any of
-#' the following:
-#'
-#' \itemize{
-#'   \item{\code{FALSE}}
-#'   \item{\code{NULL}}
-#'   \item{\code{""}}
-#'   \item{An empty atomic vector}
-#'   \item{An atomic vector that contains only missing values}
-#'   \item{A logical vector that contains all \code{FALSE} or missing values}
-#'   \item{An object of class \code{"try-error"}}
-#'   \item{A value that represents an unclicked \code{\link{actionButton}}}
-#' }
-#'
-#' If any of these values happen to be valid, you can explicitly turn them to
-#' logical values. For example, if you allow \code{NA} but not \code{NULL}, you
-#' can use the condition \code{!is.null(input$foo)}, because \code{!is.null(NA)
-#' == TRUE}.
-#'
-#' If you need validation logic that differs significantly from \code{need}, you
-#' can create other validation test functions. A passing test should return
-#' \code{NULL}. A failing test should return an error message as a
-#' single-element character vector, or if the failure should happen silently,
-#' \code{FALSE}.
-#'
-#' Because validation failure is signaled as an error, you can use
-#' \code{validate} in reactive expressions, and validation failures will
-#' automatically propagate to outputs that use the reactive expression. In
-#' other words, if reactive expression \code{a} needs \code{input$x}, and two
-#' outputs use \code{a} (and thus depend indirectly on \code{input$x}), it's
-#' not necessary for the outputs to validate \code{input$x} explicitly, as long
-#' as \code{a} does validate it.
-#'
-#' @param ... A list of tests. Each test should equal \code{NULL} for success,
-#'   \code{FALSE} for silent failure, or a string for failure with an error
-#'   message.
-#' @param errorClass A CSS class to apply. The actual CSS string will have
-#'   \code{shiny-output-error-} prepended to this value.
-#' @export
-#' @examples
-#' # in ui.R
-#' fluidPage(
-#'   checkboxGroupInput('in1', 'Check some letters', choices = head(LETTERS)),
-#'   selectizeInput('in2', 'Select a state', choices = state.name),
-#'   plotOutput('plot')
-#' )
-#'
-#' # in server.R
-#' function(input, output) {
-#'   output$plot <- renderPlot({
-#'     validate(
-#'       need(input$in1, 'Check at least one letter!'),
-#'       need(input$in2 == '', 'Please choose a state.')
-#'     )
-#'     plot(1:10, main = paste(c(input$in1, input$in2), collapse = ', '))
-#'   })
-#' }
-validate <- function(..., errorClass = character(0)) {
-  results <- sapply(list(...), function(x) {
-    # Detect NULL or NA
-    if (is.null(x))
-      return(NA_character_)
-    else if (identical(x, FALSE))
-      return("")
-    else if (is.character(x))
-      return(paste(as.character(x), collapse = "\n"))
-    else
-      stop("Unexpected validation result: ", as.character(x))
-  })
-
-  results <- na.omit(results)
-  if (length(results) == 0)
-    return(invisible())
-
-  # There may be empty strings remaining; these are message-less failures that
-  # started as FALSE
-  results <- results[nzchar(results)]
-
-  stopWithCondition(c("validation", errorClass), paste(results, collapse="\n"))
-}
-
-#' @param expr An expression to test. The condition will pass if the expression
-#'   meets the conditions spelled out in Details.
-#' @param message A message to convey to the user if the validation condition is
-#'   not met. If no message is provided, one will be created using \code{label}.
-#'   To fail with no message, use \code{FALSE} for the message.
-#' @param label A human-readable name for the field that may be missing. This
-#'   parameter is not needed if \code{message} is provided, but must be provided
-#'   otherwise.
-#' @export
-#' @rdname validate
-need <- function(expr, message = paste(label, "must be provided"), label) {
-
-  force(message) # Fail fast on message/label both being missing
-
-  if (!isTruthy(expr))
-    return(message)
-  else
-    return(invisible(NULL))
-}
-
-isTruthy <- function(x) {
-  if (inherits(x, 'try-error'))
-    return(FALSE)
-
-  if (!is.atomic(x))
-    return(TRUE)
-
-  if (is.null(x))
-    return(FALSE)
-  if (length(x) == 0)
-    return(FALSE)
-  if (all(is.na(x)))
-    return(FALSE)
-  if (is.character(x) && !any(nzchar(na.omit(x))))
-    return(FALSE)
-  if (inherits(x, 'shinyActionButtonValue') && x == 0)
-    return(FALSE)
-  if (is.logical(x) && !any(na.omit(x)))
-    return(FALSE)
-
-  return(TRUE)
-}
-
-# add class(es) to the error condition, which will be used as names of CSS
-# classes, e.g. shiny-output-error shiny-output-error-validation
-stopWithCondition <- function(class, message) {
-  cond <- structure(
-    list(message = message),
-    class = c(class, 'shiny.silent.error', 'error', 'condition')
-  )
-  stop(cond)
-}
-
-#' Collect information about the Shiny Server environment
-#'
-#' This function returns the information about the current Shiny Server, such as
-#' its version, and whether it is the open source edition or professional
-#' edition. If the app is not served through the Shiny Server, this function
-#' just returns \code{list(shinyServer = FALSE)}.
-#'
-#' This function will only return meaningful data when using Shiny Server
-#' version 1.2.2 or later.
-#' @export
-#' @return A list of the Shiny Server information.
-serverInfo <- function() {
-  .globals$serverInfo
-}
-.globals$serverInfo <- list(shinyServer = FALSE)
-
-setServerInfo <- function(...) {
-  infoOld <- serverInfo()
-  infoNew <- list(...)
-  infoOld[names(infoNew)] <- infoNew
-  .globals$serverInfo <- infoOld
-}
-
-# see if the file can be read as UTF-8 on Windows, and converted from UTF-8 to
-# native encoding; if the conversion fails, it will produce NA's in the results
-checkEncoding <- function(file) {
-  # skip *nix because its locale is normally UTF-8 based (e.g. en_US.UTF-8), and
-  # *nix users have to make a conscious effort to save a file with an encoding
-  # that is not UTF-8; if they choose to do so, we cannot do much about it
-  # except sitting back and seeing them punished after they choose to escape a
-  # world of consistency (falling back to getOption('encoding') will not help
-  # because native.enc is also normally UTF-8 based on *nix)
-  if (!isWindows()) return('UTF-8')
-  # an empty file?
-  size <- file.info(file)[, 'size']
-  if (size == 0) return('UTF-8')
-
-  x <- readLines(file, encoding = 'UTF-8', warn = FALSE)
-  # if conversion is successful and there are no embedded nul's, use UTF-8
-  if (!any(is.na(iconv(x, 'UTF-8'))) &&
-        !any(readBin(file, 'raw', size) == as.raw(0))) return('UTF-8')
-
-  # check if there is a BOM character: this is also skipped on *nix, because R
-  # on *nix simply ignores this meaningless character if present, but it hurts
-  # on Windows
-  if (identical(charToRaw(readChar(file, 3L, TRUE)), charToRaw('\UFEFF'))) {
-    warning('You should not include the Byte Order Mark (BOM) in ', file, '. ',
-            'Please re-save it in UTF-8 without BOM. See ',
-            'http://shiny.rstudio.com/articles/unicode.html for more info.')
-    if (getRversion() < '3.0.0')
-      stop('R does not support UTF-8-BOM before 3.0.0. Please upgrade R.')
-    return('UTF-8-BOM')
-  }
-
-  enc <- getOption('encoding')
-  msg <- c(sprintf('The file "%s" is not encoded in UTF-8. ', file),
-           'Please convert its encoding to UTF-8 ',
-           '(e.g. use the menu `File -> Save with Encoding` in RStudio). ',
-           'See http://shiny.rstudio.com/articles/unicode.html for more info.')
-  if (enc == 'UTF-8') stop(msg)
-  # if you publish the app to ShinyApps.io, you will be in trouble
-  warning(c(msg, ' Falling back to the encoding "', enc, '".'))
-
-  enc
-}
-
-# try to read a file using UTF-8 (fall back to getOption('encoding') in case of
-# failure, which defaults to native.enc, i.e. native encoding)
-readUTF8 <- function(file) {
-  enc <- checkEncoding(file)
-  # readLines() does not support UTF-8-BOM directly; has to go through file()
-  if (enc == 'UTF-8-BOM') {
-    file <- base::file(file, encoding = enc)
-    on.exit(close(file), add = TRUE)
-  }
-  x <- readLines(file, encoding = enc, warn = FALSE)
-  enc2native(x)
-}
-
-# similarly, try to source() a file with UTF-8
-sourceUTF8 <- function(file, ...) {
-  source(file, ..., keep.source = TRUE, encoding = checkEncoding(file))
-}
+)

README.md

@@ -1,10 +1,8 @@
-# Shiny
-
-[![Build Status](https://travis-ci.org/rstudio/shiny.svg?branch=master)](https://travis-ci.org/rstudio/shiny)
+# Shiny 
 
 Shiny is a new package from RStudio that makes it incredibly easy to build interactive web applications with R.
 
-For an introduction and examples, visit the [Shiny Dev Center](http://shiny.rstudio.com/).
+For an introduction and examples, visit the [Shiny homepage](http://www.rstudio.com/shiny/).
 
 ## Features
 
@@ -12,34 +10,26 @@ For an introduction and examples, visit the [Shiny Dev Center](http://shiny.rstu
 * Shiny applications are automatically "live" in the same way that spreadsheets are live. Outputs change instantly as users modify inputs, without requiring a reload of the browser.
 * Shiny user interfaces can be built entirely using R, or can be written directly in HTML, CSS, and JavaScript for more flexibility.
 * Works in any R environment (Console R, Rgui for Windows or Mac, ESS, StatET, RStudio, etc.)
-* Attractive default UI theme based on [Bootstrap](http://getbootstrap.com/2.3.2/).
+* Attractive default UI theme based on [Twitter Bootstrap](http://twitter.github.com/bootstrap).
 * A highly customizable slider widget with built-in support for animation.
 * Pre-built output widgets for displaying plots, tables, and printed output of R objects.
-* Fast bidirectional communication between the web browser and R using the [httpuv](https://github.com/rstudio/httpuv) package.
+* Fast bidirectional communication between the web browser and R using the [websockets](http://illposed.net/websockets.html) package.
 * Uses a [reactive](http://en.wikipedia.org/wiki/Reactive_programming) programming model that eliminates messy event handling code, so you can focus on the code that really matters.
 * Develop and redistribute your own Shiny widgets that other developers can easily drop into their own applications (coming soon!).
 
 ## Installation
 
-To install the stable version from CRAN, simply run the following from an R console:
+From an R console:
 
 ```r
 install.packages("shiny")
 ```
 
-To install the latest development builds directly from GitHub, run this instead:
-
-```r
-if (!require("devtools"))
-  install.packages("devtools")
-devtools::install_github("shiny", "rstudio")
-```
-
 ## Getting Started
 
-To learn more we highly recommend you check out the [Shiny Tutorial](http://shiny.rstudio.com/tutorial/). The tutorial explains the framework in-depth, walks you through building a simple application, and includes extensive annotated examples.
+To learn more we highly recommend you check out the [Shiny Tutorial](http://rstudio.github.com/shiny/tutorial). The tutorial explains the framework in-depth, walks you through building a simple application, and includes extensive annotated examples.
 
-We hope you enjoy using Shiny. If you have general questions about using Shiny, please use the Shiny [mailing list](https://groups.google.com/forum/#!forum/shiny-discuss). For bug reports, please use the [issue tracker](https://github.com/rstudio/shiny/issues).
+We hope you enjoy using Shiny. As you learn more and work with the package please [let us know](https://github.com/rstudio/shiny/issues) what problems you encounter and how you'd like to see Shiny evolve.
 
 ## License
 

inst/NOTICE

@@ -5,15 +5,13 @@ these components are included below):
 - jQuery
 - Bootstrap
 - bootstrap-datepicker, from https://github.com/eternicode/bootstrap-datepicker
-- selectize, from https://github.com/brianreavis/selectize.js
-- es5-shim
 - jslider
-- DataTables
+
 
 jQuery License
-----------------------------------------------------------------------
+----------------------------------------------------------------------   
 
-Copyright (c) 2012 jQuery Foundation and other contributors,
+Copyright (c) 2012 jQuery Foundation and other contributors, 
 http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -36,8 +34,8 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-Bootstrap, bootstrap-datepicker, and selectize License
-----------------------------------------------------------------------
+Bootstrap and bootstrap-datepicker License
+----------------------------------------------------------------------   
 
                                  Apache License
                            Version 2.0, January 2004
@@ -242,34 +240,8 @@ Bootstrap, bootstrap-datepicker, and selectize License
    limitations under the License.
 
 
-es5-shim License
-----------------------------------------------------------------------
-
-The MIT License (MIT)
-
-Copyright (C) 2009-2014 Kristopher Michael Kowal and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
 jslider License
-----------------------------------------------------------------------
+----------------------------------------------------------------------   
 
 The MIT License (MIT)
 Copyright (c) 2012 Egor Khmelev
@@ -291,35 +263,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-
-DataTables License
-----------------------------------------------------------------------
-
-Copyright (c) 2008-2010, Allan Jardine
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of Allan Jardine nor SpryMedia UK may be used to
-      endorse or promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

inst/examples/01_hello/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: Hello Shiny!
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/01_hello/Readme.md

@@ -1,4 +0,0 @@
-This small Shiny application demonstrates Shiny's automatic UI updates. Move
-the *Number of bins* slider and notice how the `renderPlot` expression is
-automatically re-evaluated when its dependant, `input$bins`, changes,
-causing a histogram with a new number of bins to be rendered.

inst/examples/01_hello/server.R

@@ -1,21 +1,20 @@
 library(shiny)
 
-# Define server logic required to draw a histogram
+# Define server logic required to generate and plot a random distribution
 shinyServer(function(input, output) {
-
-  # Expression that generates a histogram. The expression is
-  # wrapped in a call to renderPlot to indicate that:
+   
+  # Expression that generates a plot of the distribution. The expression
+  # is wrapped in a call to renderPlot to indicate that:
   #
-  #  1) It is "reactive" and therefore should be automatically
+  #  1) It is "reactive" and therefore should be automatically 
   #     re-executed when inputs change
-  #  2) Its output type is a plot
-
+  #  2) Its output type is a plot 
+  #
   output$distPlot <- renderPlot({
-    x    <- faithful[, 2]  # Old Faithful Geyser data
-    bins <- seq(min(x), max(x), length.out = input$bins + 1)
-
-    # draw the histogram with the specified number of bins
-    hist(x, breaks = bins, col = 'darkgray', border = 'white')
+        
+    # generate an rnorm distribution and plot it
+    dist <- rnorm(input$obs)
+    hist(dist)
   })
-
+  
 })

inst/examples/01_hello/ui.R

@@ -1,24 +1,22 @@
 library(shiny)
 
-# Define UI for application that draws a histogram
-shinyUI(fluidPage(
-
+# Define UI for application that plots random distributions 
+shinyUI(pageWithSidebar(
+  
   # Application title
-  titlePanel("Hello Shiny!"),
-
-  # Sidebar with a slider input for the number of bins
-  sidebarLayout(
-    sidebarPanel(
-      sliderInput("bins",
-                  "Number of bins:",
-                  min = 1,
-                  max = 50,
-                  value = 30)
-    ),
-
-    # Show a plot of the generated distribution
-    mainPanel(
-      plotOutput("distPlot")
-    )
+  headerPanel("Hello Shiny!"),
+  
+  # Sidebar with a slider input for number of observations
+  sidebarPanel(
+    sliderInput("obs", 
+                "Number of observations:", 
+                min = 0, 
+                max = 1000, 
+                value = 500)
+  ),
+  
+  # Show a plot of the generated distribution
+  mainPanel(
+    plotOutput("distPlot")
   )
 ))

inst/examples/02_text/DESCRIPTION

@@ -1,8 +0,0 @@
-Title: Shiny Text
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny
-

inst/examples/02_text/Readme.md

@@ -1 +0,0 @@
-This example demonstrates output of raw text from R using the `renderPrint` function in `server.R` and the `verbatimTextOutput` function in `ui.R`. In this case, a textual summary of the data is shown using R's built-in `summary` function. 

inst/examples/02_text/server.R

@@ -1,8 +1,7 @@
 library(shiny)
 library(datasets)
 
-# Define server logic required to summarize and view the selected
-# dataset
+# Define server logic required to summarize and view the selected dataset
 shinyServer(function(input, output) {
   
   # Return the requested dataset

inst/examples/02_text/ui.R

@@ -1,27 +1,25 @@
 library(shiny)
 
 # Define UI for dataset viewer application
-shinyUI(fluidPage(
+shinyUI(pageWithSidebar(
   
   # Application title
-  titlePanel("Shiny Text"),
+  headerPanel("Shiny Text"),
   
-  # Sidebar with controls to select a dataset and specify the
-  # number of observations to view
-  sidebarLayout(
-    sidebarPanel(
-      selectInput("dataset", "Choose a dataset:", 
-                  choices = c("rock", "pressure", "cars")),
-      
-      numericInput("obs", "Number of observations to view:", 10)
-    ),
+  # Sidebar with controls to select a dataset and specify the number
+  # of observations to view
+  sidebarPanel(
+    selectInput("dataset", "Choose a dataset:", 
+                choices = c("rock", "pressure", "cars")),
     
-    # Show a summary of the dataset and an HTML table with the 
-	 # requested number of observations
-    mainPanel(
-      verbatimTextOutput("summary"),
-      
-      tableOutput("view")
-    )
+    numericInput("obs", "Number of observations to view:", 10)
+  ),
+  
+  # Show a summary of the dataset and an HTML table with the requested
+  # number of observations
+  mainPanel(
+    verbatimTextOutput("summary"),
+    
+    tableOutput("view")
   )
 ))

inst/examples/03_reactivity/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: Reactivity
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/03_reactivity/Readme.md

@@ -1,5 +0,0 @@
-This example demonstrates a core feature of Shiny: **reactivity**. In `server.R`, a reactive called `datasetInput` is declared. 
-
-Notice that the reactive expression depends on the input expression `input$dataset`, and that it's used by both the output expression `output$summary` and `output$view`. Try changing the dataset (using *Choose a dataset*) while looking at the reactive and then at the outputs; you will see first the reactive and then its dependencies flash. 
-
-Notice also that the reactive expression doesn't just update whenever anything changes--only the inputs it depends on will trigger an update. Change the "Caption" field and notice how only the `output$caption` expression is re-evaluated; the reactive and its dependents are left alone.

inst/examples/03_reactivity/server.R

@@ -1,16 +1,17 @@
 library(shiny)
 library(datasets)
 
-# Define server logic required to summarize and view the selected
-# dataset
+# Define server logic required to summarize and view the selected dataset
 shinyServer(function(input, output) {
 
-  # By declaring datasetInput as a reactive expression we ensure 
-  # that:
+  # By declaring databaseInput as a reactive expression we ensure that:
   #
   #  1) It is only called when the inputs it depends on changes
-  #  2) The computation and result are shared by all the callers 
-  #	  (it only executes a single time)
+  #  2) The computation and result are shared by all the callers (it 
+  #     only executes a single time)
+  #  3) When the inputs change and the expression is re-executed, the
+  #     new result is compared to the previous result; if the two are
+  #     identical, then the callers are not notified
   #
   datasetInput <- reactive({
     switch(input$dataset,
@@ -19,34 +20,30 @@ shinyServer(function(input, output) {
            "cars" = cars)
   })
   
-  # The output$caption is computed based on a reactive expression
-  # that returns input$caption. When the user changes the
-  # "caption" field:
+  # The output$caption is computed based on a reactive expression that
+  # returns input$caption. When the user changes the "caption" field:
   #
-  #  1) This function is automatically called to recompute the 
-  #     output 
-  #  2) The new caption is pushed back to the browser for 
-  #     re-display
+  #  1) This function is automatically called to recompute the output 
+  #  2) The new caption is pushed back to the browser for re-display
   # 
-  # Note that because the data-oriented reactive expressions
-  # below don't depend on input$caption, those expressions are
-  # NOT called when input$caption changes.
+  # Note that because the data-oriented reactive expressions below don't 
+  # depend on input$caption, those expressions are NOT called when 
+  # input$caption changes.
   output$caption <- renderText({
     input$caption
   })
   
-  # The output$summary depends on the datasetInput reactive
-  # expression, so will be re-executed whenever datasetInput is
-  # invalidated
+  # The output$summary depends on the datasetInput reactive expression, 
+  # so will be re-executed whenever datasetInput is re-executed 
   # (i.e. whenever the input$dataset changes)
   output$summary <- renderPrint({
     dataset <- datasetInput()
     summary(dataset)
   })
   
-  # The output$view depends on both the databaseInput reactive
-  # expression and input$obs, so will be re-executed whenever
-  # input$dataset or input$obs is changed. 
+  # The output$view depends on both the databaseInput reactive expression
+  # and input$obs, so will be re-executed whenever input$dataset or 
+  # input$obs is changed. 
   output$view <- renderTable({
     head(datasetInput(), n = input$obs)
   })

inst/examples/03_reactivity/ui.R

@@ -1,34 +1,32 @@
 library(shiny)
 
 # Define UI for dataset viewer application
-shinyUI(fluidPage(
+shinyUI(pageWithSidebar(
   
   # Application title
-  titlePanel("Reactivity"),
+  headerPanel("Reactivity"),
   
-  # Sidebar with controls to provide a caption, select a dataset,
-  # and specify the number of observations to view. Note that
-  # changes made to the caption in the textInput control are
-  # updated in the output area immediately as you type
-  sidebarLayout(
-    sidebarPanel(
-      textInput("caption", "Caption:", "Data Summary"),
-      
-      selectInput("dataset", "Choose a dataset:", 
-                  choices = c("rock", "pressure", "cars")),
-      
-      numericInput("obs", "Number of observations to view:", 10)
-    ),
+  # Sidebar with controls to provide a caption, select a dataset, and 
+  # specify the number of observations to view. Note that changes made
+  # to the caption in the textInput control are updated in the output
+  # area immediately as you type
+  sidebarPanel(
+    textInput("caption", "Caption:", "Data Summary"),
     
+    selectInput("dataset", "Choose a dataset:", 
+                choices = c("rock", "pressure", "cars")),
     
-    # Show the caption, a summary of the dataset and an HTML 
-	 # table with the requested number of observations
-    mainPanel(
-      h3(textOutput("caption", container = span)),
-      
-      verbatimTextOutput("summary"), 
-      
-      tableOutput("view")
-    )
+    numericInput("obs", "Number of observations to view:", 10)
+  ),
+  
+  
+  # Show the caption, a summary of the dataset and an HTML table with
+  # the requested number of observations
+  mainPanel(
+    h3(textOutput("caption")), 
+    
+    verbatimTextOutput("summary"), 
+    
+    tableOutput("view")
   )
 ))

inst/examples/04_mpg/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: Miles Per Gallon
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/04_mpg/Readme.md

@@ -1,4 +0,0 @@
-This example demonstrates the following concepts:
-
-* **Global variables**: The `mpgData` variable is declared outside the `shinyServer` function. This makes it available anywhere inside `shinyServer`. The code in `server.R` outside `shinyServer` is only run once when the app starts up, so it can't contain user input.
-* **Reactive expressions**: `formulaText` is a reactive expression. Note how it re-evaluates when the Variable field is changed, but not when the Show Outliers box is ticked. 

inst/examples/04_mpg/server.R

@@ -1,19 +1,17 @@
 library(shiny)
 library(datasets)
 
-# We tweak the "am" field to have nicer factor labels. Since
-# this doesn't rely on any user inputs we can do this once at
-# startup and then use the value throughout the lifetime of the
-# application
+# We tweak the "am" field to have nicer factor labels. Since this doesn't
+# rely on any user inputs we can do this once at startup and then use the
+# value throughout the lifetime of the application
 mpgData <- mtcars
 mpgData$am <- factor(mpgData$am, labels = c("Automatic", "Manual"))
 
 
-# Define server logic required to plot various variables against
-# mpg
+# Define server logic required to plot various variables against mpg
 shinyServer(function(input, output) {
   
-  # Compute the forumla text in a reactive expression since it is
+  # Compute the forumla text in a reactive expression since it is 
   # shared by the output$caption and output$mpgPlot functions
   formulaText <- reactive({
     paste("mpg ~", input$variable)
@@ -24,8 +22,8 @@ shinyServer(function(input, output) {
     formulaText()
   })
   
-  # Generate a plot of the requested variable against mpg and
-  # only include outliers if requested
+  # Generate a plot of the requested variable against mpg and only 
+  # include outliers if requested
   output$mpgPlot <- renderPlot({
     boxplot(as.formula(formulaText()), 
             data = mpgData,

inst/examples/04_mpg/ui.R

@@ -1,29 +1,26 @@
 library(shiny)
 
 # Define UI for miles per gallon application
-shinyUI(fluidPage(
+shinyUI(pageWithSidebar(
   
   # Application title
-  titlePanel("Miles Per Gallon"),
+  headerPanel("Miles Per Gallon"),
   
-  # Sidebar with controls to select the variable to plot against
-  # mpg and to specify whether outliers should be included
-  sidebarLayout(
-    sidebarPanel(
-      selectInput("variable", "Variable:",
-                  c("Cylinders" = "cyl",
-                    "Transmission" = "am",
-                    "Gears" = "gear")),
+  # Sidebar with controls to select the variable to plot against mpg
+  # and to specify whether outliers should be included
+  sidebarPanel(
+    selectInput("variable", "Variable:",
+                c("Cylinders" = "cyl",
+                  "Transmission" = "am",
+                  "Gears" = "gear")),
+
+    checkboxInput("outliers", "Show outliers", FALSE)
+  ),
   
-      checkboxInput("outliers", "Show outliers", FALSE)
-    ),
+  # Show the caption and plot of the requested variable against mpg
+  mainPanel(
+    h3(textOutput("caption")),
     
-	 # Show the caption and plot of the requested variable against
-	 # mpg
-    mainPanel(
-      h3(textOutput("caption")),
-      
-      plotOutput("mpgPlot")
-    )
+    plotOutput("mpgPlot")
   )
 ))

inst/examples/05_sliders/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: Sliders
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/05_sliders/Readme.md

@@ -1,3 +0,0 @@
-This example demonstrates Shiny's versatile `sliderInput` widget. 
-
-Slider inputs can be used to select single values, to select a continuous range of values, and even to animate over a range.

inst/examples/05_sliders/server.R

@@ -3,8 +3,7 @@ library(shiny)
 # Define server logic for slider examples
 shinyServer(function(input, output) {
   
-  # Reactive expression to compose a data frame containing all of
-  # the values
+  # Reactive expression to compose a data frame containing all of the values
   sliderValues <- reactive({
     
     # Compose data frame

inst/examples/05_sliders/ui.R

@@ -1,43 +1,37 @@
 library(shiny)
 
 # Define UI for slider demo application
-shinyUI(fluidPage(
+shinyUI(pageWithSidebar(
   
   #  Application title
-  titlePanel("Sliders"),
+  headerPanel("Sliders"),
   
-  # Sidebar with sliders that demonstrate various available
-  # options
-  sidebarLayout(
-    sidebarPanel(
-      # Simple integer interval
-      sliderInput("integer", "Integer:", 
-                  min=0, max=1000, value=500),
-      
-      # Decimal interval with step value
-      sliderInput("decimal", "Decimal:", 
-                  min = 0, max = 1, value = 0.5, step= 0.1),
-     
-      # Specification of range within an interval
-      sliderInput("range", "Range:",
-                  min = 1, max = 1000, value = c(200,500)),
-      
-      # Provide a custom currency format for value display, 
-		# with basic animation
-      sliderInput("format", "Custom Format:", 
-                  min = 0, max = 10000, value = 0, step = 2500,
-                  format="$#,##0", locale="us", animate=TRUE),
-      
-      # Animation with custom interval (in ms) to control speed,
-		# plus looping
-      sliderInput("animation", "Looping Animation:", 1, 2000, 1,
-					  	step = 10, animate=
-							animationOptions(interval=300, loop=TRUE))
-    ),
+  # Sidebar with sliders that demonstrate various available options
+  sidebarPanel(
+    # Simple integer interval
+    sliderInput("integer", "Integer:", 
+                min=0, max=1000, value=500),
     
-    # Show a table summarizing the values entered
-    mainPanel(
-      tableOutput("values")
-    )
+    # Decimal interval with step value
+    sliderInput("decimal", "Decimal:", 
+                min = 0, max = 1, value = 0.5, step= 0.1),
+   
+    # Specification of range within an interval
+    sliderInput("range", "Range:",
+                min = 1, max = 1000, value = c(200,500)),
+    
+    # Provide a custom currency format for value display, with basic animation
+    sliderInput("format", "Custom Format:", 
+                min = 0, max = 10000, value = 0, step = 2500,
+                format="$#,##0", locale="us", animate=TRUE),
+    
+    # Animation with custom interval (in ms) to control speed, plus looping
+    sliderInput("animation", "Looping Animation:", 1, 2000, 1, step = 10, 
+                animate=animationOptions(interval=300, loop=TRUE))
+  ),
+  
+  # Show a table summarizing the values entered
+  mainPanel(
+    tableOutput("values")
   )
-))
+))

inst/examples/06_tabsets/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: Tabsets
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/06_tabsets/Readme.md

@@ -1,9 +0,0 @@
-This example demonstrates the `tabsetPanel` and `tabPanel` widgets.
-
-Notice that outputs that are not visible are not re-evaluated until they become visible. Try this: 
-
-1. Scroll to the bottom of `server.R`
-2. Change the number of observations, and observe that only `output$plot` is evaluated.
-3. Click the Summary tab, and observe that `output$summary` is evaluated.
-4. Change the number of observations again, and observe that now only `output$summary` is evaluated.
-

inst/examples/06_tabsets/server.R

@@ -3,10 +3,9 @@ library(shiny)
 # Define server logic for random distribution application
 shinyServer(function(input, output) {
   
-  # Reactive expression to generate the requested distribution.
-  # This is called whenever the inputs change. The output
-  # functions defined below then all use the value computed from
-  # this expression
+  # Reactive expression to generate the requested distribution. This is 
+  # called whenever the inputs change. The output functions defined 
+  # below then all use the value computed from this expression
   data <- reactive({
     dist <- switch(input$dist,
                    norm = rnorm,
@@ -18,11 +17,10 @@ shinyServer(function(input, output) {
     dist(input$n)
   })
   
-  # Generate a plot of the data. Also uses the inputs to build
-  # the plot label. Note that the dependencies on both the inputs
-  # and the data reactive expression are both tracked, and
-  # all expressions are called in the sequence implied by the
-  # dependency graph
+  # Generate a plot of the data. Also uses the inputs to build the 
+  # plot label. Note that the dependencies on both the inputs and
+  # the data reactive expression are both tracked, and all expressions 
+  # are called in the sequence implied by the dependency graph
   output$plot <- renderPlot({
     dist <- input$dist
     n <- input$n

inst/examples/06_tabsets/ui.R

@@ -1,38 +1,36 @@
 library(shiny)
 
 # Define UI for random distribution application 
-shinyUI(fluidPage(
+shinyUI(pageWithSidebar(
     
   # Application title
-  titlePanel("Tabsets"),
+  headerPanel("Tabsets"),
   
   # Sidebar with controls to select the random distribution type
-  # and number of observations to generate. Note the use of the
-  # br() element to introduce extra vertical spacing
-  sidebarLayout(
-    sidebarPanel(
-      radioButtons("dist", "Distribution type:",
-                   c("Normal" = "norm",
-                     "Uniform" = "unif",
-                     "Log-normal" = "lnorm",
-                     "Exponential" = "exp")),
-      br(),
-      
-      sliderInput("n", 
-                  "Number of observations:", 
-                   value = 500,
-                   min = 1, 
-                   max = 1000)
-    ),
+  # and number of observations to generate. Note the use of the br()
+  # element to introduce extra vertical spacing
+  sidebarPanel(
+    radioButtons("dist", "Distribution type:",
+                 c("Normal" = "norm",
+                   "Uniform" = "unif",
+                   "Log-normal" = "lnorm",
+                   "Exponential" = "exp")),
+    br(),
     
-    # Show a tabset that includes a plot, summary, and table view
-    # of the generated distribution
-    mainPanel(
-      tabsetPanel(type = "tabs", 
-        tabPanel("Plot", plotOutput("plot")), 
-        tabPanel("Summary", verbatimTextOutput("summary")), 
-        tabPanel("Table", tableOutput("table"))
-      )
+    sliderInput("n", 
+                "Number of observations:", 
+                 value = 500,
+                 min = 1, 
+                 max = 1000)
+  ),
+  
+  # Show a tabset that includes a plot, summary, and table view
+  # of the generated distribution
+  mainPanel(
+    tabsetPanel(
+      tabPanel("Plot", plotOutput("plot")), 
+      tabPanel("Summary", verbatimTextOutput("summary")), 
+      tabPanel("Table", tableOutput("table"))
     )
   )
 ))

inst/examples/07_widgets/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: Widgets
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/07_widgets/Readme.md

@@ -1 +0,0 @@
-This example demonstrates some additional widgets included in Shiny, such as `helpText` and `submitButton`. The latter is used to delay rendering output until the user explicitly requests it.

inst/examples/07_widgets/server.R

@@ -1,8 +1,7 @@
 library(shiny)
 library(datasets)
 
-# Define server logic required to summarize and view the 
-# selected dataset
+# Define server logic required to summarize and view the selected dataset
 shinyServer(function(input, output) {
   
   # Return the requested dataset

inst/examples/07_widgets/ui.R

@@ -1,43 +1,39 @@
 library(shiny)
 
 # Define UI for dataset viewer application
-shinyUI(fluidPage(
+shinyUI(pageWithSidebar(
   
   # Application title.
-  titlePanel("More Widgets"),
+  headerPanel("More Widgets"),
   
-  # Sidebar with controls to select a dataset and specify the
-  # number of observations to view. The helpText function is
-  # also used to include clarifying text. Most notably, the
-  # inclusion of a submitButton defers the rendering of output
-  # until the user explicitly clicks the button (rather than
-  # doing it immediately when inputs change). This is useful if
-  # the computations required to render output are inordinately
-  # time-consuming.
-  sidebarLayout(
-    sidebarPanel(
-      selectInput("dataset", "Choose a dataset:", 
-                  choices = c("rock", "pressure", "cars")),
-      
-      numericInput("obs", "Number of observations to view:", 10),
-      
-      helpText("Note: while the data view will show only the specified",
-               "number of observations, the summary will still be based",
-               "on the full dataset."),
-      
-      submitButton("Update View")
-    ),
+  # Sidebar with controls to select a dataset and specify the number
+  # of observations to view. The helpText function is also used to 
+  # include clarifying text. Most notably, the inclusion of a 
+  # submitButton defers the rendering of output until the user 
+  # explicitly clicks the button (rather than doing it immediately
+  # when inputs change). This is useful if the computations required
+  # to render output are inordinately time-consuming.
+  sidebarPanel(
+    selectInput("dataset", "Choose a dataset:", 
+                choices = c("rock", "pressure", "cars")),
     
-    # Show a summary of the dataset and an HTML table with the
-    # requested number of observations. Note the use of the h4
-    # function to provide an additional header above each output
-    # section.
-    mainPanel(
-      h4("Summary"),
-      verbatimTextOutput("summary"),
-      
-      h4("Observations"),
-      tableOutput("view")
-    )
+    numericInput("obs", "Number of observations to view:", 10),
+    
+    helpText("Note: while the data view will show only the specified",
+             "number of observations, the summary will still be based",
+             "on the full dataset."),
+    
+    submitButton("Update View")
+  ),
+  
+  # Show a summary of the dataset and an HTML table with the requested
+  # number of observations. Note the use of the h4 function to provide
+  # an additional header above each output section.
+  mainPanel(
+    h4("Summary"),
+    verbatimTextOutput("summary"),
+    
+    h4("Observations"),
+    tableOutput("view")
   )
-))
+))

inst/examples/08_html/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: Custom HTML UI
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/08_html/Readme.md

@@ -1,4 +0,0 @@
-Normally we use the built-in functions, such as `textInput()`, to generate
-the HTML UI in the R script `ui.R`. Actually **shiny** also works with a
-custom HTML page `www/index.html`. See [the
-tutorial](http://rstudio.github.io/shiny/tutorial/#html-ui) for more details.

inst/examples/09_upload/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: File Upload
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/09_upload/Readme.md

@@ -1,4 +0,0 @@
-We can add a file upload input in the UI using the function `fileInput()`,
-e.g. `fileInput('foo')`. In `server.R`, we can access the uploaded files via
-`input$foo`. See [the
-tutorial](http://rstudio.github.io/shiny/tutorial/#uploads) for more details.

inst/examples/09_upload/server.R

@@ -3,18 +3,16 @@ library(shiny)
 shinyServer(function(input, output) {
   output$contents <- renderTable({
     
-    # input$file1 will be NULL initially. After the user selects
-    # and uploads a file, it will be a data frame with 'name',
-    # 'size', 'type', and 'datapath' columns. The 'datapath'
-    # column will contain the local filenames where the data can
-    # be found.
+    # input$file1 will be NULL initially. After the user selects and uploads a 
+    # file, it will be a data frame with 'name', 'size', 'type', and 'datapath' 
+    # columns. The 'datapath' column will contain the local filenames where the 
+    # data can be found.
 
     inFile <- input$file1
 
     if (is.null(inFile))
       return(NULL)
     
-    read.csv(inFile$datapath, header=input$header, sep=input$sep, 
-				 quote=input$quote)
+    read.csv(inFile$datapath, header=input$header, sep=input$sep, quote=input$quote)
   })
 })

inst/examples/09_upload/ui.R

@@ -1,28 +1,24 @@
 library(shiny)
 
-shinyUI(fluidPage(
-  titlePanel("Uploading Files"),
-  sidebarLayout(
-    sidebarPanel(
-      fileInput('file1', 'Choose CSV File',
-                accept=c('text/csv', 
-								 'text/comma-separated-values,text/plain', 
-								 '.csv')),
-      tags$hr(),
-      checkboxInput('header', 'Header', TRUE),
-      radioButtons('sep', 'Separator',
-                   c(Comma=',',
-                     Semicolon=';',
-                     Tab='\t'),
-                   ','),
-      radioButtons('quote', 'Quote',
-                   c(None='',
-                     'Double Quote'='"',
-                     'Single Quote'="'"),
-                   '"')
-    ),
-    mainPanel(
-      tableOutput('contents')
-    )
+shinyUI(pageWithSidebar(
+  headerPanel("Uploading Files"),
+  sidebarPanel(
+    fileInput('file1', 'Choose CSV File',
+              accept=c('text/csv', 'text/comma-separated-values,text/plain')),
+    tags$hr(),
+    checkboxInput('header', 'Header', TRUE),
+    radioButtons('sep', 'Separator',
+                 c(Comma=',',
+                   Semicolon=';',
+                   Tab='\t'),
+                 'Comma'),
+    radioButtons('quote', 'Quote',
+                 c(None='',
+                   'Double Quote'='"',
+                   'Single Quote'="'"),
+                 'Double Quote')
+  ),
+  mainPanel(
+    tableOutput('contents')
   )
 ))

inst/examples/10_download/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: File Download
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/10_download/Readme.md

@@ -1,4 +0,0 @@
-We can add a download button to the UI using `downloadButton()`, and write
-the content of the file in `downloadHandler()` in `server.R`. See [the
-tutorial](http://rstudio.github.io/shiny/tutorial/#downloads) for more
-details.

inst/examples/10_download/server.R

@@ -11,9 +11,7 @@ shinyServer(function(input, output) {
   })
   
   output$downloadData <- downloadHandler(
-    filename = function() { 
-		 paste(input$dataset, '.csv', sep='') 
-	 },
+    filename = function() { paste(input$dataset, '.csv', sep='') },
     content = function(file) {
       write.csv(datasetInput(), file)
     }

inst/examples/10_download/ui.R

@@ -1,13 +1,11 @@
-shinyUI(fluidPage(
-  titlePanel('Downloading Data'),
-  sidebarLayout(
-    sidebarPanel(
-      selectInput("dataset", "Choose a dataset:", 
-                  choices = c("rock", "pressure", "cars")),
-      downloadButton('downloadData', 'Download')
-    ),
-    mainPanel(
-      tableOutput('table')
-    )
+shinyUI(pageWithSidebar(
+  headerPanel('Downloading Data'),
+  sidebarPanel(
+    selectInput("dataset", "Choose a dataset:", 
+                choices = c("rock", "pressure", "cars")),
+    downloadButton('downloadData', 'Download')
+  ),
+  mainPanel(
+    tableOutput('table')
   )
 ))

inst/examples/11_timer/DESCRIPTION

@@ -1,7 +0,0 @@
-Title: Timer
-Author: RStudio, Inc.
-AuthorUrl: http://www.rstudio.com/
-License: MIT
-DisplayMode: Showcase
-Tags: getting-started
-Type: Shiny

inst/examples/11_timer/Readme.md

@@ -1,4 +0,0 @@
-The function `invalidateLater()` can be used to invalidate an observer or
-reactive expression in a given number of milliseconds. In this example, the
-output `currentTime` is updated every second, so it shows the current time
-on a second basis.

inst/examples/11_timer/server.R

@@ -1,6 +1,6 @@
-shinyServer(function(input, output, session) {
+shinyServer(function(input, output) {
   output$currentTime <- renderText({
-    invalidateLater(1000, session)
+    invalidateLater(1000)
     paste("The current time is", Sys.time())
   })
-})
+})

inst/examples/11_timer/ui.R

@@ -1,3 +1,3 @@
-shinyUI(fluidPage(
+shinyUI(bootstrapPage(
   textOutput("currentTime")
 ))

inst/staticdocs/index.r

@@ -1,166 +0,0 @@
-sd_section("UI Layout",
-  "Functions for laying out the user interface for your application.",
-  c(
-    "absolutePanel",
-    "bootstrapPage",
-    "column",
-    "conditionalPanel",
-    "fixedPage",
-    "fluidPage",
-    "headerPanel",
-    "helpText",
-    "icon",
-    "mainPanel",
-    "navbarPage",
-    "navlistPanel",
-    "pageWithSidebar",
-    "sidebarLayout",
-    "sidebarPanel",
-    "tabPanel",
-    "tabsetPanel",
-    "titlePanel",
-    "inputPanel",
-    "flowLayout",
-    "splitLayout",
-    "verticalLayout",
-    "wellPanel",
-    "withMathJax"
-  )
-)
-sd_section("UI Inputs",
-  "Functions for creating user interface elements that prompt the user for input values or interaction.",
-  c(
-    "actionButton",
-    "checkboxGroupInput",
-    "checkboxInput",
-    "dateInput",
-    "dateRangeInput",
-    "fileInput",
-    "numericInput",
-    "radioButtons",
-    "selectInput",
-    "sliderInput",
-    "submitButton",
-    "textInput",
-    "updateCheckboxGroupInput",
-    "updateCheckboxInput",
-    "updateDateInput",
-    "updateDateRangeInput",
-    "updateNumericInput",
-    "updateRadioButtons",
-    "updateSelectInput",
-    "updateSliderInput",
-    "updateTabsetPanel",
-    "updateTextInput"
-  )
-)
-sd_section("UI Outputs",
-  "Functions for creating user interface elements that, in conjunction with rendering functions, display different kinds of output from your application.",
-  c(
-    "htmlOutput",
-    "imageOutput",
-    "plotOutput",
-    "outputOptions",
-    "tableOutput",
-    "textOutput",
-    "verbatimTextOutput",
-    "downloadButton",
-    "Progress",
-    "withProgress"
-  )
-)
-sd_section("Interface builder functions",
-  "A sub-library for writing HTML using R functions. These functions form the foundation on which the higher level user interface functions are built, and can also be used in your Shiny UI to provide custom HTML, CSS, and JavaScript.",
-  c(
-    "builder",
-    "HTML",
-    "include",
-    "singleton",
-    "tag",
-    "validateCssUnit",
-    "withTags"
-  )
-)
-sd_section("Rendering functions",
-  "Functions that you use in your application's server side code, assigning them to outputs that appear in your user interface.",
-  c(
-    "renderPlot",
-    "renderText",
-    "renderPrint",
-    "renderDataTable",
-    "renderImage",
-    "renderTable",
-    "renderUI",
-    "downloadHandler",
-    "reactivePlot",
-    "reactivePrint",
-    "reactiveTable",
-    "reactiveText",
-    "reactiveUI"
-  )
-)
-sd_section("Reactive constructs",
-  "A sub-library that provides reactive programming facilities for R.",
-  c(
-    "invalidateLater",
-    "is.reactivevalues",
-    "isolate",
-    "makeReactiveBinding",
-    "observe",
-    "reactive",
-    "reactiveFileReader",
-    "reactivePoll",
-    "reactiveTimer",
-    "reactiveValues",
-    "reactiveValuesToList",
-    "domains",
-    "showReactLog"
-  )
-)
-sd_section("Boilerplate",
-  "Functions that are required boilerplate in ui.R and server.R.",
-  c(
-    "shinyUI",
-    "shinyServer"
-  )
-)
-sd_section("Running",
-  "Functions that are used to run or stop Shiny applications.",
-  c(
-    "runApp",
-    "runExample",
-    "runUrl",
-    "stopApp"
-  )
-)
-sd_section("Extending Shiny",
-  "Functions that are intended to be called by third-party packages that extend Shiny.",
-  c(
-    "createWebDependency",
-    "addResourcePath",
-    "registerInputHandler",
-    "removeInputHandler",
-    "markRenderFunction"
-  )
-)
-sd_section("Utility functions",
-  "Miscellaneous utilities that may be useful to advanced users or when extending Shiny.",
-  c(
-    "validate",
-    "session",
-    "exprToFunction",
-    "installExprFunction",
-    "parseQueryString",
-    "plotPNG",
-    "repeatable",
-    "shinyDeprecated",
-    "serverInfo"
-  )
-)
-sd_section("Embedding",
-  "Functions that are intended for third-party packages that embed Shiny applications.",
-  c(
-    "shinyApp",
-    "maskReactiveContext"
-  )
-)

inst/tests-js/spec/inputBindingSpec.js

@@ -1135,9 +1135,10 @@ describe("Input Bindings", function() {
       set_value(id, 'option2');
       expect(get_value(id)).toBe('option2');
 
-      // Setting to nonexistent option turns the value to null
+      // Setting to nonexistent option should have no effect
+      // NOTE: this actually resets it to the first option
       set_value(id, 'option999');
-      expect(get_value(id)).toBe(null);
+      expect(get_value(id)).toBe('option1');
     });
 
     it("getState() works", function() {
@@ -1145,8 +1146,8 @@ describe("Input Bindings", function() {
         label: 'Select input:',
         value: 'option1',
         options: [
-          { value: 'option1', label: 'option1 label' },
-          { value: 'option2', label: 'option2 label' }
+          { value: 'option1', label: 'option1 label', selected: true },
+          { value: 'option2', label: 'option2 label', selected: false }
         ]
       });
     });
@@ -1156,8 +1157,8 @@ describe("Input Bindings", function() {
         label: 'Select input:',
         value: 'option4',
         options: [
-          { value: 'option3', label: 'option3 label' },
-          { value: 'option4', label: 'option4 label' }
+          { value: 'option3', label: 'option3 label', selected: false },
+          { value: 'option4', label: 'option4 label', selected: true }
         ]
       };
       receive_message(id, state_complete);
@@ -1168,45 +1169,50 @@ describe("Input Bindings", function() {
       receive_message(id, { });
       expect(get_state(id)).toEqual(state_complete);
 
-      // Don't provide value, and the default should be the first option
+      // Don't provide value, but set selected:true on an option
       var state_novalue = {
         options: [
-          { value: 'option5', label: 'option5 label' },
-          { value: 'option6', label: 'option6 label' }
+          { value: 'option5', label: 'option5 label', selected: false },
+          { value: 'option6', label: 'option6 label', selected: true }
         ]
       };
       var state_novalue_expected = {
         label: 'Select input:',
-        value: 'option5',
+        value: 'option6',
         options: state_novalue.options
       };
       receive_message(id, state_novalue);
-      expect(get_value(id)).toBe('option5');
+      expect(get_value(id)).toBe('option6');
       expect(get_state(id)).toEqual(state_novalue_expected);
 
-      // Only update value
-      var state_value = {
-        value: 'option6'
-      };
-      var state_value_expected = {
-        label: 'Select input:',
-        value: 'option6',
+
+      // Provide value, but no selected:true
+      var state_noselected = {
+        value: 'option7',
         options: [
-          { value: 'option5', label: 'option5 label' },
-          { value: 'option6', label: 'option6 label' }
+          { value: 'option7', label: 'option7 label'},
+          { value: 'option8', label: 'option8 label'}
         ]
       };
-      receive_message(id, state_value);
-      expect(get_value(id)).toEqual('option6');
-      expect(get_state(id)).toEqual(state_value_expected);
+      var state_noselected_expected = {
+        label: 'Select input:',
+        value: 'option7',
+        options: [
+          { value: 'option7', label: 'option7 label', selected: true },
+          { value: 'option8', label: 'option8 label', selected: false }
+        ]
+      };
+      receive_message(id, state_noselected);
+      expect(get_value(id)).toBe('option7');
+      expect(get_state(id)).toEqual(state_noselected_expected);
 
       // Set label
       var state_newlabel_complete = {
         label: 'new label',
         value: 'option9',
         options: [
-          { value: 'option9',  label: 'option9 label' },
-          { value: 'option10', label: 'option10 label' }
+          { value: 'option9',  label: 'option9 label',  selected: true },
+          { value: 'option10', label: 'option10 label', selected: false }
         ]
       };
       receive_message(id, state_newlabel_complete);
@@ -1267,8 +1273,8 @@ describe("Input Bindings", function() {
         label: 'Radio buttons:',
         value: 'option1',
         options: [
-          { value: 'option1', label: 'option1 label' },
-          { value: 'option2', label: 'option2 label' }
+          { value: 'option1', label: 'option1 label', checked: true },
+          { value: 'option2', label: 'option2 label', checked: false }
         ]
       });
     });
@@ -1278,8 +1284,8 @@ describe("Input Bindings", function() {
         label: 'Radio buttons:',
         value: 'option4',
         options: [
-          { value: 'option3', label: 'option3 label' },
-          { value: 'option4', label: 'option4 label' }
+          { value: 'option3', label: 'option3 label', checked: false },
+          { value: 'option4', label: 'option4 label', checked: true }
         ]
       };
       receive_message(id, state_complete);
@@ -1290,46 +1296,50 @@ describe("Input Bindings", function() {
       receive_message(id, { });
       expect(get_state(id)).toEqual(state_complete);
 
-      // Don't provide value, and the value will be undefined
-      // since no option is checked
+      // Don't provide value, but set checked:true on an option
       var state_novalue = {
         options: [
-          { value: 'option5', label: 'option5 label' },
-          { value: 'option6', label: 'option6 label' }
+          { value: 'option5', label: 'option5 label', checked: false },
+          { value: 'option6', label: 'option6 label', checked: true }
         ]
       };
       var state_novalue_expected = {
         label: 'Radio buttons:',
-        value: undefined,
+        value: 'option6',
         options: state_novalue.options
       };
       receive_message(id, state_novalue);
-      expect(get_value(id)).toBe(undefined);
+      expect(get_value(id)).toBe('option6');
       expect(get_state(id)).toEqual(state_novalue_expected);
 
-      // Only update value
-      var state_value = {
-        value: 'option6'
-      };
-      var state_value_expected = {
-        label: 'Radio buttons:',
-        value: 'option6',
+
+      // Provide value, but no checked:true
+      var state_nochecked = {
+        value: 'option7',
         options: [
-          { value: 'option5', label: 'option5 label' },
-          { value: 'option6', label: 'option6 label' }
+          { value: 'option7', label: 'option7 label'},
+          { value: 'option8', label: 'option8 label'}
         ]
       };
-      receive_message(id, state_value);
-      expect(get_value(id)).toEqual('option6');
-      expect(get_state(id)).toEqual(state_value_expected);
+      var state_nochecked_expected = {
+        label: 'Radio buttons:',
+        value: 'option7',
+        options: [
+          { value: 'option7', label: 'option7 label', checked: true },
+          { value: 'option8', label: 'option8 label', checked: false }
+        ]
+      };
+      receive_message(id, state_nochecked);
+      expect(get_value(id)).toBe('option7');
+      expect(get_state(id)).toEqual(state_nochecked_expected);
 
       // Set label
       var state_newlabel_complete = {
         label: 'new label',
         value: 'option9',
         options: [
-          { value: 'option9',  label: 'option9 label' },
-          { value: 'option10', label: 'option10 label' }
+          { value: 'option9',  label: 'option9 label',  checked: true },
+          { value: 'option10', label: 'option10 label', checked: false }
         ]
       };
       receive_message(id, state_newlabel_complete);
@@ -1410,8 +1420,8 @@ describe("Input Bindings", function() {
         label: 'Checkbox group:',
         value: ['option1'],
         options: [
-          { value: 'option1', label: 'option1 label' },
-          { value: 'option2', label: 'option2 label' }
+          { value: 'option1', label: 'option1 label', checked: true },
+          { value: 'option2', label: 'option2 label', checked: false }
         ]
       });
     });
@@ -1421,8 +1431,8 @@ describe("Input Bindings", function() {
         label: 'Checkbox group:',
         value: ['option4'],
         options: [
-          { value: 'option3', label: 'option3 label' },
-          { value: 'option4', label: 'option4 label' }
+          { value: 'option3', label: 'option3 label', checked: false },
+          { value: 'option4', label: 'option4 label', checked: true }
         ]
       };
       receive_message(id, state_complete);
@@ -1433,46 +1443,50 @@ describe("Input Bindings", function() {
       receive_message(id, { });
       expect(get_state(id)).toEqual(state_complete);
 
-      // Don't provide value
+      // Don't provide value, but set checked:true on an option
       var state_novalue = {
         options: [
-          { value: 'option5', label: 'option5 label' },
-          { value: 'option6', label: 'option6 label' }
+          { value: 'option5', label: 'option5 label', checked: true },
+          { value: 'option6', label: 'option6 label', checked: true }
         ]
       };
       var state_novalue_expected = {
         label: 'Checkbox group:',
-        value: [ ],
+        value: ['option5', 'option6'],
         options: state_novalue.options
       };
       receive_message(id, state_novalue);
-      expect(get_value(id)).toEqual([ ]);
+      expect(get_value(id)).toEqual(['option5', 'option6']);
       expect(get_state(id)).toEqual(state_novalue_expected);
 
 
-      // Only update value
-      var state_value = {
-        value: 'option6'
-      };
-      var state_value_expected = {
-        label: 'Checkbox group:',
-        value: ['option6'],
+      // Provide value, but no checked:true
+      var state_nochecked = {
+        value: 'option7',
         options: [
-          { value: 'option5', label: 'option5 label' },
-          { value: 'option6', label: 'option6 label' }
+          { value: 'option7', label: 'option7 label'},
+          { value: 'option8', label: 'option8 label'}
         ]
       };
-      receive_message(id, state_value);
-      expect(get_value(id)).toEqual(['option6']);
-      expect(get_state(id)).toEqual(state_value_expected);
+      var state_nochecked_expected = {
+        label: 'Checkbox group:',
+        value: ['option7'],
+        options: [
+          { value: 'option7', label: 'option7 label', checked: true },
+          { value: 'option8', label: 'option8 label', checked: false }
+        ]
+      };
+      receive_message(id, state_nochecked);
+      expect(get_value(id)).toEqual(['option7']);
+      expect(get_state(id)).toEqual(state_nochecked_expected);
 
       // Set label
       var state_newlabel_complete = {
         label: 'Checkbox group new label:',
         value: ['option4'],
         options: [
-          { value: 'option3', label: 'option3 label' },
-          { value: 'option4', label: 'option4 label' }
+          { value: 'option3', label: 'option3 label', checked: false },
+          { value: 'option4', label: 'option4 label', checked: true }
         ]
       };
       receive_message(id, state_newlabel_complete);
@@ -1520,9 +1534,9 @@ describe("Input Bindings", function() {
       expect(get_value(id)).toEqual(2);
     });
 
-    it("setValue() works", function() {
+    it("setValue() doesn't change the value", function() {
       set_value(id, 2000);
-      expect(get_value(id)).toEqual(2000);
+      expect(get_value(id)).toEqual(0);
     });
 
     it("getState() works", function() {
@@ -1547,7 +1561,7 @@ describe("Input Bindings", function() {
     beforeEach(function(){
       var htmlstring =
         '<div class="tabbable">\
-          <ul class="nav shiny-tab-input" id="' + id + '">\
+          <ul class="nav nav-tabs" id="' + id + '">\
             <li class="active">\
               <a href="#tab-455-1" data-toggle="tab">panel1</a>\
             </li>\

inst/tests/test-bootstrap.r

@@ -7,8 +7,8 @@ test_that("CSS unit validation", {
   }
 
   # Test strings and expected results
-  strings  <- c("100x", "10px", "10.4px", ".4px", "1px0", "px", "5",  "%", "5%", "auto", "1auto", "")
-  expected <- c(NA,     "10px", "10.4px", ".4px", NA,       NA, "5px", NA, "5%", "auto", NA,      NA)
+  strings  <- c("100x", "10px", "10.4px", ".4px", "1px0", "px", "5", "%", "5%", "auto", "1auto", "") 
+  expected <- c(NA,     "10px", "10.4px", ".4px", NA,     NA,   NA,  NA,  "5%", "auto", NA,      NA)
   results <- vapply(strings, validateCssUnit_wrap, character(1), USE.NAMES = FALSE)
   expect_equal(results, expected)
 
@@ -22,131 +22,39 @@ test_that("Repeated names for selectInput and radioButtons choices", {
   # tag object, but they get the job done for now.
 
   # Select input
-  x <- selectInput('id','label', choices = c(a='x1', a='x2', b='x3'), selectize = FALSE)
-  expect_equal(format(x), '<label class="control-label" for="id">label</label>
-<select id="id"><option value="x1" selected>a</option>\n<option value="x2">a</option>\n<option value="x3">b</option></select>')
+  x <- selectInput('id','label', choices = c(a='x1', a='x2', b='x3'))
+  choices <- x[[2]]$children
+
+  expect_equal(choices[[1]]$children[[1]], 'a')
+  expect_equal(choices[[1]]$attribs$value, 'x1')
+  expect_equal(choices[[1]]$attribs$selected, 'selected')
+
+  expect_equal(choices[[2]]$children[[1]], 'a')
+  expect_equal(choices[[2]]$attribs$value, 'x2')
+  # This one actually should be NULL, but with the syntax of selectInput, it
+  # must be 'selected'.
+  expect_equal(choices[[2]]$attribs$selected, 'selected')
+
+  expect_equal(choices[[3]]$children[[1]], 'b')
+  expect_equal(choices[[3]]$attribs$value, 'x3')
+  expect_equal(choices[[3]]$attribs$selected, NULL)
 
 
   # Radio buttons
   x <- radioButtons('id','label', choices = c(a='x1', a='x2', b='x3'))
   choices <- x$children
 
-  expect_equal(choices[[2]][[1]]$children[[2]]$children[[1]], 'a')
-  expect_equal(choices[[2]][[1]]$children[[1]]$attribs$value, 'x1')
-  expect_equal(choices[[2]][[1]]$children[[1]]$attribs$checked, 'checked')
+  expect_equal(choices[[2]]$children[[2]]$children[[1]], 'a')
+  expect_equal(choices[[2]]$children[[1]]$attribs$value, 'x1')
+  expect_equal(choices[[2]]$children[[1]]$attribs$checked, 'checked')
 
-  expect_equal(choices[[2]][[2]]$children[[2]]$children[[1]], 'a')
-  expect_equal(choices[[2]][[2]]$children[[1]]$attribs$value, 'x2')
-  expect_equal(choices[[2]][[2]]$children[[1]]$attribs$checked, NULL)
+  expect_equal(choices[[3]]$children[[2]]$children[[1]], 'a')
+  expect_equal(choices[[3]]$children[[1]]$attribs$value, 'x2')
+  # This one actually should be NULL, but with the syntax of radioButtons, it
+  # must be 'checked'.
+  expect_equal(choices[[3]]$children[[1]]$attribs$checked, 'checked')
 
-  expect_equal(choices[[2]][[3]]$children[[2]]$children[[1]], 'b')
-  expect_equal(choices[[2]][[3]]$children[[1]]$attribs$value, 'x3')
-  expect_equal(choices[[2]][[3]]$children[[1]]$attribs$checked, NULL)
-})
-
-
-test_that("Choices are correctly assigned names", {
-  # Unnamed vector
-  expect_identical(
-    choicesWithNames(c("a","b","3")),
-    list(a="a", b="b", "3"="3")
-  )
-  # Unnamed list
-  expect_identical(
-    choicesWithNames(list("a","b",3)),
-    list(a="a", b="b", "3"=3)
-  )
-  # Vector, with some named, some not
-  expect_identical(
-    choicesWithNames(c(A="a", "b", C="3", "4")),
-    list(A="a", "b"="b", C="3", "4"="4")
-  )
-  # List, with some named, some not
-  expect_identical(
-    choicesWithNames(list(A="a", "b", C=3, 4)),
-    list(A="a", "b"="b", C=3, "4"=4)
-  )
-  # List, named, with a sub-vector
-  expect_identical(
-    choicesWithNames(list(A="a", B="b", C=c("d", "e"))),
-    list(A="a", B="b", C=list(d="d", e="e"))
-  )
-  # List, named, with sublist
-  expect_identical(
-    choicesWithNames(list(A="a", B="b", C=list("d", "e"))),
-    list(A="a", B="b", C=list(d="d", e="e"))
-  )
-  # List, named, with a named sub-vector of length 1
-  expect_identical(
-    choicesWithNames(list(A="a", B="b", C=c(D="d"))),
-    list(A="a", B="b", C=list(D="d"))
-  )
-  # List, some named, with sublist
-  expect_identical(
-    choicesWithNames(list(A="a", "b", C=list("d", E="e"))),
-    list(A="a", b="b", C=list(d="d", E="e"))
-  )
-  # Deeper nesting
-  expect_identical(
-    choicesWithNames(list(A="a", "b", C=list(D=list("e", "f"), G=c(H="h", "i")))),
-    list(A="a", b="b", C=list(D=list(e="e", f="f"), G=list(H="h", i="i")))
-  )
-  # Error when sublist is unnamed
-  expect_error(choicesWithNames(list(A="a", "b", list(1,2))))
-})
-
-
-test_that("selectOptions returns correct HTML", {
-  # None selected
-  expect_identical(
-    selectOptions(choicesWithNames(list("a", "b")), list()),
-    HTML("<option value=\"a\">a</option>\n<option value=\"b\">b</option>")
-  )
-  # One selected
-  expect_identical(
-    selectOptions(choicesWithNames(list("a", "b")), "a"),
-    HTML("<option value=\"a\" selected>a</option>\n<option value=\"b\">b</option>")
-  )
-  # One selected, with named items
-  expect_identical(
-    selectOptions(choicesWithNames(list(A="a", B="b")), "a"),
-    HTML("<option value=\"a\" selected>A</option>\n<option value=\"b\">B</option>")
-  )
-  # Two selected, with optgroup
-  expect_identical(
-    selectOptions(choicesWithNames(list("a", B=list("c", D="d"))), c("a", "d")),
-    HTML("<option value=\"a\" selected>a</option>\n<optgroup label=\"B\">\n<option value=\"c\">c</option>\n<option value=\"d\" selected>D</option>\n</optgroup>")
-  )
-
-  # Escape HTML in strings
-  expect_identical(
-    selectOptions(choicesWithNames(list("<A>"="a", B="b")), "a"),
-    HTML("<option value=\"a\" selected>&lt;A&gt;</option>\n<option value=\"b\">B</option>")
-  )
-})
-
-test_that("selectInput selects items by default", {
-  # None specified as selected (defaults to first)
-  expect_true(grepl(
-    '<option value="a" selected>',
-    selectInput('x', 'x', list("a", "b"))
-  ))
-
-  # Nested list (optgroup)
-  expect_true(grepl(
-    '<option value="a" selected>',
-    selectInput('x', 'x', list(A=list("a", "b"), "c"))
-  ))
-
-  # Nothing selected when choices=NULL
-  expect_identical(
-    '<select id="x"></select>',
-    format(selectInput('x', NULL, NULL, selectize = FALSE))
-  )
-
-  # None specified as selected. With multiple=TRUE, none selected by default.
-  expect_true(grepl(
-    '<option value="a">',
-    selectInput('x', 'x', list("a", "b"), multiple = TRUE)
-  ))
+  expect_equal(choices[[4]]$children[[2]]$children[[1]], 'b')
+  expect_equal(choices[[4]]$children[[1]]$attribs$value, 'x3')
+  expect_equal(choices[[4]]$children[[1]]$attribs$checked, NULL)
 })

inst/tests/test-gc.r

@@ -7,8 +7,10 @@ test_that("unreferenced observers are garbage collected", {
   obs  <- observe({ vals$A })
 
   # These are called when the objects are garbage-collected
-  reg.finalizer(.subset2(vals,'impl'), function(e) vals_removed <<- TRUE)
-  reg.finalizer(obs, function(e) obs_removed  <<- TRUE)
+  reg.finalizer(attr(.subset2(vals,'impl'), ".xData"),
+                function(e) vals_removed <<- TRUE)
+  reg.finalizer(attr(obs, ".xData"),
+                function(e) obs_removed  <<- TRUE)
 
   flushReact()
 
@@ -40,8 +42,10 @@ test_that("suspended observers are garbage collected", {
   obs  <- observe({ vals$A })
 
   # These are called when the objects are garbage-collected
-  reg.finalizer(.subset2(vals,'impl'), function(e) vals_removed <<- TRUE)
-  reg.finalizer(obs, function(e) obs_removed <<- TRUE)
+  reg.finalizer(attr(.subset2(vals,'impl'), ".xData"),
+                function(e) vals_removed <<- TRUE)
+  reg.finalizer(attr(obs, ".xData"),
+                function(e) obs_removed  <<- TRUE)
 
   flushReact()
 

inst/tests/test-input-handler.R

@@ -1,47 +0,0 @@
-context("Parse Shiny Input")
-
-test_that("A new type can be registered successfully", {
-  registerInputHandler("shiny.someType", function(){})
-})
-
-test_that("A duplicated type throws", {
-  expect_error({
-    registerInputHandler("shiny.dupType", function(){})
-    registerInputHandler("shiny.dupType", function(){})
-  })
-})
-
-test_that("Date converts to date", {
-  x <- "2013/01/01"
-  class(x) <- "shiny.date"
-  handler <- inputHandlers$get('shiny.date')
-  expect_identical(    
-    handler(x), as.Date(unclass(x))
-  )
-})
-
-test_that("List of dates converts to vector", {
-  x <- list("2013/01/01", "2014/01/01")
-  class(x) <- "shiny.date"
-  handler <- inputHandlers$get('shiny.date')
-  expect_identical(    
-    handler(x), as.Date(unlist(x))
-  )
-})
-
-test_that("Matrix converts list of lists to matrix", {
-  x <- list(a=1:3,b=4:6)
-  class(x) <- "shiny.matrix"
-  handler <- inputHandlers$get('shiny.matrix')
-  expect_identical(
-    handler(x), matrix(c(1:3,4:6), byrow=FALSE, ncol=2)
-  )
-})
-
-test_that("Nulls are not converted to NAs in parsing", {
-  msg <- charToRaw("{\"method\":\"init\",\"data\":{\"obs\":500,\"nullObs\":null}}")
-  expect_identical(
-    decodeMessage(msg), 
-    list(method="init", data=list(obs=500, nullObs=NULL)) 
-  )
-})

inst/tests/test-reactivity.r

@@ -663,161 +663,3 @@ test_that("Observer priorities are respected", {
   
   expect_identical(results, c(30, 20, 21, 22, 10))
 })
-
-test_that("reactivePoll and reactiveFileReader", {
-  path <- tempfile('file')
-  on.exit(unlink(path))
-  write.csv(cars, file=path, row.names=FALSE)
-  rfr <- reactiveFileReader(100, NULL, path, read.csv)
-  expect_equal(isolate(rfr()), cars)
-  
-  write.csv(rbind(cars, cars), file=path, row.names=FALSE)
-  Sys.sleep(0.15)
-  timerCallbacks$executeElapsed()
-  expect_equal(isolate(rfr()), cars)
-  flushReact()
-  expect_equal(isolate(rfr()), rbind(cars, cars))
-})
-
-
-test_that("classes of reactive object", {
-  v <- reactiveValues(a = 1)
-  r <- reactive({ v$a + 1 })
-  o <- observe({ print(r()) })
-
-  expect_false(is.reactivevalues(12))
-  expect_true(is.reactivevalues(v))
-  expect_false(is.reactivevalues(r))
-  expect_false(is.reactivevalues(o))
-
-  expect_false(is.reactive(12))
-  expect_false(is.reactive(v))
-  expect_true(is.reactive(r))
-  expect_false(is.reactive(o))
-
-  o$destroy()
-})
-
-test_that("{} and NULL also work in reactive()", {
-  reactive({})
-  reactive(NULL)
-})
-
-test_that("shiny.suppressMissingContextError option works", {
-  options(shiny.suppressMissingContextError=TRUE)
-  on.exit(options(shiny.suppressMissingContextError=FALSE), add = TRUE)
-
-  expect_true(reactive(TRUE)())
-})
-
-test_that("reactive domains are inherited", {
-
-  domainA <- createMockDomain()
-  domainB <- createMockDomain()
-
-  local({
-    domainY <- NULL
-    domainZ <- NULL
-    x <- observe({
-
-      y <- observe({
-        # Should be domainA (inherited from observer x)
-        domainY <<- getDefaultReactiveDomain()
-      })
-
-      z <- observe({
-        # Should be domainB (explicitly passed in)
-        domainZ <<- getDefaultReactiveDomain()
-      }, domain = domainB)
-
-    }, domain = domainA)
-
-    flushReact()
-    flushReact()
-
-    expect_identical(domainY, domainA)
-    expect_identical(domainZ, domainB)
-  })
-
-  local({
-    domainY <- 1
-    x <- NULL
-    y <- NULL
-    z <- NULL
-    r3 <- NULL
-    domainR3 <- NULL
-
-    r1 <- reactive({
-      y <<- observe({
-        # Should be NULL (r1 has no domain)
-        domainY <<- getDefaultReactiveDomain()
-      })
-    })
-    r2 <- reactive({
-      z <<- observe({
-        # Should be domainB (r2 has explicit domainB)
-        domainZ <<- getDefaultReactiveDomain()
-      })
-    }, domain = domainB)
-
-    observe({
-      r3 <<- reactive({
-        # This should be domainA. Doesn't matter where r3 is invoked, it only
-        # matters where it was created.
-        domainR3 <<- getDefaultReactiveDomain()
-      })
-      r1()
-      r2()
-    }, domain = domainA)
-
-    flushReact()
-    flushReact()
-    isolate(r3())
-
-    expect_identical(execCount(y), 1L)
-    expect_identical(execCount(z), 1L)
-    expect_identical(domainY, NULL)
-    expect_identical(domainZ, domainB)
-    expect_identical(domainR3, domainA)
-  })
-})
-
-test_that("observers autodestroy (or not)", {
-
-  domainA <- createMockDomain()
-  local({
-    a <- observe(NULL, domain = domainA)
-
-    b <- observe(NULL, domain = domainA, autoDestroy = FALSE)
-
-    c <- observe(NULL, domain = domainA)
-    c$setAutoDestroy(FALSE)
-
-    d <- observe(NULL, domain = domainA, autoDestroy = FALSE)
-    d$setAutoDestroy(TRUE)
-
-    e <- observe(NULL)
-
-    domainA$end()
-
-    flushReact()
-
-    expect_identical(execCount(a), 0L)
-    expect_identical(execCount(b), 1L)
-    expect_identical(execCount(c), 1L)
-    expect_identical(execCount(d), 0L)
-    expect_identical(execCount(e), 1L)
-  })
-})
-
-test_that("maskReactiveContext blocks use of reactives", {
-  vals <- reactiveValues(x = 123)
-
-  # Block reactive contexts (created by isolate)
-  expect_error(isolate(maskReactiveContext(vals$x)))
-  expect_error(isolate(isolate(maskReactiveContext(vals$x))))
-
-  # Reactive contexts within maskReactiveContext shouldn't be blocked
-  expect_identical(maskReactiveContext(isolate(vals$x)), 123)
-  expect_identical(isolate(maskReactiveContext(isolate(vals$x))), 123)
-})

inst/tests/test-stack.R

@@ -1,40 +0,0 @@
-context("Stack")
-
-test_that("Basic operations", {
-  s <- Stack$new()
-  expect_identical(s$size(), 0L)
-
-  s$push(5)$push(6)$push(NULL)$push(list(a=1,b=2))
-
-  expect_identical(s$pop(), list(a=1,b=2))
-  expect_identical(s$peek(), NULL)
-  expect_identical(s$pop(), NULL)
-  expect_identical(s$size(), 2L)
-
-  # as_list() returns in the order that they were inserted
-  expect_identical(s$as_list(), list(5, 6))
-})
-
-
-test_that("Pushing multiple", {
-  s <- Stack$new()
-  s$push(1,2,3)
-  s$push(4,5, .list=list(6,list(7,8)))
-  s$push(9,10)
-  expect_identical(s$as_list(), list(1,2,3,4,5,6,list(7,8),9,10))
-  expect_identical(s$pop(), 10)
-  expect_identical(s$pop(), 9)
-  expect_identical(s$pop(), list(7,8))
-})
-
-
-test_that("Popping from empty stack", {
-  s <- Stack$new()
-  expect_null(s$pop())
-  expect_null(s$pop())
-  expect_null(s$peek())
-  expect_identical(s$size(), 0L)
-
-  s$push(5)$push(6)
-  expect_identical(s$as_list(), list(5, 6))
-})

inst/tests/test-staticdocs.R

@@ -1,35 +0,0 @@
-context("staticdocs")
-
-test_that("All man pages have an entry in staticdocs/index.r", {
-  if (!all(file.exists(c('../../inst/staticdocs', '../../man')))) {
-    # This test works only when run against a package directory
-    return()
-  }
-  # Known not to be indexed
-  known_unindexed <- c("shiny-package", "knitr_methods", "knitr_methods_htmltools")
-
-  indexed_topics <- local({
-    result <- character(0)
-    sd_section <- function(dummy1, dummy2, section_topics) {
-      result <<- c(result, section_topics)
-    }
-    source("../../inst/staticdocs/index.r", local = TRUE)
-    result
-  })
-
-  all_topics <- sub("\\.Rd", "", list.files("../../man", pattern = "*.Rd"))
-
-  # This test ensures that every documented topic is included in
-  # staticdocs/index.r, unless explicitly waived by specifying it
-  # in the known_unindexed variable above.
-  missing <- setdiff(sort(all_topics), sort(c(known_unindexed, indexed_topics)))
-  unknown <- setdiff(sort(c(known_unindexed, indexed_topics)), sort(all_topics))
-  expect_equal(length(missing), 0,
-    info = paste("Functions missing from index:\n",
-      paste("  ", missing, sep = "", collapse = "\n"),
-      sep = ""))
-  expect_equal(length(unknown), 0,
-    info = paste("Unrecognized functions in index.r:\n",
-      paste("  ", unknown, sep = "", collapse = "\n"),
-      sep = ""))
-})

inst/tests/test-tags.r

@@ -0,0 +1,300 @@
+context("tags")
+
+test_that("Basic tag writing works", {
+  expect_equal(as.character(tagList("hi")), HTML("hi"))
+  expect_equal(
+    as.character(tagList("one", "two", tagList("three"))),
+    HTML("one\ntwo\nthree"))
+  expect_equal(
+    as.character(tags$b("one")),
+    HTML("<b>one</b>"))
+  expect_equal(
+    as.character(tags$b("one", "two")),
+    HTML("<b>\n  one\n  two\n</b>"))
+  expect_equal(
+    as.character(tagList(list("one"))),
+    HTML("one"))
+  expect_equal(
+    as.character(tagList(list(tagList("one")))),
+    HTML("one"))
+  expect_equal(
+    as.character(tagList(tags$br(), "one")),
+    HTML("<br/>\none"))
+})
+
+
+test_that("withTags works", {
+  output_tags <- tags$div(class = "myclass",
+    tags$h3("header"),
+    tags$p("text here")
+  )
+  output_withhtml <- withTags(
+    div(class = "myclass",
+      h3("header"),
+      p("text here")
+    )
+  )
+  expect_identical(output_tags, output_withhtml)
+
+
+  # Check that current environment is searched
+  x <- 100
+  expect_identical(tags$p(x), withTags(p(x)))
+
+  # Just to make sure, run it in a function, which has its own environment
+  foo <- function() {
+    y <- 100
+    withTags(p(y))
+  }
+  expect_identical(tags$p(100), foo())
+})
+
+
+test_that("HTML escaping in tags", {
+  # Regular text is escaped
+  expect_equivalent(format(div("<a&b>")), "<div>&lt;a&amp;b&gt;</div>")
+
+  # Text in HTML() isn't escaped
+  expect_equivalent(format(div(HTML("<a&b>"))), "<div><a&b></div>")
+
+  # Text in a property is escaped
+  expect_equivalent(format(div(class = "<a&b>", "text")),
+                    '<div class="&lt;a&amp;b&gt;">text</div>')
+
+  # HTML() has no effect in a property like 'class'
+  expect_equivalent(format(div(class = HTML("<a&b>"), "text")),
+                    '<div class="&lt;a&amp;b&gt;">text</div>')
+})
+
+
+test_that("Adding child tags", {
+  tag_list <- list(tags$p("tag1"), tags$b("tag2"), tags$i("tag3"))
+
+  # Creating nested tags by calling the tag$div function and passing a list
+  t1 <- tags$div(class="foo", tag_list)
+  expect_equal(length(t1$children), 3)
+  expect_equal(t1$children[[1]]$name, "p")
+  expect_equal(t1$children[[1]]$children[[1]], "tag1")
+  expect_equal(t1$children[[2]]$name, "b")
+  expect_equal(t1$children[[2]]$children[[1]], "tag2")
+  expect_equal(t1$children[[3]]$name, "i")
+  expect_equal(t1$children[[3]]$children[[1]], "tag3")
+
+
+  # div tag used as starting point for tests below
+  div_tag <- tags$div(class="foo")
+
+  # Appending each child
+  t2 <- tagAppendChild(div_tag, tag_list[[1]])
+  t2 <- tagAppendChild(t2, tag_list[[2]])
+  t2 <- tagAppendChild(t2, tag_list[[3]])
+  expect_identical(t1, t2)
+
+
+  # tagSetChildren, using list argument
+  t2 <- tagSetChildren(div_tag, list = tag_list)
+  expect_identical(t1, t2)
+
+  # tagSetChildren, using ... arguments
+  t2 <- tagSetChildren(div_tag, tag_list[[1]], tag_list[[2]], tag_list[[3]])
+  expect_identical(t1, t2)
+
+  # tagSetChildren, using ... and list arguments
+  t2 <- tagSetChildren(div_tag, tag_list[[1]], list = tag_list[2:3])
+  expect_identical(t1, t2)
+
+  # tagSetChildren overwrites existing children
+  t2 <- tagAppendChild(div_tag, p("should replace this tag"))
+  t2 <- tagSetChildren(div_tag, list = tag_list)
+  expect_identical(t1, t2)
+
+
+  # tagAppendChildren, using list argument
+  t2 <- tagAppendChild(div_tag, tag_list[[1]])
+  t2 <- tagAppendChildren(t2, list = tag_list[2:3])
+  expect_identical(t1, t2)
+
+  # tagAppendChildren, using ... arguments
+  t2 <- tagAppendChild(div_tag, tag_list[[1]])
+  t2 <- tagAppendChildren(t2, tag_list[[2]], tag_list[[3]])
+  expect_identical(t1, t2)
+
+  # tagAppendChildren, using ... and list arguments
+  t2 <- tagAppendChild(div_tag, tag_list[[1]])
+  t2 <- tagAppendChildren(t2, tag_list[[2]], list = list(tag_list[[3]]))
+  expect_identical(t1, t2)
+
+  # tagAppendChildren can start with no children
+  t2 <- tagAppendChildren(div_tag, list = tag_list)
+  expect_identical(t1, t2)
+
+
+  # tagSetChildren preserves attributes
+  x <- tagSetChildren(div(), HTML("text"))
+  expect_identical(attr(x$children[[1]], "html"), TRUE)
+
+  # tagAppendChildren preserves attributes
+  x <- tagAppendChildren(div(), HTML("text"))
+  expect_identical(attr(x$children[[1]], "html"), TRUE)
+})
+
+
+test_that("Creating simple tags", {
+  # Empty tag
+  expect_identical(
+    div(),
+    structure(
+      list(name = "div", attribs = list(), children = list()),
+      .Names = c("name", "attribs", "children"),
+      class = "shiny.tag"
+    )
+  )
+
+  # Tag with text
+  expect_identical(
+    div("text"),
+    structure(
+      list(name = "div", attribs = list(), children = list("text")),
+      .Names = c("name", "attribs", "children"),
+      class = "shiny.tag"
+    )
+  )
+
+  # NULL attributes are dropped
+  expect_identical(
+    div(a = NULL, b = "value"),
+    div(b = "value")
+  )
+
+  # Numbers are coerced to strings
+  expect_identical(
+    div(1234),
+    structure(
+      list(name = "div", attribs = list(), children = list("1234")),
+      .Names = c("name", "attribs", "children"),
+      class = "shiny.tag"
+    )
+  )
+})
+
+
+test_that("Creating nested tags", {
+  # Simple version
+  # Note that the $children list should not have a names attribute
+  expect_identical(
+    div(class="foo", list("a", "b")),
+    structure(
+      list(name = "div",
+           attribs = structure(list(class = "foo"), .Names = "class"),
+           children = list("a", "b")),
+      .Names = c("name", "attribs", "children"),
+      class = "shiny.tag"
+    )
+  )
+
+  # More complex version
+  t1 <- withTags(
+    div(class = "foo",
+      p("child tag"),
+      list(
+        p("in-list child tag 1"),
+        "in-list character string",
+        p(),
+        p("in-list child tag 2")
+      ),
+      "character string",
+      1234
+    )
+  )
+
+  # t1 should be identical to this data structure.
+  # The nested list should be flattened, and non-tag, non-strings should be
+  # converted to strings
+  t1_full <- structure(
+    list(
+      name = "div",
+      attribs = list(class = "foo"),
+      children = list(
+        structure(list(name = "p",
+                       attribs = list(),
+                       children = list("child tag")),
+                  class = "shiny.tag"
+        ),
+        structure(list(name = "p",
+                       attribs = list(),
+                       children = list("in-list child tag 1")),
+                  class = "shiny.tag"
+        ),
+        "in-list character string",
+        structure(list(name = "p",
+                       attribs = list(),
+                       children = list()),
+                  class = "shiny.tag"
+        ),
+        structure(list(name = "p",
+                       attribs = list(),
+                       children = list("in-list child tag 2")),
+                  class = "shiny.tag"
+        ),
+        "character string",
+        "1234"
+      )
+    ),
+    class = "shiny.tag"
+  )
+
+  expect_identical(t1, t1_full)
+})
+
+test_that("Attributes are preserved", {
+  # HTML() adds an attribute to the data structure (note that this is
+  # different from the 'attribs' field in the list)
+  x <- HTML("<tag>&&</tag>")
+  expect_identical(attr(x, "html"), TRUE)
+  expect_equivalent(format(x), "<tag>&&</tag>")
+
+  # Make sure attributes are preserved when wrapped in other tags
+  x <- div(HTML("<tag>&&</tag>"))
+  expect_equivalent(x$children[[1]], "<tag>&&</tag>")
+  expect_identical(attr(x$children[[1]], "html"), TRUE)
+  expect_equivalent(format(x), "<div><tag>&&</tag></div>")
+
+  # Deeper nesting
+  x <- div(p(HTML("<tag>&&</tag>")))
+  expect_equivalent(x$children[[1]]$children[[1]], "<tag>&&</tag>")
+  expect_identical(attr(x$children[[1]]$children[[1]], "html"), TRUE)
+  expect_equivalent(format(x), "<div>\n  <p><tag>&&</tag></p>\n</div>")
+})
+
+
+test_that("Flattening a list of tags", {
+  # Flatten a nested list
+  nested <- list(
+    "a1",
+    list(
+      "b1",
+      list("c1", "c2"),
+      list(),
+      "b2",
+      list("d1", "d2")
+    ),
+    "a2"
+  )
+  flat <- list("a1", "b1", "c1", "c2", "b2", "d1", "d2", "a2")
+  expect_identical(flattenTags(nested), flat)
+
+  # no-op for flat lists
+  expect_identical(flattenTags(list(a="1", "b")), list(a="1", "b"))
+
+  # numbers are coerced to character
+  expect_identical(flattenTags(list(a=1, "b")), list(a="1", "b"))
+
+  # empty list results in empty list
+  expect_identical(flattenTags(list()), list())
+
+  # preserve attributes
+  nested <- list("txt1", list(structure("txt2", prop="prop2")))
+  flat <- list("txt1",
+               structure("txt2", prop="prop2"))
+  expect_identical(flattenTags(nested), flat)
+})

inst/tests/test-url.R

@@ -17,26 +17,4 @@ test_that("Query string parsing", {
 
   # Should be the same with or without leading question mark
   expect_identical(parseQueryString("?foo=1&bar=b"), parseQueryString("foo=1&bar=b"))
-
-
-  # Nested and non-nested query strings
-  expect_identical(
-    parseQueryString("a[i1][j1]=x&b[i1][j1]=y&b[i2][j1]=z"),
-    list(
-      "a[i1][j1]" = "x",
-      "b[i1][j1]" = "y",
-      "b[i2][j1]" = "z"
-    )
-  )
-
-  expect_identical(
-    parseQueryString("a[i1][j1]=x&b[i1][j1]=y&b[i2][j1]=z", nested = TRUE),
-    list(
-      a = list(i1 = list(j1 = "x")),
-      b = list(
-        i1 = list(j1 = "y"),
-        i2 = list(j1 = "z")
-      )
-    )
-  )
 })

inst/tests/test-utils.R

@@ -1,90 +0,0 @@
-context("utils")
-
-test_that("Private randomness works at startup", {
-
-  if (exists(".Random.seed", envir = .GlobalEnv))
-    rm(".Random.seed", envir = .GlobalEnv)
-  .globals$ownSeed <- NULL
-  # Just make sure this doesn't blow up
-  createUniqueId(4)
-})
-
-test_that("Setting process-wide seed doesn't affect private randomness", {
-  set.seed(0)
-  id1 <- createUniqueId(4)
-  set.seed(0)
-  id2 <- createUniqueId(4)
-
-  expect_false(identical(id1, id2))
-})
-
-test_that("Resetting private seed doesn't result in dupes", {
-  .globals$ownSeed <- NULL
-  id3 <- createUniqueId(4)
-  # Make sure we let enough time pass that reinitializing the seed is
-  # going to result in a different value. This is especially required
-  # on Windows.
-  Sys.sleep(1)
-  set.seed(0)
-  .globals$ownSeed <- NULL
-  id4 <- createUniqueId(4)
-
-  expect_false(identical(id3, id4))
-})
-
-test_that("Clearing process-wide seed doesn't affect private randomness", {
-  set.seed(NULL)
-  id5 <- createUniqueId(4)
-  set.seed(NULL)
-  id6 <- createUniqueId(4)
-
-  expect_false(identical(id5, id6))
-})
-
-test_that("Setting the private seed explicitly results in identical values", {
-  set.seed(0)
-  .globals$ownSeed <- .Random.seed
-  id7 <- createUniqueId(4)
-  set.seed(0)
-  .globals$ownSeed <- .Random.seed
-  id8 <- createUniqueId(4)
-
-  expect_identical(id7, id8)
-})
-
-test_that("need() works as expected", {
-
-  # These are all falsy
-
-  expect_false(need(FALSE, FALSE))
-  expect_false(need(NULL, FALSE))
-  expect_false(need("", FALSE))
-
-  expect_false(need(character(0), FALSE))
-  expect_false(need(logical(0), FALSE))
-  expect_false(need(numeric(0), FALSE))
-  expect_false(need(integer(0), FALSE))
-  expect_false(need(complex(0), FALSE))
-  expect_false(need(matrix(), FALSE))
-
-  expect_false(need(NA, FALSE))
-  expect_false(need(NA_integer_, FALSE))
-  expect_false(need(NA_real_, FALSE))
-  expect_false(need(NA_complex_, FALSE))
-  expect_false(need(NA_character_, FALSE))
-
-  expect_false(need(c(NA, NA, FALSE), FALSE))
-  expect_false(need(c(FALSE), FALSE))
-
-  expect_false(need(try(stop("boom"), silent = TRUE), FALSE))
-
-  # These are all truthy
-
-  expect_null(need(0, FALSE))
-  expect_null(need(1:10, FALSE))
-  expect_null(need(LETTERS, FALSE))
-  expect_null(need("NA", FALSE))
-  expect_null(need(TRUE, FALSE))
-  expect_null(need(c(NA, NA, TRUE), FALSE))
-  expect_null(need(c(FALSE, FALSE, TRUE), FALSE))
-})

inst/www/index.html

@@ -7,7 +7,6 @@
   <ul>
     <li><code>www/index.html</code></li>
     <li><code>ui.R</code></li>
-    <li><code>app.R</code></li>
   </ul>
 </body>
 </html>

inst/www/reactive-graph.html

@@ -114,37 +114,6 @@ svg {
   height: auto;
   display: none;
 }
-#timeline {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 20px;
-  transition: height 500ms;
-}
-#timeline, #timeline * {
-  cursor: pointer;
-}
-#timeline:hover {
-  height: 32px;
-}
-#timeline-bg {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 12px;
-  background-color: silver;
-}
-#timeline-fill {
-  background-color: #28A3F2;
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  width: 0;
-  transition: width 500ms;
-}
 </style>
 <script>
 var log = [
@@ -271,6 +240,11 @@ var force = d3.layout.force()
 force.on('tick', onTick);
 
 function pathDataForNode(node) {
+/*
+d="m 58,2  c -75,0 -75,100 0,100  l 60,0  l 50,-50  l -50,-50  Z"
+d="m 58,2  c -75,0 -75,100 0,100  l 100,0  l 0,-100 Z"
+d="m 2,0 l 0,100 l 100,0  l 50,-50  l -50,-50  Z"
+*/
   switch (node.type) {
     case 'observer':
       return 'M -25,-50  c -75,0 -75,100 0,100  l 100,0  l 0,-100 Z';
@@ -329,10 +303,10 @@ function update() {
   force.size([document.documentElement.clientWidth / 4,
               document.documentElement.clientHeight / 4]);
 
-  var layoutDirty = false;
+  var layoutDirty = true;
 
   node = d3.select('#nodes').selectAll('.node').data(nodeList);
-  layoutDirty = layoutDirty || !node.enter().empty() || !node.exit().empty();
+  //layoutDirty = layoutDirty || !node.enter().empty() || !node.exit().empty();
   var newG = node.enter().append('g')
       .attr('class', function(n) {return 'node ' + n.type;})
       .attr('r', 5)
@@ -357,7 +331,7 @@ function update() {
   newG.append('text')
       .attr('x', 3)
       .attr('y', 0)
-      .attr('font-size', 3.25)
+      .attr('font-size', 2.5)
       .attr('transform', function(n) {
         if (n.type !== 'observer')
           return 'translate(1.5, 0)';
@@ -383,7 +357,7 @@ function update() {
     return changed;
   }).selectAll('tspan')
     .data(function(n) {
-      var lines = n.label.replace(/ /g, '\xA0').split('\n');
+      var lines = n.label.split('\n');
       if (lines.length > MAX_LINES) {
         lines.splice(MAX_LINES);
       }
@@ -400,7 +374,7 @@ function update() {
       .text(function(line) { return line; });
 
   link = d3.select('#links').selectAll('.link').data(links);
-  layoutDirty = layoutDirty || !link.enter().empty() || !link.exit().empty();
+  //layoutDirty = layoutDirty || !link.enter().empty() || !link.exit().empty();
   link.enter().append('path')
       .attr('class', 'link')
       .attr('marker-mid', 'url(#triangle)');
@@ -434,7 +408,7 @@ function onTick() {
       });
 }
 
-function createNodeWithUndo(data) {
+function createNode(data) {
   var node;
   if (!data.prevId) {
     node = {
@@ -443,163 +417,53 @@ function createNodeWithUndo(data) {
       hide: data.hide
     };
     nodes[data.id] = node;
-    pushUndo(function() {
-      delete nodes[data.id];
-    });
-    if (!node.hide) {
+    if (!node.hide)
       nodeList.push(node);
-      pushUndo(function() {
-        nodeList.pop();
-      });
-    }
   } else {
     node = nodes[data.prevId];
-    var oldLabel = node.label;
-    var oldInvalidated = node.invalidated;
     delete nodes[data.prevId];
     nodes[data.id] = node;
     node.label = data.label;
     node.invalidated = false;
-    pushUndo(function() {
-      node.label = oldLabel;
-      node.invalidated = oldInvalidated;
-      delete nodes[data.id];
-      nodes[data.prevId] = node;
-    });
   }
 }
 
-Array.prototype.pushWithUndo = function(value) {
-  var self = this;
-  this.push(value);
-  pushUndo(function() {
-    self.pop();
-  });
-}
-
-Array.prototype.shiftWithUndo = function(value) {
-  var self = this;
-  var value = this.shift();
-  pushUndo(function() {
-    self.unshift(value);
-  });
-  return value;
-}
-
-var undoStack = [];
-var currentUndos = null;
-function startUndoScope() {
-  if (currentUndos !== null)
-    throw new Error('Illegal state');
-  currentUndos = [];
-}
-function pushUndo(func) {
-  currentUndos.push(func);
-}
-function endUndoScope() {
-  var localUndos = currentUndos;
-  undoStack.push(function() {
-    while (localUndos.length) {
-      localUndos.pop()();
-    }
-  });
-  currentUndos = null;
-}
-function undo() {
-  if (undoStack.length) {
-    undoStack.pop()();
-    update();
-    return true;
-  }
-  return false;
-}
-function undoAll() {
-  while (undo()) {}
-}
-
-// Here we monkeypatch Math.random to take part in the undo mechanism.
-// This allows "random" d3 force-layout decisions to be reproducible.
-// If we don't do this, then doing/undoing/redoing a node creation step
-// looks very confusing, as the node comes flying in from a different
-// direction each time.
-var trueRandom = Math.random;
-Math.random = (function() {
-  var randomStack = [];
-  return function() {
-    if (!currentUndos)
-      return trueRandom();
-
-    var value;
-    if (randomStack.length > 0) {
-      value = randomStack.pop();
-    }
-    else {
-      value = trueRandom();
-    }
-    pushUndo(function() {
-      randomStack.push(value);
-    });
-    return value;
-  };
-})();
-
 var callbacks = {
   ctx: function(data) {
-    createNodeWithUndo(data);
+    createNode(data);
     return true;
   },
   dep: function(data) {
     var dependsOn = nodes[data.dependsOn];
     if (!dependsOn) {
-      createNodeWithUndo({id: data.dependsOn, label: data.dependsOn, type: 'value'});
+      createNode({id: data.dependsOn, label: data.dependsOn, type: 'value'});
       dependsOn = nodes[data.dependsOn];
     }
     if (dependsOn.hide) {
       dependsOn.hide = false;
       nodeList.push(dependsOn);
-      pushUndo(function() {
-        dependsOn.hide = true;
-        nodeList.pop();
-      });
     }
     links.push({
       source: nodes[data.id],
       target: nodes[data.dependsOn]
     });
-    pushUndo(function() {
-      links.pop();
-    });
   },
   depId: function(data) {
     links.push({
       source: nodes[data.id],
       target: nodes[data.dependsOn]
     });
-    pushUndo(function() {
-      links.pop();
-    });
   },
   invalidate: function(data) {
     var node = nodes[data.id];
-    if (node.invalidated)
-      throw new Error('Illegal sequence');
-
     node.invalidated = true;
-    pushUndo(function() {
-      node.invalidated = false;
-    });
-
-    var origLinks = links;
     links = links.filter(function(link) {
       return link.source !== node;
     });
-    pushUndo(function() {
-      links = origLinks;
-    });
   },
   valueChange: function(data) {
     var existed = !!nodes[data.id];
-    createNodeWithUndo({
+    createNode({
       id: data.id,
       label: data.id + ' = ' + data.value,
       type: 'value',
@@ -609,94 +473,38 @@ var callbacks = {
     if (!existed || nodes[data.id].hide)
       return true;
     nodes[data.id].changed = true;
-    pushUndo(function() {
+    executeBeforeNextCommand.push(function() {
       nodes[data.id].changed = false;
     });
-    executeBeforeNextCommand.pushWithUndo(function() {
-      nodes[data.id].changed = false;
-      pushUndo(function() {
-        nodes[data.id].changed = true;
-      });
-    });
   },
   enter: function(data) {
     var node = nodes[data.id];
     node.running = true;
-    pushUndo(function() {
-      node.running = false;
-    });
   },
   exit: function(data) {
     var node = nodes[data.id];
     node.running = false;
-    pushUndo(function() {
-      node.running = true;
-    });
   }
 };
 
-function processMessage(data, suppressUpdate) {
+function processMessage(data) {
   console.log(JSON.stringify(data));
   if (!callbacks.hasOwnProperty(data.action))
     throw new Error('Unknown action ' + data.action);
   var result = callbacks[data.action].call(callbacks, data);
-  if (!suppressUpdate)
-    update();
+  update();
   return result;
 }
 
 var executeBeforeNextCommand = [];
-function doNext(suppressUpdate) {
-  if (!log.length)
-    return;
-
-  startUndoScope();
-  while (executeBeforeNextCommand.length) {
-    executeBeforeNextCommand.shiftWithUndo()();
-  }
-  while (log.length) {
-    var result = (function() {
-      var message = log.shift();
-      pushUndo(function() {
-        log.unshift(message);
-      })
-      return processMessage(message, suppressUpdate);
-    })();
-    if (!result)
+function doNext() {
+  while (executeBeforeNextCommand.length)
+    executeBeforeNextCommand.shift()();
+  while (log.length)
+    if (!processMessage(log.shift()))
       break;
-  }
-  if (!log.length) {
+  if (!log.length)
     $('#ended').fadeIn(1500);
-    pushUndo(function() {
-      $('#ended').hide();
-    });
-  }
-  step++;
-  updateTimeline();
-  pushUndo(function() {
-    step--;
-    updateTimeline();
-  });
-  endUndoScope();
-}
-
-function countSteps() {
-  if (undoStack.length !== 0) {
-    throw new Error(
-      'Illegal state; must call countSteps before execution begins');
-  }
-  var steps = 0;
-  while (log.length) {
-    doNext();
-    steps++;
-  }
-  while (undoStack.length)
-    undoStack.pop()();
-  return steps;
-}
-
-function updateTimeline() {
-  $('#timeline-fill').width((step/totalSteps*100) + '%');
 }
 
 function zoom() {
@@ -705,71 +513,20 @@ function zoom() {
   var y = d3.event.translate[1];
   d3.select('#viz').attr('transform', 'scale(' + scale + ') translate(' + x/scale + ' ' + y/scale + ')');
 }
-
-// The total number of steps, as far as the user is concerned, in the log.
-// This may/will be different than the number of log entries, since each
-// step may include more than one log entry.
-var totalSteps;
-// The current step we're on.
-var step;
 $(function() {
   d3.select('svg').call(d3.behavior.zoom().scale(4).on('zoom', zoom));
   $(document.body).on('keydown', function(e) {
-    if (e.which === 39 || e.which === 32) { // space, right
-      // Move one step ahead
+    if (e.which === 39 || e.which === 32)
       doNext();
-    }
-    if (e.which === 37) { // left
-      // Move one step back
-      undo();
-    }
-    if (e.which === 35) { // end
-      // Seek to end
+    if (e.which === 35) {
       while (log.length) {
         doNext();
       }
     }
-    if (e.which === 36) { // home
-      // Seek to beginning
-      undoAll();
-    }
   });
-
-  // Timeline click and scrub
-  $('#timeline').on('click mousemove', function(e) {
-    // Make sure left mouse button is down.
-    // Firefox is stupid; e.which is always 1 on mousemove events,
-    // even when button is not down!! So read e.originalEvent.buttons.
-    if (typeof(e.originalEvent.buttons) !== 'undefined') {
-      if (e.originalEvent.buttons !== 1)
-        return;
-    } else if (e.which !== 1) {
-      return;
-    }
-
-    var timeline = e.currentTarget;
-    var pos = e.offsetX || e.originalEvent.layerX;
-    var width = timeline.offsetWidth;
-    var targetStep = Math.round((pos/width) * totalSteps);
-    while (step < targetStep) {
-      doNext();
-    }
-    while (step > targetStep && step != 1) {
-      undo();
-    }
-  });
-
-  totalSteps = countSteps();
-  step = 0;
-
   doNext();
-
-  // don't allow undoing past initial state
-  while (undoStack.length)
-    undoStack.pop();
   executeBeforeNextCommand.push(function() {
     $('#instructions').fadeOut(1000);
-    // It's weird for the instructions to fade back in, so no pushUndo here
   });
 });
 </script>
@@ -800,7 +557,7 @@ $(function() {
     Press right-arrow to advance
   </div>
   <div id="ended" style="display: none;">
-    <strong>You&rsquo;ve reached the end</strong><br/>Press the Home key to start over
+    <strong>You&rsquo;ve reached the end</strong><br/>Reload the page to start over
   </div>
   <div id="legend">
     <div class="color normal"></div> Normal<br/>
@@ -809,10 +566,5 @@ $(function() {
   </div>
   <br/>
   <pre id="description"><br/></pre>
-  <div id="timeline">
-    <div id="timeline-bg">
-      <div id="timeline-fill"></div>
-    </div>
-  </div>
 </body>
 </html>

inst/www/shared/bootstrap/css/bootstrap-responsive.css

@@ -1,11 +1,11 @@
 /*!
- * Bootstrap Responsive v2.3.2
+ * Bootstrap Responsive v2.1.0
  *
- * Copyright 2013 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Designed and built with all the love in the world by @mdo and @fat.
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
  */
 
 .clearfix {
@@ -40,10 +40,6 @@
           box-sizing: border-box;
 }
 
-@-ms-viewport {
-  width: device-width;
-}
-
 .hidden {
   display: none;
   visibility: hidden;
@@ -95,19 +91,6 @@
   }
 }
 
-.visible-print {
-  display: none !important;
-}
-
-@media print {
-  .visible-print {
-    display: inherit !important;
-  }
-  .hidden-print {
-    display: none !important;
-  }
-}
-
 @media (min-width: 1200px) {
   .row {
     margin-left: -30px;
@@ -124,7 +107,6 @@
   }
   [class*="span"] {
     float: left;
-    min-height: 1px;
     margin-left: 30px;
   }
   .container,
@@ -232,9 +214,6 @@
   .row-fluid [class*="span"]:first-child {
     margin-left: 0;
   }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.564102564102564%;
-  }
   .row-fluid .span12 {
     width: 100%;
     *width: 99.94680851063829%;
@@ -474,7 +453,6 @@
   }
   [class*="span"] {
     float: left;
-    min-height: 1px;
     margin-left: 20px;
   }
   .container,
@@ -582,9 +560,6 @@
   .row-fluid [class*="span"]:first-child {
     margin-left: 0;
   }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.7624309392265194%;
-  }
   .row-fluid .span12 {
     width: 100%;
     *width: 99.94680851063829%;
@@ -805,8 +780,7 @@
     padding-left: 20px;
   }
   .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
+  .navbar-fixed-bottom {
     margin-right: -20px;
     margin-left: -20px;
   }
@@ -837,15 +811,11 @@
     margin-left: 0;
   }
   [class*="span"],
-  .uneditable-input[class*="span"],
   .row-fluid [class*="span"] {
     display: block;
     float: none;
-    width: 100%;
+    width: auto;
     margin-left: 0;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
   }
   .span12,
   .row-fluid .span12 {
@@ -854,9 +824,6 @@
        -moz-box-sizing: border-box;
             box-sizing: border-box;
   }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
   .input-large,
   .input-xlarge,
   .input-xxlarge,
@@ -878,9 +845,6 @@
     display: inline-block;
     width: auto;
   }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
   .modal {
     position: fixed;
     top: 20px;
@@ -889,11 +853,8 @@
     width: auto;
     margin: 0;
   }
-  .modal.fade {
-    top: -100px;
-  }
   .modal.fade.in {
-    top: 20px;
+    top: auto;
   }
 }
 
@@ -909,7 +870,7 @@
   input[type="radio"] {
     border: 1px solid #ccc;
   }
-  .form-horizontal .control-label {
+  .form-horizontal .control-group > label {
     float: none;
     width: auto;
     padding-top: 0;
@@ -925,16 +886,6 @@
     padding-right: 10px;
     padding-left: 10px;
   }
-  .media .pull-left,
-  .media .pull-right {
-    display: block;
-    float: none;
-    margin-bottom: 10px;
-  }
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
   .modal {
     top: 10px;
     right: 10px;
@@ -993,14 +944,14 @@
     display: none;
   }
   .nav-collapse .nav .nav-header {
-    color: #777777;
+    color: #555555;
     text-shadow: none;
   }
   .nav-collapse .nav > li > a,
   .nav-collapse .dropdown-menu a {
     padding: 9px 15px;
     font-weight: bold;
-    color: #777777;
+    color: #555555;
     -webkit-border-radius: 3px;
        -moz-border-radius: 3px;
             border-radius: 3px;
@@ -1016,19 +967,11 @@
     margin-bottom: 2px;
   }
   .nav-collapse .nav > li > a:hover,
-  .nav-collapse .nav > li > a:focus,
-  .nav-collapse .dropdown-menu a:hover,
-  .nav-collapse .dropdown-menu a:focus {
+  .nav-collapse .dropdown-menu a:hover {
     background-color: #f2f2f2;
   }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: #999999;
-  }
   .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .nav > li > a:focus,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
     background-color: #111111;
   }
   .nav-collapse.in .btn-group {
@@ -1039,7 +982,7 @@
     position: static;
     top: auto;
     left: auto;
-    display: none;
+    display: block;
     float: none;
     max-width: none;
     padding: 0;
@@ -1053,9 +996,6 @@
        -moz-box-shadow: none;
             box-shadow: none;
   }
-  .nav-collapse .open > .dropdown-menu {
-    display: block;
-  }
   .nav-collapse .dropdown-menu:before,
   .nav-collapse .dropdown-menu:after {
     display: none;
@@ -1063,10 +1003,6 @@
   .nav-collapse .dropdown-menu .divider {
     display: none;
   }
-  .nav-collapse .nav > li > .dropdown-menu:before,
-  .nav-collapse .nav > li > .dropdown-menu:after {
-    display: none;
-  }
   .nav-collapse .navbar-form,
   .nav-collapse .navbar-search {
     float: none;
@@ -1078,11 +1014,6 @@
        -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
             box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
   }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: #111111;
-    border-bottom-color: #111111;
-  }
   .navbar .nav-collapse .nav.pull-right {
     float: none;
     margin-left: 0;