alexa_hue 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a860a3862c73d97b96d2099308d960b63ab1ec25
-  data.tar.gz: 5cdc6c1eef1700a4be503187addcab5db8a657e5
+  metadata.gz: 57a0ac8e1a676ca01553ffd07787129c43dc5a17
+  data.tar.gz: 48e7ca98535697a5ca4721e954e5346b40678887
 SHA512:
-  metadata.gz: 10a43e57896d0c32ec2e3b9e142cd151d1c1b07325ddd3fab251b2b5f76ff7fbf06a773310af527e380c408266057297f4bd250c64135a9edf1bd397e7ce5267
-  data.tar.gz: 145d7ba3d020c0a07f4ef31f30964f256d21cd8d1b27e4774eafb7dec609a7328eaf92b92a62ec4a26313fe86b0e3badb3827a6f243e4f4755ba568237a7f765
+  metadata.gz: 3a7abed1501fb8e48a008a437d81e54cced4358a7270c26bef2aa82385a4d49c297af824f2760bb29f0fea8828d11411766eabd4c58241a28490d2f2f371cb0c
+  data.tar.gz: f6bc4b6015915cd1fb076269eaea1ce5b73eeb201e48fa744e7056858f2851fb8f2f864320a747a15d06223537c00c2279aa5285e18fcc6f0352067d219857ee

data/lib/alexa_hue/custom_slots.rb

@@ -3,10 +3,10 @@ module Hue
   def self.custom_slots
     client = Hue::Client.new
     slots = "LIGHTS"
-    client.instance_variable_get(("@lights").intern).keys.each {|x| slots << "\n#{x}"}
-    client.instance_variable_get(("@groups").intern).keys.each {|x| slots << "\n#{x}"}
+    client.instance_variable_get("@lights").keys.each {|x| slots << "\n#{x}"}
+    client.instance_variable_get("@groups").keys.each {|x| slots << "\n#{x}"}
     slots << "\n\nSCENE"
-    client.instance_variable_get(("@scenes").intern).keys.each {|x| slots << "\n#{x}"}
+    client.instance_variable_get("@scenes").keys.each {|x| slots << "\n#{x}"}
     slots << "\n"
     slots << File.read(File.expand_path('../../../skills_config/custom_slots.txt', __FILE__))
     slots

data/lib/alexa_hue/hue/client.rb

@@ -50,15 +50,17 @@ module Hue
       @client.put_all_lights(alert: 'select')
     end
     
-    def hue(numeric_value)
-      @body.reset
-      @body.hue = numeric_value
-    end
+    # Not currently used??
+    
+    # def hue(numeric_value)
+    #   @body.reset
+    #   @body.hue = numeric_value
+    # end
 
-    def mired(numeric_value)
-      @body.reset
-      @body.ct = numeric_value
-    end
+    # def mired(numeric_value)
+    #   @body.reset
+    #   @body.ct = numeric_value
+    # end
 
     def color(color_name)
       @body.reset
@@ -81,7 +83,7 @@ module Hue
       @body.transitiontime = in_seconds * 10
     end
 
-    def light (*args)
+    def light(*args)
       @lights_array = []
       @_group = ""
       @body.clear_scene
@@ -103,7 +105,7 @@ module Hue
       @body.scene = scene_details["id"]
     end
     
-    def save_scene(scene_name)
+    def savescene(scene_name)
       fade(2) if @body.transitiontime == nil
       light_group = @_group.empty? ? @client.get_all_lights.body["lights"] : @client.get_group(group: @_group).body["lights"]
       params = {name: scene_name.gsub!(' ','-'), lights: light_group, transitiontime: @body.transitiontime}
@@ -112,7 +114,7 @@ module Hue
     end
 
     def toggle_lights
-      @lights_array.each { |l| @client.put_lights({lights: l}.merge(@body.to_hash)) }
+      @lights_array.each { |l| @client.put_light({lights: l}.merge(@body.to_hash)) }
     end
 
     def toggle_group
@@ -124,7 +126,7 @@ module Hue
         @client.put_group({group: @_group}.merge(@body.to_hash(without_scene: true)))
       else
         @client.get_scenes[@body[:scene]]["lights"].each do |l|
-          @client.put_lights({lights: l}.merge(@body.to_hash))
+          @client.put_light({lights: l}.merge(@body.to_hash))
         end
       end
     end
@@ -177,6 +179,7 @@ module Hue
     end
 
     def alert(value)
+      value = value.to_sym
       if value == :short
         @body.alert = "select"
       elsif value == :long

data/lib/alexa_hue/hue/helpers.rb

@@ -39,24 +39,24 @@ module Hue
       end
     end
     
