alexa_hue 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a6e8ca4b56fe2a6cd2eece2da39267159f9025
-  data.tar.gz: 7095152315f70877ab2359665558296901912a14
+  metadata.gz: 9899901a0800aaac312d75eba07974c4caf1777f
+  data.tar.gz: 63a10072deb984d0c3a9f5908e82a2c61474fc24
 SHA512:
-  metadata.gz: 3fe7d7d210600fe573bbea05fedbcf23d44bbad90dddc8e0a81c4c70cd0eb8e25b75625d746c8361c4f7fde6f0afc9a799652cc645590dbd1b29daca42466424
-  data.tar.gz: 85b7d71dfaff8d58174301df1f623f0c45477b163d4c43ae5755cb39630f61f271dedda432bb186c6c80dde09809fb19219fd8ac4768191bcda47fc734f7df4d
+  metadata.gz: 392e2fde49d7b0cfca31e316817fd674abe79663bb65c7596a9df49322b820a9fe6b9da9f4c6c83286516bf4316e94e18959023e6bd521c4d6fb6d8016c24f1a
+  data.tar.gz: 6118cb8026c5b30b063e80582652013705cc03b7aa9523de7850bbf4e630d9c59861bf5db2f8f06dbe0cd7965be6834113181577c156247e4632cdc22c004fad

data/lib/alexa_hue/version.rb

@@ -1,4 +1,4 @@
 module Hue
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end
 

data/lib/alexa_hue.rb

@@ -11,21 +11,24 @@ 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
-    LEVELS = {} ; [*1..10].each { |t| LEVELS[t.to_s ] = t.in_words }
-    
     def control_lights
-      [:brightness, :saturation].each do |attribute|
-        if @echo_request.slots.send(attribute)
-          LEVELS.keys.reverse_each { |level| @echo_request.slots.send(attribute).sub!(level, LEVELS[level]) } if @echo_request.slots.schedule.nil? 
-        end
+      if @echo_request.slots.brightness
+        LEVELS.keys.reverse_each { |level| @echo_request.slots.brightness.sub!(level, LEVELS[level]) } if @echo_request.slots.schedule.nil? 
+      end
+
+      if @echo_request.slots.saturation
+        LEVELS.keys.reverse_each { |level| @echo_request.slots.saturation.sub!(level, LEVELS[level]) } if @echo_request.slots.schedule.nil?
       end
 
-      # TODO: ...something about this feel ugly and unexpressive
       @echo_request.slots.to_h.each do |k,v| 
         @string ||= ""
         next unless v
@@ -41,42 +44,51 @@ module Hue
           @string << "#{k.to_s} #{v.to_s}  "
         end
       end
-
-      # TODO: create context for these statements  
+        
       fix_schedule_syntax(@string)        
-      @string.sub!("color loop", "colorloop").strip!
+      @string.sub!("color loop", "colorloop")
+      @string.strip!
+
+      begin
+        switch = Hue::Switch.new
+      rescue RuntimeError
+        halt AlexaObjects::Response.new(spoken_response: "Hello. Before using Hue lighting, you'll need to give me access to your Hue bridge. Please press the link button on your bridge and launch the skill again within ten seconds.").to_json
+      end
       
-      if @echo_request.slots.scene.nil? && @echo_request.slots.savescene.nil?
-        if @echo_request.slots.lights.nil? || @echo_request.slots.lights&.scan(/light|lights/).empty?
+      if @echo_request.slots.lights.nil? && @echo_request.slots.scene.nil? && @echo_request.slots.savescene.nil?
+        halt AlexaObjects::Response.new(end_session: false, spoken_response: "Please specify which light or lights you'd like to adjust. I'm ready to control the lights.").to_json
+      end
+
+      if @echo_request.slots.lights
+        if @echo_request.slots.lights.scan(/light|lights/).empty?
           halt AlexaObjects::Response.new(end_session: false, spoken_response: "Please specify which light or lights you'd like to adjust. I'm ready to control the lights.").to_json
         end
       end
 
-      # TODO: 58-68 seem to both express the same thought from alexa, could be simplified?
       if @echo_request.slots.lights
         if @echo_request.slots.lights.include?('lights')
-          if !(hue_client.list_groups.keys.join(', ').downcase.include?("#{@echo_request.slots.lights.sub(' lights','')}"))
+          if !(switch.list_groups.keys.join(', ').downcase.include?("#{@echo_request.slots.lights.sub(' lights','')}"))
             halt AlexaObjects::Response.new(spoken_response: "I couldn't find a group with the name #{@echo_request.slots.lights}").to_json
           end
         elsif  @echo_request.slots.lights.include?('light')
-          if  !(hue_client.list_lights.keys.join(', ').downcase.include?("#{@echo_request.slots.lights.sub(' light','')}"))
+          if  !(switch.list_lights.keys.join(', ').downcase.include?("#{@echo_request.slots.lights.sub(' light','')}"))
             halt AlexaObjects::Response.new(spoken_response: "I couldn't find a light with the name #{@echo_request.slots.lights}").to_json
           end
         end
       end
+        
 
-      #TODO : majorly create context for this
-      hue_client.voice @string 
+      #if  @string.include?('light ')
+      #  if (@string.split(' ') & switch.list_lights.keys.join(', ').downcase.split(', ')).empty?
+      #    r = AlexaObjects::Response.new
+      #    r.end_session = true
+      #    r.spoken_response = "I couldn't find a light with the name #{@echo_request.slots.lights}"
+      #    halt r.without_card.to_json
+      #  end
+      #end
+      switch.voice @string 
 
       return AlexaObjects::Response.new(spoken_response: "okay").to_json
     end
-
-    def hue_client
-      begin
-        @client = Hue::Switch.new
-      rescue RuntimeError
-        halt AlexaObjects::Response.new(spoken_response: "Hello. Before using Hue lighting, you'll need to give me access to your Hue bridge. Please press the link button on your bridge and launch the skill again within ten seconds.").to_json
-      end
-    end
   end
 end

metadata

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