Permalink
Browse files

Merge branch 'refs/heads/develop'

  • Loading branch information...
2 parents 44fea43 + a2aec59 commit 1f8a4515f21e557dd6cde3a58255d0500d20246f @kilianc committed Jun 16, 2012
Showing with 5,590 additions and 250 deletions.
  1. +2 −0 .gitignore
  2. +6 −0 .npmignore
  3. +3 −6 Makefile
  4. +230 −83 README.md
  5. +6 −0 examples/account/config/routes.json
  6. +1 −0 examples/account/lib/api_modules/index.js
  7. +109 −0 examples/account/lib/api_modules/users.js
  8. +13 −0 examples/account/package.json
  9. +9 −0 examples/account/public/css/bootstrap.min.css
  10. +4 −0 examples/account/public/css/main.css
  11. BIN examples/account/public/img/glyphicons-halflings-white.png
  12. BIN examples/account/public/img/glyphicons-halflings.png
  13. +59 −0 examples/account/public/index.html
  14. +1 −0 examples/account/public/js/async.min.js
  15. +1,550 −0 examples/account/public/js/handlebars-1.0.0.beta.6.js
  16. +98 −0 examples/account/public/js/main.js
  17. +36 −0 examples/account/public/js/mootools-more-1.4.0.1.js
  18. +527 −0 examples/account/public/js/mootools-yui-compressed.js
  19. +83 −0 examples/account/public/js/utils.js
  20. +10 −0 examples/account/public/partials/user_row.html
  21. +64 −0 examples/account/server.js
  22. +4 −0 examples/instagram/config/routes.json
  23. +1 −0 examples/instagram/lib/api_modules/index.js
  24. +113 −0 examples/instagram/lib/api_modules/photos.js
  25. +13 −0 examples/instagram/package.json
  26. +9 −0 examples/instagram/public/css/bootstrap.min.css
  27. +2 −0 examples/instagram/public/css/main.css
  28. BIN examples/instagram/public/img/glyphicons-halflings-white.png
  29. BIN examples/instagram/public/img/glyphicons-halflings.png
  30. +39 −0 examples/instagram/public/index.html
  31. +1 −0 examples/instagram/public/js/async.min.js
  32. +1,550 −0 examples/instagram/public/js/handlebars-1.0.0.beta.6.js
  33. +59 −0 examples/instagram/public/js/main.js
  34. +36 −0 examples/instagram/public/js/mootools-more-1.4.0.1.js
  35. +527 −0 examples/instagram/public/js/mootools-yui-compressed.js
  36. +83 −0 examples/instagram/public/js/utils.js
  37. +15 −0 examples/instagram/public/partials/photo.html
  38. +68 −0 examples/instagram/server.js
  39. +95 −71 lib-cov/apiserver.js
  40. +15 −8 lib-cov/middleware/multipart-parser.js
  41. +15 −18 lib-cov/middleware/payload-parser.js
  42. +25 −26 lib/apiserver.js
  43. +5 −2 lib/middleware/multipart-parser.js
  44. +1 −2 lib/middleware/payload-parser.js
  45. +10 −4 package.json
  46. +19 −6 test/apiserver-test.js
  47. +4 −2 test/fixtures/class-module.js
  48. +11 −1 test/fixtures/multipart-module.js
  49. +4 −2 test/fixtures/object-module.js
  50. +16 −4 test/fixtures/payload-module.js
  51. +39 −15 test/middleware/multipart-parser-test.js
View
@@ -0,0 +1,2 @@
+examples/instagram/public/uploads/
+examples/instagram/tmp/
View
@@ -0,0 +1,6 @@
+docs/
+examples/
+test/
+lib-cov/
+coverage.html
+README.md
View
@@ -4,15 +4,12 @@ test:
@NODE_ENV=test ./node_modules/.bin/mocha test/*-test.js test/*/*-test.js $(OPT) --reporter $(REPORTER)
test-bail:
+ @rm -rf lib-cov
+ @jscoverage lib lib-cov
$(MAKE) test OPT=--bail
test-cov:
- $(MAKE) lib-cov
@APISERVER_COV=1 $(MAKE) test REPORTER=html-cov > coverage.html
@open -g coverage.html
-lib-cov:
- @rm -rf lib-cov
- @jscoverage lib lib-cov
-
-.PHONY: test test-bail test-cov lib-cov
+.PHONY: test test-bail test-cov
Oops, something went wrong.

0 comments on commit 1f8a451

Please sign in to comment.