diff --git a/Makefile b/Makefile index 89a1cdff..9318ef7d 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,17 @@ build: install: @mkdir -p $(DESTDIR)$(PREFIX)/bin && \ - mkdir -p $(DESTDIR)$(PREFIX)/lib/node_modules/geddy && \ - mkdir -p ./node_modules && \ - npm install jake utilities model barista && \ + mkdir -p $(DESTDIR)$(PREFIX)/lib/node_modules/geddy && \ + mkdir -p ./node_modules && \ + npm install jake utilities model barista && \ + cp -R ./* $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/ && \ + ln -snf ../lib/node_modules/geddy/bin/cli.js $(DESTDIR)$(PREFIX)/bin/geddy && \ + chmod 755 $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/bin/cli.js && \ + echo 'Geddy installed.' + +quickinstall: + @mkdir -p $(DESTDIR)$(PREFIX)/bin && \ + mkdir -p $(DESTDIR)$(PREFIX)/lib/node_modules/geddy && \ cp -R ./* $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/ && \ ln -snf ../lib/node_modules/geddy/bin/cli.js $(DESTDIR)$(PREFIX)/bin/geddy && \ chmod 755 $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/bin/cli.js && \ diff --git a/examples/related_models/app/models/box.js b/examples/related_models/app/models/box.js index d3255018..c59c6b1e 100644 --- a/examples/related_models/app/models/box.js +++ b/examples/related_models/app/models/box.js @@ -6,7 +6,7 @@ var Box = function () { this.hasMany('Things'); - this.adapter = 'Mongo'; + this.adapter = 'mongo'; }; Box = geddy.model.register('Box', Box); diff --git a/examples/related_models/app/models/thing.js b/examples/related_models/app/models/thing.js index d0a2ae79..cbceb936 100644 --- a/examples/related_models/app/models/thing.js +++ b/examples/related_models/app/models/thing.js @@ -7,7 +7,7 @@ var Thing = function () { this.belongsTo('Box'); - this.adapter = 'Mongo'; + this.adapter = 'mongo'; }; Thing = geddy.model.register('Thing', Thing); diff --git a/examples/related_models/app/models/widget.js b/examples/related_models/app/models/widget.js index 96d7bba2..56d3ce18 100644 --- a/examples/related_models/app/models/widget.js +++ b/examples/related_models/app/models/widget.js @@ -6,7 +6,7 @@ var Widget = function () { this.hasOne('Thing'); - this.adapter = 'Mongo'; + this.adapter = 'mongo'; }; Widget = geddy.model.register('Widget', Widget); diff --git a/examples/todo_app_coffee/app/models/todo.coffee b/examples/todo_app_coffee/app/models/todo.coffee index 3f05a122..1a781d57 100644 --- a/examples/todo_app_coffee/app/models/todo.coffee +++ b/examples/todo_app_coffee/app/models/todo.coffee @@ -16,6 +16,6 @@ Todo = -> @validatesWithFunction 'status', (status) -> status == 'open' || status == 'done' - @adapter = 'Mongo' + @adapter = 'mongo' Todo = geddy.model.register 'Todo', Todo diff --git a/site/tutorial.html b/site/tutorial.html index 494604da..81ea5343 100644 --- a/site/tutorial.html +++ b/site/tutorial.html @@ -13,7 +13,8 @@ - + + @@ -97,7 +98,8 @@ - + +