Fix some bugs for the R client (#6535)

* * Fix bugs in api.mustache, model.mustache, mostly bracket errors or small typos
* Added section about installation in README.mustace
TODO: fix tests in testthat
TODO: fix bug in description.mustace regarding package name

* Updates to sample for R client caused by running ./bin/r-petstore.sh (or .\bin\windows\r-petstore.bat)

* Add R specific files to .gitignore

* [R] add additional files generated by the petstore sample. (see #6520)

Author: jschelbert

.gitignore

@@ -174,3 +174,6 @@ samples/client/petstore/kotlin/src/main/kotlin/test/
 .stack-work
 .cabal-sandbox
 cabal.project.local
+
+# R
+.Rproj.user

modules/swagger-codegen/src/main/resources/r/README.mustache

@@ -18,8 +18,22 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 {{/infoUrl}}
 
 ## Installation
+You'll need the `devtools` package in order to build the API.
+Make sure you have a proper CRAN repository from which you can download packages.
 
-TODO
+### Prerequisites
+Install the `devtools` package with the following command.
+```R
+if(!require(devtools)) { install.packages("devtools") }
+```
+
+### Installation of the API package
+Make sure you set the working directory to where the API code is located.
+Then execute
+```R
+library(devtools)
+install(".")
+```
 
 ## Author
 

modules/swagger-codegen/src/main/resources/r/api.mustache

@@ -36,6 +36,7 @@
             {{#queryParams}}
             "{{baseName}}" = {{paramName}}{{#hasMore}},{{/hasMore}}
             {{/queryParams}}
+			)
           {{/hasQueryParams}}
           )
 

modules/swagger-codegen/src/main/resources/r/model.mustache

@@ -81,14 +81,14 @@
       {{classname}}Object <- jsonlite::fromJSON({{classname}}Json)
       {{#vars}}
       {{#isPrimitiveType}}
-      self$`{{baseName}}` <- {{classname}}Object`${{baseName}}`
+      self$`{{baseName}}` <- {{classname}}Object$`{{baseName}}`
       {{/isPrimitiveType}}
       {{^isPrimitiveType}}
       {{#isListContainer}}
-      self$`{{baseName}}` <- lapply({{classname}}Object$`{{baseName}}`, function(x) {{datatype}}$new()$fromJSON(jsonlite::toJSON(x))
+      self$`{{baseName}}` <- lapply({{classname}}Object$`{{baseName}}`, function(x) {{datatype}}$new()$fromJSON(jsonlite::toJSON(x)))
       {{/isListContainer}}
       {{^isListContainer}}
-      self$`{{baseName}}` <- {{datatype}}$new()$fromJSON(jsonlite::toJSON({{classname}}Object${{baseName}))
+      self$`{{baseName}}` <- {{datatype}}$new()$fromJSON(jsonlite::toJSON({{classname}}Object${{baseName}}))
       {{/isListContainer}}
       {{/isPrimitiveType}}
       {{/vars}}

samples/client/petstore/R/.gitignore

@@ -1,3 +1,35 @@
-.Rproj.user
+# ref: https://github.com/github/gitignore/blob/master/R.gitignore
+
+# History files
 .Rhistory
+.Rapp.history
+
+# Session Data files
 .RData
+
+# Example code in package build process
+*-Ex.R
+
+# Output files from R CMD build
+/*.tar.gz
+
+# Output files from R CMD check
+/*.Rcheck/
+
+# RStudio files
+.Rproj.user/
+
+# produced vignettes
+vignettes/*.html
+vignettes/*.pdf
+
+# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
+.httr-oauth
+
+# knitr and R markdown default cache directories
+/*_cache/
+/cache/
+
+# Temporary files created by R markdown
+*.utf8.md
+*.knit.md

samples/client/petstore/R/.swagger-codegen-ignore

@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/petstore/R/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+2.3.0-SNAPSHOT

samples/client/petstore/R/.travis.yml

@@ -0,0 +1,3 @@
+# ref: https://docs.travis-ci.com/user/languages/r/
+language: r
+cache: packages

samples/client/petstore/R/DESCRIPTION

@@ -1,13 +1,12 @@
 Package: petstore
-Title: R Package Client for <http://swagger.io> Petstore APIs
-Version: 0.0.0.9000
-Authors@R: person("Ramkumar", "Chandrasekaran", email = "ramkumar.november@gmail.com", role = c("aut", "cre"))
-Description: R Package Client for <http://swagger.io> Petstore APIs.
+Title: R Package Client for Swagger Petstore
+Version: 1.0.0
+Authors@R: person("Swagger Codegen community", email = "apiteam@swagger.io", role = c("aut", "cre"))
+Description: This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 Depends: R (>= 3.3.3)
 Encoding: UTF-8
-License: MIT
+License: Unlicense
 LazyData: true
 Suggests: testthat
 Imports: jsonlite, httr, R6
 RoxygenNote: 6.0.1.9000
-

samples/client/petstore/R/NAMESPACE

@@ -1,6 +1,11 @@
 # Generated by roxygen2: do not edit by hand
 
+export(ApiResponse)
+export(Category)
 export(Element)
+export(Order)
 export(Pet)
 export(PetStoreClient)
 export(Response)
+export(Tag)
+export(User)