hue_switch 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc73a1c86510dc51fd64bbaa2ed0adbd6c90b12d
-  data.tar.gz: d4847f737495d0bcf86ca1ddc996a59f60c13c79
+  metadata.gz: a855176711f1ab01897ae965d6945e3aec5be9ad
+  data.tar.gz: 2366d5667f67a30c5017f4d340358ac49df08f7f
 SHA512:
-  metadata.gz: 5acb073efe02cd60629fa8c3f09b0f27115597bf205145cf49a5a78668b65cc72287b082dab79954936d4e3959f717a83caf4a5778a0bef8b7130ece3742a963
-  data.tar.gz: b5630d83d8b24adc5d35a4cd957f19349654d8dcad347b527b33cd121e639fb7518bcbcb46d7912f7fb37909eb58ba8be16fb5e09c5d401705d79b20757b4fbc
+  metadata.gz: 249948fbb69223becc3ba6cfae193fe3afaa0628d884de860c971c25b7b53b02c2296100e756e244e20944a30cd62cf88ee8bd538d3349c55f205214bee13e2d
+  data.tar.gz: ee818b3127438d7e426dd31f703f61d8e2ac6fd1243fc2e3d56cf22eea08928f9ede9ec9671c09280633f7ce2264a08ff41229fa5ed706e6204c0cf9d612d557

data/README.md

@@ -12,7 +12,7 @@ Or install it yourself as:
 
     $ gem install hue_switch
     
-#####Note: There are significant changes between .9 versions and 1.0.0. Some basic commands work slightly differently. Random Colors have been removed. Verion 1.0.0 includes a new method, .voice, that allows most Switch methods to be passed as a string. Please see updated README.
+#####Note: There are significant changes between .9 versions and 1.0.0. Some basic commands work slightly differently. Random Colors have been removed. Version 1.0.0 includes a new method -- #voice -- that allows most Switch methods to be passed as a string. Please see end of README for details.
 
 ## Usage
 A Hue Switch is designed control Hue lights, groups, and scenes. You can schedule a Switch. You can save a Switch as a Hue Scene on the bridge.
@@ -23,7 +23,7 @@ Why is this different from other wrappers?
 
 1. Hue-Switch is not designed to give full access to Hue API, but to make access to basic operations super easy. A Hue Switch can be assigned an existing group, scene, or one or more individual lights. Switches can be scheduled easily. Color effects can be added (color loop, long and short alerts etc.) For example, a switch could be three random lights on a colorloop. If you turn the switch off, the lights go off. Turn it on, and they continue to cycle through colors.
 
-2. Hue-Switch comes with a utility method (dare I call it a DSL?), #voice. The voice method allows access to (almost) all of the Switch class funtionality with a single string. See below for important differences when using the #voice method
+2. Hue-Switch comes with a utility method (dare I call it a DSL?), #voice. The voice method allows access to (almost) all of the Switch class funtionality with a single string. See below for important differences when using the #voice method.
 
 ###Create a Switch
 
@@ -48,7 +48,7 @@ switch = Switch.new do
   fade 10  #specified in seconds
 end
 ```
-Then switch.on
+Then `switch.on`
 
 Colors can be specified by
 
@@ -56,6 +56,13 @@ Colors can be specified by
 
 2. Numeric value of hue [0-65535], or mired color value [0-500]
 
+```ruby
+switch.mired 250
+switch.hue 45000
+switch.color :green
+switch.color :concentrate
+```
+
 Groups are indicated by **:lights**, single lights by **:light**.
 
 A switch can control multiple individual lights, even if they are not in a group.
@@ -98,14 +105,11 @@ switch.reset
 Switches can be scheduled:
 
 ```ruby
-switch.schedule :on, "8:30 tonight"
+switch.schedule :on, "eight thirty tonight"
+switch.schedule :on, "June 9 at 08:00"
 switch.schedule :off, "in three minutes"  # "tomorrow", "next week"
 ```
 
-1. If you don't specify :on, :off, or a time, schedule will default to turning on the current switch state in 24 hours.
-2. Lights will flash once to let you know the scene was successfully sceduled.
-3. Schedules can be set a week up to a week ahead of time. You can specify days of the week (e.g, monday, next tuesday) but you cannot specify a date.
-
 ####Delete the schedule(s) created by the switch:
 
 ```ruby
@@ -113,9 +117,9 @@ switch.delete_schedules!
 ```
 ###Dynamic Effects:
 ```ruby
