Skip to content

Commit

Permalink
v6.46.4. Bugfix. Improvement.
Browse files Browse the repository at this point in the history
- v6.46.4 July 27, 2013
	- Fixes
		- Fixed virtual documents firing duplicated events
			- Plugins should now use `DocPad::cloneModel(model)` instead of
`model.clone()` as the latter can't bind events correctly
		- Fixed `Object #<Model> has no method 'setDefaults'` error (bug
since v6.46.3)
			- Moved `FileModel::setDefaults` back into `Base::setDefaults`
			- Thanks to [Jeff Barczewski](https://github.com/jeffbski) for
[docpad-archive/documentation#40](https://github.com/bevry/docpad-document
ation/pull/40)
		- Fixed the 500 middleware not working
	- Changes
		- The `documents` collection is now defined by `render:true,
write:true` rather than being paths and `isDocument:true` based
		- The `files` collection is now defined by `render:false, write:true`
rather than being paths and `isFile:true` based
		- The `html` collection now checks for `write:true` instead of
`isDocument:true` or `isFile:true`
		- The `stylesheet` collection now checks for `write:true` instead of
`isDocument:true` or `isFile:true`
	- Additions
		- Added ability to do `getCollection('database')` to get the global
database
		- Added naming to collections to easily identify which collection we
are in when debugging
		- Added `render` alias for documents directory
		- Added `static` alias for files directory
		- Added logging for event emits
		- Re-added `DocPad::parseDocumentDirectory` and `parseFileDirectory`
(removed from v6.46.0) which wraps around the new ways of doing things
		- Added `DocPad::createModel(attrs,opts)` and updated
`DocPad::createDocument` and `DocPad::createFile` to use it
		- Added `DocPad::ensureModel(attrs,opts)` and updated
`DocPad::ensureDocument`, `DocPad::ensurefile`, and
`DocPad::ensureFileOrDocument` to use it
		- Added `DocPad::attachModelEvents(model)` to attach the required
docpad events to a model
  • Loading branch information
balupton committed Jul 27, 2013
1 parent 38329fa commit b040c5a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
41 changes: 23 additions & 18 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
## History

- v6.46.4 Unreleased
- Fixed virtual documents firing duplicated events
- Added `cloneModel(model)` to properly handle events when cloning (`model.clone()` will no longer clone events)
- Fixed `Object #<Model> has no method 'setDefaults'` error (bug since v6.46.3)
- Moved `FileModel::setDefaults` back into `Base::setDefaults`
- Thanks to [Jeff Barczewski](https://github.com/jeffbski) for [bevry/docpad-documentation#40](https://github.com/bevry/docpad-documentation/pull/40)
- Fixed the 500 middleware not working
- Added ability to do `getCollection('database')` to get the global database
- Added `render` alias for documents directory
- Added `static` alias for files directory
- The `documents` collection is now defiend by `render:true, write:true` rather than being paths and `isDocument:true` based
- The `files` collection is now defiend by `render:false, write:true` rather than being paths and `isFile:true` based
- The `html` collection is now checks for `write:true` instead of `isDocument:true` or `isFile:true`
- The `stylesheet` collection is now checks for `write:true` instead of `isDocument:true` or `isFile:true`
- Re-added `DocPad::parseDocumentDirectory` and `parseFileDirectory` (removed from v6.46.0) which wraps around the new ways of doing things
- Added `DocPad::createModel(attrs,opts)` and updated `DocPad::createDocument` and `DocPad::createFile` to use it
- Added `DocPad::ensureModel(attrs,opts)` and updated `DocPad::ensureDocument`, `DocPad::ensurefile`, and `DocPad::ensureFileOrDocument` to use it
- Added `DocPad::attachModelEvents(model)` to attach the required docpad events to a model
- v6.46.4 July 27, 2013
- Fixes
- Fixed virtual documents firing duplicated events
- Plugins should now use `DocPad::cloneModel(model)` instead of `model.clone()` as the latter can't bind events correctly
- Fixed `Object #<Model> has no method 'setDefaults'` error (bug since v6.46.3)
- Moved `FileModel::setDefaults` back into `Base::setDefaults`
- Thanks to [Jeff Barczewski](https://github.com/jeffbski) for [bevry/docpad-documentation#40](https://github.com/bevry/docpad-documentation/pull/40)
- Fixed the 500 middleware not working
- Changes
- The `documents` collection is now defined by `render:true, write:true` rather than being paths and `isDocument:true` based
- The `files` collection is now defined by `render:false, write:true` rather than being paths and `isFile:true` based
- The `html` collection now checks for `write:true` instead of `isDocument:true` or `isFile:true`
- The `stylesheet` collection now checks for `write:true` instead of `isDocument:true` or `isFile:true`
- Additions
- Added ability to do `getCollection('database')` to get the global database
- Added naming to collections to easily identify which collection we are in when debugging
- Added `render` alias for documents directory
- Added `static` alias for files directory
- Added logging for event emits
- Re-added `DocPad::parseDocumentDirectory` and `parseFileDirectory` (removed from v6.46.0) which wraps around the new ways of doing things
- Added `DocPad::createModel(attrs,opts)` and updated `DocPad::createDocument` and `DocPad::createFile` to use it
- Added `DocPad::ensureModel(attrs,opts)` and updated `DocPad::ensureDocument`, `DocPad::ensurefile`, and `DocPad::ensureFileOrDocument` to use it
- Added `DocPad::attachModelEvents(model)` to attach the required docpad events to a model

- v6.46.3 July 25, 2013
- Moved `Base::setDefaults` to `FileModel::setDefaults`
Expand Down
1 change: 1 addition & 0 deletions locale/en.cson
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
More information here: http://docpad.org/render-early-via-include
"""
welcome: "Welcome to DocPad %s"
welcomeContribute: "Contribute: http://docpad.org/docs/contribute"
welcomePlugins: "Plugins: %s"
welcomeEnvironment: "Environment: %s"
includeFailed: "Could not include the file at path %s as we could not find it"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docpad",
"version": "6.46.3",
"version": "6.46.4",
"description": "DocPad is a language agnostic document management system. This means you write your website as documents, in whatever language you wish, and DocPad will handle the compiling, templates and layouts for you. For static documents it will generate static files, for dynamic documents it'll re-render them on each request. You can utilise DocPad by itself, or use it as a module your own custom system. It's pretty cool, and well worth checking out. We love it.",
"homepage": "https://github.com/bevry/docpad",
"installUrl": "http://docpad.org/install",
Expand Down
1 change: 1 addition & 0 deletions src/lib/docpad.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -1284,6 +1284,7 @@ class DocPad extends EventEmitterGrouped

# Welcome Output
docpad.log 'info', util.format(locale.welcome, "v#{@getVersion()}")
docpad.log 'info', locale.welcomeContribute
docpad.log 'info', util.format(locale.welcomePlugins, pluginsList)
docpad.log 'info', util.format(locale.welcomeEnvironment, @getEnvironment())

Expand Down

0 comments on commit b040c5a

Please sign in to comment.