Comparing version 0.0.4 to 0.1.0
@@ -8,4 +8,4 @@ /* | ||
var Cocktail, | ||
cocktail, | ||
var sequence = require('./processor/sequence'), | ||
Cocktail, | ||
ANNOTATION_REG_EXP = /^@/, | ||
@@ -15,7 +15,3 @@ DEFAULT_PROCESSORS = {}; | ||
Cocktail = function(){ | ||
//NO-OP | ||
}; | ||
Cocktail.prototype = { | ||
Cocktail = { | ||
/** | ||
@@ -179,3 +175,3 @@ * @private | ||
module.exports = cocktail = new Cocktail(); | ||
module.exports = Cocktail; | ||
@@ -198,2 +194,10 @@ /** | ||
cocktail.registerProcessors(DEFAULT_PROCESSORS); | ||
Cocktail.registerProcessors(DEFAULT_PROCESSORS); | ||
Cocktail.mix(Cocktail, { | ||
/** | ||
* @public | ||
* SEQUENCE is used to define a enumaration of priorities for annotations | ||
*/ | ||
SEQUENCE: sequence | ||
}); |
@@ -10,2 +10,3 @@ /* | ||
var Cocktail = require('../../Cocktail'), | ||
sequence = require('../sequence'), | ||
Annotation = function(){}; | ||
@@ -15,3 +16,3 @@ | ||
retain : false, | ||
priority : 1000, | ||
priority : sequence.ANNOTATION, | ||
name : '@annotation', | ||
@@ -18,0 +19,0 @@ |
@@ -9,7 +9,8 @@ /* | ||
var Extends = function(){}; | ||
var sequence = require('../sequence'), | ||
Extends = function(){}; | ||
Extends.prototype = { | ||
retain : false, | ||
priority : 10, | ||
priority : sequence.EXTENDS, | ||
name : '@extends', | ||
@@ -16,0 +17,0 @@ |
@@ -8,7 +8,8 @@ /* | ||
var Merge = function(){}; | ||
var sequence = require('../sequence'), | ||
Merge = function(){}; | ||
Merge.prototype = { | ||
priority : 99, | ||
retain : false, | ||
priority : sequence.MERGE, | ||
name : '@merge', | ||
@@ -15,0 +16,0 @@ |
@@ -9,7 +9,8 @@ /* | ||
var Properties = function(){}; | ||
var sequence = require('../sequence'), | ||
Properties = function(){}; | ||
Properties.prototype = { | ||
retain : false, | ||
priority : 20, | ||
priority : sequence.PROPERTIES, | ||
name : '@properties', | ||
@@ -16,0 +17,0 @@ |
@@ -9,3 +9,4 @@ /* | ||
var Requires = function(){}; | ||
var sequence = require('../sequence'), | ||
Requires = function(){}; | ||
@@ -16,3 +17,3 @@ Requires.requiredMethod = function required(){ throw new Error('method is marked as required but it has not been defined');}; | ||
retain : false, | ||
priority : 30, | ||
priority : sequence.REQUIRES, | ||
name : '@requires', | ||
@@ -19,0 +20,0 @@ |
@@ -9,3 +9,4 @@ /* | ||
var Requires = require('./Requires'), | ||
var sequence = require('../sequence'), | ||
Requires = require('./Requires'), | ||
Traits = function(){}; | ||
@@ -15,3 +16,3 @@ | ||
retain : false, | ||
priority : 100, | ||
priority : sequence.TRAITS, | ||
name : '@traits', | ||
@@ -18,0 +19,0 @@ |
@@ -8,7 +8,8 @@ /* | ||
var NoOp = function(){}; | ||
var sequence = require('./sequence'), | ||
NoOp = function(){}; | ||
NoOp.prototype = { | ||
retain : false, | ||
priority : -1, | ||
priority : sequence.NO_OP, | ||
name : 'noOp', | ||
@@ -15,0 +16,0 @@ |
{ | ||
"name": "cocktail", | ||
"description": "CocktailJS is an small library to explore traits, talents, inheritance and annotations concepts in nodejs - Shake your objects and classes with Cocktail!", | ||
"version": "0.0.4", | ||
"description": "CocktailJS is a small library to explore traits, talents, inheritance and annotations concepts in nodejs - Shake your objects and classes with Cocktail!", | ||
"version": "0.1.0", | ||
"homepage": "http://cocktailjs.github.io", | ||
@@ -6,0 +6,0 @@ "author": { |
@@ -37,3 +37,2 @@ # Cocktail JS [![Build Status](https://travis-ci.org/CocktailJS/Cocktail.png?branch=master)](https://travis-ci.org/CocktailJS/Cocktail) | ||
## Getting Started | ||
Guides will be soon posted on CocktailJS site. | ||
@@ -43,2 +42,4 @@ - Install the module with: `npm install cocktail` or add cocktail to your `package.json` and then `npm install` | ||
## Guides | ||
Guides can be found at [CocktailJS Guides](http://cocktailjs.github.io/guides/) | ||
@@ -56,4 +57,10 @@ ## Documentation | ||
- 0.0.4 (current master) | ||
- 0.1.0 (current master) | ||
- status: Alpha | ||
- Added sequence to define custom annotations priorities. | ||
- Documentation update. | ||
- Tests for Sequence. | ||
- 0.0.4 | ||
- status: Alpha | ||
- Added new merge strategies: mine (default -same as single), their, deep-mine and deep-their. | ||
@@ -60,0 +67,0 @@ - Test for Merge strategies. |
22194
13
534
84