-switch.colorloop  # to cycle through colors
-switch.alert  # to flash lights once
-switch.long_alert  # to flash lights for 30 seconds
+switch.colorloop  :start # to cycle through colors
+switch.alert :short # to flash lights once
+switch.alert :long  # to flash lights for 30 seconds
 ```
 Then `switch.on`
 
@@ -130,20 +134,20 @@ The voice method takes a single string and is meant to control the Switch class
 
 Because #voice takes a string meant to be spoken, there are important differences between using switch and switch.voice:
 
-1. switch.voice takes no numeric inputs. Brightness and Saturation are set on a scale of one to ten. Fade times for lights are similarly specified in words by seconds. See examples below.
+1. switch.voice takes no numeric inputs. Brightness and Saturation are set on a scale of one to ten. Fade times for lights are similarly specified in words by seconds. See examples below. Scheduling has some restrictions.
 2. Colors can only be specified by name (i.e., 'hue 40000' is not available using #voice).
 3. Only a single light can be specified after a 'light' command.
-4. .reset and .delete_scenes! methods not available with #voice
+4. \#reset and #delete_scenes! methods not available with #voice
 5. **Changes take effect immediately.** Using the #voice method, you don't need to send a separate "on" command for switch properties to be sent to the lights. So:
 
 ```ruby
-switch.color :blue : switch.on
+switch.color :blue ; switch.on
 switch.lights :kitchen ; switch.saturation 255 ; switch.brightness 127 ; switch.on
 ```
 is now
 ```ruby
 switch.voice "color blue"
-swtich.voice "kitchen lights saturation ten brightness five"
+switch.voice "kitchen lights saturation ten brightness five"
 ```
 ###Examples
 #####Recall a scene
@@ -156,20 +160,21 @@ Will save the current light configuration to a scene on the bridge.
 ```ruby
 switch.voice "save scene as romantic dinner"
 ```
-###Schedules
-Scheduling syntax is extremely flexible. Any command can be scheduled. You can schedule up to a week ahead of time.
+note: scenes saved with \#voice will be affect all lights.
+######Schedules
+Scheduling syntax is extremely flexible. Any command can be scheduled. With \#voice you can schedule up to a week ahead of time (e.g., "next Monday") and dates ("June 22") are not supported
 ```ruby
 switch.voice "schedule kitchen lights color blue in ten minutes"
 switch.voice "start colorloop bedside light schedule at eight fifty three next Friday"
 switch.voice "romantic scene schedule tomorrow at eight in the evening"
 switch.voice "schedule purple paradise scene thursday evening at eight forty five"
 ```
-###Dynamic Effects:
+######Dynamic Effects:
 ```ruby
