Skip to content

Commit

Permalink
minor updates. Removed Makefile~ from git
Browse files Browse the repository at this point in the history
  • Loading branch information
podviaznikov committed Dec 2, 2011
1 parent 17632fc commit 629b572
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 38 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules/
*.*~
Makefile~
17 changes: 0 additions & 17 deletions Makefile~

This file was deleted.

22 changes: 4 additions & 18 deletions lib/dao/users.dao.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,13 @@ class UsersDao extends Dao
populateEntity: (meta, attributes) ->
new User(meta.key, attributes.email, meta.links) if attributes?

# return map:
fetchAllRepos: (user, callback) =>
@links user, [["repositories", type, 1],["objects", "commit", 1],["objects", "tree", 1],["objects", "blob", 1]], (err, docs) =>
fetchAllRepos: (username, callback) =>
@get username, (err, user) =>
console.log "user", user.links()
if err
callback err
else
repos = []
blobs = []
commits = []
trees = []
for doc in docs
data = doc.data
if doc.meta.bucket == "repositories"
repos.push reposDao.populateEntity doc.meta, data
else if doc.meta.bucket == "objects"
switch data.type
when "blob" then blobs.push blobsDao.populateEntity(doc.meta, data)
when "tree" then trees.push treesDao.populateEntity(doc.meta, data)
when "commit" then commits.push commitsDao.populateEntity(doc.meta, data)

callback undefined, {repos: repos, commits: commits, trees: trees, blobs: blobs}
callback undefined, user.getLinks "repositories"

addRepo: (user, repoId, type, callback) =>
@get user, (err, user) =>
Expand Down
4 changes: 1 addition & 3 deletions lib/massive.git.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,12 @@ MassiveGit = exports.MassiveGit = class MassiveGit
else
callback undefined, ok

getUserRepos: (user, callback) => @searchRepos undefined, user, callback
getUserRepos: (user, callback) => @usersDao.fetchAllRepos user, callback

getNewestRepos: (callback) => @reposDao.getNewestRepos callback

searchRepos: (name, author, callback) => @reposDao.search name, author, callback

getUserReposEntries: (user, callback) => @usersDao.fetchAllRepos user, callback

commit: (entries, repoId, author, message = "initial commit", parentCommit = undefined, callback) =>
preparedEntries = @_prepareEntries entries, repoId
tasks = preparedEntries.tasks
Expand Down

0 comments on commit 629b572

Please sign in to comment.