siriproxypm-honey 0.0.2 → 0.0.3

data/lib/siriproxypm-honey.rb

@@ -1,7 +1,7 @@
 require 'cora'
 require 'siriproxy/plugin_manager'
 require 'socket' 
-requrie 
+require 'siriproxypm-clientstatecache'
 
 class SiriProxy::PluginManager::Honey < SiriProxy::PluginManager::ClientStateCache
 
@@ -14,7 +14,7 @@ class SiriProxy::PluginManager::Honey < SiriProxy::PluginManager::ClientStateCac
 
   def get_plugin_list
     result = get_app_config("speakers",get_speaker,"plugins")
-    if result == nil || !result.is_a(Array) 
+    if result == nil || !result.is_a?(Array) 
       result = []
     end
     return result
@@ -23,7 +23,10 @@ class SiriProxy::PluginManager::Honey < SiriProxy::PluginManager::ClientStateCac
 
   def process_plugins(text)
     result = nil
-    if  (result = switch_speaker(proc_text ))== nil
+    speaker = get_speaker
+    log "Incoming speaker #{speaker}"
+    if  (result = switch_speaker(text ))== nil 
+      log "Did not switch speaker.  will prcess #{text} on parent"
       result = super(text)
     end
     return result
@@ -61,25 +64,24 @@ class SiriProxy::PluginManager::Honey < SiriProxy::PluginManager::ClientStateCac
     clients = get_app_config('client_preferences')
     if client != nil \
       && clients != nil \
-      && clients.respond_to?('each')
+      && clients.respond_to?('each') \
       && speakers.respond_to?('has_key?')
       clients.each do |range,client_preferences| 
-        if!client_preferences \
-        || !client_preferences.has_key?("speakers")  \
-        || !in_range(client,range)  
-        next
-      end
-      if client_preferences['speakers'].respond_to?("each") 
-        speakers = client_preferences['speakers']
-      else
-        speakers = [client_preferences['speakers']]
-      end
-      speakers.each do |speaker|       
-        if speaker == nil
+        if !client_preferences \
+          || !client_preferences.has_key?("speakers")  \
+          || !in_range(client,range)  
           next
         end
-        if  speakers.has_key?(speaker)
-          return speaker
+        if client_preferences['speakers'].respond_to?("each") 
+          speakers = client_preferences['speakers']
+        else
+          speakers = [client_preferences['speakers']]
+        end
+        if speakers != nil \
+          && speakers.respond_to?('keys') \
+          && (keys = speakers.keys) != nil \
+          && keys.count > 0 
+          return speakers[keys[0]]
         end
       end
     end
@@ -90,7 +92,7 @@ class SiriProxy::PluginManager::Honey < SiriProxy::PluginManager::ClientStateCac
   def switch_speaker(text) 
     new_speaker = nil
     speakers = get_app_config("speakers")
-    if speakers != null speakers.respond_to?('each')   
+    if speakers != nil && speakers.respond_to?('each')   
       speakers.each do |speaker,speaker_config|
         if identify_speaker(speaker,text)
           new_speaker = speaker
@@ -101,13 +103,13 @@ class SiriProxy::PluginManager::Honey < SiriProxy::PluginManager::ClientStateCac
     if new_speaker != nil && (client = get_client) != nil
       #verify on this ip address
       valid_speaker = false
-      client_prefereces = get_app_config("client_preferences")
+      client_preferences = get_app_config("client_preferences")
       if client_preferences.respond_to?('each') 
         client_preferences.each do |range,client_preferences| 
           if client_preferences == nil\
             || !client_preferences.respond_to?("has_key?") \
             || !client_preferences.has_key?("speakers") \
-            || client_preferences['speakers'] == nil 
+            || client_preferences['speakers'] == nil  \
             || !in_range(client,range) 
             next
           end
@@ -133,13 +135,13 @@ class SiriProxy::PluginManager::Honey < SiriProxy::PluginManager::ClientStateCac
 
 
   def identify_speaker(speaker,text) 
-    return text_matches(text,get_app_config("speakers",speaker,"identity"));
+    return text_matches(text,get_app_config("speakers",speaker,"identify"));
   end
 
 
   def welcome_speaker(speaker)    
-    if (welcome = get_app_config("speakers",speaker,"welcome"))  != nil
-      respond(speaker_config['welcome'])
+    if (welcome = get_app_config("speakers",speaker,"welcome")) != nil
+      respond(welcome)
     end
   end
 

data/siriproxypm-honey.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "siriproxypm-honey"
-  s.version     = "0.0.2" 
+  s.version     = "0.0.3" 
   s.authors     = ["litlfred"]
   s.email       = [""]
   s.homepage    = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siriproxypm-honey
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: siriproxypm-clientstatecache
-  requirement: &78836590 !ruby/object:Gem::Requirement
+  requirement: &72932750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78836590
+  version_requirements: *72932750
 description: ! 'Plugin manager with speakers (i.e. users/roles) '
 email:
 - ''