Merge pull request #2 from zaboco/master

Does not try to wrap getters & setters

index.js

@@ -69,7 +69,7 @@ function validateMethodNames(methodNames) {
 }
 
 function wrapFunctions(target, methodNames) {
-  Object.getOwnPropertyNames(target).forEach(function(key) {
+  _actualMethodKeys(target).forEach(function(key) {
     let constructor = target[key].constructor.name;
 
     if (methodNames) {
@@ -78,8 +78,6 @@ function wrapFunctions(target, methodNames) {
       return;
     }
 
-    if (typeof target[key] !== 'function') return;
-
     if (target[key].constructor.name === 'GeneratorFunction') {
       target[key] = Promise.coroutine(target[key]);
     } else {
@@ -88,6 +86,15 @@ function wrapFunctions(target, methodNames) {
   });
 }
 
+function _actualMethodKeys(target) {
+  return Object.getOwnPropertyNames(target)
+    .filter(key => {
+      var propertyDescriptor = Object.getOwnPropertyDescriptor(target, key);
+      return !propertyDescriptor.get && !propertyDescriptor.set;
+    })
+    .filter(key => typeof target[key] === 'function');
+}
+
 module.exports = {
   wrap,
   wrapStaticMethods,

test.js

@@ -33,6 +33,10 @@ class FakeDataStore {
     return keys;
   }
 
+  get size() {
+    return this.store.size;
+  }
+
   getAsync(key) {
     let val = this.store.get(key);
     return Promise.resolve(val);
@@ -54,8 +58,12 @@ describe('async-class', function() {
   });
 
   describe('wrap', function() {
+    it('does not modify getters', function() {
+      expect(dataStore.size).to.eql(0);
+    });
+
     it('only modifies properties that are functions', function() {
-      expect(dataStore.store).to.be.instanceOf(Map)
+      expect(dataStore.store).to.be.instanceOf(Map);
     });
 
     it('does not wrap functions that do not end with Async', function() {