Skip to content

Commit

Permalink
Merge branch 'release/0.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
darko-mijic committed Jan 23, 2016
2 parents b26e4ea + 272eb75 commit 22e5cb1
Show file tree
Hide file tree
Showing 9 changed files with 405 additions and 47 deletions.
177 changes: 177 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
/**
* 0 - turn the rule off
* 1 - turn the rule on as a warning (doesn't affect exit code)
* 2 - turn the rule on as an error (exit code will be 1)
*
* Meteor Style Guide: https://github.com/meteor/meteor/wiki/Meteor-Style-Guide
*
*/

{
"parser": "babel-eslint",
"env": {
"browser": true,
"node": true
},
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"classes": true,
"defaultParams": true,
"destructuring": true,
"forOf": true,
"generators": false,
"modules": true,
"objectLiteralComputedProperties": true,
"objectLiteralDuplicateProperties": false,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"spread": true,
"superInFunctions": true,
"templateStrings": true,
"jsx": true
},
"rules": {
/**
* Strict mode
*/
// babel inserts "use strict"; for us
// http://eslint.org/docs/rules/strict
"strict": 0,

/**
* ES6
*/
"no-var": 1, // http://eslint.org/docs/rules/no-var

/**
* Variables
*/
"no-shadow": 2, // http://eslint.org/docs/rules/no-shadow
"no-shadow-restricted-names": 2, // http://eslint.org/docs/rules/no-shadow-restricted-names
"no-unused-vars": [2, { // http://eslint.org/docs/rules/no-unused-vars
"vars": "local",
"args": "after-used"
}],
"no-use-before-define": [2, "nofunc"], // http://eslint.org/docs/rules/no-use-before-define

/**
* Possible errors
*/
"comma-dangle": [1, "never"], // http://eslint.org/docs/rules/comma-dangle
"no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign
"no-console": 1, // http://eslint.org/docs/rules/no-console
"no-debugger": 1, // http://eslint.org/docs/rules/no-debugger
"no-alert": 1, // http://eslint.org/docs/rules/no-alert
"no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition
"no-dupe-keys": 2, // http://eslint.org/docs/rules/no-dupe-keys
"no-duplicate-case": 2, // http://eslint.org/docs/rules/no-duplicate-case
"no-empty": 2, // http://eslint.org/docs/rules/no-empty
"no-ex-assign": 2, // http://eslint.org/docs/rules/no-ex-assign
"no-extra-boolean-cast": 0, // http://eslint.org/docs/rules/no-extra-boolean-cast
"no-extra-semi": 2, // http://eslint.org/docs/rules/no-extra-semi
"no-func-assign": 2, // http://eslint.org/docs/rules/no-func-assign
"no-inner-declarations": 2, // http://eslint.org/docs/rules/no-inner-declarations
"no-invalid-regexp": 2, // http://eslint.org/docs/rules/no-invalid-regexp
"no-irregular-whitespace": 2, // http://eslint.org/docs/rules/no-irregular-whitespace
"no-obj-calls": 2, // http://eslint.org/docs/rules/no-obj-calls
"quote-props": [2, "as-needed", { "keywords": true, "unnecessary": false }], // http://eslint.org/docs/rules/quote-props (previously known as no-reserved-keys)
"no-sparse-arrays": 2, // http://eslint.org/docs/rules/no-sparse-arrays
"no-unreachable": 2, // http://eslint.org/docs/rules/no-unreachable
"use-isnan": 2, // http://eslint.org/docs/rules/use-isnan
"block-scoped-var": 0, // http://eslint.org/docs/rules/block-scoped-var

/**
* Best practices
*/
"consistent-return": 2, // http://eslint.org/docs/rules/consistent-return
"curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly
"default-case": 2, // http://eslint.org/docs/rules/default-case
"dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation
"allowKeywords": true
}],
"eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq
"guard-for-in": 2, // http://eslint.org/docs/rules/guard-for-in
"no-caller": 2, // http://eslint.org/docs/rules/no-caller
//"no-else-return": 2, // http://eslint.org/docs/rules/no-else-return
"no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null
"no-eval": 2, // http://eslint.org/docs/rules/no-eval
"no-extend-native": 2, // http://eslint.org/docs/rules/no-extend-native
"no-extra-bind": 2, // http://eslint.org/docs/rules/no-extra-bind
"no-fallthrough": 2, // http://eslint.org/docs/rules/no-fallthrough
"no-floating-decimal": 2, // http://eslint.org/docs/rules/no-floating-decimal
"no-implied-eval": 2, // http://eslint.org/docs/rules/no-implied-eval
"no-lone-blocks": 2, // http://eslint.org/docs/rules/no-lone-blocks
"no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func
"no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str
"no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign
"no-new": 2, // http://eslint.org/docs/rules/no-new
"no-new-func": 2, // http://eslint.org/docs/rules/no-new-func
"no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers
"no-octal": 2, // http://eslint.org/docs/rules/no-octal
"no-octal-escape": 2, // http://eslint.org/docs/rules/no-octal-escape
"no-param-reassign": 2, // http://eslint.org/docs/rules/no-param-reassign
"no-proto": 2, // http://eslint.org/docs/rules/no-proto
"no-redeclare": 2, // http://eslint.org/docs/rules/no-redeclare
"no-return-assign": 2, // http://eslint.org/docs/rules/no-return-assign
"no-script-url": 2, // http://eslint.org/docs/rules/no-script-url
"no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
"no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
"no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
"no-with": 2, // http://eslint.org/docs/rules/no-with
"radix": 2, // http://eslint.org/docs/rules/radix
"vars-on-top": 1, // http://eslint.org/docs/rules/vars-on-top
"wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife
"yoda": 2, // http://eslint.org/docs/rules/yoda
"max-len": [1, 200, 2], // http://eslint.org/docs/rules/max-len

