Skip to content

Commit

Permalink
more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
lancejpollard committed Feb 28, 2012
1 parent c52a3d7 commit fda3039
Show file tree
Hide file tree
Showing 67 changed files with 636 additions and 228 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
@@ -0,0 +1,4 @@
language: node_js
node_js:
- 0.4
- 0.6
4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -4,6 +4,8 @@
Built on top of Node's Connect and Express, modeled after Ruby on Rails. Built for the client and server from the ground up.

[![Build Status](https://secure.travis-ci.org/viatropos/tower.png)](http://travis-ci.org/viatropos/tower)

Follow me [@viatropos](http://twitter.com/viatropos).

More docs in the docs section on [towerjs.org](http://towerjs.org). Docs are a work in progress.
Expand Down Expand Up @@ -133,7 +135,7 @@ class App.User extends Tower.Model
@hasOne "address", embed: true

@hasMany "posts"
@hasmany "comments"
@hasMany "comments"

@scope "thisWeek", -> @where(createdAt: ">=": -> require('moment')().subtract('days', 7))

Expand Down
156 changes: 92 additions & 64 deletions dist/tower.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/tower.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/tower/application/assets.js
Expand Up @@ -37,7 +37,7 @@ Tower.Application.Assets = {
manifest = {};
bundle = function(type, extension, compressor, callback) {
var assetBlocks, assets, compile, name, paths;
assets = Tower.assets[type];
assets = Tower.config.assets[type];
compile = function(data, next) {
var content, name, path, paths, _i, _len;
name = data.name, paths = data.paths;
Expand All @@ -49,7 +49,7 @@ Tower.Application.Assets = {
}
fs.writeFileSync("public/assets/" + name + extension, content);
return process.nextTick(function() {
return compressor(content, function(error, result) {
return compressor(content, {}, function(error, result) {
var digestPath;
if (error) {
console.log(error);
Expand Down
2 changes: 1 addition & 1 deletion lib/tower/application/client.js
Expand Up @@ -118,7 +118,7 @@ Tower.Application = (function(_super) {
return self.handle(request, response);
});
} else {
return _console.warn("History not enabled");
return console.warn("History not enabled");
}
};

Expand Down

0 comments on commit fda3039

Please sign in to comment.