Skip to content

Commit e34d346

Browse files
perNyfeltperNyfelt
committed
* Added single quotes around object model in Description
* Hide some methods that are internal only from being listed in the documentation using #' #'@Keywords internal * Change group name to org.renjin.cran for renjin build to have the same R code work in both Renjin and GNU-R
1 parent 3f79206 commit e34d346

File tree

7 files changed

+92
-17
lines changed

7 files changed

+92
-17
lines changed

‎DESCRIPTION

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
Package: xmlr
2-
Version: 0.1.2
3-
Date: 2020-05-06
2+
Version: 0.2.0.9001
3+
Date: 2020-05-09
44
Title: Read, Write and Work with 'XML' Data
55
Authors@R: c(
66
person("Per", "Nyfelt", email = "[email protected]", role = c("cre", "aut")),
77
person("Alipsa HB", email = "[email protected]", role = "cph"),
88
person("Steven", "Brandt", role = "ctb")
99
)
10+
Author:
11+
Per Nyfelt [cre, aut],
12+
Alipsa HB [cph],
13+
Steven Brandt [ctb]
1014
Maintainer: Per Nyfelt <[email protected]>
1115
Depends: R (>= 3.1.0)
1216
Encoding: UTF-8
13-
Description: 'XML' package for creating and reading and manipulating 'XML', with an object model based on 'Reference Classes'.
17+
Description: 'XML' package for creating, reading and manipulating 'XML', with an object model based on 'Reference Classes'.
1418
License: MIT + file LICENSE
1519
URL: https://github.com/Alipsa/xmlr
1620
BugReports: https://github.com/Alipsa/xmlr/issues

‎NEWS.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
1-
# version 0.1.1
21

3-
# version 0.1.0
2+
## version 0.2.0.9000-
3+
* Added single quotes around object model in Description
4+
* Hide some methods that are internal only from being listed in the documentation using #' #'@keywords internal
5+
* Change group name to org.renjin.cran for renjin build to have the same R code work in both Renjin and GNU-R
6+
7+
## version 0.1.2, 2020-05-06
8+
* Removed all print calls and replaced with warning or message when relevant
9+
* Add Authors@R field instead if Author and Copyright fields as per feed-back.
10+
* Add Steven Brandt as contributor as his article in Java World formed the basis of the XMl parser
11+
* Add \value tag to utils.Rd
12+
* Add single quote in Title and Description fields where required in DESCRPTION
13+
14+
## version 0.1.1, 2020-05-03
15+
* Fixed the LICENSE to adhere to the standard template format for MIT
16+
17+
# version 0.1.0, 2020-04-14
418
Initial release.
519

620
"Works for me" and I looked at various examples to make sure xmlr could handle them, which it does.

‎R/utils.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ isRc <- function(x, clazz = "refClass") {
1010
is(x, clazz)
1111
}
1212

13-
# internal
13+
#'@keywords internal
1414
notImplemented <- function(className, methodName, ...) {
1515
warning(paste(paste0(className, "$", methodName), "Not implemented,", ...))
1616
}
1717

18-
# internal
18+
#'@keywords internal
1919
whitespace <- c(" ", "\t", "\n", "\r" , "\v", "\f")
2020

21-
# internal
21+
#'@keywords internal
2222
hasWhiteSpace <- function(string) {
2323
if (is.null(string)) return(FALSE)
2424
str <- strsplit(string, "")[[1]]
2525
any(str %in% whitespace)
2626
}
2727

28-
# internal
28+
#'@keywords internal
2929
isWhiteSpaceChar <- function(char) {
3030
if (is.null(char)) return(FALSE)
3131
if (nchar(char, keepNA=TRUE) > 1) return(hasWhiteSpace(char))

‎R/xmlr.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#' xmlr
2-
#' @description A package for creating and reading and manipulating XML
3-
#' inspired by JDOM (http://www.jdom.org/), implemented with Reference Classes.
2+
#' @description A package for creating, reading and manipulating XML
3+
#' providing and object model implemented with Reference Classes. This is perhaps especially useful when
4+
#' dealing with deeply nested XML structures.
45
#' @import methods
56
#' @docType package
67
#' @name xmlr

‎cran-comments.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## Resubmission 2
2+
This is a resubmission. In this version I have:
3+
* Added single quotes around object model in Description, 'Reference Classes' are already
4+
quoted with undirected single quotes so this is the only other expression that is is not
5+
commonly understood english that I could think of.
6+
* Hide some methods that are internal only from being listed in the documentation using #' #'@keywords internal
7+
* Update NEWS file with all version history
8+
19
## Resubmission 2
210
This is a resubmission. In this version I have:
311
* Removed all print calls and replaced with warning or message when relevant

‎man/xmlr.Rd

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
<modelVersion>4.0.0</modelVersion>
77

8-
<groupId>se.alipsa</groupId>
8+
<groupId>org.renjin.cran</groupId>
99
<artifactId>xmlr</artifactId>
10-
<version>1.0-SNAPSHOT</version>
10+
<version>0.2.0-SNAPHOT</version>
1111
<packaging>jar</packaging>
1212

1313
<!-- general information about your package -->
@@ -68,11 +68,11 @@
6868
<artifactId>testthat</artifactId>
6969
<version>2.1.1-b2</version>
7070
</dependency>
71-
<dependency>
71+
<!--dependency>
7272
<groupId>org.renjin.cran</groupId>
7373
<artifactId>devtools</artifactId>
7474
<version>1.13.4-b3</version>
75-
</dependency>
75+
</dependency-->
7676
</dependencies>
7777
<repositories>
7878
<repository>
@@ -130,6 +130,53 @@
130130
</execution-->
131131
</executions>
132132
</plugin>
133+
<plugin>
134+
<groupId>se.alipsa</groupId>
135+
<artifactId>renjin-test-maven-plugin</artifactId>
136+
<version>1.3.1</version>
137+
<configuration>
138+
<runSourceScriptsBeforeTests>false</runSourceScriptsBeforeTests>
139+
</configuration>
140+
<executions>
141+
<!-- Expect_error does not quite work in Renjin. Instead of capturing the stop message it captures
142+
"Exception calling rlang_eval : null" -->
143+
<execution>
144+
<id>testthat</id>
145+
<phase>test</phase>
146+
<goals>
147+
<goal>testR</goal>
148+
</goals>
149+
<configuration>
150+
<testFailureIgnore>true</testFailureIgnore>
151+
<sourceDirectory>${project.basedir}/R</sourceDirectory>
152+
<testSourceDirectory>${project.basedir}/tests</testSourceDirectory>
153+
</configuration>
154+
</execution>
155+
</executions>
156+
<dependencies>
157+
<dependency>
158+
<groupId>org.renjin</groupId>
159+
<artifactId>renjin-script-engine</artifactId>
160+
<version>${renjin.version}</version>
161+
<exclusions>
162+
<exclusion>
163+
<groupId>commons-logging</groupId>
164+
<artifactId>commons-logging</artifactId>
165+
</exclusion>
166+
</exclusions>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.slf4j</groupId>
170+
<artifactId>slf4j-log4j12</artifactId>
171+
<version>1.7.30</version>
172+
</dependency>
173+
<dependency>
174+
<groupId>org.slf4j</groupId>
175+
<artifactId>jcl-over-slf4j</artifactId>
176+
<version>1.7.30</version>
177+
</dependency>
178+
</dependencies>
179+
</plugin>
133180
</plugins>
134181
</build>
135182
</project>

0 commit comments

Comments
 (0)