Models with static and instance methods are working

package.json

@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "iojs ./node_modules/mocha/bin/mocha --harmony_proxies test/unit --bail"
+    "test": "iojs ./node_modules/mocha/bin/mocha --harmony_proxies test/implementation --bail"
   },
   "author": "",
   "license": "ISC",

src/Orm/Proxy/Model/index.js

@@ -92,10 +92,21 @@ class Model {
    * @return {Promise}
    */
   forceDelete () {
+    let self = this
     if(!helpers.isFetched(this)){
       throw new Error(`You cannot delete a fresh model instance , trying fetching one using find method`)
     }
-    return this.constructor.forceDelete(this.connection)
+    return new Promise(function (resolve,reject) {
+      self
+      .constructor
+      .forceDelete(self.connection)
+      .then (function (response) {
+        self.attributes = {}
+        self.connection = self.constructor.database.table(self.constructor.table)
+        resolve(response)
+      })
+      .catch(reject)
+    })
   }
 
   /**

src/Orm/Proxy/Model/mapper.js

@@ -34,6 +34,10 @@ mapper.get = function (target, name) {
  * @param {*} value
  */
 mapper.set = function (target, name, value) {
+  if(name === 'attributes'){
+    target[name] = value
+    return true
+  }
   const setter = helpers.mutateField(target, name)
   target.attributes[name] = setter ? setter(value) : value
 }

src/Orm/Proxy/Static/hijacker.js

@@ -69,23 +69,19 @@ hijacker.find = function (target,id) {
     .where(target.primaryKey, id)
     .first()
     .then(function (values) {
-
       let instance = new target(values)
       instance.connection.where(target.primaryKey, id)
       resolve(instance)
-
     })
     .catch(reject)
     .finally(function () {
-
       /**
        * here we empty query chain after returning
        * all data, it is required otherwise old
        * methods will be called while making a
        * new query
        */
       target.new()
-
     })
   })
 }

src/Orm/Proxy/Static/index.js

@@ -54,6 +54,7 @@ class StaticProxy {
      * chain will we prepended.
      */
     Model.new = function () {
+      this.disableSoftDeletes = false
       this.activeConnection = this.database.table(this.table)
       return this
     }

test/implementation/model.spec.js

@@ -41,6 +41,9 @@ User = User.extend()
 class Posts extends Model{
 }
 
+let user_id = null
+let instanceUserId = null
+
 describe('Database Implementation', function () {
 
   context('Users', function () {
@@ -53,8 +56,6 @@ describe('Database Implementation', function () {
         password: 'foobar'
       }
 
-      let user_id = null
-
       User
       .create(userData)
       .then (function (user) {
@@ -69,6 +70,161 @@ describe('Database Implementation', function () {
 
     })
 
+    it('should be able to fetch all users', function (done) {
+
+      User
+      .select('*')
+      .fetch()
+      .then (function (users) {
+        users.each(function (user){
+          expect(user.id).not.to.be('undefined')
+        })
+        done()
+      })
+      .catch(done)
+
+    })
+
+    it('should be able to update selected user', function (done) {
+
+      User
+      .where('id',user_id)
+      .update({username:'foo'})
+      .then (function () {
+        return User.where('id',user_id).fetch()
+      })
+      .then (function (user) {
+        expect(user.first().username).to.equal('FOO')
+        done()
+      }).catch(done)
+
+    })
+
+    it('should be able to soft delete a given user', function (done) {
+
+      User
+      .where('id',user_id)
+      .delete()
+      .then (function () {
+        return User.where('id',user_id).fetch()
+      })
+      .then (function (user){
+        expect(user.size()).to.equal(0)
+        done()
+      }).catch(done)
+
+    })
+
+    it('should be able to fetch soft deleted entries', function (done) {
+
+      User
+      .where('id',user_id)
+      .delete()
+      .then (function () {
+        return User.withTrashed().where('id',user_id).fetch()
+      })
+      .then (function (user){
+        expect(user.first().username).to.equal('FOO')
+        done()
+      }).catch(done)
+
+    })
+
+    it('should be able to forceDelete entires', function (done) {
+
+      User
+      .where('id',user_id)
+      .forceDelete()
+      .then (function () {
+        return User.withTrashed().where('id',user_id).fetch()
+      })
+      .then (function (user){
+        expect(user.size()).to.equal(0)
+        done()
+      }).catch(done)
+
+    })
+
+  })
+
+  context('Database instance', function () {
+
+    it('should be able to insert values using model instance', function (done){
+
+      const user = new User({username:'virk'})
+
+      user
+      .create()
+      .then (function (user) {
+        instanceUserId = user[0]
+        return User.where('id',instanceUserId).fetch()
+      }).then(function (user) {
+        expect(user.first().username).to.equal('VIRK')
+        done()
+      }).catch(done)
+
+    })
+
+    it('should be able to update values using model instance', function (done){
+
+      User
+      .find(instanceUserId)
+      .then (function (user) {
+        user.username = 'bar'
+        return user.update()
+      })
+      .then (function () {
+        return User.where('id',instanceUserId).fetch()
+      }).then(function (user) {
+        expect(user.first().username).to.equal('BAR')
+        done()
+      }).catch(done)
+
+    })
+
+
+    it('should be able to soft delete row using model instance', function (done){
+
+      User
+      .find(instanceUserId)
+      .then (function (user) {
+        return user.delete()
+      })
+      .then (function () {
+        return User.where('id',instanceUserId).fetch()
+      }).then(function (user) {
+        expect(user.size()).to.equal(0)
+        done()
+      }).catch(done)
+
+    })
+
+    it('should be able to find soft deleted values and return true while checking is softDeleted', function (done) {
+
+      User
+      .find(instanceUserId)
+      .then (function (user) {
+        expect(user.isTrashed()).to.equal(true)
+        done()
+      }).catch(done)
+
+    })
+
+    it('should be able to forceDelete model instance', function (done) {
+
+      User
+      .find(instanceUserId)
+      .then (function (user){
+        return user.forceDelete()
+      }).then (function () {
+        return User.where('id',instanceUserId).fetch()
+      }).then (function (user) {
+        expect(user.size()).to.equal(0)
+        done()
+      }).catch(done)
+
+    })
+
   })
 
 })