Merge pull request #7 from snicker/master

humanlike language
elvisimprsntr · Apr 18, 2013 · f4de4f6 · f4de4f6
2 parents 7573062 + 32d2470
commit f4de4f6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/siriproxy-ipcam.rb b/lib/siriproxy-ipcam.rb
@@ -13,11 +13,16 @@ def initialize(config = {})
 
 ########## Commands   
 
-  listen_for(/camera (.*)/i) do |camera|
+  listen_for /(show me|snapshot for) the (.*) camera/i do |keyword, camera|
 	check_camera camera.downcase.strip
 	request_completed
   end
-
+
+  listen_for /camera(?: of)?(?: for)?(?: the)? (.*)/i do |camera|
+        check_camera camera.downcase.strip
+        request_completed
+  end
+
   listen_for(/check cameras/i) do 
 	@camUrl.each_key {|camera| check_camera(camera)} 
 	request_completed
@@ -55,4 +60,4 @@ def push_image(title, image)
   end		
 
 
-end
+end