core.15; run syncAll in it's own Fiber (#175), key/debug log in (#182)

Author: gadicc

README.md

@@ -16,7 +16,7 @@ Current versions of each package (requires manual, explicit updates until
 the stable release):
 
 ```
-meteor add msgfmt:core@2.0.0-preview.14
+meteor add msgfmt:core@2.0.0-preview.15 (2015-12-23)
 meteor add msgfmt:extract@2.0.0-preview.12
 meteor add msgfmt:ui@2.0.0-preview.5
 ```

msgfmt:core/.versions

@@ -31,15 +31,15 @@ http@1.1.1
 id-map@1.0.4
 jag:pince@0.0.6
 jquery@1.11.4
-local-test:msgfmt:core@2.0.0-preview.14
+local-test:msgfmt:core@2.0.0-preview.15
 logging@1.0.8
 meteor@1.1.10
 meteorhacks:inject-initial@1.0.2
 minifiers@1.1.7
 minimongo@1.0.10
 mongo@1.1.3
 mongo-id@1.0.1
-msgfmt:core@2.0.0-preview.14
+msgfmt:core@2.0.0-preview.15
 npm-mongo@1.4.39_1
 observe-sequence@1.0.7
 ordered-dict@1.0.4

msgfmt:core/History.md

@@ -1,5 +1,16 @@
 ## vNEXT
 
+## 2.0.0-preview.15
+
+* Run `syncAll` in it's own Fiber to avoid blocking on load
+  from `server/mfAll.js` in the case of slow I/O (#175).
+  Thanks also @sbalmer and @1u.
+
+* When warning about calling mf() on the server from outside
+  a method/publish, mention the offfending key (!)
+  use `log.warn` instead of `console.log`.
+  Thanks @MartinFournier (#182).
+
 ## 2.0.0-preview.14
 
 * Add `check` package (now that Meteor 1.2 is stricter)

msgfmt:core/lib/mfPkg/messageformat-server.js

@@ -1,3 +1,5 @@
+var Fiber = Npm.require('fibers');
+
 // server only, but used on the client in msgfmt:ui
 mfPkg.mfRevisions = new Mongo.Collection('mfRevisions');
 
@@ -158,21 +160,26 @@ mfPkg.addNative = function(strings, meta) {
 
 // called from mfTrans.js
 mfPkg.syncAll = function(strings, meta) {
+  new Fiber(function() {
+    var startTime = Date.now();
+
+    var lastSync = msgfmt.mfMeta.findOne('syncTrans');
+    lastSync = lastSync ? lastSync.mtime : 0;
 
-	var lastSync = this.mfMeta.findOne('syncTrans');
-	lastSync = lastSync ? lastSync.mtime : 0;
+    for (lang in strings)
+      if (lang != msgfmt.native)
+        msgfmt.langUpdate(lang, strings[lang], meta, lastSync);
 
-	for (lang in strings)
-		if (lang != this.native)
-			this.langUpdate(lang, strings[lang], meta, lastSync);
+    // TODO.  Sync native strings too, ensure _id's are the same,
+    // allow for random load order  
 
-	// TODO.  Sync native strings too, ensure _id's are the same,
-	// allow for random load order	
+    msgfmt['syncTrans'] = meta.updatedAt;
+    msgfmt.mfMeta.upsert('syncTrans', {$set: {mtime: msgfmt['syncTrans'] } });
 
-	this['syncTrans'] = meta.updatedAt;
-	this.mfMeta.upsert('syncTrans', {$set: {mtime: this['syncTrans'] } });
+    msgfmt.observeFrom(meta.updatedAt, 'trans');
 
-    this.observeFrom(meta.updatedAt, 'trans');
+    log.debug('Finished syncAll (in a fiber) in ' + (Date.now() - startTime) + ' ms');
+  }).run();
 }
 
 var meta = mfPkg.mfMeta.find().fetch();

msgfmt:core/lib/mfPkg/messageformat.js

@@ -133,8 +133,8 @@ mf = function(key, params, message, locale) {
         if (currentInvocation)
             locale = currentInvocation.connection.locale;
         else {
-            console.log(
-              "[msgfmt] You called mf() with the key '" + key +
+            log.warn(
+              "You called mf() with the key '" + key +
               "' outside of a method/publish and " +
               "without specifying a locale, defaulting to native (" + msgfmt.native + ")"
             );

msgfmt:core/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name:    "msgfmt:core",
-  version: "2.0.0-preview.14",
+  version: "2.0.0-preview.15",
   summary: "MessageFormat support, the Meteor way",
   git:     "https://github.com/gadicc/meteor-messageformat.git",
 });

website/.meteor/versions

@@ -57,8 +57,8 @@ mobile-status-bar@1.0.3
 momentjs:moment@2.10.6
 mongo@1.1.0
 mrt:sp-marked@0.0.2
-msgfmt:core@2.0.0-preview.13
-msgfmt:extract@2.0.0-preview.10
+msgfmt:core@2.0.0-preview.14
+msgfmt:extract@2.0.0-preview.12
 msgfmt:ui@2.0.0-preview.5
 nicolaslopezj:router-layer@0.0.11
 npm-bcrypt@0.7.8_2