annyang_rails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGExMzcxZDZhYzJlNmYxZjM0YmVhNDRiYjIxNjY0NzkwNmEzZWE1MA==
+    YTAwMzQ2Nzg5ODM2NzI5ODhkMTE0ZDZmN2JlY2ExMzBhYTkyNzExZg==
   data.tar.gz: !binary |-
-    MGRhN2Y5ZWNiMGExZmU1ZDk3MTQzODFhYjIzMzUyODlkNTI1MDMwNA==
+    ZDFjNWVmYTJkODcxODY1NjU0MWE0NWEzMzNjZDFkNDdhMDhjMjkxNg==
 SHA512:
   metadata.gz: !binary |-
-    NDZlZjIwMTkyNjI5NTMwODIxOWM5Y2IzMDE3Njk5ZTZjZWQ5Y2JmMGYxNWY4
-    MWViZWMxYjBmNmE1ZDdlNTc5ZGI4ODUyMDVjODE5NmM4OTdhNzYzZTNhNzVl
-    YjM2MjE5YWY3MGViZTY3Zjk2MjZkY2E0MmQxOTQ2OGUwNDFlMjg=
+    ZWJjYjFmMDEyMjFjMWJmMzBlODlkOTlkNTM2MTY0MmE1MTg4Zjc0ZTdmYTBm
+    ZjhjZDU4ZGI0MzBmYjZiNDUzZDQzNjJkMjA2NzlkNTlmMWY1YjE5MTBlYWY2
+    MGRiOGYzN2EzMDMwYTg2ZGY3OWRkZjk0OTFhZWRkNjU1MTdjNWY=
   data.tar.gz: !binary |-
-    ODBjOWYyMDhiYzVkNmI5N2E5NzAzMTYyNjc4OWYyMTg4ZDdlNzA1ODAyNDcz
-    ZmJjYTY3Zjg1MGIzNjBiMjA3ODc2YTM2MmQ0OGMyYjVlYzQwZWRiYWRmMjA5
-    MTcyOWM1NTYyNDdjZDg0NTMyOWM1MjQ3YmQ3Zjg4ZmQzN2FmNjU=
+    Y2EzZDBjZGExYTIzYzljNGYxOTdjNzNkMDc0NWRiMzYwZjIwYzY4NTdmZGFh
+    MDljYzViOTNjNTRmODZlY2E3Mzg2MDcwODlmNWI5MTk2NDU0MTQyZTRmYzA4
+    MThlZTI0YzY3ZjA0OTViMGQ2MDJjMWU4M2NkZDE5NTYzMGE5M2Q=

data/app/assets/javascripts/annyang.js

@@ -1,9 +1,9 @@
 //! annyang
-//! version : 1.0.0
+//! version : 1.1.0
 //! author  : Tal Ater @TalAter
 //! license : MIT
 //! https://www.TalAter.com/annyang/
-(function () {
+(function (undefined) {
   "use strict";
 
   // Save a reference to the global object (window in the browser)
@@ -20,12 +20,11 @@
   // This is done as early as possible, to make it as fast as possible for unsupported browsers
   if (!SpeechRecognition) {
     root.annyang = null;
-    return null;
+    return undefined;
   }
 
-  var commandsList;
+  var commandsList = [];
   var recognition;
-  var lang = 'en-US';
   var callbacks = { start: [], error: [], end: [], result: [], resultMatch: [], resultNoMatch: [], errorNetwork: [], errorPermissionBlocked: [], errorPermissionDenied: [] };
   var autoRestart;
   var lastStartedAt = 0;
@@ -56,11 +55,28 @@
     });
   };
 
+  var initIfNeeded = function() {
+    if (!isInitialized()) {
+      root.annyang.init({}, false);
+    }
+  };
+
+  var isInitialized = function() {
+    return recognition !== undefined;
+  };
+
   root.annyang = {
     // Initialize annyang with a list of commands to recognize.
     // e.g. annyang.init({'hello :name': helloFunction})
     // annyang understands commands with named variables, splats, and optional words.
-    init: function(commands) {
+    init: function(commands, resetCommands) {
+
+      // resetCommands defaults to true
+      if (resetCommands === undefined) {
+        resetCommands = true;
+      } else {
+        resetCommands = !!resetCommands;
+      }
 
       // Abort previous instances of recognition already running
       if (recognition && recognition.abort) {
@@ -74,7 +90,7 @@
       recognition.maxAlternatives = 5;
       recognition.continuous = true;
       // Sets the language to the default 'en-US'. This can be changed with annyang.setLanguage()
-      recognition.lang = lang;
+      recognition.lang = 'en-US';
 
       recognition.onstart   = function()      { invokeCallbacks(callbacks.start); };
 
@@ -147,8 +163,12 @@
       };
 
       // build commands list
-      commandsList = [];
-      this.addCommands(commands);
+      if (resetCommands) {
+        commandsList = [];
+      }
+      if (commands.length) {
+        this.addCommands(commands);
+      }
     },
 
     // Start listening (asking for permission first, if needed).
@@ -156,8 +176,9 @@
     // Receives an optional options object:
     // { autoRestart: true }
     start: function(options) {
+      initIfNeeded();
       options = options || {};
-      if (options.autoRestart !== void 0) {
+      if (options.autoRestart !== undefined) {
         autoRestart = !!options.autoRestart;
       } else {
         autoRestart = true;
@@ -169,7 +190,9 @@
     // abort the listening session (aka stop)
     abort: function() {
       autoRestart = false;
-      recognition.abort();
+      if (isInitialized) {
+        recognition.abort();
+      }
     },
 
     // Turn on output of debug messages to the console. Ugly, but super-handy!
@@ -184,16 +207,17 @@
     // Set the language the user will speak in. If not called, defaults to 'en-US'.
     // e.g. 'fr-FR' (French-France), 'es-CR' (Español-Costa Rica)
     setLanguage: function(language) {
-      lang = language;
-      if (recognition && recognition.abort) {
-        recognition.lang = language;
-      }
+      initIfNeeded();
+      recognition.lang = language;
     },
 
     // Add additional commands that annyang will respond to. Similar in syntax to annyang.init()
     addCommands: function(commands) {
       var cb,
           command;
+
+      initIfNeeded();
+
       for (var phrase in commands) {
         if (commands.hasOwnProperty(phrase)) {
           cb = root[commands[phrase]] || commands[phrase];
@@ -228,7 +252,7 @@
     // start, error, end, result, resultMatch, resultNoMatch, errorNetwork, errorPermissionBlocked, errorPermissionDenied
     // Can also optionally receive a context for the callback function as the third argument
     addCallback: function(type, callback, context) {
-      if (callbacks[type]  === void 0) {
+      if (callbacks[type]  === undefined) {
         return;
       }
       var cb = root[callback] || callback;

data/lib/annyang_rails/version.rb

@@ -1,3 +1,3 @@
 module AnnyangRails
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annyang_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Guy Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler