alexa_hue 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe4659ee0eb80c1e886f7f8e6e998ad1703f54f
-  data.tar.gz: 00402f7a5131214ebd433e74a42d057eb68168ee
+  metadata.gz: 939ace937c9a84b49de17edb7195b74a5a6dc433
+  data.tar.gz: de31f09e481c0b904f704ec7b33a3349aa0f0827
 SHA512:
-  metadata.gz: 1ed672e8af71018fe25726970758c737c831f71aae85cc593cfa977ce5259acaff1067cfbb0c47b776fe18dd07a9d726fe1f8e47c6065d4e2f18d097454cbe0c
-  data.tar.gz: d6a8eb44881f710495c9ebb1ef4dfddfc58008bb73953615a472c96474ce7e12ebb88a275af3d93cac9fe0cd3d5fe15a8d24e8aab9983cd1415dba07d49538bc
+  metadata.gz: c375f8c8205baf13a4d7b7b055bc8778bb96a2826b18a0ba6f00d30603a9f0bb839f8078e36006ac4de429b40a78d7454bf3b1897c5e818f8dbc4ed014e5fd98
+  data.tar.gz: 8033ac7150f3fb23608e593d3c26e9d79862fedb7b86e4aa0d059027c19910e38d78ac89bdf86ba61e59b99769da5540e9daacc0dfc9413a79c31d0dcba91a9f

data/alexa_hue.gemspec

@@ -5,7 +5,7 @@ require 'alexa_hue/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "alexa_hue"
-  spec.version       = Sinatra::Hue::VERSION
+  spec.version       = Hue::VERSION
   spec.authors       = ["Kyle Lucas"]
   spec.email         = ["kglucas93@gmail.com"]
   spec.summary       = %q{A sinatra middleware for alexa hue actions.}

data/lib/alexa_hue/custom_slots.rb

@@ -1,7 +1,5 @@
-module Sinatra
-  module Hue
-    def self.custom_slots
-      File.read(File.expand_path('../../../skills_config/custom_slots.txt', __FILE__))
-    end
+module Hue
+  def self.custom_slots
+    File.read(File.expand_path('../../../skills_config/custom_slots.txt', __FILE__))
   end
-end
+end

data/lib/alexa_hue/hue_switch.rb

@@ -10,7 +10,6 @@ require 'numbers_in_words'
 require 'numbers_in_words/duck_punch'
 require 'timeout'
 
-module Sinatra
 module Hue
   module_function
 
@@ -26,24 +25,14 @@ module Hue
   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
-          if @ip.nil?
-            bridge = get_bridge_by_SSDP
-            @ip = bridge.ip
-          end
 
-        rescue Timeout::Error
-          puts "Time Out"
-        rescue NoMethodError
-          puts "Cannot Find Bridge via Hue broker service, trying SSDP..."
-        rescue Errno::ECONNREFUSED
-          puts "Connection refused"
-        rescue SocketError
-          puts "Cannot connect to local network"
-        end
+      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
@@ -58,16 +47,12 @@ module Hue
     end
 
     def list_lights
-      light_list = {}
-      HTTParty.get("http://#{@ip}/api/#{@user}/lights").each { |k,v| light_list["#{v['name']}".downcase] = k }
-      light_list
+      HTTParty.get("http://#{@ip}/api/#{@user}/lights").map{|k,v|[k,"#{v['name']}".downcase]}.to_h
     end
 
     def list_groups
-      group_list = {}
-      HTTParty.get("http://#{@ip}/api/#{@user}/groups").each { |k,v| group_list["#{v['name']}".downcase] = k }
-      group_list["all"] = "0"
-      group_list
+      HTTParty.get("http://#{@ip}/api/#{@user}/groups").map{|k,v|[k,"#{v['name']}".downcase]}.to_h.merge("all" => 
+        "0")
     end
 
     def list_scenes
@@ -111,9 +96,7 @@ module Hue
     end
 
     def clear_attributes
-      self.body.delete(:scene)
-      self.body.delete(:ct)
-      self.body.delete(:hue)
+      self.body.delete_if{|k|[:scene,:ct,:hue].include?(k)}
     end
 
     def fade(in_seconds)
@@ -143,19 +126,17 @@ module Hue
     end
 
     def confirm
-      params = {:alert => 'select'}
-      HTTParty.put("http://#{@ip}/api/#{@user}/groups/0/action" , :body => params.to_json)
+      HTTParty.put("http://#{@ip}/api/#{@user}/groups/0/action" , :body => {:alert => 'select'}.to_json)
     end
 
     def save_scene(scene_name)
-      scene_name.gsub!(' ','-')
       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, lights: light_group, transitiontime: self.body[:transitiontime]}
+      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
@@ -174,7 +155,6 @@ module Hue
       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
@@ -272,7 +252,6 @@ module Hue
     #The rest of the methods allow access to most of the Switch class functionality by supplying a single string
 
     def voice(string)
-      puts string
       self.reset
       self.command << string
 
@@ -400,10 +379,6 @@ module Hue
     end
   end
 
-
-  # The Device and SSDP classes are basically lifted from Sam Soffes' great GitHub repo:
-  # https://github.com/soffes/discover.
-
   class Device
     attr_reader :ip
     attr_reader :port
