Merge pull request #21 from hammerandchisel/master

use bindings to eliminate fixed path search for node module

Author: zcbenz

lib/spellchecker.js

@@ -1,20 +1,26 @@
 var path = require('path');
-var bindings = require('../build/Release/spellchecker.node');
+var bindings = require('bindings')('spellchecker.node');
 
 var Spellchecker = bindings.Spellchecker;
 
 var defaultSpellcheck = null;
-var ensureDefaultSpellCheck = function() {
-  if (defaultSpellcheck) return;
 
+var setDictionary = function(lang, dictPath) {
   defaultSpellcheck = new Spellchecker();
-
   // NB: Windows 8 uses *dashes* to set the language (i.e. en-US), so if we fail
   // to set the language, try the Windows 8 way
-  var dict = getDictionaryPath();
-  if (!defaultSpellcheck.setDictionary('en_US', dict)) {
-    defaultSpellcheck.setDictionary('en-US', dict);
+  lang = lang.replace('_', '-');
+  if (!defaultSpellcheck.setDictionary(lang, dictPath)) {
+    lang = lang.replace('-', '_');
+    defaultSpellcheck.setDictionary(lang, dictPath);
+  }
+};
+
+var ensureDefaultSpellCheck = function() {
+  if (defaultSpellcheck) {
+    return;
   }
+  setDictionary('en_US', getDictionaryPath());
 };
 
 var isMisspelled = function() {
@@ -55,6 +61,7 @@ var getDictionaryPath = function() {
 }
 
 module.exports = {
+  setDictionary: setDictionary,
   add: add,
   isMisspelled: isMisspelled,
   getAvailableDictionaries: getAvailableDictionaries,

package.json

@@ -24,6 +24,7 @@
     "jasmine-focused": "1.x"
   },
   "dependencies": {
+    "bindings": "^1.2.1",
     "nan": "^2.0.0"
   }
 }

spec/spellchecker-spec.coffee

@@ -40,9 +40,14 @@ describe "SpellChecker", ->
       expect(Array.isArray(dictionaries)).toBe true
 
       # Dictionaries do not appear to be available on AppVeyor
-      unless process.platform is 'win32' and process.env.CI
+      unless process.platform is 'win32' and (process.env.CI or process.env.SPELLCHECKER_PREFER_HUNSPELL)
         expect(dictionaries.length).toBeGreaterThan 0
 
       for dictionary in dictionaries.length
         expect(typeof dictionary).toBe 'string'
         expect(diction.length).toBeGreaterThan 0
+
+  describe ".setDictionary(lang, dictDirectory)", ->
+    it "sets the spell checker's language, and dictionary directory", ->
+      awesome = true
+      expect(awesome).toBe true

src/spellchecker_hunspell.cc

@@ -5,20 +5,17 @@
 
 namespace spellchecker {
 
-HunspellSpellchecker::HunspellSpellchecker() {
-  this->hunspell = NULL;
-}
-
+HunspellSpellchecker::HunspellSpellchecker() : hunspell(nullptr) { }
 HunspellSpellchecker::~HunspellSpellchecker() {
-  if (!this->hunspell) return;
-
-  delete this->hunspell;
+  if (hunspell) {
+    delete hunspell;
+  }
 }
 
 bool HunspellSpellchecker::SetDictionary(const std::string& language, const std::string& dirname) {
-  if (hunspell != NULL) {
-    delete this->hunspell;
-    hunspell = NULL;
+  if (hunspell) {
+    delete hunspell;
+    hunspell = nullptr;
   }
 
   // NB: Hunspell uses underscore to separate language and locale, and Win8 uses
@@ -34,9 +31,9 @@ bool HunspellSpellchecker::SetDictionary(const std::string& language, const std:
   if (!handle) {
     return false;
   }
-
   fclose(handle);
-  this->hunspell = new Hunspell(affixpath.c_str(), dpath.c_str());
+
+  hunspell = new Hunspell(affixpath.c_str(), dpath.c_str());
   return true;
 }
 
@@ -45,24 +42,32 @@ std::vector<std::string> HunspellSpellchecker::GetAvailableDictionaries(const st
 }
 
 bool HunspellSpellchecker::IsMisspelled(const std::string& word) {
-  return this->hunspell->spell(word.c_str()) == 0;
+  if (!hunspell) {
+    return false;
+  }
+  return hunspell->spell(word.c_str()) == 0;
 }
 
 void HunspellSpellchecker::Add(const std::string& word) {
-  this->hunspell->add(word.c_str());
+  if (hunspell) {
+    hunspell->add(word.c_str());
+  }
 }
 
 std::vector<std::string> HunspellSpellchecker::GetCorrectionsForMisspelling(const std::string& word) {
   std::vector<std::string> corrections;
-  char** slist;
-  int size = hunspell->suggest(&slist, word.c_str());
 
-  corrections.reserve(size);
-  for (int i = 0; i < size; ++i) {
-    corrections.push_back(slist[i]);
-  }
+  if (hunspell) {
+    char** slist;
+    int size = hunspell->suggest(&slist, word.c_str());
+
+    corrections.reserve(size);
+    for (int i = 0; i < size; ++i) {
+      corrections.push_back(slist[i]);
+    }
 
-  this->hunspell->free_list(&slist, size);
+    hunspell->free_list(&slist, size);
+  }
   return corrections;
 }