/**
* Style
*/
"indent": [2, 2, {"VariableDeclarator": 2}], // http://eslint.org/docs/rules/indent
"brace-style": [2, // http://eslint.org/docs/rules/brace-style
"1tbs", {
"allowSingleLine": true
}],
"camelcase": [2, { // http://eslint.org/docs/rules/camelcase
"properties": "never"
}],
"comma-spacing": [2, { // http://eslint.org/docs/rules/comma-spacing
"before": false,
"after": true
}],
"comma-style": [2, "last"], // http://eslint.org/docs/rules/comma-style
"eol-last": 2, // http://eslint.org/docs/rules/eol-last
"func-names": 0, // http://eslint.org/docs/rules/func-names
"func-style": [2, "expression"], // http://eslint.org/docs/rules/func-style
"key-spacing": [2, { // http://eslint.org/docs/rules/key-spacing
"beforeColon": false,
"afterColon": true
}],
"new-cap": [2, { // http://eslint.org/docs/rules/new-cap
"newIsCap": true
}],
"no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines
"max": 2
}],
"no-nested-ternary": 2, // http://eslint.org/docs/rules/no-nested-ternary
"no-new-object": 2, // http://eslint.org/docs/rules/no-new-object
"no-array-constructor": 2, // http://eslint.org/docs/rules/no-array-constructor
"no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func
"no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces
"no-extra-parens": 0, // http://eslint.org/docs/rules/no-extra-parens (previously known as no-wrap-func)
"no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle
"one-var": [1, "never"], // http://eslint.org/docs/rules/one-var
"semi": [2, "always"], // http://eslint.org/docs/rules/semi
"semi-spacing": [2, { // http://eslint.org/docs/rules/semi-spacing
"before": false,
"after": true
}],
"space-after-keywords": 2, // http://eslint.org/docs/rules/space-after-keywords
"space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks
"space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren
"space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops
"space-return-throw-case": 2, // http://eslint.org/docs/rules/space-return-throw-case
"spaced-comment": 2, // http://eslint.org/docs/rules/spaced-comment (previously known as spaced-line-comment)
}
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.build*
local-packages.json
packages
6 changes: 0 additions & 6 deletions .travis.yml

This file was deleted.