-"living room lights short alert" [flash lights in the group once]
-"long alert table light" [flash light for 30 seconds]
-"brightness five fireplace lights start colorloop"
-"fireplace lights stop colorloop"
+switch.voice "living room lights short alert" [flash lights in the group once]
+switch.voice "long alert table light" [flash light for 30 seconds]
+switch.voice "brightness five fireplace lights start colorloop"
+switch.voice "fireplace lights stop colorloop"
 ```
 
 

data/hue_switch.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'numbers_in_words', '~> 0.2.0' 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rspec', '~> 2.4.0'
+  spec.add_development_dependency 'rspec', '~> 2.4', '>=2.4.0'
 end

data/lib/hue_switch/version.rb

@@ -1,3 +1,3 @@
 module HueSwitch
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/hue_switch.rb

@@ -10,43 +10,47 @@ class Switch
 
 		@user = "1234567890"
 		@ip = HTTParty.get("https://www.meethue.com/api/nupnp").first["internalipaddress"]
+		
+		authorize_user
+		populate_switch
+		
+		self.lights_array = []
+		self.schedule_ids = []
+		self.schedule_params = nil
+		self.command = ""
+		self._group = "0"
+		self.body = {}
+		instance_eval(&block) if block_given?
+	end
+
+	def authorize_user
 		unless HTTParty.get("http://#{@ip}/api/#{@user}/config").include?("whitelist")
 			if HTTParty.post("http://#{@ip}/api", :body => ({:devicetype => "Hue_Switch", :username=>"1234567890"}).to_json).first.include?("error")
 				raise "You need to press the link button on the bridge and run again"
 			end
 		end
-			
+	end
+
+	def populate_switch
 		@colors = {red: 65280, pink: 56100, purple: 52180, violet: 47188, blue: 46920, turquoise: 31146, green: 25500, yellow: 12750, orange: 8618}
-		@mired_colors = {candle: 500, relax: 467, reading: 346, neutral: 300, concentrate: 231, energize: 136} ; puts @mired_colors
+		@mired_colors = {candle: 500, relax: 467, reading: 346, neutral: 300, concentrate: 231, energize: 136}
 		@scenes = [] ; HTTParty.get("http://#{@ip}/api/#{@user}/scenes").keys.each { |k| @scenes.push(k) }
 		@groups = {} ; HTTParty.get("http://#{@ip}/api/#{@user}/groups").each { |k,v| @groups["#{v['name']}".downcase] = k } ; @groups["all"] = "0"
 		@lights = {} ; HTTParty.get("http://#{@ip}/api/#{@user}/lights").each { |k,v| @lights["#{v['name']}".downcase] = k }
-		
-		self.lights_array = []
-		self.schedule_ids = []
-		self.schedule_params = nil
-		self.command = ""
-		self._group = :all
-		self.body = {}
-		instance_eval(&block) if block_given?
 	end
 
 	def hue (numeric_value)
-		self.body.delete(:scene)
-		self.body.delete(:ct)
+		clear_attributes
 		self.body[:hue] = numeric_value
 	end
 
 	def mired (numeric_value)
-		self.body.delete(:scene)
-		self.body.delete(:hue)
+		clear_attributes
 		self.body[:ct] = numeric_value
 	end
 
 	def color(color_name)
-		self.body.delete(:scene)
-		self.body.delete(:ct)
-		self.body.delete(:hue)
+		clear_attributes
 		@colors.keys.include?(color_name.to_sym) ?
 		self.body[:hue] = @colors[color_name.to_sym] : self.body[:ct] = @mired_colors[color_name.to_sym]
 	end
@@ -61,14 +65,19 @@ class Switch
 		self.body[:bri] = depth
 	end
 
+	def clear_attributes
+		self.body.delete(:scene)
+		self.body.delete(:ct)
+		self.body.delete(:hue)
+	end
+
 	def fade(in_seconds)
 		self.body[:transitiontime] = in_seconds * 10
 	end	
 
 	def light (*args)
 		self.lights_array = []
-		self._group = nil
-		self.body.delete(:groups)
+		self._group = ""
 		self.body.delete(:scene)
 		args.each { |l| self.lights_array.push @lights[l.to_s] if @lights.keys.include?(l.to_s) }
 	end
@@ -80,80 +89,101 @@ class Switch
 	end
 
 	def scene(scene_name)
+		clear_attributes
 		self.lights_array = []
-		self._group = 0
-		self.body.delete(:groups)
-		self.body.delete(:hue)
-		self.body.delete(:ct)
+		self._group = "0"
 		self.body[:scene] = scene_name.to_s
 	end
 
+	def confirm
+		params = {:alert => 'select'}
+		HTTParty.put("http://#{@ip}/api/#{@user}/groups/0/action" , :body => params.to_json)
+	end
+
 	def save_scene(scene_name)
+		scene_name.gsub!(' ','-')
 		self.fade 2 if self.body[:transitiontime] == nil
-		if self._group.nil?
+		if self._group.empty?
 			light_group = HTTParty.get("http://#{@ip}/api/#{@user}/groups/0")["lights"]
 		else
 			light_group = HTTParty.get("http://#{@ip}/api/#{@user}/groups/#{self._group}")["lights"]
 		end
-		scene_name.gsub!(' ','-')
 		params = {name: scene_name, lights: light_group, transitiontime: self.body[:transitiontime]}
 		response = HTTParty.put("http://#{@ip}/api/#{@user}/scenes/#{scene_name}", :body => params.to_json)
-		if response.first.keys[0] == "success"
-			puts "Scene created!"
-		else
-			puts "Error: scene was NOT created!"
+		confirm if response.first.keys[0] == "success"
+	end
+
+	def lights_on_off
+		self.lights_array.each { |l| HTTParty.put("http://#{@ip}/api/#{@user}/lights/#{l}/state", :body => (self.body).to_json) }
+	end
+
+	def group_on_off
+		HTTParty.put("http://#{@ip}/api/#{@user}/groups/#{self._group}/action", :body => (self.body.reject { |s| s == :scene }).to_json)
+	end
+
+	def scene_on_off
+		if self.body[:on] == true
+			HTTParty.put("http://#{@ip}/api/#{@user}/groups/#{self._group}/action", :body => (self.body.select { |s| s == :scene }).to_json)
+		elsif self.body[:on] == false
+			# turn off individual lights in the scene
+			(HTTParty.get("http://#{@ip}/api/#{@user}/scenes"))[self.body[:scene]]["lights"].each do |l|
+				puts self.body
+				HTTParty.put("http://#{@ip}/api/#{@user}/lights/#{l}/state", :body => (self.body).to_json)
+			end
 		end
 	end
 
 	def on
 		self.body[:on]=true
-		if self.lights_array.any?
-			self.lights_array.each { |l| HTTParty.put("http://#{@ip}/api/#{@user}/lights/#{l}/state", :body => (self.body).to_json) }
-		elsif self.body.include?(:scene)
-			HTTParty.put("http://#{@ip}/api/#{@user}/groups/#{self._group}/action", :body => (self.body.select { |s| s == :scene }).to_json)
-		else 
-			HTTParty.put("http://#{@ip}/api/#{@user}/groups/#{self._group}/action", :body => (self.body).to_json)
-		end
+		lights_on_off if self.lights_array.any?
+		group_on_off if (!self._group.empty? && self.body[:scene].nil?)
+		scene_on_off if !self.body[:scene].nil?
 	end
 
 	def off
-		self.body[:on] = false
-		if self.lights_array.any?
-			self.lights_array.each { |l| HTTParty.put("http://#{@ip}/api/#{@user}/lights/#{l}/state", :body => (self.body).to_json) }
-		elsif !self.body[:scene].nil? 
-			(HTTParty.get("http://#{@ip}/api/#{@user}/scenes"))[self.body[:scene]]["lights"].each do |l|
-				HTTParty.put("http://#{@ip}/api/#{@user}/lights/#{l}/state", :body => ({:on=>false}).to_json)
-			end
-		else
-			HTTParty.put("http://#{@ip}/api/#{@user}/groups/#{self._group}/action", :body => (self.body).to_json)
-		end
+		self.body[:on]=false
+		lights_on_off if self.lights_array.any?
+		group_on_off if (!self._group.empty? && self.body[:scene].nil?)
+		scene_on_off if !self.body[:scene].nil?	
 	end
 
-	def schedule (on_or_off = :default, string)
-		if on_or_off != :default
-			on_or_off = on_or_off == :on ? true : false
-			self.body[:on]=on_or_off
-		end 
+	# Parses times in words (e.g., "eight forty five") to standard HH:MM format
+
+	def numbers_to_times(numbers)
+		numbers.map!(&:in_numbers)
+		numbers.map!(&:to_s)
+		numbers.push("0") if numbers[1] == nil
+		numbers = numbers.shift + ':' + (numbers[0].to_i + numbers[1].to_i).to_s
+		numbers.gsub!(':', ':0') if numbers.split(":")[1].length < 2
+		numbers
+	end
+
+	def parse_time(string)
+		string.sub!(" noon", " twelve in the afternoon")
+		string.sub!("midnight", "twelve in the morning")
+		time_modifier = string.downcase.scan(/(evening)|(night|tonight)|(afternoon)|(pm)|(a.m.)|(morning)|(today)/).flatten.compact.first
+		guess = Time.now.strftime('%H').to_i >= 12 ?  "p.m." : "a.m."
+		time_modifier = time_modifier.nil? ? guess : time_modifier
+		day_modifier = string.scan(/(tomorrow)|(next )?(monday|tuesday|wednesday|thursday|friday|saturday|sunday)/).flatten.compact.join(' ')
+		numbers_in_words = string.scan(Regexp.union((1..59).map(&:in_words)))
+		set_time = numbers_to_times(numbers_in_words)
+		set_time = Chronic.parse(day_modifier +  ' ' + set_time + ' ' + time_modifier)
+	end
 
+	def set_time(string)
 		if string.scan(/ seconds?| minutes?| hours?| days?| weeks?/).any? 
 			set_time = Time.now + ChronicDuration.parse(string)
+		elsif string.scan(/\d/).any?
+			set_time = Chronic.parse(string)
 		else
-			string.sub!(" noon", " twelve in the afternoon")
-			string.sub!("midnight", "twelve in the morning")
-			time_modifier = string.downcase.scan(/(evening)|(night|tonight)|(afternoon)|(pm)|(a.m.)|(morning)|(today)/).flatten.compact.first
-			guess = Time.now.strftime('%H').to_i >= 12 ?  "p.m." : "a.m."
-			time_modifier = time_modifier.nil? ? guess : time_modifier
-			day_modifier = string.scan(/(tomorrow)|(next )?(monday|tuesday|wednesday|thursday|friday|saturday|sunday)/).flatten.compact.join(' ')
-			set_time = string.scan(Regexp.union((1..59).map(&:in_words)))
-			set_time.map!(&:in_numbers)
-			set_time.map!(&:to_s)
-			set_time.push("0") if set_time[1] == nil
-			set_time = set_time.shift + ':' + (set_time[0].to_i + set_time[1].to_i).to_s
-			set_time.gsub!(':', ':0') if set_time.split(":")[1].length < 2
-			set_time = Chronic.parse(day_modifier +  ' ' + set_time + ' ' + time_modifier)
-			p set_time
+			set_time = parse_time(string)
 		end
+	end
 
+	def schedule (on_or_off = :default, string)
+		self.body[:on] = true if on_or_off == :on
+		self.body[:on] = false if on_or_off == :off
+		set_time = set_time(string)
 		if set_time < Time.now 
 			p "You've scheduled this in the past"
 		else
@@ -165,23 +195,14 @@ class Switch
 						 :autodelete=>true
 						}
 			if self.lights_array.any?
-				self.schedule_params[:name]= "Hue_Switch Alarm Light Set"
 				lights_array.each do |l|
 					self.schedule_params[:command] = {:address=>"/api/#{@user}/lights/#{l}/state", :method=>"PUT", :body=>self.body}
-					self.schedule_ids.push(HTTParty.post("http://#{@ip}/api/#{@user}/schedules", :body => (self.schedule_params).to_json))
 				end
-			elsif !self.body[:scene].nil?
-				self.schedule_params[:command] = {:address=>"/api/#{@user}/groups/#{self._group}/action", :method=>"PUT", :body=>self.body }
-				self.schedule_ids.push(HTTParty.post("http://#{@ip}/api/#{@user}/schedules", :body => (self.schedule_params).to_json))
 			else
 				self.schedule_params[:command] = {:address=>"/api/#{@user}/groups/#{self._group}/action", :method=>"PUT", :body=>self.body}
-				self.schedule_ids.push(HTTParty.post("http://#{@ip}/api/#{@user}/schedules", :body => (self.schedule_params).to_json))
 			end
-			result = self.schedule_ids.flatten.last
-		  if result.keys.include?("success")
-		    params = {:alert => 'select'}
-		    HTTParty.put("http://#{@ip}/api/#{@user}/groups/0/action" , :body => params.to_json)
-		  end
+			self.schedule_ids.push(HTTParty.post("http://#{@ip}/api/#{@user}/schedules", :body => (self.schedule_params).to_json))
+			confirm if self.schedule_ids.flatten.last.include?("success")
 		end
 	end
 
@@ -214,94 +235,88 @@ class Switch
 
 	def reset
 		self.command = ""
-		self._group = 0
+		self._group = "0"
 		self.body = {}
 		self.schedule_params = nil
 	end
 
-	#The following two methods are required to use Switch for Zach Feldman's Alexa-home*
+	#The following two methods are required to use Switch with Zach Feldman's Alexa-home*
 	def wake_words
-		["light", "lights", "scene", "seen", "flash"]
+		["light", "lights", "scene", "seen"]
 	end
 
 	def process_command (command)
 		command.sub!("color loop", "colorloop")
 		command.sub!("too", "two")
+		command.sub!("for", "four")
 		command.sub!(/a half$/, 'thirty seconds')
 		self.voice command
 	end
 	
-	#This method allows access to most of the Switch class functionality by supplying a single string.
-	def voice (string)
-		trailing_methods = string.split(' ') & %w[lights light]
-		leading_methods = string.split(' ') & %w[hue brightness saturation fade color]
-		dynamic_methods = string.split(' ') & %w[colorloop alert]
-		scene_name = string.partition(" scene").first
-		self.command = ""
-		self.command << string
-		string.gsub!('schedule','')
-
-		if string.include?('scene')
-			scene_name.gsub!(' ','-') if scene_name.size > 1
-			scene_name.gsub!(/schedule-?/,'') if scene_name.include?('schedule')
-			puts scene_name
-			self.send("scene", scene_name)
+	#The rest of the methods allow access to most of the Switch class functionality by supplying a single string.
+	def parse_leading(methods)
+		methods.each do |l|
+			capture = (self.command.match (/\b#{l}\s\w+/)).to_s.split(' ')
+			method = capture[0]
+			value = capture[1]
+			value = value.in_numbers if value.scan(Regexp.union( (1..10).map {|k| k.in_words} ) ).any?
+			value = ((value.to_f/10.to_f)*255).to_i if (value.class == Fixnum) && (l != "fade")
+			self.send( method, value )
 		end
+	end
 
-		if leading_methods.any?
-			leading_methods.each do |l|
-				capture = (string.match (/\b#{l}\s\w+/)).to_s.split(' ')
-				method = capture[0]
-				value = capture[1]
-				value = value.in_numbers if value.scan(Regexp.union( (1..10).map {|k| k.in_words} ) ).any?
-				value = ((value.to_f/10.to_f)*255).to_i if (value.class == Fixnum) && (l != "fade")
-				self.send( method, value )
-			end
-		end
+	def parse_trailing(method)
+		all_keys = Regexp.union((@groups.keys + @lights.keys).flatten)
+		value = self.command.match(all_keys).to_s
+		self.send( method.first, value )
+	end
 
-		if trailing_methods.any?
-			trailing_methods.each do |t|
-				all_keys = []
-				all_keys.push(@groups.keys)
-				all_keys.push(@lights.keys)
-				all_keys.flatten!
-				all_keys = Regexp.union(all_keys)
-				value = string.match (all_keys).to_s
-				self.send( "#{t}", value )
-			end
+	def parse_dynamic(methods)
+	methods.each do |d|
+			capture = (self.command.match (/\w+ #{d}\b/)).to_s.split(' ')
+			method = capture[1]
+			value = capture[0].to_sym
+			self.send( method, value )
 		end
+	end
 
-		if dynamic_methods.any?
-			dynamic_methods.each do |d|
-				capture = (string.match (/\w+ #{d}\b/)).to_s.split(' ')
-				capture = capture.reverse
-				method = capture[0]
-				value = capture[1].to_sym
-				self.send( method, value )
-			end
-		end
+	def parse_scene(scene_name)
+		scene_name.gsub!(' ','-') if scene_name.size > 1
+		scene_name.gsub!(/schedule-?/,'') if scene_name.include?('schedule')
+		self.send("scene", scene_name)
+	end
+	
+	def parse_save_scene
+		save_scene = self.command.partition(/save (scene|seen) as /).last
+		self.send( "save_scene", save_scene)
+	end
 
-		if self.command.scan(/save (scene|seen) as/).length > 0
-			scene_name = self.command.partition(/save (scene|seen) as /).last
-			self.send( "save_scene", scene_name)
-		end
+	def parse_voice(string)
+		trailing = string.split(' ') & %w[lights light]
+		leading = string.split(' ') & %w[hue brightness saturation fade color]
+		dynamic = string.split(' ') & %w[colorloop alert]
+		scene_name = string.partition(" scene").first
 
-		if !self.command.include?("schedule")
-			if string.include?(" on")
-				self.send("on")
-			elsif string.include?(" off")
-			 	self.send("off")
-			end
-		end
+		parse_scene(scene_name) if string.include?(" scene") && !string.include?("save")
+		parse_leading(leading) if leading.any?
+		parse_trailing(trailing) if trailing.any?
+		parse_dynamic(dynamic) if dynamic.any?
+		parse_save_scene if self.command.scan(/save (scene|seen) as/).length > 0
+	end
+
+	def voice(string)
+		self.reset
+		self.command << string
+		string.gsub!('schedule','')
+
+		parse_voice(string)
 
 		if self.command.include?("schedule")
-			if string.include?(" on")
-				self.body[:on] = true
-			elsif string.include?(" off")
-				self.body[:on] = false
-			end
+			self.body[:on] = true if string.include?(' on')
+			self.body[:on] = false if string.include?(' off')
 			self.send("schedule", string)
-		end
-		self.send("on") if !command.include?(" off") && !command.include?("schedule")
+		else
+			string.include?(' off') ? self.send("off") : self.send("on")
+		end	
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hue_switch
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - sarkonovich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -99,6 +99,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
@@ -106,6 +109,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 description: A 'switch' controls Hue lights, groups, or scenes. Switches can be scheduled,