alexa_hue 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41cf2d211de58023ad84df53b07f60a9ab028c7d
-  data.tar.gz: 0245ab6dcddd231b95c32a4ba173e7698fee7fc5
+  metadata.gz: 74ccfb20286a662feb0b45d2cdb4b0cc11f02c39
+  data.tar.gz: 7ffb4a66747a207b92d2e35632dee93a935eda26
 SHA512:
-  metadata.gz: 154364856c9d59917a21286c2ea810a8651914fc1a28bfb8568b25b10770d5725d0c88de26c61c444f4dbf8ca78618523c497ce1f4a46f857a5869489a706fbd
-  data.tar.gz: 34197a4cb99a615c381c5481a024a49a086f54946d723031466bae93e2c7131414c7aec8d3ec0907bcb6b8e9b2f469d71869dfc5a35e298fc46da143b482d59e
+  metadata.gz: e11657c198e45afffb7317ded242e175836b03b38af9f77b67d6b8b42574c538a416e1d1a9efa9a4ad9a948b97ea99acf52243d9e06fc4ad66ed29644acc15c9
+  data.tar.gz: cfa9faba82b2f9939a3790e63a800cb11656d83d04d38b34dff177fc16c6969479503fc1cee65d964c987d21b04ef739c044b5cdcafc6308c013fa3212878671

data/Gemfile

@@ -4,12 +4,14 @@ gemspec
 
 gem 'chronic', '~> 0.10.0'
 gem 'chronic_duration', '~> 0'
-gem 'httparty', '~> 0.13.0'
+gem 'curb'
+gem 'oj'
 gem 'numbers_in_words', '~> 0.2.0'
 gem 'sinatra'
 gem 'alexa_objects'
 gem 'activesupport'
 gem 'takeout', '~> 1.0.6'
+gem 'json', '1.8.3'
 
 group :development do
   gem "guard", "2.12.5", require: false

data/README.md

@@ -0,0 +1,26 @@
+# Alexa Hue
+[![Gem Version](https://badge.fury.io/rb/alexa_hue.svg)](http://badge.fury.io/rb/alexa_hue)
+[![Code Climate](https://codeclimate.com/github/kylegrantlucas/takeout/badges/gpa.svg)](https://codeclimate.com/github/kylegrantlucas/takeout) 
+
+A SingingAssistant middleware for using Alexa commands with Phillips Hue products 💡 
+
+## Installation
+
+Add this line to your SingingAssistant installation's Gemfile:
+
+```ruby
+gem 'alexa_hue'
+```
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/kylegrantlucas/alexa_hue. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/alexa_hue.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'alexa_objects'
-  spec.add_runtime_dependency 'httparty'
+  spec.add_runtime_dependency 'curb'
+  spec.add_runtime_dependency 'oj'
   spec.add_runtime_dependency 'numbers_in_words'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'chronic'

data/lib/alexa_hue.rb

@@ -1,15 +1,11 @@
 require 'json'
 require 'alexa_objects'
-require 'httparty'
 require 'numbers_in_words'
-require 'numbers_in_words/duck_punch'
-require 'chronic'
 require 'alexa_hue/version'
 require 'sinatra/extension'
 require 'numbers_in_words/duck_punch'
 require 'alexa_hue/hue/voice_parser'
 require 'alexa_hue/hue/helpers'
-require 'chronic_duration'
 
 module Hue
   include Hue::Helpers
@@ -31,18 +27,6 @@ module Hue
         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')
-      #     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  !(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
-
       return AlexaObjects::Response.new(spoken_response: "okay").to_json
     end
   end

data/lib/alexa_hue/custom_slots.rb

@@ -3,8 +3,8 @@ module Hue
   def self.custom_slots
     client = Hue::Client.new
     slots = "LIGHTS"
-    client.instance_variable_get("@lights").keys.each {|x| slots << "\n#{x}"}
-    client.instance_variable_get("@groups").keys.each {|x| slots << "\n#{x}"}
+    client.instance_variable_get("@lights").keys.each {|x| slots << "\n#{x} light"}
+    client.instance_variable_get("@groups").keys.each {|x| slots << "\n#{x} lights"}
     slots << "\n\nSCENE"
     client.instance_variable_get("@scenes").keys.each {|x| slots << "\n#{x}"}
     slots << "\n"

data/lib/alexa_hue/hue/client.rb

@@ -1,5 +1,6 @@
 require 'takeout'
-require 'httparty'
+require 'curb'
+require 'oj'
 require 'alexa_hue/hue/helpers'
 require 'alexa_hue/hue/request_body'
 
@@ -7,11 +8,11 @@ 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
+    attr_accessor :client, :user, :bridge_ip, :scenes, :groups, :lights, :schedule_ids, :schedule_params, :command, :_group, :body
     
     def initialize(options={}, &block)
       # JUST UPNP SUPPORT FOR NOW
-      @bridge_ip = HTTParty.get("https://www.meethue.com/api/nupnp").first["internalipaddress"] rescue nil
+      @bridge_ip = Oj.load(Curl.get("https://www.meethue.com/api/nupnp")).first["internalipaddress"] rescue nil
       @user = "1234567890"
       @groups, @lights, @scenes = {}, {}, []
       prefix = "/api/#{@user}"
@@ -37,10 +38,12 @@ module Hue
       
       @client = Takeout::Client.new(uri: @bridge_ip, endpoint_prefix: prefix, schemas: schemas, headers: { "Expect" => "100-continue" })
       
+      @lights_array, @schedule_ids, @schedule_params, @command, @_group, @body = [], [], [], "", "0", Hue::RequestBody.new
+
       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?

data/lib/alexa_hue/hue/voice_parser.rb

@@ -2,6 +2,7 @@ require 'alexa_hue/hue/client'
 require 'alexa_hue/hue/js_client'
 require 'alexa_hue/hue/helpers'
 require 'active_support/core_ext/hash'
+require 'singleton'
 
 module Hue
   class VoiceParser

data/lib/alexa_hue/version.rb

@@ -1,4 +1,4 @@
 module Hue
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_hue
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Kyle Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -216,6 +230,7 @@ files:
 - ".gitignore"
 - Gemfile
 - Guardfile
+- README.md
 - Rakefile
 - alexa_hue.gemspec
 - lib/alexa_hue.rb