16 changes: 16 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
machine:
node:
version: 0.10.33
environment:
PACKAGE_DIRS: packages
pre:
- curl https://install.meteor.com | /bin/sh
dependencies:
pre:
- npm install -g mgp
- npm install -g spacejam
override:
- mgp
test:
override:
- spacejam test-packages ./
22 changes: 22 additions & 0 deletions git-packages.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"space:base": {
"git":"https://github.com/meteor-space/base.git",
"version": "89534cec7275ea0f50c0de88f84bba9216be86c6"
},
"space:messaging": {
"git":"https://github.com/meteor-space/messaging.git",
"version": "bbaf57c511f7230c662d2ea4473b056148c82787"
},
"space:domain": {
"git":"https://github.com/meteor-space/domain.git",
"version": "c3915404196c201b3db69effb844b16bc1ceb74a"
},
"space:testing": {
"git":"https://github.com/meteor-space/testing.git",
"version": "53f24417c325500e1b836b88d5f03a17b2d97585"
},
"space:testing-messaging": {
"git":"https://github.com/meteor-space/testing-messaging.git",
"version": "81aee53c36b724818f1581572c1206c19d776ae9"
}
}
17 changes: 11 additions & 6 deletions package.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@

Package.describe({
summary: 'Value Objects for numeral domains.',
name: 'space:vo-numeral',
summary: 'Value Objects for numeral domains.',
version: '0.1.0',
git: 'https://github.com/meteor-space/vo-numeral.git',
documentation: 'README.md'
});

Package.onUse(function(api) {

api.versionsFrom('[email protected]');
api.versionsFrom('1.2.0.1');

api.use([
'check',
'space:[email protected]'
'ecmascript',
'space:[email protected]'
]);

api.add_files([
'source/quantity.js',
'source/quantity.js'
]);

api.export('Quantity');
Expand All @@ -27,13 +30,15 @@ Package.onTest(function(api) {
api.use([
'check',
'ejson',
'ecmascript',
'space:vo-numeral',
'practicalmeteor:[email protected]',
'space:[email protected]',
'space:[email protected]',
'space:[email protected]'
]);

api.add_files([
'tests/quantity.unit.js',
'tests/quantity.unit.js'
]);

});
66 changes: 47 additions & 19 deletions source/quantity.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,66 @@
* Quantity: A ValueObject that represents an a positive integer value.
* EJSON compatible, can be transparently used in Meteor.methods and MongoDB.
*/
Quantity = Space.messaging.Serializable.extend('Quantity', {
Quantity = Space.domain.ValueObject.extend('Quantity', {

// Create with either `new Quantity(1)` or `new Quantity({ value: 1 })`
Constructor: function(data) {

var value = (data && data.value) ? data.value : data;

if(value < 0) {
Constructor(data) {
let value = (data && data.value !== undefined) ? data.value : data;
try {
Quantity.__super__.constructor.call(this, { value });
} catch (e) {
throw new Error(Quantity.ERRORS.invalidType);
}
if (value < 0) {
throw new Error(Quantity.ERRORS.invalidRange);
}

Space.messaging.Serializable.call(this, { value: value });
Object.freeze(this);
},

toString: function() {
// Defines the EJSON fields that are automatically serialized
fields() {
return {
value: Match.Integer
};
},

toString() {
return "" + this.value;
},

equals: function(other) {
return (other instanceof Quantity) && other.value === this.value;
}
isMore(other) {
return this.value > this._getCleanValue(other);
},

});
isLess(other) {
return this.value < this._getCleanValue(other);
},

// Register EJSON type
Quantity.type('Quantity');
add(other) {
let toAdd = other;
if (!(toAdd instanceof Quantity)) {
toAdd = new Quantity(other);
}
return new Quantity(this.value + toAdd.value);
},

// Defines the EJSON fields that are automatically serialized
Quantity.fields = {
value: Match.Integer
};
substract(other) {
let toSubstract = other;
if (!(toSubstract instanceof Quantity)) {
toSubstract = new Quantity(other);
}
return new Quantity(this.value - toSubstract.value);
},

delta(other) {
return this.value - this._getCleanValue(other);
},

_getCleanValue(other) {
return (other instanceof Quantity) ? other.value : other;
}

});

Quantity.ERRORS = {
invalidType: 'Quantity must be an integer.',
Expand Down
9 changes: 9 additions & 0 deletions test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

export PACKAGE_DIRS='packages'

if [ "$PORT" ]; then
meteor test-packages ./ --port $PORT
else
meteor test-packages ./
fi
Loading

0 comments on commit 22e5cb1

Please sign in to comment.