common functionality was extracted into riak-entity

lib/dao/objects.dao.coffee

@@ -1,4 +1,4 @@
-Dao = require("./dao").Dao
+Dao = require("riak-entity").Dao
 
 ## ObjectsDao
 ## -------------

lib/dao/repos.dao.coffee

@@ -1,4 +1,4 @@
-Dao  = require("./dao").Dao
+Dao  = require("riak-entity").Dao
 Repo = require("../objects/repo").Repo
 
 class ReposDao extends Dao

lib/dao/users.dao.coffee

@@ -1,5 +1,5 @@
 _          = require "underscore"
-Dao        = require("./dao").Dao
+Dao        = require("riak-entity").Dao
 reposDao   = require("./repos.dao").newInstance()
 blobsDao   = require("./blobs.dao").newInstance()
 commitsDao = require("./commits.dao").newInstance()

lib/massive.git.coffee

@@ -1,7 +1,6 @@
 async        = require "async"
 _            = require "underscore"
 validators   = require "./validators/input.validators"
-utils        = require("./objects/utils")
 
 # Dao objects
 ReposDao     = require "./dao/repos.dao"
@@ -18,6 +17,8 @@ Blob = exports.Blob = require("./objects/blob").Blob
 Commit = exports.Commit = require("./objects/commit").Commit
 TreeEntry = exports.TreeEntry = require("./objects/tree.entry").TreeEntry
 
+# Utility method for merging two arrays into one.
+mergeArrays = (first, second) -> Array::push.apply first, second
 
 MassiveGit = exports.MassiveGit = class MassiveGit
 
@@ -121,7 +122,7 @@ MassiveGit = exports.MassiveGit = class MassiveGit
         mergedEntries = tree.entries
         newEntriesNames = (entry.name for entry in newEntries)
         mergedEntries = _.reject mergedEntries, (entry) -> _.include newEntriesNames, entry.name
-        utils.mergeArrays mergedEntries, newEntries
+        mergeArrays mergedEntries, newEntries
         async.series tasks, (err, results) =>
           if err
             callback err

lib/objects/git.object.coffee

@@ -1,5 +1,5 @@
 crypto    = require "crypto"
-GitEntity = require("./git.entity").GitEntity
+GitEntity = require("riak-entity").Entity
 
 sha1 = (data) -> crypto.createHash("sha1").update(data).digest("hex")
 

lib/objects/repo.coffee

@@ -1,4 +1,4 @@
-GitEntity = require("./git.entity").GitEntity
+Entity = require("riak-entity").Entity
 
 # Repo
 # ---------
@@ -9,7 +9,7 @@ GitEntity = require("./git.entity").GitEntity
 # `public` - flag that indicated whether repo is public or private. Default to `true`.
 # `commit` - last commit for this repository. Can be `null` if repository wasn't commited previously.
 # `forkedFrom` - id of the repository from which this was cloned. Default to `null`.
-Repo = exports.Repo = class Repo extends GitEntity
+Repo = exports.Repo = class Repo extends Entity
 
   constructor: (@name, @author, @type, @public = true, @commit, @forkedFrom = null) ->
 

lib/objects/user.coffee

@@ -1,11 +1,11 @@
-_         = require "underscore"
-GitEntity = require("./git.entity").GitEntity
+_      = require "underscore"
+Entity = require("riak-entity").Entity
 
 # User
 # ------------
 # Class represent information about user in the system.
 # User has `id` (which is username) and `email`.
-User = exports.User = class User extends GitEntity
+User = exports.User = class User extends Entity
 
   constructor: (@_id, @email, @_links = []) ->
 

package.json

@@ -12,7 +12,7 @@
     "node": "~v0.4.12"
   },
   "dependencies": {
-    "riak-js": ">=0.4.1",
+    "riak-entity": ">=0.1.0",
     "coffee-script": ">=1.1.2",
     "underscore": ">=1.2.0",
     "validator": ">=0.3.0"