Merge branch 'master' of github.com:binary-array-ld/net.binary_array_ld.bald

Author: simonoakesepimorphics

binary-array-ld-cli/src/test/kotlin/net/bald/BinaryArrayConvertCliTest.kt

@@ -496,6 +496,9 @@ class BinaryArrayConvertCliTest {
                 statement(BALD.contains, createResource("http://test.binary-array-ld.net/example/")) {
                     statement(RDF.type, BALD.Container)
                     statement(BALD.contains, createResource("http://test.binary-array-ld.net/example/var0"), sortAnon = ::sortRefs) {
+                        statement(createProperty("${TestVocab.prefix}name"), createStringLiteral("var0"))
+                        statement(TestVocab.references, createResource("http://test.binary-array-ld.net/example/var1"))
+                        statement(TestVocab.references, createResource("http://test.binary-array-ld.net/example/var2"))
                         statement(RDF.type, BALD.Array)
                         statement(BALD.references) {
                             statement(RDF.type, BALD.Reference)

binary-array-ld-netcdf/src/main/kotlin/net/bald/netcdf/NetCdfAttribute.kt

@@ -12,7 +12,7 @@ class NetCdfAttribute(
     private val attr: Attribute
 ): net.bald.Attribute {
     private val name: String get() = attr.shortName
-    private val prop: Property get() = parent.parseProperty(name)
+    val prop: Property get() = parent.parseProperty(name)
 
     override val uri: String get() = prop.uri
 

binary-array-ld-netcdf/src/main/kotlin/net/bald/netcdf/NetCdfVar.kt

@@ -69,6 +69,7 @@ class NetCdfVar(
     private fun attributeRefs(): Sequence<NetCdfVar> {
         return v.attributes().let(::source)
             .attributes()
+            .filter { attr -> attr.prop.let(parent.alias::isReferenceProperty) }
             .mapNotNull(NetCdfAttribute::rawValues)
             .flatten()
             .mapNotNull(parent::parseReferences)

binary-array-ld-netcdf/src/test/kotlin/net/bald/netcdf/NetCdfBinaryArrayTest.kt

@@ -370,7 +370,10 @@ class NetCdfBinaryArrayTest {
 
     @Test
     fun vars_withReferenceAttributes_returnsReferences() {
-        val ba = fromCdl("/netcdf/ref-attr.cdl", "http://test.binary-array-ld.net/ref-attr.nc")
+        val alias = javaClass.getResourceAsStream("/turtle/var-alias.ttl").use { input ->
+            ModelFactory.createDefaultModel().read(input, null, "ttl")
+        }.let(ModelAliasDefinition::create)
+        val ba = fromCdl("/netcdf/ref-attr.cdl", "http://test.binary-array-ld.net/ref-attr.nc", alias = alias)
         ContainerVerifier(ba.root).vars {
             variable("http://test.binary-array-ld.net/ref-attr.nc/var0") {
                 dimensions(10, 90, 15)

binary-array-ld-test/src/main/resources/netcdf/ref-attr.cdl

@@ -6,7 +6,8 @@ netcdf attributes {
         d3 = 60 ;
     variables:
         int var0(d0, d1, d2) ;
-            var0:bald__references = "var1 var2" ;
+            var0:test__references = "var1 var2" ;
+            var0:test__name = "var0" ;
         int var1(d1, d2, d3) ;
             var1:test__references = "var2";
         int var2(d2) ;

docs/alias.md

@@ -6,15 +6,23 @@ as described in the [draft specification](http://docs.opengeospatial.org/DRAFTS/
 ## CLI
 
 You can provide aliases as a set of RDF files.
-Use the `--alias` or `-a` option to specify the locations of alias files
-as a comma-delimited list.
-Note that these files must have a suitable extension in order to be parsed correctly.
+Use the `--alias` or `-a` option to specify the locations of alias files as a comma-delimited list.
+These can be the paths of files on the local file system, or the URLs of remote resources. 
+
+Note that the alias paths must have a suitable extension in order to be parsed correctly.
 
 #### Example
 ```
 java -jar bald-cli.jar --alias /path/to/alias.ttl /path/to/netcdf.nc /path/to/graph.ttl
 ```
 
+### Note
+
+If your alias files are remote resources and you are using a proxy server,
+you must provide the proxy host and port with the `-Dhttp.proxyHost` and `-Dhttp.proxyPort`
+JVM arguments.
+See [here](https://docs.oracle.com/javase/8/docs/technotes/guides/net/proxies.html) for official documentation.
+
 ## Library
 
 You can provide aliases as an Apache Jena [model](https://jena.apache.org/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html).