merge skim master

skimcom · May 6, 2013 · 1b974ee · 1b974ee
2 parents 39bde83 + 8881e44
commit 1b974ee
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/Readme.md b/Readme.md
@@ -51,6 +51,8 @@ Dialect is a painless nodejs module to manage your translations.
   * `host`: _127.0.0.1_
   * `port`: _27017_
   * `collection`: _translations_
+  * `username` (optional)
+  * `password` (optional)
 * `sqlite`
   * `database`: _dialect.db_
   * `table`: _dialect_

diff --git a/lib/dialect.js b/lib/dialect.js
@@ -50,7 +50,7 @@ module.exports = function (options) {
    */
   DIALECT.connect = function (cb) {
     if (DIALECT.store.is_connected()) {
-      cb('already connected', null);
+      cb(null);
     } else {
       DIALECT.store.connect(cb);
     }

diff --git a/lib/helpers/plurals.js b/lib/helpers/plurals.js
@@ -84,7 +84,7 @@ module.exports = function plurals(locale) {
   // 2 Plurals
   default:
     if (parts.length === 2) {
-      plurals(parts[0]);
+      return plurals(parts[0]);
     } else {
       return function (n) {
         return n === 1 ? 0 : 1;

diff --git a/lib/stores/mongodb.js b/lib/stores/mongodb.js
@@ -74,7 +74,6 @@ module.exports = function (options) {
             });
           }
       });
-    }
 
     callback = _default(callback);
 

diff --git a/lib/stores/sqlite.js b/lib/stores/sqlite.js
@@ -19,7 +19,8 @@ module.exports = function (options) {
         return callback || function () { };
       },
 
-      _is_connected = false;
+      _is_connected = false,
+      _connecting = false;
 
   Object.defineProperty(STORE, 'db', {value : new sqlite.Database()});
 
@@ -42,6 +43,12 @@ module.exports = function (options) {
 
     callback = _default(callback);
 
+    STORE.db.on('dialectReady', callback);
+
+    if (_connecting) {
+      return;
+    }
+
     STORE.db.open(options.database || 'dialect.db', function (err) {
       if (err) {
         callback(err, null);
@@ -54,7 +61,9 @@ module.exports = function (options) {
             if (data) {
               _is_connected = true;
             }
-            callback(err, data);
+
+            _connecting = false;
+            STORE.db.emit('dialectReady', err);
           }
         );
       }

diff --git a/package.json b/package.json
@@ -1,11 +1,10 @@
 {
   "name": "dialect",
   "description": "Translations manager for nodejs",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "author": "Pau Ramon <masylum@gmail.com>",
   "dependencies": {
     "mongodb": "0.9.6-23",
-    "sqlite": "1.0.4",
     "funk": "1.0.1"
   },
   "devDependencies": {