Merge branch 'master' of github.com:okfn/dpm

lib/index.js

@@ -178,6 +178,8 @@ Dpm.prototype.get = function(dpkgId, opts, callback) {
 
     async.each(resources, function(r, cb) {
       cb = once(cb);
+      if(r.data) return cb(null);
+
       var resourceUrl = r.url ? r.url : spec.url.replace(/\/$/, '') + '/' + r.path;
 
       self.logHttp('GET', resourceUrl);

test/all.js

@@ -48,6 +48,20 @@ describe('get', function() {
       done();
     });
   });
+
+  it('should ignore data resource', function(done) {
+    var ours = new dpm({}, root);
+    var url = 'https://raw.githubusercontent.com/okfn/dpm/master/test/fixtures/datapackage-example-inline';
+    var dpjson = path.join(root, 'datapackages', 'datapackage-example-inline', 'datapackage.json');
+
+    ours.get(url, function(err) {
+      if (err) return done(err);
+
+      var dpkg = JSON.parse(fs.readFileSync(dpjson));
+      assert.equal(dpkg.name, 'datapackage-example-inline');
+      done();
+    });
+  });
 });
 
 describe('info', function() {

test/fixtures/datapackage-example-inline/README.md

@@ -0,0 +1 @@
+This is a basic example of using an inline data element in a datapackage. Adapted from the documentation.

test/fixtures/datapackage-example-inline/datapackage.json

@@ -0,0 +1,10 @@
+{
+  "name" : "datapackage-example-inline",
+  "license" : "CC0",
+  "resources": [
+     {
+        "format": "csv",
+        "data": "A,B,C\n1,2,3\n4,5,6"
+     }
+   ]
+}