alexa_hue 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 939ace937c9a84b49de17edb7195b74a5a6dc433
-  data.tar.gz: de31f09e481c0b904f704ec7b33a3349aa0f0827
+  metadata.gz: 966f685e91dc2b39bca4fe3460b3e54dcf9ad350
+  data.tar.gz: 3695c7c36fe1ca51430e386661d54c0ee23e0051
 SHA512:
-  metadata.gz: c375f8c8205baf13a4d7b7b055bc8778bb96a2826b18a0ba6f00d30603a9f0bb839f8078e36006ac4de429b40a78d7454bf3b1897c5e818f8dbc4ed014e5fd98
-  data.tar.gz: 8033ac7150f3fb23608e593d3c26e9d79862fedb7b86e4aa0d059027c19910e38d78ac89bdf86ba61e59b99769da5540e9daacc0dfc9413a79c31d0dcba91a9f
+  metadata.gz: 7c57e8457a958dddf91067cc04adf62f0927180fe9fd82acc02bfa56b6b50ad8ec34243e7f6faf7f0c734fb9235b17d42576ca5f846af3b8643f8cb069d317fc
+  data.tar.gz: af8afc1312c35e9910965bea816dbc7f57178b7642c59243855c0e811f85ad276d8ac59959b5b6d31b84a2118ca4fa58e750b9ce5851031b30cf5feebac75b79

data/Gemfile

@@ -9,6 +9,7 @@ gem 'numbers_in_words', '~> 0.2.0'
 gem 'sinatra'
 gem 'alexa_objects'
 gem 'activesupport'
+gem 'takeout', '~> 1.0.6'
 
 group :development do
   gem "guard", "2.12.5", require: false

data/alexa_hue.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'chronic'
   spec.add_runtime_dependency 'chronic_duration'
-  spec.add_runtime_dependency 'sinatra'
+  spec.add_runtime_dependency 'takeout', '~> 1.0.6'
+  spec.add_runtime_dependency 'sinatra-contrib'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/alexa_hue/hue/client.rb

