From ef76286abaede37700fa1e288ed9bcff03c8581c Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Mon, 7 Sep 2015 11:12:57 +0200 Subject: [PATCH 01/23] adds javascript port of i18n value objects --- .travis.yml | 6 +++ CHANGELOG.md | 5 +++ README.md | 24 +++++++++++ package.js | 41 +++++++++++++++++++ source/country.js | 91 ++++++++++++++++++++++++++++++++++++++++++ source/language.js | 56 ++++++++++++++++++++++++++ tests/country.unit.js | 78 ++++++++++++++++++++++++++++++++++++ tests/language.unit.js | 67 +++++++++++++++++++++++++++++++ 8 files changed, 368 insertions(+) create mode 100644 .travis.yml create mode 100644 CHANGELOG.md create mode 100644 README.md create mode 100644 package.js create mode 100644 source/country.js create mode 100644 source/language.js create mode 100644 tests/country.unit.js create mode 100644 tests/language.unit.js diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..c3868a4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: node_js +sudo: required +node_js: +- "0.10" +before_install: +- "curl -L http://git.io/ejPSng | /bin/sh" diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..8c2c946 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +Changelog +========= + +### 0.1.0 +First release of the Javascript port of `Language` and `Country` value objects. diff --git a/README.md b/README.md new file mode 100644 index 0000000..e3abae9 --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +# Value Objects for i18n domains + +[![Build Status](https://travis-ci.org/meteor-space/vo-i18n.svg?branch=master)](https://travis-ci.org/meteor-space/vo-i18n) +[![Join the chat at https://gitter.im/meteor-space/general](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/meteor-space/general?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +## Installation +`meteor add space:vo-i18n` + +## Documentation +Please look through the tests to get a feeling what this package can do for you. +We hope to find time to write some more documentation together soon ;-) + +## Contributing +In lieu of a formal styleguide, take care to maintain the existing coding style. +Add unit / integration tests for any new or changed functionality. + +## Run the tests +`meteor test-packages ./` + +## Release History +You can find the release history in the [changelog](https://github.com/meteor-space/vo-i18n/blob/master/CHANGELOG.md) + +## License +Licensed under the MIT license. diff --git a/package.js b/package.js new file mode 100644 index 0000000..ac0dcb7 --- /dev/null +++ b/package.js @@ -0,0 +1,41 @@ + +Package.describe({ + summary: 'Value Objects for i18n domains.', + name: 'space:vo-i18n', + version: '0.1.0', +}); + +Package.onUse(function(api) { + + api.versionsFrom('METEOR@1.0'); + + api.use([ + 'check', + 'space:messaging@1.6.0' + ]); + + api.add_files([ + 'source/language.js', + 'source/country.js', + ]); + + api.export('Language'); + api.export('Country'); + +}); + +Package.onTest(function(api) { + + api.use([ + 'check', + 'space:vo-i18n', + 'practicalmeteor:munit@2.1.5', + 'space:testing@1.3.0', + ]); + + api.add_files([ + 'tests/language.unit.js', + 'tests/country.unit.js', + ]); + +}); diff --git a/source/country.js b/source/country.js new file mode 100644 index 0000000..f9b1fb7 --- /dev/null +++ b/source/country.js @@ -0,0 +1,91 @@ + +Country = Space.messaging.Serializable.extend('Country', { + + Constructor: function(country) { + + // Allow to provide another instance of Country as param + if(country instanceof Country) { + // Just use its code + country = country.code; + } + + country = (country && country.code) ? country.code : country; + + if(!Country.isValidCountryCode(country)) { + throw new Error(Country.ERRORS.invalidCountryCode(country)); + } + + this.code = country; + Object.freeze(this); + }, + + isEuropean: function() { + return Country.isEuropean(this.code); + }, + + toString: function() { + return this.code; + }, + + equals: function(country) { + return (country instanceof Country) && country.code === this.code; + } +}); + +Country.type('Country'); + +Country.fields = { + code: String +}; + +Country.ERRORS = { + invalidCountryCode: function(code) { + return "Invalid country code '" + code + "'"; + } +}; + +Country.isEuropean = function(code) { + return Country.EUROPEAN_COUNTRIES.indexOf(code) > -1; +}; + +Country.isValidCountryCode = function(code) { + return Country.ISO_COUNTRY_CODES.indexOf(code) > -1; +}; + +Country.getAll = function() { + return Country.ISO_COUNTRY_CODES.slice(); +}; + +Country.getEuropean = function() { + return Country.EUROPEAN_COUNTRIES.slice(); +}; + +Country.ISO_COUNTRY_CODES = [ + 'AF', 'AX', 'AL', 'DZ', 'AS', 'AD', 'AO', 'AI', 'AQ', 'AG', 'AR', 'AM', + 'AW', 'AU', 'AT', 'AZ', 'BS', 'BH', 'BD', 'BB', 'BY', 'BE', 'BZ', 'BJ', + 'BM', 'BT', 'BO', 'BQ', 'BA', 'BW', 'BV', 'BR', 'IO', 'BN', 'BG', 'BF', + 'BI', 'KH', 'CM', 'CA', 'CV', 'KY', 'CF', 'TD', 'CL', 'CN', 'CX', 'CC', + 'CO', 'KM', 'CG', 'CD', 'CK', 'CR', 'CI', 'HR', 'CU', 'CW', 'CY', 'CZ', + 'DK', 'DJ', 'DM', 'DO', 'EC', 'EG', 'SV', 'GQ', 'ER', 'EE', 'ET', 'FK', + 'FO', 'FJ', 'FI', 'FR', 'GF', 'PF', 'TF', 'GA', 'GM', 'GE', 'DE', 'GH', + 'GI', 'GR', 'GL', 'GD', 'GP', 'GU', 'GT', 'GG', 'GN', 'GW', 'GY', 'HT', + 'HM', 'VA', 'HN', 'HK', 'HU', 'IS', 'IN', 'ID', 'IR', 'IQ', 'IE', 'IM', + 'IL', 'IT', 'JM', 'JP', 'JE', 'JO', 'KZ', 'KE', 'KI', 'KP', 'KR', 'KW', + 'KG', 'LA', 'LV', 'LB', 'LS', 'LR', 'LY', 'LI', 'LT', 'LU', 'MO', 'MK', + 'MG', 'MW', 'MY', 'MV', 'ML', 'MT', 'MH', 'MQ', 'MR', 'MU', 'YT', 'MX', + 'FM', 'MD', 'MC', 'MN', 'ME', 'MS', 'MA', 'MZ', 'MM', 'NA', 'NR', 'NP', + 'NL', 'NC', 'NZ', 'NI', 'NE', 'NG', 'NU', 'NF', 'MP', 'NO', 'OM', 'PK', + 'PW', 'PS', 'PA', 'PG', 'PY', 'PE', 'PH', 'PN', 'PL', 'PT', 'PR', 'QA', + 'RE', 'RO', 'RU', 'RW', 'BL', 'SH', 'KN', 'LC', 'MF', 'PM', 'VC', 'WS', + 'SM', 'ST', 'SA', 'SN', 'RS', 'SC', 'SL', 'SG', 'SX', 'SK', 'SI', 'SB', + 'SO', 'ZA', 'GS', 'SS', 'ES', 'LK', 'SD', 'SR', 'SJ', 'SZ', 'SE', 'CH', + 'SY', 'TW', 'TJ', 'TZ', 'TH', 'TL', 'TG', 'TK', 'TO', 'TT', 'TN', 'TR', + 'TM', 'TC', 'TV', 'UG', 'UA', 'AE', 'GB', 'US', 'UM', 'UY', 'UZ', 'VU', + 'VE', 'VN', 'VG', 'VI', 'WF', 'EH', 'YE', 'ZM', 'ZW' +]; + +Country.EUROPEAN_COUNTRIES = [ + 'AT','BE', 'BG', 'HR', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', + 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', + 'SI', 'ES', 'SE', 'GB' +]; diff --git a/source/language.js b/source/language.js new file mode 100644 index 0000000..052a3a4 --- /dev/null +++ b/source/language.js @@ -0,0 +1,56 @@ + +Language = Space.messaging.Serializable.extend('Language', { + + Constructor: function(data) { + var code = (data && data.code) ? data.code : data; + + if(!Language.isValid(code)) { + throw new Error(Language.ERRORS.invalidLanguageCode(code)); + } + + Space.messaging.Serializable.call(this, { code: code }); + Object.freeze(this); + }, + + equals: function(other) { + return (other instanceof Language) && other.code === this.code; + }, + + toString: function() { + return this.code; + } + +}); + +// Register as EJSON type +Language.type('Language'); + +// EJSON serializable fields +Language.fields = { + code: String +}; + +Language.ERRORS = { + invalidLanguageCode: function(code) { + return "Invalid language code '" + code + "' given."; + } +}; + +Language.isValid = function (code) { + return Language.ISO_LANGUAGE_CODES.indexOf(code) > -1; +}; + +Language.ISO_LANGUAGE_CODES = [ + 'om', 'ab', 'aa', 'af', 'sq', 'am', 'ar', 'hy', 'as', 'ay', 'az', 'ba', + 'eu', 'bn', 'dz', 'bh', 'bi', 'br', 'bg', 'my', 'be', 'km', 'ca', 'zh', + 'co', 'hr', 'cs', 'da', 'nl', 'en', 'eo', 'et', 'fo', 'fj', 'fi', 'fr', + 'fy', 'gl', 'ka', 'de', 'el', 'kl', 'gn', 'gu', 'ha', 'he', 'hi', 'hu', + 'is', 'id', 'ia', 'ie', 'ik', 'iu', 'ga', 'it', 'ja', 'jw', 'kn', 'ks', + 'kk', 'rw', 'ky', 'rn', 'ko', 'ku', 'lo', 'la', 'lv', 'ln', 'lt', 'mk', + 'mg', 'ms', 'ml', 'mt', 'mi', 'mr', 'mo', 'mn', 'na', 'ne', 'no', 'oc', + 'or', 'ps', 'fa', 'pl', 'pt', 'pa', 'qu', 'rm', 'ro', 'ru', 'sm', 'sg', + 'sa', 'Ga', 'gd', 'sr', 'sh', 'st', 'tn', 'sn', 'sd', 'si', 'ss', 'sk', + 'sl', 'so', 'es', 'su', 'sw', 'sv', 'tl', 'tg', 'ta', 'tt', 'te', 'th', + 'bo', 'ti', 'to', 'ts', 'tr', 'tk', 'tw', 'ug', 'uk', 'ur', 'uz', 'vi', + 'vo', 'cy', 'wo', 'xh', 'yi', 'yo', 'za', 'zu' +]; diff --git a/tests/country.unit.js b/tests/country.unit.js new file mode 100644 index 0000000..83f6c86 --- /dev/null +++ b/tests/country.unit.js @@ -0,0 +1,78 @@ +describe("Country", function() { + + beforeEach(function() { + this.austria = new Country('AT'); + }); + + it('is serializable', function() { + var copy = EJSON.parse(EJSON.stringify(this.austria)); + expect(copy.equals(this.austria)).to.be.true; + }); + + describe('construction', function() { + + it('takes a country code and assigns it', function() { + expect(this.austria.code).to.equal('AT'); + }); + + it('throws error if invalid country code is assigned', function() { + expect(function() { + new Country('XX'); + }).to["throw"]("Invalid country code 'XX'"); + }); + + }); + + describe('equality', function() { + + it('compares itself to another country instance', function() { + var austria = new Country('AT'); + var germany = new Country('DE'); + expect(austria.equals(austria)).to.be.true; + expect(austria.equals(germany)).to.be.false; + }); + + it('only accepts other instance of Country', function() { + expect(this.austria.equals('AT')).to.be.false; + }); + + }); + + describe('country code validation', function() { + + it('returns true for any valid country code', function() { + for (var i = 0, len = Country.ISO_COUNTRY_CODES.length; i < len; i++) { + var code = Country.ISO_COUNTRY_CODES[i]; + expect(Country.isValidCountryCode(code)).to.be.true; + } + }); + + }); + + describe('checking for european countries', function() { + + it('returns true for any European country code', function() { + for (var i = 0, len = Country.EUROPEAN_COUNTRIES.length; i < len; i++) { + var code = Country.EUROPEAN_COUNTRIES[i]; + expect(Country.isEuropean(code)).to.be.true; + } + }); + + it('returns true if it is an european country', function() { + for (var i = 0, len = Country.EUROPEAN_COUNTRIES.length; i < len; i++) { + var code = Country.EUROPEAN_COUNTRIES[i]; + var country = new Country(code); + expect(country.isEuropean()).to.be.true; + } + }); + + }); + + describe('immutability', function() { + + it('freezes itself', function() { + expect(Object.isFrozen(this.austria)).to.be.true; + }); + + }); +}); diff --git a/tests/language.unit.js b/tests/language.unit.js new file mode 100644 index 0000000..075e23c --- /dev/null +++ b/tests/language.unit.js @@ -0,0 +1,67 @@ +describe("Language", function() { + + beforeEach(function() { + this.code = 'de'; + this.language = new Language(this.code); + }); + + it('is serializable', function() { + var copy = EJSON.parse(EJSON.stringify(this.language)); + expect(copy.equals(this.language)).to.be.true; + }); + + describe('construction', function() { + + it('takes a language code and assigns it', function() { + expect(this.language.code).to.equal(this.code); + }); + + it('it only takes valid ISO language codes', function() { + expect(function() { + new Language('XX'); + }).to["throw"]("Invalid language code 'XX' given."); + }); + + }); + + describe('serialization', function() { + + it('defines its EJSON type correctly', function() { + expect(this.language.toString()).to.equal(this.language.code); + }); + + }); + + describe('equality', function() { + + it('s true if language codes are equal', function() { + var first = new Language('de'); + var second = new Language('de'); + expect(first.equals(second)).to.be.true; + expect(second.equals(first)).to.be.true; + }); + + it('s false if language codes are different', function() { + var first = new Language('de'); + var second = new Language('en'); + expect(first.equals(second)).to.be.false; + expect(second.equals(first)).to.be.false; + expect(second.equals(null)).to.be.false; + expect(second.equals({})).to.be.false; + expect(second.equals(1)).to.be.false; + }); + + it('only accepts other instances of Language class', function() { + expect(this.language.equals(this.code)).to.be.false; + }); + + }); + + describe('immutability', function() { + + it('freezes itself', function() { + expect(Object.isFrozen(this.language)).to.be.true; + }); + + }); +}); From 1779b88df6fa87e59a8a204afff0925aaf35c199 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Thu, 24 Sep 2015 10:55:41 +1000 Subject: [PATCH 02/23] Adds git link --- package.js | 1 + 1 file changed, 1 insertion(+) diff --git a/package.js b/package.js index ac0dcb7..6337bfc 100644 --- a/package.js +++ b/package.js @@ -3,6 +3,7 @@ Package.describe({ summary: 'Value Objects for i18n domains.', name: 'space:vo-i18n', version: '0.1.0', + git: 'https://github.com/meteor-space/vo-i18n.git' }); Package.onUse(function(api) { From 28a8b625c63132c3307d30b74fff97dc967bd69f Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Thu, 24 Sep 2015 11:02:24 +1000 Subject: [PATCH 03/23] Standardise Package.describe --- package.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.js b/package.js index 6337bfc..a92d827 100644 --- a/package.js +++ b/package.js @@ -1,9 +1,10 @@ Package.describe({ - summary: 'Value Objects for i18n domains.', name: 'space:vo-i18n', + summary: 'Value Objects for i18n domains.', version: '0.1.0', - git: 'https://github.com/meteor-space/vo-i18n.git' + git: 'https://github.com/meteor-space/vo-i18n.git', + documentation: 'README.md' }); Package.onUse(function(api) { From f654542db74c7000f802e68a71b176bc3e9ff797 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Wed, 30 Sep 2015 22:03:10 +1000 Subject: [PATCH 04/23] Adds missing dependency in testing environment --- package.js | 1 + 1 file changed, 1 insertion(+) diff --git a/package.js b/package.js index a92d827..6a18971 100644 --- a/package.js +++ b/package.js @@ -30,6 +30,7 @@ Package.onTest(function(api) { api.use([ 'check', + 'ejson', 'space:vo-i18n', 'practicalmeteor:munit@2.1.5', 'space:testing@1.3.0', From 2e053a8b23dac3ca7759b4024f1876d338ffaeea Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Mon, 2 Nov 2015 19:46:23 +0100 Subject: [PATCH 05/23] update to space:messaging@2.0.0 as supported version --- package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.js b/package.js index 6a18971..e8fef39 100644 --- a/package.js +++ b/package.js @@ -13,7 +13,7 @@ Package.onUse(function(api) { api.use([ 'check', - 'space:messaging@1.6.0' + 'space:messaging@2.0.0' ]); api.add_files([ From 9306b256e824e7b49cfdc846223294b27b7ed059 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Mon, 18 Jan 2016 22:31:37 +1100 Subject: [PATCH 06/23] Add test script --- test.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 test.sh diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..7b9cd76 --- /dev/null +++ b/test.sh @@ -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 From f0ec8e96a57cbedb8bf705d42c82d4ef8cdd6ba6 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Mon, 18 Jan 2016 22:31:57 +1100 Subject: [PATCH 07/23] Add .eslintrc --- .eslintrc | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 .eslintrc diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..6cfc870 --- /dev/null +++ b/.eslintrc @@ -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) + } +} From 9e3c007143b52af190f06b5e6f65841379a9d291 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Mon, 18 Jan 2016 22:33:01 +1100 Subject: [PATCH 08/23] Replace TravisCI with CircleCI --- .travis.yml | 6 ------ ci.sh | 9 +++++++++ circle.yml | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 .travis.yml create mode 100755 ci.sh create mode 100644 circle.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c3868a4..0000000 --- a/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: node_js -sudo: required -node_js: -- "0.10" -before_install: -- "curl -L http://git.io/ejPSng | /bin/sh" diff --git a/ci.sh b/ci.sh new file mode 100755 index 0000000..bf44aff --- /dev/null +++ b/ci.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +export PACKAGE_DIRS='packages' + +if [ "$PORT" ]; then + spacejam test-packages ./ --port $PORT +else + spacejam test-packages ./ +fi \ No newline at end of file diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..7eb2a03 --- /dev/null +++ b/circle.yml @@ -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: + - ./ci.sh From 6f57143897d66573d296cb0038e9040bab689a80 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Mon, 18 Jan 2016 22:37:50 +1100 Subject: [PATCH 09/23] Add git-packages.json --- .gitignore | 3 +++ git-packages.json | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 .gitignore create mode 100644 git-packages.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7beca49 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.build* +local-packages.json +packages diff --git a/git-packages.json b/git-packages.json new file mode 100644 index 0000000..8bc61a6 --- /dev/null +++ b/git-packages.json @@ -0,0 +1,10 @@ +{ + "space:base": { + "git":"https://github.com/meteor-space/base.git", + "version": "bb66c1cbfd2d94bf9675533fe91d0f1cbbd82a8c" + }, + "space:messaging": { + "git":"https://github.com/meteor-space/messaging.git", + "version": "ff0dfa578b2fcd39f167f3c51afc6d9ac7011ae3" + } +} From beb2d6078ee5b028e5a7de73a3fe85d0e6c175df Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Mon, 18 Jan 2016 23:21:05 +1100 Subject: [PATCH 10/23] Switch to domain.ValueObject minor formatting, remove outdated test --- git-packages.json | 4 ++++ package.js | 13 +++++++------ source/country.js | 2 +- tests/language.unit.js | 10 +--------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/git-packages.json b/git-packages.json index 8bc61a6..70e2925 100644 --- a/git-packages.json +++ b/git-packages.json @@ -6,5 +6,9 @@ "space:messaging": { "git":"https://github.com/meteor-space/messaging.git", "version": "ff0dfa578b2fcd39f167f3c51afc6d9ac7011ae3" + }, + "space:domain": { + "git":"https://github.com/meteor-space/domain.git", + "version": "9a138335d5b573fa086d1407a0f9c3cc6cf24922" } } diff --git a/package.js b/package.js index e8fef39..a464564 100644 --- a/package.js +++ b/package.js @@ -13,12 +13,13 @@ Package.onUse(function(api) { api.use([ 'check', - 'space:messaging@2.0.0' + 'space:messaging@2.1.0', + 'space:domain@0.1.0' ]); - api.add_files([ + api.addFiles([ 'source/language.js', - 'source/country.js', + 'source/country.js' ]); api.export('Language'); @@ -33,12 +34,12 @@ Package.onTest(function(api) { 'ejson', 'space:vo-i18n', 'practicalmeteor:munit@2.1.5', - 'space:testing@1.3.0', + 'space:testing@2.0.1' ]); - api.add_files([ + api.addFiles([ 'tests/language.unit.js', - 'tests/country.unit.js', + 'tests/country.unit.js' ]); }); diff --git a/source/country.js b/source/country.js index f9b1fb7..6441001 100644 --- a/source/country.js +++ b/source/country.js @@ -1,5 +1,5 @@ -Country = Space.messaging.Serializable.extend('Country', { +Country = Space.domain.ValueObject.extend('Country', { Constructor: function(country) { diff --git a/tests/language.unit.js b/tests/language.unit.js index 075e23c..e07d498 100644 --- a/tests/language.unit.js +++ b/tests/language.unit.js @@ -23,15 +23,7 @@ describe("Language", function() { }); }); - - describe('serialization', function() { - - it('defines its EJSON type correctly', function() { - expect(this.language.toString()).to.equal(this.language.code); - }); - - }); - + describe('equality', function() { it('s true if language codes are equal', function() { From b3e0a81ef34912d5c1784f67e5abfea8d30c4a3c Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Tue, 19 Jan 2016 01:18:25 +1100 Subject: [PATCH 11/23] Add ecmascript, remove space:messaging dep --- package.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.js b/package.js index a464564..2c06ad1 100644 --- a/package.js +++ b/package.js @@ -13,7 +13,7 @@ Package.onUse(function(api) { api.use([ 'check', - 'space:messaging@2.1.0', + 'ecmascript', 'space:domain@0.1.0' ]); @@ -30,6 +30,7 @@ Package.onUse(function(api) { Package.onTest(function(api) { api.use([ + 'ecmascript', 'check', 'ejson', 'space:vo-i18n', From ac94086c467ca8d06fd9dd65a86c3ad71627b489 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Tue, 19 Jan 2016 01:19:41 +1100 Subject: [PATCH 12/23] Update mgp deps, add testing dep --- git-packages.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/git-packages.json b/git-packages.json index 70e2925..f8fb0bc 100644 --- a/git-packages.json +++ b/git-packages.json @@ -1,7 +1,7 @@ { "space:base": { "git":"https://github.com/meteor-space/base.git", - "version": "bb66c1cbfd2d94bf9675533fe91d0f1cbbd82a8c" + "version": "80400f278c0ad911b8dee888eca4c54d979f1a1c" }, "space:messaging": { "git":"https://github.com/meteor-space/messaging.git", @@ -9,6 +9,10 @@ }, "space:domain": { "git":"https://github.com/meteor-space/domain.git", - "version": "9a138335d5b573fa086d1407a0f9c3cc6cf24922" + "version": "86355d17dcb211e1a5bffb439fea92d99b15f00b" + }, + "space:testing": { + "git":"https://github.com/meteor-space/testing.git", + "version": "1978ad9b6c40c1cda6030cafb7cc2496b27187e2" } } From 6dcc694728e5504bf7e23b81da66b24d1f7b1905 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Tue, 19 Jan 2016 01:20:47 +1100 Subject: [PATCH 13/23] Remove equality tests This is inherited --- tests/country.unit.js | 15 --------------- tests/language.unit.js | 25 ------------------------- 2 files changed, 40 deletions(-) diff --git a/tests/country.unit.js b/tests/country.unit.js index 83f6c86..9c42292 100644 --- a/tests/country.unit.js +++ b/tests/country.unit.js @@ -23,21 +23,6 @@ describe("Country", function() { }); - describe('equality', function() { - - it('compares itself to another country instance', function() { - var austria = new Country('AT'); - var germany = new Country('DE'); - expect(austria.equals(austria)).to.be.true; - expect(austria.equals(germany)).to.be.false; - }); - - it('only accepts other instance of Country', function() { - expect(this.austria.equals('AT')).to.be.false; - }); - - }); - describe('country code validation', function() { it('returns true for any valid country code', function() { diff --git a/tests/language.unit.js b/tests/language.unit.js index e07d498..f3beda1 100644 --- a/tests/language.unit.js +++ b/tests/language.unit.js @@ -23,31 +23,6 @@ describe("Language", function() { }); }); - - describe('equality', function() { - - it('s true if language codes are equal', function() { - var first = new Language('de'); - var second = new Language('de'); - expect(first.equals(second)).to.be.true; - expect(second.equals(first)).to.be.true; - }); - - it('s false if language codes are different', function() { - var first = new Language('de'); - var second = new Language('en'); - expect(first.equals(second)).to.be.false; - expect(second.equals(first)).to.be.false; - expect(second.equals(null)).to.be.false; - expect(second.equals({})).to.be.false; - expect(second.equals(1)).to.be.false; - }); - - it('only accepts other instances of Language class', function() { - expect(this.language.equals(this.code)).to.be.false; - }); - - }); describe('immutability', function() { From 76037bd13906e11d730855500c102bdd8da9e1e4 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Tue, 19 Jan 2016 01:23:22 +1100 Subject: [PATCH 14/23] Remove Country equals methods, move fields into 'class' --- source/country.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/source/country.js b/source/country.js index 6441001..f754ff2 100644 --- a/source/country.js +++ b/source/country.js @@ -1,4 +1,3 @@ - Country = Space.domain.ValueObject.extend('Country', { Constructor: function(country) { @@ -19,25 +18,25 @@ Country = Space.domain.ValueObject.extend('Country', { Object.freeze(this); }, + // Defines the EJSON fields that are automatically serialized + fields() { + return { + code: String + }; + }, + isEuropean: function() { return Country.isEuropean(this.code); }, toString: function() { return this.code; - }, - - equals: function(country) { - return (country instanceof Country) && country.code === this.code; } + }); Country.type('Country'); -Country.fields = { - code: String -}; - Country.ERRORS = { invalidCountryCode: function(code) { return "Invalid country code '" + code + "'"; From 4d44594f407c3764399627e5246a9f945dc4377a Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Tue, 19 Jan 2016 01:24:29 +1100 Subject: [PATCH 15/23] Standardise Language variable names and format, move fields into 'class' --- source/language.js | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/source/language.js b/source/language.js index 052a3a4..4801adf 100644 --- a/source/language.js +++ b/source/language.js @@ -1,19 +1,28 @@ +Language = Space.domain.ValueObject.extend('Language', { -Language = Space.messaging.Serializable.extend('Language', { + Constructor: function(language) { - Constructor: function(data) { - var code = (data && data.code) ? data.code : data; + // Allow to provide another instance of Language as param + if(language instanceof Language) { + // Just use its code + language = language.code; + } + + language = (language && language.code) ? language.code : language; - if(!Language.isValid(code)) { - throw new Error(Language.ERRORS.invalidLanguageCode(code)); + if(!Language.isValid(language)) { + throw new Error(Language.ERRORS.invalidLanguageCode(language)); } - Space.messaging.Serializable.call(this, { code: code }); + this.code = language; Object.freeze(this); }, - equals: function(other) { - return (other instanceof Language) && other.code === this.code; + // Defines the EJSON fields that are automatically serialized + fields() { + return { + code: String + }; }, toString: function() { @@ -25,11 +34,6 @@ Language = Space.messaging.Serializable.extend('Language', { // Register as EJSON type Language.type('Language'); -// EJSON serializable fields -Language.fields = { - code: String -}; - Language.ERRORS = { invalidLanguageCode: function(code) { return "Invalid language code '" + code + "' given."; From 7dc18ee0cfcebd2c13330a016226787185b0379f Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Tue, 19 Jan 2016 01:26:22 +1100 Subject: [PATCH 16/23] ES6 function upgrade --- source/country.js | 8 ++++---- source/language.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/country.js b/source/country.js index f754ff2..9ec2b24 100644 --- a/source/country.js +++ b/source/country.js @@ -1,6 +1,6 @@ Country = Space.domain.ValueObject.extend('Country', { - Constructor: function(country) { + Constructor(country) { // Allow to provide another instance of Country as param if(country instanceof Country) { @@ -25,11 +25,11 @@ Country = Space.domain.ValueObject.extend('Country', { }; }, - isEuropean: function() { + isEuropean() { return Country.isEuropean(this.code); }, - toString: function() { + toString() { return this.code; } @@ -38,7 +38,7 @@ Country = Space.domain.ValueObject.extend('Country', { Country.type('Country'); Country.ERRORS = { - invalidCountryCode: function(code) { + invalidCountryCode(code) { return "Invalid country code '" + code + "'"; } }; diff --git a/source/language.js b/source/language.js index 4801adf..94b1c28 100644 --- a/source/language.js +++ b/source/language.js @@ -1,6 +1,6 @@ Language = Space.domain.ValueObject.extend('Language', { - Constructor: function(language) { + Constructor(language) { // Allow to provide another instance of Language as param if(language instanceof Language) { @@ -25,7 +25,7 @@ Language = Space.domain.ValueObject.extend('Language', { }; }, - toString: function() { + toString() { return this.code; } @@ -35,7 +35,7 @@ Language = Space.domain.ValueObject.extend('Language', { Language.type('Language'); Language.ERRORS = { - invalidLanguageCode: function(code) { + invalidLanguageCode(code) { return "Invalid language code '" + code + "' given."; } }; From c9ccd65a96c7eb3063e78c8105abe65364ac19b2 Mon Sep 17 00:00:00 2001 From: Rhys Bartels-Waller Date: Tue, 19 Jan 2016 01:38:34 +1100 Subject: [PATCH 17/23] Update to latest space:domain --- git-packages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-packages.json b/git-packages.json index f8fb0bc..f739347 100644 --- a/git-packages.json +++ b/git-packages.json @@ -9,7 +9,7 @@ }, "space:domain": { "git":"https://github.com/meteor-space/domain.git", - "version": "86355d17dcb211e1a5bffb439fea92d99b15f00b" + "version": "590e07a1c53917bef877f1bdb39b4068f299f6cb" }, "space:testing": { "git":"https://github.com/meteor-space/testing.git", From d6566ffe3c188fd701b6415b5ac825755690cd16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darko=20Miji=C4=87?= Date: Tue, 19 Jan 2016 14:00:37 +0100 Subject: [PATCH 18/23] Add WebStrom configuration to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7beca49..cedea3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .build* local-packages.json packages +.idea \ No newline at end of file From 25f30fa8d3c32701ccbff58be3b2bf87c918e26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darko=20Miji=C4=87?= Date: Tue, 19 Jan 2016 14:00:59 +0100 Subject: [PATCH 19/23] Remove explicit type registration --- git-packages.json | 4 ++-- source/country.js | 2 -- source/language.js | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/git-packages.json b/git-packages.json index f739347..3f6b883 100644 --- a/git-packages.json +++ b/git-packages.json @@ -1,7 +1,7 @@ { "space:base": { "git":"https://github.com/meteor-space/base.git", - "version": "80400f278c0ad911b8dee888eca4c54d979f1a1c" + "version": "ea63a29ad0e5bb604c8622c9c96132558dd8cd3e" }, "space:messaging": { "git":"https://github.com/meteor-space/messaging.git", @@ -9,7 +9,7 @@ }, "space:domain": { "git":"https://github.com/meteor-space/domain.git", - "version": "590e07a1c53917bef877f1bdb39b4068f299f6cb" + "version": "7ad670416b7b62e97d3313b2562bd9e8c449df1e" }, "space:testing": { "git":"https://github.com/meteor-space/testing.git", diff --git a/source/country.js b/source/country.js index 9ec2b24..20e00a5 100644 --- a/source/country.js +++ b/source/country.js @@ -35,8 +35,6 @@ Country = Space.domain.ValueObject.extend('Country', { }); -Country.type('Country'); - Country.ERRORS = { invalidCountryCode(code) { return "Invalid country code '" + code + "'"; diff --git a/source/language.js b/source/language.js index 94b1c28..1d5c81e 100644 --- a/source/language.js +++ b/source/language.js @@ -31,9 +31,6 @@ Language = Space.domain.ValueObject.extend('Language', { }); -// Register as EJSON type -Language.type('Language'); - Language.ERRORS = { invalidLanguageCode(code) { return "Invalid language code '" + code + "' given."; From f9e76924821132225fd5ab094cbf57921e97de9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darko=20Miji=C4=87?= Date: Fri, 22 Jan 2016 14:44:11 +0100 Subject: [PATCH 20/23] Update mpg and package configuration --- git-packages.json | 12 ++++++++---- package.js | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/git-packages.json b/git-packages.json index 3f6b883..07fd839 100644 --- a/git-packages.json +++ b/git-packages.json @@ -1,18 +1,22 @@ { "space:base": { "git":"https://github.com/meteor-space/base.git", - "version": "ea63a29ad0e5bb604c8622c9c96132558dd8cd3e" + "version": "cc23eb17c6742697d3f6c5e4886a5617daadce8c" }, "space:messaging": { "git":"https://github.com/meteor-space/messaging.git", - "version": "ff0dfa578b2fcd39f167f3c51afc6d9ac7011ae3" + "version": "7be58d67c15b94033c7af698caec0a85b7841660" }, "space:domain": { "git":"https://github.com/meteor-space/domain.git", - "version": "7ad670416b7b62e97d3313b2562bd9e8c449df1e" + "version": "10a85b3a554652bc565ecfa1b4788abfc501051c" }, "space:testing": { "git":"https://github.com/meteor-space/testing.git", - "version": "1978ad9b6c40c1cda6030cafb7cc2496b27187e2" + "version": "f964632b5ff87a72fe83a75d6c65ad967dbaeed4" + }, + "space:testing-messaging": { + "git":"https://github.com/meteor-space/testing-messaging.git", + "version": "48d486509b0bec2eaeef4bac0c8a5519c107aab1" } } diff --git a/package.js b/package.js index 2c06ad1..e3a63fe 100644 --- a/package.js +++ b/package.js @@ -9,7 +9,7 @@ Package.describe({ Package.onUse(function(api) { - api.versionsFrom('METEOR@1.0'); + api.versionsFrom('1.2.0.1'); api.use([ 'check', @@ -35,7 +35,8 @@ Package.onTest(function(api) { 'ejson', 'space:vo-i18n', 'practicalmeteor:munit@2.1.5', - 'space:testing@2.0.1' + 'space:testing@3.0.1', + 'space:testing-messaging@3.0.0' ]); api.addFiles([ From 1efc9ae599667cecb7c65519dfac58c6aea831e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darko=20Miji=C4=87?= Date: Sat, 23 Jan 2016 13:13:07 +0100 Subject: [PATCH 21/23] Update mgp configuration to release commits --- git-packages.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/git-packages.json b/git-packages.json index 07fd839..232cdcc 100644 --- a/git-packages.json +++ b/git-packages.json @@ -1,22 +1,22 @@ { "space:base": { "git":"https://github.com/meteor-space/base.git", - "version": "cc23eb17c6742697d3f6c5e4886a5617daadce8c" + "version": "89534cec7275ea0f50c0de88f84bba9216be86c6" }, "space:messaging": { "git":"https://github.com/meteor-space/messaging.git", - "version": "7be58d67c15b94033c7af698caec0a85b7841660" + "version": "bbaf57c511f7230c662d2ea4473b056148c82787" }, "space:domain": { "git":"https://github.com/meteor-space/domain.git", - "version": "10a85b3a554652bc565ecfa1b4788abfc501051c" + "version": "c3915404196c201b3db69effb844b16bc1ceb74a" }, "space:testing": { "git":"https://github.com/meteor-space/testing.git", - "version": "f964632b5ff87a72fe83a75d6c65ad967dbaeed4" + "version": "53f24417c325500e1b836b88d5f03a17b2d97585" }, "space:testing-messaging": { "git":"https://github.com/meteor-space/testing-messaging.git", - "version": "48d486509b0bec2eaeef4bac0c8a5519c107aab1" + "version": "81aee53c36b724818f1581572c1206c19d776ae9" } } From eecb1313fd0d6ff91431b56e10999a1c6c81fcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darko=20Miji=C4=87?= Date: Sat, 23 Jan 2016 13:25:12 +0100 Subject: [PATCH 22/23] Update Country and Laguage constructors --- source/country.js | 13 ++++--------- source/language.js | 13 ++++--------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/source/country.js b/source/country.js index 20e00a5..55b14f0 100644 --- a/source/country.js +++ b/source/country.js @@ -1,14 +1,9 @@ Country = Space.domain.ValueObject.extend('Country', { - Constructor(country) { + Constructor(data) { - // Allow to provide another instance of Country as param - if(country instanceof Country) { - // Just use its code - country = country.code; - } - - country = (country && country.code) ? country.code : country; + // Allow to provide another object with country attribute as param + let country = (data && data.code) ? data.code : data; if(!Country.isValidCountryCode(country)) { throw new Error(Country.ERRORS.invalidCountryCode(country)); @@ -37,7 +32,7 @@ Country = Space.domain.ValueObject.extend('Country', { Country.ERRORS = { invalidCountryCode(code) { - return "Invalid country code '" + code + "'"; + return `Invalid country code '${code}'`; } }; diff --git a/source/language.js b/source/language.js index 1d5c81e..b2b75dc 100644 --- a/source/language.js +++ b/source/language.js @@ -1,14 +1,9 @@ Language = Space.domain.ValueObject.extend('Language', { - Constructor(language) { + Constructor(data) { - // Allow to provide another instance of Language as param - if(language instanceof Language) { - // Just use its code - language = language.code; - } - - language = (language && language.code) ? language.code : language; + // Allow to provide another object with code attribute as param + let language = (data && data.code) ? data.code : data; if(!Language.isValid(language)) { throw new Error(Language.ERRORS.invalidLanguageCode(language)); @@ -33,7 +28,7 @@ Language = Space.domain.ValueObject.extend('Language', { Language.ERRORS = { invalidLanguageCode(code) { - return "Invalid language code '" + code + "' given."; + return `Invalid language code '${code}' given.`; } }; From ed0a2d800bbaebd8c4bccf1c45532ee8c602f699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darko=20Miji=C4=87?= Date: Sat, 23 Jan 2016 13:48:25 +0100 Subject: [PATCH 23/23] Add .versions file --- .versions | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .versions diff --git a/.versions b/.versions new file mode 100644 index 0000000..1ca33bc --- /dev/null +++ b/.versions @@ -0,0 +1,60 @@ +babel-compiler@5.8.24_1 +babel-runtime@0.1.4 +base64@1.0.4 +binary-heap@1.0.4 +blaze@2.1.3 +blaze-tools@1.0.4 +boilerplate-generator@1.0.4 +caching-compiler@1.0.0 +callback-hook@1.0.4 +check@1.1.0 +coffeescript@1.0.11 +ddp@1.2.2 +ddp-client@1.2.1 +ddp-common@1.2.2 +ddp-server@1.2.2 +deps@1.0.9 +diff-sequence@1.0.1 +ecmascript@0.1.6 +ecmascript-runtime@0.2.6 +ejson@1.0.7 +fongandrew:find-and-modify@0.2.1 +geojson-utils@1.0.4 +html-tools@1.0.5 +htmljs@1.0.5 +id-map@1.0.4 +jquery@1.11.4 +local-test:space:vo-i18n@0.1.0 +logging@1.0.8 +meteor@1.1.10 +minimongo@1.0.10 +mongo@1.1.3 +mongo-id@1.0.1 +npm-mongo@1.4.39_1 +observe-sequence@1.0.7 +ordered-dict@1.0.4 +practicalmeteor:chai@2.1.0_1 +practicalmeteor:loglevel@1.2.0_2 +practicalmeteor:munit@2.1.5 +practicalmeteor:sinon@1.14.1_2 +promise@0.5.1 +random@1.0.5 +reactive-dict@1.1.3 +reactive-var@1.0.6 +retry@1.0.4 +routepolicy@1.0.6 +space:base@4.0.0 +space:domain@0.1.0 +space:messaging@3.0.1 +space:testing@3.0.1 +space:testing-messaging@3.0.0 +space:vo-i18n@0.1.0 +spacebars@1.0.7 +spacebars-compiler@1.0.7 +test-helpers@1.0.5 +tinytest@1.0.6 +tracker@1.0.9 +ui@1.0.8 +underscore@1.0.4 +webapp@1.2.3 +webapp-hashing@1.0.5