hue 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad60609e78dfac717ff59ed735c6ec9c309f8faa
-  data.tar.gz: 0d2fc9f44ae1279957886998ba2ce97ca5880b55
+  metadata.gz: c7a23b14e8208a859509d097fef847c13d57d182
+  data.tar.gz: 2e272e991cf0e356918d0ece627ebabb85e2c24a
 SHA512:
-  metadata.gz: eb07141d9c06f26184b2f97ff74a4ac233fdd51a6619f08269ccec08a0091c13410106595a36b49615aef7cb41fb213704d0108de26aa639583d82e210f750ba
-  data.tar.gz: ff655b5c6066d7c6ca4af4317f4b172f84ce4cc846005c9684e31686ad5d27db45fd95ee31fc1a71b9e66720d0b76f70bfeb50a1a14bb67c19286a5a85c1b060
+  metadata.gz: 1afc23c78f02b7a51531c38bb83a35c09d2fbf797ade300209c2b59ce6cefa4860a0b9647d1b82db83b7b8a107e1434faf55952e5d726d355ab7f51391828b74
+  data.tar.gz: 74a25b2a7c6cd6cc19c126dc151f541ff70c1e769b8b4aea24448c170f2c5f967b100c22785a30eb08ca1ff55fba21c28ca8df2fd0db9df8a3fe0f5f8b21f20a

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Sam Soffes
+Copyright (c) 2013-2014 Sam Soffes, http://soff.es
 
 MIT License
 

data/hue.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 1.8.7'
-  spec.add_dependency 'multi_json'
   spec.add_dependency 'thor'
+  spec.add_dependency 'json'
 end

data/lib/hue/bridge.rb

@@ -68,6 +68,22 @@ module Hue
       unpack(json)
     end
 
+    def lights
+      @lights ||= begin
+        json = JSON(Net::HTTP.get(URI.parse("http://#{ip}/api/#{@client.username}")))
+        json['lights'].map do |key, value|
+          Light.new(@client, self, key, value)
+        end
+      end
+    end
+
+    def add_lights
+      uri = URI.parse("http://#{ip}/api/#{@client.username}/lights")
+      http = Net::HTTP.new(uri.host)
+      response = http.request_post(uri.path, nil)
+      (response.body).first
+    end
+
   private
 
     KEYS_MAP = {
@@ -85,7 +101,6 @@ module Hue
     }
 
     def unpack(hash)
-      puts hash
       KEYS_MAP.each do |local_key, remote_key|
         value = hash[remote_key.to_s]
         next unless value
@@ -94,7 +109,7 @@ module Hue
     end
 
     def get_configuration
-      MultiJson.load(Net::HTTP.get(URI.parse("#{base_url}/config")))
+      JSON(Net::HTTP.get(URI.parse("#{base_url}/config")))
     end
 
     def base_url

data/lib/hue/client.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-require 'multi_json'
+require 'json'
 
 module Hue
   class Client
@@ -24,7 +24,7 @@ module Hue
     def bridges
       @bridges ||= begin
         bs = []
-        MultiJson.load(Net::HTTP.get(URI.parse('http://www.meethue.com/api/nupnp'))).each do |hash|
+        JSON(Net::HTTP.get(URI.parse('https://www.meethue.com/api/nupnp'))).each do |hash|
           bs << Bridge.new(self, hash)
         end
         bs
@@ -32,21 +32,11 @@ module Hue
     end
 
     def lights
-      @lights ||= begin
-        ls = []
-        json = MultiJson.load(Net::HTTP.get(URI.parse("http://#{bridge.ip}/api/#{@username}")))
-        json['lights'].each do |key, value|
-          ls << Light.new(self, bridge, key, value)
-        end
-        ls
-      end
+      bridge.lights
     end
 
     def add_lights
-      uri = URI.parse("http://#{bridge.ip}/api/#{@username}/lights")
-      http = Net::HTTP.new(uri.host)
-      response = http.request_post(uri.path, nil)
-      MultiJson.load(response.body).first
+      bridge.add_lights
     end
 
     def light(id)
@@ -56,7 +46,7 @@ module Hue
   private
 
     def validate_user
-      response = MultiJson.load(Net::HTTP.get(URI.parse("http://#{bridge.ip}/api/#{@username}")))
+      response = JSON(Net::HTTP.get(URI.parse("http://#{bridge.ip}/api/#{@username}")))
 
       if response.is_a? Array
         response = response.first
@@ -76,7 +66,7 @@ module Hue
 
       uri = URI.parse("http://#{bridge.ip}/api")
       http = Net::HTTP.new(uri.host)
-      response = MultiJson.load(http.request_post(uri.path, MultiJson.dump(body)).body).first
+      response = JSON(http.request_post(uri.path, JSON.dump(body)).body).first
 
       if error = response['error']
         parse_error(error)

data/lib/hue/light.rb

@@ -99,8 +99,8 @@ module Hue
 
       uri = URI.parse(base_url)
       http = Net::HTTP.new(uri.host)
-      response = http.request_put(uri.path, MultiJson.dump(body))
-      response = MultiJson.load(response.body).first
+      response = http.request_put(uri.path, JSON.dump(body))
+      response = JSON(response.body).first
       if response['success']
         @name = new_name
       # else
@@ -112,7 +112,7 @@ module Hue
       @state['on']
     end
 
-    %w{on hue saturation brightness color_temperature}.each do |key|
+    %w{on hue saturation brightness color_temperature alert}.each do |key|
       define_method "#{key}=".to_sym do |value|
         set_state({key.to_sym => value})
         instance_variable_set("@#{key}".to_sym, value)
@@ -143,13 +143,13 @@ module Hue
 
       uri = URI.parse("#{base_url}/state")
       http = Net::HTTP.new(uri.host)
-      response = http.request_put(uri.path, MultiJson.dump(body))
-      MultiJson.load(response.body)
+      response = http.request_put(uri.path, JSON.dump(body))
+      JSON(response.body)
     end
 
     # Refresh the state of the lamp
     def refresh
-      json = MultiJson.load(Net::HTTP.get(URI.parse(base_url)))
+      json = JSON(Net::HTTP.get(URI.parse(base_url)))
       unpack(json)
     end
 

data/lib/hue/version.rb

@@ -1,3 +1,3 @@
 module Hue
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: hue
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sam Soffes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: thor
   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: thor
+  name: json
   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'
 description: Work with Philips Hue light bulbs.
@@ -46,7 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Contributing.markdown
 - Gemfile
 - LICENSE
@@ -72,17 +72,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Work with Philips Hue light bulbs from Ruby.