@@ -521,4 +496,3 @@ module Hue
     end
   end
 end
-end

data/lib/alexa_hue/intent_schema.rb

@@ -1,7 +1,5 @@
-module Sinatra
-  module Hue
-    def self.intent_schema
-      File.read(File.expand_path('../../../skills_config/intent_schema.txt', __FILE__))
-    end
+module Hue
+  def self.intent_schema
+    File.read(File.expand_path('../../../skills_config/intent_schema.txt', __FILE__))
   end
-end
+end

data/lib/alexa_hue/sample_utterances.rb

@@ -1,7 +1,5 @@
-module Sinatra
-  module Hue
-    def self.sample_utterances
-      File.read(File.expand_path('../../../skills_config/sample_utterances.txt', __FILE__))
-    end
+module Hue
+  def self.sample_utterances
+    File.read(File.expand_path('../../../skills_config/sample_utterances.txt', __FILE__))
   end
-end
+end

data/lib/alexa_hue/version.rb

@@ -1,5 +1,4 @@
-module Sinatra
-  module Hue
-    VERSION = "1.0.2"
-  end
+module Hue
+  VERSION = "1.1.0"
 end
+

data/lib/alexa_hue.rb

@@ -14,131 +14,80 @@ require 'alexa_hue/fix_schedule_syntax'
 
 LEVELS = {} ; [*1..10].each { |t| LEVELS[t.to_s ] = t.in_words }
 
-module Sinatra
-  module Hue
-    def self.registered(app)
-      app.post '/alexa_hue' do
-        content_type :json
 
-        # halt 400, "Invalid Application ID" unless @application_id == "your application id here"
-        
-        # Behavior for Launch Request
-        if @echo_request.launch_request?
-          response = AlexaObjects::Response.new
-          response.spoken_response = "I'm ready to control the lights"
-          response.end_session = false
-          response.without_card.to_json
-        
-        # Behavior for ControlLights intent. Keys and values need to be adjusted a bit to work with HueSwitch #voice syntax.
-        elsif @echo_request.intent_name == "ControlLights"
-        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
+module Hue
+  extend Sinatra::Extension
 
-        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
+  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
 
-        puts @echo_request.slots
-        @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!
- 
-        begin
-          switch = Hue::Switch.new
-        rescue RuntimeError
-          response = AlexaObjects::Response.new
-          response.end_session = true
-          response.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."
-          halt response.without_card.to_json
+      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
+
+      @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
         
-        if @echo_request.slots.lights.nil? && @echo_request.slots.scene.nil? && @echo_request.slots.savescene.nil?
-          r = AlexaObjects::Response.new
-          r.end_session = false
-          r.spoken_response = "Please specify which light or lights you'd like to adjust. I'm ready to control the lights."
-          halt r.without_card.to_json
-        end
+      fix_schedule_syntax(@string)        
+      @string.sub!("color loop", "colorloop")
+      @string.strip!
 
-         if @echo_request.slots.lights
-          if @echo_request.slots.lights.scan(/light|lights/).empty?
-            r = AlexaObjects::Response.new
-            r.end_session = false
-            r.spoken_response = "Please specify which light or lights you'd like to adjust. I'm ready to control the lights."
-            halt r.without_card.to_json
-          end
+      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.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
 
-        puts @echo_request.slots.lights
-        if @echo_request.slots.lights
+      if @echo_request.slots.lights
         if @echo_request.slots.lights.include?('lights')
-           puts switch.list_groups.keys.join(', ').downcase
           if !(switch.list_groups.keys.join(', ').downcase.include?("#{@echo_request.slots.lights.sub(' lights','')}"))
-            r = AlexaObjects::Response.new
-            r.end_session = true
-            r.spoken_response = "I couldn't find a group with the name #{@echo_request.slots.lights}"
-            halt r.without_card.to_json
+            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','')}"))
-            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
+            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 
+      #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 
 
-        response = AlexaObjects::Response.new
-        response.end_session = true
-        response.spoken_response = "okay"
-        response.card_content =  "#{@string}...#{@data}"
-        response.without_card.to_json # change to .with_card.to_json for debugging info
-          
-        # Behavior for End Session requests.
-        elsif @echo_request.intent_name == "EndSession"
-          response = AlexaObjects::Response.new
-          response.end_session = true
-          response.spoken_response = "exiting lighting"
-          response.without_card.to_json
-        
-        elsif @echo_request.session_ended_request?
-          response = AlexaObjects::Response.new
-          response.end_session = true
-          response.without_card.to_json
-        end
-      end
+      return AlexaObjects::Response.new(spoken_response: "okay").to_json
     end
   end
-
-  register Hue
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_hue
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Kyle Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -207,7 +207,6 @@ files:
 - alexa_hue.gemspec
 - lib/alexa_hue.rb
 - lib/alexa_hue/custom_slots.rb
-- lib/alexa_hue/endpoint.rb
 - lib/alexa_hue/fix_schedule_syntax.rb
 - lib/alexa_hue/hue_switch.rb
 - lib/alexa_hue/intent_schema.rb

data/lib/alexa_hue/endpoint.rb

@@ -1,7 +0,0 @@
-module Sinatra
-  module Hue
-    def self.endpoint
-      '/alexa_hue'
-    end
-  end
-end