Fixed bug with non-tabular resources in ZIP files; added test

Author: JohannesJander

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.frictionlessdata</groupId>
     <artifactId>datapackage-java</artifactId>
-    <version>0.6.10-SNAPSHOT</version>
+    <version>0.6.11-SNAPSHOT</version>
     <packaging>jar</packaging>
     <issueManagement>
         <url>https://github.com/frictionlessdata/datapackage-java/issues</url>
@@ -22,7 +22,7 @@
         <java.version>8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <tableschema-java-version>0.6.10</tableschema-java-version>
+        <tableschema-java-version>0.6.11</tableschema-java-version>
         <hamcrest.version>1.3</hamcrest.version>
         <junit.version>5.9.1</junit.version>
         <slf4j-simple.version>2.0.5</slf4j-simple.version>

src/main/java/io/frictionlessdata/datapackage/Package.java

@@ -666,11 +666,11 @@ protected ObjectNode getJsonNode(){
                 Set<String> datafileNames = resource.getDatafileNamesForWriting();
                 Set<String> outPaths = datafileNames.stream().map((r) -> r+"."+resource.getSerializationFormat()).collect(Collectors.toSet());
                 if (outPaths.size() == 1) {
-                    obj.put("path", outPaths.iterator().next());
+                    obj.put(JSON_KEY_PATH, outPaths.iterator().next());
                 } else {
-                    obj.set("path", JsonUtil.getInstance().createArrayNode(outPaths));
+                    obj.set(JSON_KEY_PATH, JsonUtil.getInstance().createArrayNode(outPaths));
                 }
-                obj.put("format", resource.getSerializationFormat());
+                obj.put(JSON_KEY_FORMAT, resource.getSerializationFormat());
             }
             obj.remove("originalReferences");
             resourcesJsonArray.add(obj);
@@ -848,11 +848,17 @@ private void addResource(Resource resource, boolean validate)
         DataPackageException dpe = null;
         if (resource.getName() == null){
             dpe = new DataPackageValidationException("Invalid Resource, it does not have a name property.");
+            if (validate)
+                validate(dpe);
         }
         if (resource instanceof AbstractDataResource)
             addResource((AbstractDataResource) resource, validate);
         else if (resource instanceof AbstractReferencebasedResource)
             addResource((AbstractReferencebasedResource) resource, validate);
+        else {
+            dpe = checkDuplicates(resource);
+        }
+        this.resources.add(resource);
         if (validate)
             validate(dpe);
     }
@@ -868,8 +874,6 @@ private void addResource(AbstractDataResource resource, boolean validate)
         }
         if (validate)
             validate(dpe);
-
-        this.resources.add(resource);
     }
 
     private void addResource(AbstractReferencebasedResource resource, boolean validate)
@@ -882,8 +886,6 @@ private void addResource(AbstractReferencebasedResource resource, boolean valida
         }
         if (validate)
             validate(dpe);
-
-        this.resources.add(resource);
     }
 
     private void validate(DataPackageException dpe) throws IOException {
@@ -898,7 +900,6 @@ private void validate(DataPackageException dpe) throws IOException {
             }
         }
 
-        // Validate.
         this.validate();
     }
 

src/main/java/io/frictionlessdata/datapackage/resource/FilebasedResource.java

@@ -96,14 +96,20 @@ public File getBasePath() {
 
     @Override
     byte[] getRawData(File input)  throws IOException {
-        File f = new File(this.basePath, input.getPath());
-        try (InputStream inputStream = Files.newInputStream(f.toPath())) {
-            return getRawData(inputStream);
+        if (this.isInArchive) {
+            String fileName = input.getPath().replaceAll("\\\\", "/");
+            return getZipFileContentAsString (basePath.toPath(), fileName).getBytes();
+        } else {
+            File file = new File(this.basePath, input.getPath());
+            try (InputStream inputStream = Files.newInputStream(file.toPath())) {
+                return getRawData(inputStream);
+            }
         }
+
     }
 
     @Override
-    Table createTable(File reference) throws Exception {
+    Table createTable(File reference) {
         return Table.fromSource(reference, basePath, schema, getCsvFormat());
     }
 
@@ -125,7 +131,7 @@ List<Table> readData () throws Exception{
         return tables;
     }
 
-    private List<Table> readfromZipFile() throws Exception {
+    private List<Table> readfromZipFile() throws IOException {
         List<Table> tables = new ArrayList<>();
         for (File file : paths) {
             String fileName = file.getPath().replaceAll("\\\\", "/");
@@ -135,7 +141,7 @@ private List<Table> readfromZipFile() throws Exception {
         }
         return tables;
     }
-    private List<Table> readfromOrdinaryFile() throws Exception {
+    private List<Table> readfromOrdinaryFile() throws IOException {
         List<Table> tables = new ArrayList<>();
         for (File file : paths) {
                 /* from the spec: "SECURITY: / (absolute path) and ../ (relative parent path)

src/test/java/io/frictionlessdata/datapackage/PackageTest.java

@@ -384,6 +384,23 @@ public void testNonTabularPackage() throws Exception{
         Assertions.assertEquals(t, s);
     }
 
+    @Test
+    @DisplayName("Test getting resource data from a non-tabular datapackage, ZIP based")
+    public void testNonTabularPackageFromZip() throws Exception{
+        String pathName = "/fixtures/zip/non-tabular.zip";
+        Path resourcePath = TestUtil.getResourcePath(pathName);
+        Package dp = new Package(resourcePath, true);
+
+        Resource<?,?> resource = dp.getResource("logo-svg");
+        Assertions.assertTrue(resource instanceof FilebasedResource);
+        byte[] rawData = (byte[])resource.getRawData();
+        String s = new String (rawData).replaceAll("[\n\r]+", "\n");
+
+        byte[] testData = TestUtil.getResourceContent("/fixtures/files/frictionless-color-full-logo.svg");
+        String t = new String (testData).replaceAll("[\n\r]+", "\n");
+        Assertions.assertEquals(t, s);
+    }
+
 
     @Test
     @DisplayName("Test getting resource data from a non-tabular datapackage, URL based")