@@ -0,0 +1,216 @@
+require 'takeout'
+require 'httparty'
+require 'alexa_hue/hue/helpers'
+require 'alexa_hue/hue/request_body'
+
+
+module Hue
+  class Client
+    include Hue::Helpers
+    attr_accessor :client, :user, :bridge_ip, :scenes, :groups, :lights, :schedule_ids, :schedule_params, :command, :_group
+    
+    def initialize(options={}, &block)
+      # JUST UPNP SUPPORT FOR NOW
+      @bridge_ip = HTTParty.get("https://www.meethue.com/api/nupnp").first["internalipaddress"] rescue nil
+      @user = "1234567890"
+      @groups, @lights, @scenes = {}, {}, []
+      prefix = "/api/#{@user}"
+      schemas = {
+                  get: {
+                    all_lights: "#{prefix}/groups/0",
+                    group: "#{prefix}/groups/{{group}}",
+                    root: "#{prefix}/"
+                  },
+                  put: {
+                    scene: "#{prefix}/scenes/{{scene}}",
+                    light: "#{prefix}/lights/{{lights}}/state",
+                    group: "#{prefix}/groups/{{group}}/action",
+                    all_lights: "#{prefix}/groups/0"
+                  },
+                  delete: {
+                    schedule: "#{prefix}/schedules/{{schedule}}"
+                  },
+                  post: {
+                    root: "#{prefix}/"
+                  }
+                }
+      
+      @client = Takeout::Client.new(uri: @bridge_ip, endpoint_prefix: prefix, schemas: schemas, debug: true, headers: { "Expect" => "100-continue" })
+      
+      authorize_user
+      populate_client
+      
+      @lights_array, @schedule_ids, @schedule_params, @command, @_group, @body = [], [], "", "0", Hue::RequestBody.new
+      
+      # TODO: Do blocks right
+      instance_eval(&block) if block_given?
+    end
+    
+    def confirm
+      @client.put_all_lights(alert: 'select')
+    end
+    
+    def hue(numeric_value)
+      @body.reset
+      @body.hue = numeric_value
+    end
+
+    def mired(numeric_value)
+      @body.reset
+      @body.ct = numeric_value
+    end
+
+    def color(color_name)
+      @body.reset
+      @body.hue = @colors.keys.include?(color_name.to_sym) ? 
+                        @colors[color_name.to_sym] :
+                        @mired_colors[color_name.to_sym]
+    end
+
+    def saturation(depth)
+      @body.clear_scene
+      @body.sat = depth
+    end
+
+    def brightness(depth)
+      @body.clear_scene
+      @body.bri = depth
+    end
+    
+    def fade(in_seconds)
+      @body.transitiontime = in_seconds * 10
+    end
+
+    def light (*args)
+      @lights_array = []
+      @_group = ""
+      @body.clear_scene
+      args.each { |l| @lights_array.push @lights[l.to_s] if @lights.keys.include?(l.to_s) }
+    end
+
+    def lights(group_name)
+      @lights_array = []
+      @body.clear_scene
+      group = @groups[group_name.to_s]
+      @_group = group if !group.nil?
+    end
+
+    def scene(scene_name)
+      @body.reset
+      scene_details = @scenes[scene_name]
+      @lights_array = scene_details["lights"]
+      @_group = "0"
+      @body.scene = scene_details["id"]
+    end
+    
+    def save_scene(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}
+      response = @client.put_scene(scene: scene_name, options: params).body
+      confirm if response.first.keys[0] == "success"
+    end
+
+    def toggle_lights
+      @lights_array.each { |l| @client.put_lights({lights: l}.merge(@body.to_hash)) }
+    end
+
+    def toggle_group
+      @client.put_group({group: @_group}.merge(@body.to_hash(without_scene: true)))
+    end
+
+    def toggle_scene
+      if @body.on
+        @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))
+        end
+      end
+    end
+    
+    def toggle_system
+      toggle_lights if @lights_array.any?
+      toggle_group if (!@_group.empty? && @body.scene.nil?)
+      toggle_scene if @body.scene
+    end
+    
+    def on
+      @body.on = true
+      toggle_system
+    end
+
+    def off
+      @body.on = false
+      toggle_system
+    end
+    
+    def schedule(string, on_or_off = :default)
+      @body.on = (on_or_off == :on)
+      set_time = set_time(string)
+      unless set_time < Time.now
+        set_time = set_time.to_s.split(' ')[0..1].join(' ').sub(' ',"T")
+        @schedule_params = {:name=>"Hue_Switch Alarm",
+               :description=>"",
+               :localtime=>"#{set_time}",
+               :status=>"enabled",
+               :autodelete=>true
+              }
+        if @lights_array.any?
+          lights_array.each {|l| @schedule_params[:command] = {:address=>"/api/#{@user}/lights/#{l}/state", :method=>"PUT", :body=>@body} }
+        else
+          @schedule_params[:command] = {:address=>"/api/#{@user}/groups/#{@_group}/action", :method=>"PUT", :body=>@body}
+        end
+        @schedule_ids.push(@client.post_schedules(@schedule_params).body)
+        confirm if @schedule_ids.flatten.last.include?("success")
+      end
+    end
+    
+    def delete_schedules!
+      @schedule_ids.flatten!
+      @schedule_ids.each { |k| @client.delete_schedule(schedule: k.dig("success","id")) }
+      @schedule_ids = []
+    end
+
+    def colorloop(start_or_stop)
+      @body.effect = (start_or_stop == :start) ? "colorloop" : "none"
+    end
+
+    def alert(value)
+      if value == :short
+        @body.alert = "select"
+      elsif value == :long
+        @body.alert = "lselect"
+      elsif value == :stop
+        @body.alert = "none"
+      end
+    end
+
+    def reset
+      @command, @_group, @body, @schedule_params = "", "0", Hue::RequestBody.new, nil
+    end
+    
+    private
+        
+    def authorize_user
+      begin
+        if @client.get_config.body.include?("whitelist") == false
+          body = {:devicetype => "Hue_Switch", :username=>"1234567890"}
+          create_user = @client.post_root(body).body
+          puts "You need to press the link button on the bridge and run again" if create_user.first.include?("error")
+        end
+      rescue Errno::ECONNREFUSED
+        puts "Cannot Reach Bridge"
+      end
+    end
+    
+    def populate_client
+      @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}
+      @scenes = {} ; @client.get_scenes.body.each { |s| @scenes.merge!({"#{s[1]["name"].split(' ').first.downcase}" => {"id" => s[0]}.merge(s[1])}) if s[1]["owner"] != "none"}
+      @groups = {} ; @client.get_groups.body.each { |k,v| @groups["#{v['name']}".downcase] = k } ; @groups["all"] = "0"
+      @lights = {} ; @client.get_lights.body.each { |k,v| @lights["#{v['name']}".downcase] = k }
+    end
+  end
+end
+    

data/lib/alexa_hue/hue/helpers.rb

@@ -0,0 +1,62 @@
+require 'chronic'
+require 'chronic_duration'
+require 'numbers_in_words'
+require 'numbers_in_words/duck_punch'
+
+module Hue
+  module Helpers
+    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.)|(am)|(p.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 = string.partition("in").last.strip!
+        set_time = Time.now + ChronicDuration.parse(string)
+      elsif string.scan(/\d/).any?
+        set_time = string.partition("at").last.strip!
+        set_time = Chronic.parse(set_time)
+      else
+        set_time = string.partition("at").last.strip!
+        set_time = parse_time(set_time)
+      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)?/)
+
+      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
+  end
+end

data/lib/alexa_hue/hue/js_client.rb

@@ -0,0 +1,66 @@
+require 'alexa_hue/hue/client'
+
+module Hue
+  class JsClient < Client
+    attr_accessor :client, :user, :bridge_ip, :schedule_ids, :schedule_params, :command, :_group
+    
+    def initialize(options={})
+      @client = Takeout::Client.new(uri: options[:uri], port: options[:port])
+      @lights_array, @schedule_ids, @schedule_params, @command, @_group, @body = [], [], "", "0", Hue::RequestBody.new
+    
+      populate_client
+    end
+    
+    def confirm
+      @client.apply_alert(:alert => 'select')
+    end
+    
+    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
+      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"
+    end
+    
+    def delete_schedules!
+      @schedule_ids.flatten!
+      @schedule_ids.each { |k| @client.delete_schedule(schedule: k.dig("success","id")) }
+      @schedule_ids = []
+    end
+    
+    def schedule(string, on_or_off = :default)
+      @body.on = (on_or_off == :on)
+      set_time = set_time(string)
+      unless set_time < Time.now
+        set_time = set_time.to_s.split(' ')[0..1].join(' ').sub(' ',"T")
+        @schedule_params = {:name=>"Hue_Switch Alarm",
+               :description=>"",
+               :localtime=>"#{set_time}",
+               :status=>"enabled",
+               :autodelete=>true
+              }
+        if @lights_array.any?
+          lights_array.each {|l| @schedule_params[:command] = {:address=>"/api/#{@user}/lights/#{l}/state", :method=>"PUT", :body=>@body} }
+        else
+          @schedule_params[:command] = {:address=>"/api/#{@user}/groups/#{@_group}/action", :method=>"PUT", :body=>@body}
+        end
+        @schedule_ids.push(@client.post_schedules(options: @schedule_params).body)
+        confirm if @schedule_ids.flatten.last.include?("success")
+      end
+    end
+
+    def on
+      if @body.scene
+        @client.get_activate_scene(scene: @body.scene)
+      end
+    end
+    
+    def off
+    end
+  end
+end

data/lib/alexa_hue/hue/request_body.rb

