Change dep to aldeed:collection2 and publish 3.0.0

Author: aldeed

.versions

@@ -1,17 +1,21 @@
 # Change Log
 
-# 2.0.1
+## 3.0.0
+
+Updated to depend on `aldeed:collection2@3.0.0` rather than `aldeed:collection2-core`. Core has been merged back into the main package as a 3.0.0 release.
+
+## 2.0.1
 
 Fix default error messages
 
-# 2.0.0
+## 2.0.0
 
 For use with aldeed:collection2-core@2.0.0. Requires SimpleSchema 2.0
 
-# 1.1.0
+## 1.1.0
 
 Support for SimpleSchema 2.0
 
-# 1.0.0
+## 1.0.0
 
-Initial release. Originally included in the aldeed:collection2 package.
+Initial release. Originally included in the aldeed:collection2 package.

CHANGELOG.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 Eric Dobbertin
+Copyright (c) 2015-2018 Eric Dobbertin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

LICENSE

@@ -1,16 +1,15 @@
 [![CircleCI](https://circleci.com/gh/aldeed/meteor-schema-deny/tree/master.svg?style=svg)](https://circleci.com/gh/aldeed/meteor-schema-deny/tree/master)
 
-aldeed:schema-deny
-=========================
+# aldeed:schema-deny
 
 A Meteor package that allows you to deny inserting or updating certain properties in your database by setting options in your schema.
 
 ## Installation
 
 In your Meteor app directory, enter:
 
-```
-$ meteor add aldeed:schema-deny
+```bash
+meteor add aldeed:schema-deny
 ```
 
 ## Usage
@@ -46,13 +45,13 @@ Anyone is welcome to contribute. Fork, make and test your changes (`meteor test-
 ### Running Tests
 
 ```bash
-$ cd tests
-$ npm i && npm test
+cd tests
+npm i && npm test
 ```
 
 ### Running Tests in Watch Mode
 
 ```bash
-$ cd tests
-$ npm i && npm run test:watch
+cd tests
+npm i && npm run test:watch
 ```

README.md

@@ -1,42 +1,47 @@
-aldeed:collection2-core@2.0.0
-aldeed:schema-deny@2.0.1
+aldeed:collection2@3.0.0
+aldeed:schema-deny@3.0.0
 allow-deny@1.1.0
-babel-compiler@6.24.7
-babel-runtime@1.1.1
+babel-compiler@7.0.0
+babel-runtime@1.2.2
 base64@1.0.10
 binary-heap@1.0.10
-boilerplate-generator@1.3.1
-callback-hook@1.0.10
-check@1.2.5
+boilerplate-generator@1.4.0
+callback-hook@1.1.0
+check@1.3.0
 ddp@1.4.0
-ddp-client@2.2.0
-ddp-common@1.3.0
-ddp-server@2.1.1
-diff-sequence@1.0.7
-ecmascript@0.9.0
+ddp-client@2.3.1
+ddp-common@1.4.0
+ddp-server@2.1.2
+diff-sequence@1.1.0
+dynamic-import@0.3.0
+ecmascript@0.10.0
 ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.5.0
+ecmascript-runtime-client@0.6.0
 ecmascript-runtime-server@0.5.0
 ejson@1.1.0
 geojson-utils@1.0.10
-id-map@1.0.9
+http@1.4.0
+id-map@1.1.0
 logging@1.1.19
-meteor@1.8.0
-minimongo@1.4.0
-modules@0.11.0
-modules-runtime@0.9.0
-mongo@1.3.0
+meteor@1.8.2
+minimongo@1.4.3
+modules@0.11.3
+modules-runtime@0.9.2
+mongo@1.4.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.6
-npm-mongo@2.2.33
-ordered-dict@1.0.9
-promise@0.10.0
+npm-mongo@2.2.34
+ordered-dict@1.1.0
+promise@0.10.1
 raix:eventemitter@0.1.3
-random@1.0.10
-retry@1.0.9
+random@1.1.0
+reload@1.2.0
+retry@1.1.0
 routepolicy@1.0.12
-tmeasday:check-npm-versions@0.3.1
+socket-stream-client@0.1.0
+tmeasday:check-npm-versions@0.3.2
 tracker@1.1.3
 underscore@1.0.10
-webapp@1.4.0
+url@1.2.0
+webapp@1.5.0
 webapp-hashing@1.0.9

package/deny/.versions

@@ -1,6 +1,6 @@
-// collection2-core checks to make sure that simpl-schema package is added
+// collection2 checks to make sure that simpl-schema package is added
 import SimpleSchema from 'simpl-schema';
-import Collection2 from 'meteor/aldeed:collection2-core';
+import Collection2 from 'meteor/aldeed:collection2';
 
 // Extend the schema options allowed by SimpleSchema
 SimpleSchema.extendOptions(['denyInsert', 'denyUpdate']);
@@ -9,8 +9,8 @@ Collection2.on('schema.attached', function (collection, ss) {
   if (ss.version >= 2 && ss.messageBox && typeof ss.messageBox.messages === 'function') {
     ss.messageBox.messages({
       en: {
-        insertNotAllowed: '{{label}} cannot be set during an insert.',
-        updateNotAllowed: '{{label}} cannot be set during an update.'
+        insertNotAllowed: '{{label}} cannot be set during an insert',
+        updateNotAllowed: '{{label}} cannot be set during an update'
       }
     });
   }

package/deny/deny.js

@@ -1,14 +1,14 @@
 Package.describe({
   name: "aldeed:schema-deny",
   summary: "Deny inserting or updating certain properties through schema options",
-  version: "2.0.1",
+  version: "3.0.0",
   documentation: '../../README.md',
   git: "https://github.com/aldeed/meteor-schema-deny.git"
 });
 
 Package.onUse(function(api) {
   api.use([
-    'aldeed:collection2-core@2.0.0',
+    'aldeed:collection2@3.0.0',
     'ecmascript@0.6.1',
   ]);
 

package/deny/package.js

@@ -22,7 +22,7 @@ autopublish@1.0.7             # Publish all data to the clients (for prototyping
 insecure@1.0.7                # Allow all DB writes from clients (for prototyping)
 
 underscore@1.0.10
-aldeed:collection2-core@2.0.0
 aldeed:schema-deny
 dynamic-import
 meteortesting:mocha
+aldeed:collection2@3.0.0

tests/.meteor/packages

@@ -1,5 +1,5 @@
-aldeed:collection2-core@2.0.4
-aldeed:schema-deny@2.0.0
+aldeed:collection2@3.0.0
+aldeed:schema-deny@3.0.0
 allow-deny@1.1.0
 autopublish@1.0.7
 autoupdate@1.3.12

tests/.meteor/versions

@@ -21,7 +21,7 @@ describe('deny', function () {
     test.insert({
       denyInsert: 'foo'
     }, error => {
-      expect(error && error.message).toBe('Deny insert cannot be set during an insert.');
+      expect(error && error.message).toBe('Deny insert cannot be set during an insert in test insert');
 
       const validationErrors = test.simpleSchema().namedContext().validationErrors();
       expect(validationErrors.length).toBe(1);
@@ -45,7 +45,7 @@ describe('deny', function () {
           denyUpdate: 'foo',
         },
       }, error => {
-        expect(error && error.message).toBe('Deny update cannot be set during an update.');
+        expect(error && error.message).toBe('Deny update cannot be set during an update in test update');
 
         const validationErrors = test.simpleSchema().namedContext().validationErrors();
         expect(validationErrors.length).toBe(1);