alexa_hue 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a8279f7243276431c830a00b52f689fc6f2a335
-  data.tar.gz: 904de5cd7fb0ca4c6770c614e5c36475a9cb8f3a
+  metadata.gz: 40a90ef5b2445e359556fa8742c82678c9e22e7f
+  data.tar.gz: d6f773a6d0cf794281feb524b8c3dea86de639a3
 SHA512:
-  metadata.gz: 2afeb307b65861a95bfa926393d63bcff6cbcad432240b22c2c02279108e69f242c0d5a2a9dd420a58364c92e60865fa5a506f66051b35409e2122f28a9fb4a3
-  data.tar.gz: 041321635e647fcc8b66b12cdc75880d7ac20e933d0ba3ed51c8a6358220ce9d2e268444c3bdc47df0048cdb106939f6b92df5d5aeea45e0886327cc5ed5600a
+  metadata.gz: 17e7d69e7cad79bc308d760a12dcb8b9f8e2ff0c4090299fb5df44440ce66d8a4665db64d9bc72f94650f9401bb824278faa90a13f6d8e6d77d0d6e8a637b272
+  data.tar.gz: 7131a59f1d835c6d2fcb48afaea11e0243b1c047c8c0a834ead80693fe7d9fa2af7c2f9a0eac1fa4ac11e2a2dde9c4fa48d5e1a13f79c08fadc6e6ee2236c72b

data/lib/alexa_hue/hue/voice_parser.rb

@@ -13,23 +13,21 @@ module Hue
       @client = options[:js] ? Hue::JsClient.new(options[:js]) : Hue::Client.new
     end
     
-    def voice(echo_response)
+    def run(echo_response)
       @client.reset
       
       echo_response.slots.to_h.except(:state).each do |key, value|
         if value
-          if value.split(' ').last == "light"
+          if value.to_s.split(' ').last == "light"
             key = "light"
             value = value[/(.*)\s/,1]
-          elsif value.split(' ').last == "lights"
+          elsif value.to_s.split(' ').last == "lights"
             key = "lights"
-            value = value.split(' ').count == 1 ? "lights" : value[/(.*)\s/,1]
+            value = value.to_s.split(' ').count == 1 ? "lights" : value[/(.*)\s/,1]
           end
           
-          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) && (key.to_s != "fade")
           @client.send(key.to_sym, value)
-          puts "Calling: #{key}(#{value})"
         end
       end
       

data/lib/alexa_hue/version.rb

@@ -1,4 +1,4 @@
 module Hue
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end
 

data/lib/alexa_hue.rb

@@ -11,24 +11,20 @@ require 'alexa_hue/hue/voice_parser'
 require 'alexa_hue/hue/helpers'
 require 'chronic_duration'
 
-LEVELS = {} ; [*1..10].each { |t| LEVELS[t.to_s ] = t.in_words }
-
 module Hue
   include Hue::Helpers
   extend Sinatra::Extension
 
   helpers do
-    def switch
+    def voice_parser
       Hue::VoiceParser.instance
     end
     
     def control_lights
       Thread.start do 
-        [:brightness, :saturation].each do |attribute|
-          LEVELS.keys.reverse_each { |level| @echo_request.slots.send(attribute).sub!(level, LEVELS[level]) } if @echo_request.slots.send(attribute) && @echo_request.slots.schedule.nil? 
-        end
+        [:brightness, :saturation].each { |attribute| @echo_request.slots.send("#{attribute}=", @echo_request.slots.send(attribute)&.in_numbers) unless @echo_request.slots.schedule }
 
-        switch.voice @echo_request
+        voice_parser.run @echo_request
       end
 
       if (@echo_request.slots.lights.nil? && @echo_request.slots.scene.nil? && @echo_request.slots.savescene.nil?) || (@echo_request.slots.lights && @echo_request.slots.lights.scan(/light|lights/).empty?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexa_hue
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Kyle Lucas