@@ -0,0 +1,29 @@
+require 'json'
+
+module Hue
+  class RequestBody
+    attr_accessor :hue, :ct, :bri, :scene, :sat, :transitiontime, :on, :effect, :alert
+    
+    def initialize(options={})
+      options.each {|k,v| self.send("#{k}=".to_sym, v)}
+    end
+    
+    def reset
+      @hue, @ct, @scene = nil, nil, nil
+    end
+    
+    def clear_scene
+      @scene = nil
+    end
+    
+    def to_json(without_scene:false)
+      return self.to_hash(without_scene: without_scene).to_json
+    end
+    
+    def to_hash(without_scene:false)
+      hash = {hue: @hue, ct: @ct, bri: @bri, sat: @sat, transitiontime: @transitiontime, on: @on, effect: @effect, alert: alert}
+      hash.merge!(scene: @scene) if without_scene
+      return hash
+    end
+  end
+end

data/lib/alexa_hue/hue/voice_parser.rb

@@ -0,0 +1,80 @@
+require 'alexa_hue/hue/client'
+require 'alexa_hue/hue/js_client'
+require 'alexa_hue/hue/helpers'
+
+module Hue
+  class VoiceParser
+    include Hue::Helpers
+    attr_accessor :client
+    
+    def initialize(options={})
+      @client = options[:js] ? Hue::JsClient.new(options[:js]) : Hue::Client.new
+    end
+    
+    def voice(string)
+      @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
+      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
+    end
+  end
+end

data/lib/alexa_hue/version.rb

@@ -1,4 +1,4 @@
 module Hue
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end
 

data/lib/alexa_hue.rb

@@ -5,29 +5,27 @@ require 'numbers_in_words'
 require 'numbers_in_words/duck_punch'
 require 'chronic'
 require 'alexa_hue/version'
-require 'sinatra/base'
+require 'sinatra/extension'
 require 'numbers_in_words/duck_punch'
-require 'alexa_hue/hue_switch'
+require 'alexa_hue/hue/voice_parser'
+require 'alexa_hue/hue/helpers'
 require 'chronic_duration'
-require 'alexa_hue/fix_schedule_syntax'
-
-
-LEVELS = {} ; [*1..10].each { |t| LEVELS[t.to_s ] = t.in_words }
-
 
 module Hue
+  include Hue::Helpers
   extend Sinatra::Extension
 
   helpers do
-    def control_lights
-      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
+    LEVELS = [*1..10].map{|k,v|[k.to_s,t,in_words]}.to_h
 
-      if @echo_request.slots.saturation
-        LEVELS.keys.reverse_each { |level| @echo_request.slots.saturation.sub!(level, LEVELS[level]) } if @echo_request.slots.schedule.nil?
+    def control_lights
+      [:brightness, :satruation].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
       end
 
+      # TODO: ...something about this feel ugly and unexpressive
       @echo_request.slots.to_h.each do |k,v| 
         @string ||= ""
         next unless v
@@ -43,51 +41,42 @@ module Hue
           @string << "#{k.to_s} #{v.to_s}  "
         end
       end
-        
-      fix_schedule_syntax(@string)        
-      @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
+      # TODO: create context for these statements  
+      fix_schedule_syntax(@string)        
+      @string.sub!("color loop", "colorloop").strip!
       
-      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?
+      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?
           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 !(switch.list_groups.keys.join(', ').downcase.include?("#{@echo_request.slots.lights.sub(' lights','')}"))
