Merge pull request #8 from okgreece/master

Update

.Rbuildignore

@@ -9,5 +9,4 @@
 ^frictionlessdata\.png$
 ^okgr\.png$
 ^oklabs\.png$
-^inst
 ^codecov\.yml$

.gitignore

@@ -4,31 +4,24 @@
 
 # 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
-.Rproj.user
+.Rproj.user
+inst/doc

.travis.yml

@@ -1,50 +1,23 @@
 # R for travis: see documentation at https://docs.travis-ci.com/user/languages/r
-
 language: r
-pandoc_version: 1.19
-sudo: false
-cache: packages
-
 r:
   - oldrel
   - release
+  - devel
+sudo: false
+cache: packages
+warnings_are_errors: false
+r_packages:
+ - tableschema.r
 before_install:
   - tlmgr install index
-env:
-  global:
-  - _R_CHECK_FORCE_SUGGESTS_=false
--brew_packages:		
- - jsonvalidate		
- - V8		
--r_packages:		
- - config
- - crul
- - curl
- - covr		
- - future		
- - httr		
- - iterators		
- - jsonlite		
- - purrr		
- - R6		
- - R.utils		
- - Rcpp		
- - RCurl		
- - readr		
- - roxygen2		
- - stringr		
- - tools
- - urltools		
- - utils
- - webmockr
-r_github_packages: 
- - okgreece/tableschema.r
- - hadley/devtools
 addons:
   apt:
     packages:
       - libxml2-dev
       - libv8-dev
-warnings_are_errors: false
+repos:
+  CRAN: http://cran.rstudio.com
+r_github_packages: okgreece/tableschema-r
 after_success:
  - Rscript -e 'covr::coveralls()'

DESCRIPTION

@@ -5,32 +5,56 @@ Version: 0.1.0
 Date: 2017-07-01
 Author: c(person("Kleanthis", "Koupidis", email = "[email protected]", role = c("aut", "cre"), 
             person("Lazaros", "Ioannidis", email = "[email protected]", role = "cre"))
+            person("Charalampos", "Bratsas", email = "[email protected]", role = "aut"))
 Maintainer: Open Knowledge Greece <[email protected]>
 Description: A library for working with Data Package (<http://frictionlessdata.io/specs/data-package/>).
 License: MIT + file LICENSE
 Encoding: UTF-8
 LazyData: true
-Imports: V8, brew, config, curl, future, httr, iterators, jsonlite, jsonvalidate, purrr, R6, R.utils, Rcpp, RCurl, readr, roxygen2, stringr, tools, urltools, utils, xml2
-Remotes: okgreece/tableschema.r, hadley/testthat, hadley/devtools
-SystemRequirements: V8 <= 3.15: libv8-3.14-dev (deb), v8-314-devel (rpm), v8-3.14 (arch, from AUR), [email protected] (homebrew)
-RoxygenNote: 6.0.1
+Imports:
+    config, 
+    devtools, 
+    future, 
+    httr, 
+    iterators, 
+    jsonlite, 
+    jsonvalidate, 
+    purrr, 
+    R6, 
+    R.utils, 
+    readr, 
+    rlist, 
+    stringr, 
+    tableschema.r, 
+    tools, 
+    urltools, 
+    utils, 
+    V8
+Remotes:
+    okgreece/tableschema-r
 Suggests:
     covr,
     crul,
+    data.table,
+    DBI,
     foreach,
-    testthat,
-    webmockr,
+    httptest,
+    knitr,
     mockery,
-    httptest
+    rmarkdown,
+    RSQLite,
+    testthat,
+    webmockr
 Collate: 
     'DataPackageError.R'
     'Package.R'
     'helpers.R'
     'profile.R'
     'binary.readable.connection.r'
     'binary.readable.r'
-    'errors.R'
     'infer.R'
     'is.valid.R'
     'resource.R'
     'validate.R'
+RoxygenNote: 6.0.1
+VignetteBuilder: knitr

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Frictionless Data
+
+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.

NAMESPACE

@@ -14,6 +14,8 @@ export(dereferenceResourceDescriptor)
 export(descriptor.pointer)
 export(expandPackageDescriptor)
 export(expandResourceDescriptor)
+export(file_basename)
+export(file_extension)
 export(findFiles)
 export(helpers.from.json.to.list)
 export(helpers.from.list.to.json)
@@ -31,5 +33,7 @@ export(locateDescriptor)
 export(push)
 export(retrieveDescriptor)
 export(validate)
+export(write_json)
 import(jsonvalidate)
 importFrom(R6,R6Class)
+importFrom(tableschema.r,TableSchemaError)

R/DataPackageError.R

@@ -2,6 +2,7 @@
 #'
 #' @docType class
 #' @importFrom R6 R6Class
+#' @importFrom tableschema.r TableSchemaError
 #' @export
 #' @keywords data
 #' @return Object of \code{\link{R6Class}} .
@@ -10,11 +11,15 @@
 DataPackageError <- R6::R6Class(
 
   "DataPackageError",
-
+
+  inherit = TableSchemaError,
 
   public = list(
+
     message=NULL,
+
     error=NULL,
+
     initialize = function (message, error=NULL){
       self$message <- message
       self$error <- error