Merge pull request #261 from js-data/csp

Fixes #258.
js-data · Nov 4, 2015 · bf774b4 · bf774b4
2 parents 3f962e3 + c6ced66
commit bf774b4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/datastore/index.js b/src/datastore/index.js
@@ -94,6 +94,7 @@ defaultsPrototype.beforeUpdate = lifecycleNoopCb
 defaultsPrototype.beforeValidate = lifecycleNoopCb
 defaultsPrototype.bypassCache = false
 defaultsPrototype.cacheResponse = !!DSUtils.w
+defaultsPrototype.csp = false
 defaultsPrototype.clearEmptyQueries = true
 defaultsPrototype.computed = {}
 defaultsPrototype.defaultAdapter = 'http'

diff --git a/src/datastore/sync_methods/defineResource.js b/src/datastore/sync_methods/defineResource.js
@@ -138,14 +138,20 @@ module.exports = function defineResource (definition) {
     var _class = def['class'] = DSUtils.pascalCase(def.name)
     try {
       if (typeof def.useClass === 'function') {
-        def[_class] = new Function('def', `return function ${_class}() { def.useClass.call(this); }`)(def) // eslint-disable-line
+        if (def.csp) {
+          def[_class] = function () { def.useClass.call(this) }
+        } else {
+          def[_class] = new Function('def', `return function ${_class}() { def.useClass.call(this); }`)(def) // eslint-disable-line
+        }
         def[_class].prototype = (function (proto) {
           function Ctor () {
           }
 
           Ctor.prototype = proto
           return new Ctor()
         })(def.useClass.prototype)
+      } else if (def.csp) {
+        def[_class] = function () { }
       } else {
         def[_class] = new Function(`return function ${_class}() {}`)() // eslint-disable-line
       }

diff --git a/test/both/datastore/sync_methods/defineResource.test.js b/test/both/datastore/sync_methods/defineResource.test.js
@@ -290,4 +290,17 @@ describe('DS#defineResource', function () {
     assert.equal(foo.bar.id, 1);
     assert.isTrue(wasItActivated);
   });
+  it('should work with csp set to true', function () {
+    var store = new JSData.DS({
+      csp: true
+    });
+    var User = store.defineResource({
+      name: 'user'
+    });
+    var user = User.createInstance({ name: 'John' });
+    assert.isTrue(user instanceof User[User.class]);
+    assert.equal(User[User.class].name, '');
+
+    assert.equal(Post[Post.class].name, 'Post');
+  });
 });