+          if !(hue_client.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  !(switch.list_lights.keys.join(', ').downcase.include?("#{@echo_request.slots.lights.sub(' light','')}"))
+          if  !(hue_client.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
-        
 
-      #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 
+      #TODO : majorly create context for this
+      hue_client.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_hue
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kyle Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: takeout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +213,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - Guardfile
@@ -207,8 +220,11 @@ files:
 - alexa_hue.gemspec
 - lib/alexa_hue.rb
 - lib/alexa_hue/custom_slots.rb
-- lib/alexa_hue/fix_schedule_syntax.rb
-- lib/alexa_hue/hue_switch.rb
+- lib/alexa_hue/hue/client.rb
+- lib/alexa_hue/hue/helpers.rb
+- lib/alexa_hue/hue/js_client.rb
+- lib/alexa_hue/hue/request_body.rb
+- lib/alexa_hue/hue/voice_parser.rb
 - lib/alexa_hue/intent_schema.rb
 - lib/alexa_hue/sample_utterances.rb
 - lib/alexa_hue/version.rb
@@ -236,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A sinatra middleware for alexa hue actions.

data/lib/alexa_hue/fix_schedule_syntax.rb

@@ -1,19 +0,0 @@
-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_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

data/lib/alexa_hue/hue_switch.rb

@@ -1,498 +0,0 @@
-require 'net/http'
-require 'uri'
-require 'socket'
-require 'ipaddr'
-require 'timeout'
-require 'chronic'
-require 'chronic_duration'
-require 'httparty'
-require 'numbers_in_words'
-require 'numbers_in_words/duck_punch'
-require 'timeout'
-
-module Hue
-  module_function
-
-  def devices(options = {})
-    SSDP.new(options).devices
-  end
-
-  def first(options = {})
-    options = options.merge(:first => true)
-    SSDP.new(options).devices
-  end
-
-  class Switch
-    attr_accessor :command, :lights_array, :_group, :body, :schedule_params, :schedule_ids
-    def initialize(command = "", _group = 0, &block)
-      @user = "1234567890"
-
-      begin
-        @ip = HTTParty.get("https://www.meethue.com/api/nupnp").first["internalipaddress"] rescue nil
-        @ip ||= get_bridge_by_SSDP.ip
-      rescue 
-        puts "Cannot connect to bridge."
-      end
-
-      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 list_lights
-      HTTParty.get("http://#{@ip}/api/#{@user}/lights").map{|k,v|[k,"#{v['name']}".downcase]}.to_h
-    end
-
-    def list_groups
-      HTTParty.get("http://#{@ip}/api/#{@user}/groups").map{|k,v|[k,"#{v['name']}".downcase]}.to_h.merge("all" => 
-        "0")
-    end
-
-    def list_scenes
-      scene_list = {}
-      HTTParty.get("http://#{@ip}/api/#{@user}/scenes").each do |scene|
-        if scene[1]["owner"] != "none"
-          inner = {"id" => scene[0]}.merge(scene[1])
-          scene_list.merge!({"#{scene[1]["name"].split(' ').first.downcase}" => inner})
-        end
-      end
-      scene_list
-    end
-
-    def hue (numeric_value)
-      clear_attributes
-      self.body[:hue] = numeric_value
-    end
-
-    def mired (numeric_value)
-      clear_attributes
-      self.body[:ct] = numeric_value
-    end
-
-    def color(color_name)
-      clear_attributes
-      if @colors.keys.include?(color_name.to_sym)
-        self.body[:hue] = @colors[color_name.to_sym]
-      else
-        self.body[:ct] = @mired_colors[color_name.to_sym]
-      end
-    end
-
-    def saturation(depth)
-      self.body.delete(:scene)
-      self.body[:sat] = depth
-    end
-
-    def brightness(depth)
-      self.body.delete(:scene)
-      self.body[:bri] = depth
-    end
-
-    def clear_attributes
-      self.body.delete_if{|k|[:scene,:ct,:hue].include?(k)}
-    end
-
-    def fade(in_seconds)
-      self.body[:transitiontime] = in_seconds * 10
-    end
-
-    def light (*args)
-      self.lights_array = []
-      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
-
-    def lights(group_name)
-      self.lights_array = []
-      self.body.delete(:scene)
-      group = @groups[group_name.to_s]
-      self._group = group if !group.nil?
-    end
-
-    def scene(scene_name)
-      clear_attributes
-      scene_details = self.list_scenes[scene_name]
-      self.lights_array = scene_details["lights"]
-      self._group = "0"
-      self.body[:scene] = scene_details["id"]
-    end
-
-    def confirm
-      HTTParty.put("http://#{@ip}/api/#{@user}/groups/0/action" , :body => {:alert => 'select'}.to_json)
-    end
-
-    def save_scene(scene_name)
-      self.fade 2 if self.body[:transitiontime] == 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
-      params = {name: scene_name.gsub!(' ','-'), lights: light_group, transitiontime: self.body[:transitiontime]}
-      response = HTTParty.put("http://#{@ip}/api/#{@user}/scenes/#{scene_name}", :body => params.to_json)
-      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|
-          HTTParty.put("http://#{@ip}/api/#{@user}/lights/#{l}/state", :body => (self.body).to_json)
-        end
-      end
-    end
-
-    def on
-      self.body[:on]=true
-      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
-      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
-
-    # Parses times in words (e.g., "eight forty five") to standard HH:MM format
-
-    def schedule (string, on_or_off = :default)
-      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
-        set_time = set_time.to_s.split(' ')[0..1].join(' ').sub(' ',"T")
-        self.schedule_params = {:name=>"Hue_Switch Alarm",
-               :description=>"",
-               :localtime=>"#{set_time}",
-               :status=>"enabled",
-               :autodelete=>true
-              }
-        if self.lights_array.any?
-          lights_array.each do |l|
-            self.schedule_params[:command] = {:address=>"/api/#{@user}/lights/#{l}/state", :method=>"PUT", :body=>self.body}
-          end
-        else
-          self.schedule_params[:command] = {:address=>"/api/#{@user}/groups/#{self._group}/action", :method=>"PUT", :body=>self.body}
-        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
-
-    def delete_schedules!
-      self.schedule_ids.flatten!
-      self.schedule_ids.each { |k|
-        id = k["success"]["id"] if k.include?("success")
-        HTTParty.delete("http://#{@ip}/api/#{@user}/schedules/#{id}")
-      }
-      self.schedule_ids = []
-    end
-
-    def colorloop(start_or_stop)
-      if start_or_stop == :start
-        self.body[:effect] = "colorloop"
-      elsif start_or_stop == :stop
-        self.body[:effect] = "none"
-      end
-    end
-
-    def alert(value)
-      if value == :short
-        self.body[:alert] = "select"
-      elsif value == :long
-        self.body[:alert] = "lselect"
-      elsif value == :stop
-        self.body[:alert] = "none"
-      end
-    end
-
-    def reset
-      self.command = ""
-      self._group = "0"
-      self.body = {}
-      self.schedule_params = nil
-    end
-
-    #The following two methods are required to use Switch with Zach Feldman's Alexa-home*
-    def wake_words
-      ["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
-
-    #The rest of the methods allow access to most of the Switch class functionality by supplying a single string
-
-    def voice(string)
-      self.reset
-      self.command << string
-
-      parse_voice(string)
-
-      if self.command.include?("schedule")
-        state = string.match(/off|on/)[0].to_sym rescue nil
-        self.send("schedule", *[string, state])
-      else
-        string.include?(' off') ? self.send("off") : self.send("on")
-      end
-    end
-
-    private
-
-    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
-
-    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
-
-    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
-
-    def parse_scene(scene_name)
-      scene_name.gsub!(' ','-') if scene_name.size > 1
-      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
-
-    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 self.command.scan(/save (scene|seen) as/).length > 0
-    end
-
-    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.)|(am)|(p.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 = string.partition("in").last.strip!
-        set_time = Time.now + ChronicDuration.parse(string)
-      elsif string.scan(/\d/).any?
-        set_time = string.partition("at").last.strip!
-        set_time = Chronic.parse(set_time)
-      else
-        set_time = string.partition("at").last.strip!
-        set_time = parse_time(set_time)
-      end
-    end
-
-    def authorize_user
-      begin
-        if HTTParty.get("http://#{@ip}/api/#{@user}/config").include?("whitelist") == false
-          body = {:devicetype => "Hue_Switch", :username=>"1234567890"}
-          create_user = HTTParty.post("http://#{@ip}/api", :body => body.to_json)
-          puts "You need to press the link button on the bridge and run again" if create_user.first.include?("error")
-        end
-      rescue Errno::ECONNREFUSED
-        puts "Cannot Reach Bridge"
-      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}
-      @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 }
-    end
-
-    def get_bridge_by_SSDP
-      discovered_devices = Hue.devices
-      bridge = discovered_devices.each do |device|
-          next unless device.get_response.include?("hue Personal")
-      end.first
-    end
-  end
-
-  class Device
-    attr_reader :ip
-    attr_reader :port
-    attr_reader :description_url
-    attr_reader :server
-    attr_reader :service_type
-    attr_reader :usn
-    attr_reader :url_base
-    attr_reader :name
-    attr_reader :manufacturer
-    attr_reader :manufacturer_url
-    attr_reader :model_name
-    attr_reader :model_number
-    attr_reader :model_description
-    attr_reader :model_url
-    attr_reader :serial_number
-    attr_reader :software_version
-    attr_reader :hardware_version
-
-    def initialize(info)
-      headers = {}
-      info[0].split("\r\n").each do |line|
-        matches = line.match(/^([\w\-]+):(?:\s)*(.*)$/)
-        next unless matches
-        headers[matches[1].upcase] = matches[2]
-      end
-
-      @description_url = headers['LOCATION']
-      @server = headers['SERVER']
-      @service_type = headers['ST']
-      @usn = headers['USN']
-
-      info = info[1]
-      @port = info[1]
-      @ip = info[2]
-    end
-
-    def get_response
-      Net::HTTP.get_response(URI.parse(description_url)).body
-    end
-  end
-
-  class SSDP
-    # SSDP multicast IPv4 address
-    MULTICAST_ADDR = '239.255.255.250'.freeze
-
-    # SSDP UDP port
-    MULTICAST_PORT = 1900.freeze
-
-    # Listen for all devices
-    DEFAULT_SERVICE_TYPE = 'ssdp:all'.freeze
-
-    # Timeout in 2 seconds
-    DEFAULT_TIMEOUT = 2.freeze
-
-    attr_reader :service_type
-    attr_reader :timeout
-    attr_reader :first
-
-    # @param service_type [String] the identifier of the device you're trying to find
-    # @param timeout [Fixnum] timeout in seconds
-    def initialize(options = {})
-      @service_type = options[:service_type]
-      @timeout = (options[:timeout] || DEFAULT_TIMEOUT)
-      @first = options[:first]
-      initialize_socket
-    end
-
-    # Look for devices on the network
-    def devices
-      @socket.send(search_message, 0, MULTICAST_ADDR, MULTICAST_PORT)
-      listen_for_responses(first)
-    end
-
-  private
-
-    def listen_for_responses(first = false)
-      @socket.send(search_message, 0, MULTICAST_ADDR, MULTICAST_PORT)
-
-      devices = []
-      Timeout::timeout(timeout) do
-        loop do
-          device = Device.new(@socket.recvfrom(2048))
-          next if service_type && service_type != device.service_type
-
-          if first
-            return device
-          else
-            devices << device
-          end
-        end
-      end
-      devices
-
-    rescue Timeout::Error => ex
-      devices
-    end
-
-    def initialize_socket
-      # Create a socket
-      @socket = UDPSocket.open
-
-      # We're going to use IP with the multicast TTL. Mystery third parameter is a mystery.
-      @socket.setsockopt(Socket::IPPROTO_IP, Socket::IP_MULTICAST_TTL, 2)
-    end
-
-    def search_message
-     [
-        'M-SEARCH * HTTP/1.1',
-        "HOST: #{MULTICAST_ADDR}:reservedSSDPport",
-        'MAN: ssdp:discover',
-        "MX: #{timeout}",
-        "ST: #{service_type || DEFAULT_SERVICE_TYPE}"
-      ].join("\n")
-    end
-  end
-end