-    def fix_schedule_syntax(string)
-      sub_time = string.match(/time \d{2}:\d{2}/)
-      sub_duration = string.match(/schedule PT(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?/)
+    # def fix_schedule_syntax(string)
+    #   sub_time = string.match(/time \d{2}:\d{2}/)
+    #   sub_duration = string.match(/schedule PT(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?/)
 
-      if sub_time
-        sub_time = sub_time.to_s
-        string.slice!(sub_time).strip
-        string << " #{sub_time}"
-        string.sub!("time", "schedule at")
-      end
+    #   if sub_time
+    #     sub_time = sub_time.to_s
+    #     string.slice!(sub_time).strip
+    #     string << " #{sub_time}"
+    #     string.sub!("time", "schedule at")
+    #   end
 
-      if sub_duration
-        sub_duration = sub_duration.to_s
-        string.slice!(sub_duration).strip
-        sub_duration = ChronicDuration.parse(sub_duration.split(' ').last)
-        string << " schedule in #{sub_duration} seconds"
-      end
-      string.strip if string
-    end
+    #   if sub_duration
+    #     sub_duration = sub_duration.to_s
+    #     string.slice!(sub_duration).strip
+    #     sub_duration = ChronicDuration.parse(sub_duration.split(' ').last)
+    #     string << " schedule in #{sub_duration} seconds"
+    #   end
+    #   string.strip if string
+    # end
   end
 end

data/lib/alexa_hue/hue/js_client.rb

@@ -17,14 +17,9 @@ module Hue
     
     def save_scene(scene_name)
       fade(2) if @body.transitiontime == nil
-      if @_group.empty?
-        light_group = @client.get_all_lights.body["lights"]
-      else
-        light_group = @client.get_group(group: @_group).body["lights"]
-      end
+      light_group = @_group.empty? ? @client.get_all_lights.body["lights"] : @client.get_group(group: @_group).body["lights"]
       params = {name: scene_name.gsub!(' ','-'), lights: light_group, transitiontime: @body.transitiontime}
-      response = @client.put_scene(scene: scene_name, options: params).body
-      confirm if response.first.keys[0] == "success"
+      confirm if @client.put_scene(scene: scene_name, options: params).body.first.keys[0] == "success"
     end
     
     def delete_schedules!
@@ -54,10 +49,8 @@ module Hue
       end
     end
 
-    def on
-      if @body.scene
-        @client.get_activate_scene(scene: @body.scene)
-      end
+    def toggle_scene
+      @client.get_activate_scene(scene: @body.scene)
     end
     
     def off

data/lib/alexa_hue/hue/voice_parser.rb

@@ -1,6 +1,7 @@
 require 'alexa_hue/hue/client'
 require 'alexa_hue/hue/js_client'
 require 'alexa_hue/hue/helpers'
+require 'active_support/core_ext/hash'
 
 module Hue
   class VoiceParser
@@ -12,70 +13,27 @@ module Hue
       @client = options[:js] ? Hue::JsClient.new(options[:js]) : Hue::Client.new
     end
     
-    def voice(string)
+    def voice(echo_response)
       @client.reset
-      @client.command << string
-
-      parse_voice(string)
-
-      if @client.command.include?("schedule")
-        state = string.match(/off|on/)[0].to_sym rescue nil
-        @client.schedule(*[string, state])
-      else
-        string.include?(' off') ? @client.off : @client.on
+      
+      echo_response.slots.to_h.except(:state).each do |key, value|
+        if value
+          if value.split(' ').last == "light"
+            key = "light"
+            value = value[/(.*)\s/,1]
+          elsif value.split(' ').last == "lights"
+            key = "lights"
+            value = value.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
-    end
-    
-    private
-    
-    def parse_leading(methods)
-      methods.each do |l|
-        capture = (@client.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")
-        @client.send( method, value )
-      end
-    end
-
-    def parse_trailing(method)
-      all_keys = Regexp.union((@client.groups.keys + @client.lights.keys).flatten)
-      value = @client.command.match(all_keys).to_s
-      @client.send(method.first, value)
-    end
-
-    def parse_dynamic(methods)
-      methods.each do |d|
-        capture = (@client.command.match (/\w+ #{d}\b/)).to_s.split(' ')
-        method = capture[1]
-        value = capture[0].to_sym
-        @client.send(method, value)
-      end
-    end
-
-    def parse_scene(scene_name)
-      scene_name.gsub!(' ','-') if scene_name.size > 1
-      @client.scene(scene_name)
-    end
-
-    def parse_save_scene
-      save_scene = @client.command.partition(/save (scene|seen) as /).last
-      @client.save_scene(save_scene)
-    end 
-    
-    def parse_voice(string)
-      string.gsub!('schedule ','')
-      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
-
-      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 @client.command.scan(/save (scene|seen) as/).length > 0
+      
+      echo_response.slots.state == "off" ? @client.off : @client.on 
     end
   end
 end

data/lib/alexa_hue/version.rb

@@ -1,4 +1,4 @@
 module Hue
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end
 

data/lib/alexa_hue.rb

@@ -28,37 +28,12 @@ module Hue
           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
 
-        @echo_request.slots.to_h.each do |k,v| 
-          @string ||= ""
-          next unless v
-          if k == :scene || k == :alert
-            @string << "#{v.to_s} #{k.to_s}  "
-          elsif k == :lights || k == :modifier || k == :state
-            @string << "#{v.to_s}  "
-          elsif k == :savescene
-            @string << "save scene as #{v.to_s} "
-          elsif k == :flash
-            @string << "start long alert "
-          else
-            @string << "#{k.to_s} #{v.to_s}  "
-          end
-        end
-        
-        fix_schedule_syntax(@string)        
-        @string.sub!("color loop", "colorloop")
-        @string.strip!
-        switch.voice @string
+        switch.voice @echo_request
       end
-      
-      # 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
+      if (@echo_request.slots.lights.nil? && @echo_request.slots.scene.nil? && @echo_request.slots.savescene.nil?) || @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
 
       # if @echo_request.slots.lights
       #   if @echo_request.slots.lights.include?('lights')
@@ -71,16 +46,6 @@ module Hue
       #     end
       #   end
       # end
-        
-
-      #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
 
       return AlexaObjects::Response.new(spoken_response: "okay").to_json
     end

metadata

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