hue 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c06483132e27c548f6636b9717d0fb1d7d3fb52
-  data.tar.gz: 4fe57bd0ecb43a9a208adcb8cdef6b490b0f813e
+  metadata.gz: d6a7f55311b35aa3cb7e2907ecad349632e102b7
+  data.tar.gz: 3201fe193181c257741f03f14a71b78b78ca3ecf
 SHA512:
-  metadata.gz: 79d882703ab4d35a2792e8b62711941cb8ff88b33a5a444c31f11c450fe1d5ef0e9f713d55dadbf36666155f63f312351f8220570e375c70c2399c5a4d0b2b13
-  data.tar.gz: 2fa2d565f33b0a7464a906da5eebbae52f220baca044436f7c0f2e55009a461227cbe4d133bbf7226f0264fea1e3c428d9bbd10a23240115a1121415eea3ff0b
+  metadata.gz: 76884d923bbe4ee4084bd121caae4f0004cb25f0fcd8e0618f27acd5887c89350f412e4d765c2e0ac148c079e82f245261d0a8664eff2eb6dbb3a7a64d8f88b3
+  data.tar.gz: c86bbdea9bca5ec707791137c72836fae70f3a4fd9978eff41b472968391f2a32b14494bb9885fa943a8f636ac9d4e9a62de83d15bc24917fcdcdeae2829c150

data/Readme.markdown

@@ -2,6 +2,8 @@
 
 Work with Philips Hue light bulbs from Ruby.
 
+[![Code Climate](https://codeclimate.com/github/soffes/hue.png)](https://codeclimate.com/github/soffes/hue) [![Dependency Status](https://gemnasium.com/soffes/hue.png)](https://gemnasium.com/soffes/hue) [![Gem Version](https://badge.fury.io/rb/hue.png)](http://badge.fury.io/rb/hue)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Todo.markdown

@@ -7,5 +7,4 @@
 * Effects
 * User management
 * Configuration
-* More efficient calls
 * Local UPNP

data/lib/hue.rb

@@ -1,6 +1,7 @@
 require 'hue/version'
 require 'hue/errors'
 require 'hue/client'
+require 'hue/bridge'
 require 'hue/light'
 
 module Hue

data/lib/hue/bridge.rb

@@ -0,0 +1,104 @@
+module Hue
+  class Bridge
+    # ID of the bridge.
+    attr_reader :id
+
+    # Name of the bridge. This is also its uPnP name, so will reflect the
+    # actual uPnP name after any conflicts have been resolved.
+    attr_accessor :name
+
+    # IP address of the bridge.
+    attr_reader :ip
+
+    # MAC address of the bridge.
+    attr_reader :mac_address
+
+    # IP Address of the proxy server being used.
+    attr_reader :proxy_address
+
+    # Port of the proxy being used by the bridge. If set to 0 then a proxy is
+    # not being used.
+    attr_reader :proxy_port
+
+    # Software version of the bridge.
+    attr_reader :software_version
+
+    # Contains information related to software updates.
+    attr_reader :software_update
+
+    # An array of whitelisted user IDs.
+    attr_reader :ip_whitelist
+
+    # Network mask of the bridge.
+    attr_reader :network_mask
+
+    # Gateway IP address of the bridge.
+    attr_reader :gateway
+
+    # Whether the IP address of the bridge is obtained with DHCP.
+    attr_reader :dhcp
+
+    def initialize(client, hash)
+      @client = client
+      unpack(hash)
+    end
+
+    # Current time stored on the bridge.
+    def utc
+      json = get_configuration
+      DateTime.parse(json['utc'])
+    end
+
+    # Indicates whether the link button has been pressed within the last 30
+    # seconds.
+    def link_button_pressed?
+      json = get_configuration
+      json['linkbutton']
+    end
+
+    # This indicates whether the bridge is registered to synchronize data with a
+    # portal account.
+    def has_portal_services?
+      json = get_configuration
+      json['portalservices']
+    end
+
+    def refresh
+      json = get_configuration
+      unpack(json)
+    end
+
+  private
+
+    KEYS_MAP = {
+      :id => :id,
+      :ip => :internalipaddress,
+      :name => :name,
+      :proxy_port => :proxyport,
+      :software_update => :swupdate,
+      :ip_whitelist => :whitelist,
+      :software_version => :swversion,
+      :proxy_address => :proxyaddress,
+      :mac_address => :macaddress,
+      :network_mask => :netmask,
+      :portal_services => :portalservices,
+    }
+
+    def unpack(hash)
+      puts hash
+      KEYS_MAP.each do |local_key, remote_key|
+        value = hash[remote_key.to_s]
+        next unless value
+        instance_variable_set("@#{local_key}", value)
+      end
+    end
+
+    def get_configuration
+      MultiJson.load(Net::HTTP.get(URI.parse("#{base_url}/config")))
+    end
+
+    def base_url
+      "http://#{ip}/api/#{@client.username}"
+    end
+  end
+end

data/lib/hue/client.rb

@@ -14,23 +14,29 @@ module Hue
       validate_user
     end
 
-    def base_station
+    def bridge
       # Pick the first one for now. In theory, they should all do the same thing.
-      base_station = base_stations.first
-      raise NoBaseStationFound unless base_station
-      base_station
+      bridge = bridges.first
+      raise NoBridgeFound unless bridge
+      bridge
     end
 
-    def base_stations
-      @base_stations ||= MultiJson.load(Net::HTTP.get(URI.parse('http://www.meethue.com/api/nupnp')))
+    def bridges
+      @bridges ||= begin
+        bs = []
+        MultiJson.load(Net::HTTP.get(URI.parse('http://www.meethue.com/api/nupnp'))).each do |hash|
+          bs << Bridge.new(self, hash)
+        end
+        bs
+      end
     end
 
     def lights
       @lights ||= begin
         ls = []
-        json = MultiJson.load(Net::HTTP.get(URI.parse("http://#{bridge_ip}/api/#{@username}/lights")))
-        json.each do |key, value|
-          ls << Light.new(self, key, value['name'])
+        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
@@ -43,7 +49,12 @@ module Hue
   private
 
     def validate_user
-      response = MultiJson.load(Net::HTTP.get(URI.parse("http://#{bridge_ip}/api/#{@username}")))
+      response = MultiJson.load(Net::HTTP.get(URI.parse("http://#{bridge.ip}/api/#{@username}")))
+
+      if response.is_a? Array
+        response = response.first
+      end
+
       if error = response['error']
         parse_error(error)
       end
@@ -56,8 +67,8 @@ module Hue
         username: @username
       }
 
-      uri = URI.parse("http://#{bridge_ip}/api")
-      http = Net::HTTP.new(uri.hostname)
+      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
 
       if error = response['error']
@@ -66,10 +77,6 @@ module Hue
       response['success']
     end
 
-    def bridge_ip
-      base_station['internalipaddress']
-    end
-
     def parse_error(error)
       # Find error or return
       klass = Hue::ERROR_MAP[error['type']]

data/lib/hue/errors.rb

@@ -17,6 +17,7 @@ module Hue
 
   class InvalidUsername < Error; end
   class UnknownError < Error; end
+  class NoBridgeFound < Error; end
 
   # Status code to exception map
   ERROR_MAP = {

data/lib/hue/light.rb

@@ -8,6 +8,9 @@ module Hue
     # Unique identification number.
     attr_reader :id
 
+    # Bridge the light is associated with
+    attr_reader :bridge
+
     # A unique, editable name given to the light.
     attr_accessor :name
 
@@ -78,15 +81,11 @@ module Hue
     # Reserved for future functionality.
     attr_reader :point_symbol
 
-    def initialize(client, id, name)
+    def initialize(client, bridge, id, hash)
       @client = client
+      @bridge = bridge
       @id = id
-      @name = name
-      refresh
-    end
-
-    def [](index)
-      lights[index]
+      unpack(hash)
     end
 
     def name=(new_name)
@@ -99,7 +98,7 @@ module Hue
       }
 
       uri = URI.parse(base_url)
-      http = Net::HTTP.new(uri.hostname)
+      http = Net::HTTP.new(uri.host)
       response = http.request_put(uri.path, MultiJson.dump(body))
       response = MultiJson.load(response.body).first
       if response['success']
@@ -133,28 +132,17 @@ module Hue
     end
 
     # @param transition The duration of the transition from the light’s current
-    #   state to the new state. This is given as a multiple of 100ms and defaults
-    #   to 4 (400ms). For example, setting transistiontime:10 will make the
-    #   transition last 1 second.
+    #   state to the new state. This is given as a multiple of 100ms and
+    #   defaults to 4 (400ms). For example, setting transistiontime:10 will
+    #   make the transition last 1 second.
     def set_state(attributes, transition = nil)
-      map = {
-        :brightness => :bri,
-        :saturation => :sat,
-        :color_temperature => :ct,
-      }
-
-      body = {}
-      attributes.each do |key, value|
-        new_key = map[key.to_sym]
-        key = new_key if new_key
-        body[key] = value
-      end
+      body = translate_keys(attributes)
 
       # Add transition
       body.merge!({:transitiontime => transition}) if transition
 
       uri = URI.parse("#{base_url}/state")
-      http = Net::HTTP.new(uri.hostname)
+      http = Net::HTTP.new(uri.host)
       response = http.request_put(uri.path, MultiJson.dump(body))
       MultiJson.load(response.body)
     end
@@ -162,28 +150,59 @@ module Hue
     # Refresh the state of the lamp
     def refresh
       json = MultiJson.load(Net::HTTP.get(URI.parse(base_url)))
+      unpack(json)
+    end
 
-      @state = json['state']
-      @brightness = @state['bri']
-      @hue = @state['hue']
-      @saturation = @state['sat']
+  private
+
+    KEYS_MAP = {
+      :state => :state,
+      :type => :type,
+      :name => :name,
+      :model => :modelid,
+      :software_version => :swversion,
+      :point_symbol => :pointsymbol
+    }
+
+    STATE_KEYS_MAP = {
+      :on => :on,
+      :brightness => :bri,
+      :hue => :hue,
+      :saturation => :sat,
+      :xy => :xy,
+      :color_temperature => :ct,
+      :alert => :alert,
+      :effect => :effect,
+      :color_mode => :colormode,
+      :reachable => :reachable,
+    }
+
+    def translate_keys(hash)
+      new_hash = {}
+      hash.each do |key, value|
+        new_key = KEYS_MAP[key.to_sym]
+        key = new_key if new_key
+        new_hash[key] = value
+      end
+      new_hash
+    end
+
+    def unpack(hash)
+      unpack_hash(hash, KEYS_MAP)
+      unpack_hash(@state, STATE_KEYS_MAP)
       @x, @y = @state['xy']
-      @color_temperature = @state['ct']
-      @alert = @state['alert'].to_sym
-      @effect = @state['effect'].to_sym
-      @color_mode = @state['colormode']
-      @type = json['type']
-      @name = json['name']
-      @model = json['modelid']
-      @software_version = json['swversion']
-      @point_symbol = json['pointsymbol']
     end
 
-  private
+    def unpack_hash(hash, map)
+      map.each do |local_key, remote_key|
+        value = hash[remote_key.to_s]
+        next unless value
+        instance_variable_set("@#{local_key}", value)
+      end
+    end
 
     def base_url
-      bridge_ip = @client.base_station['internalipaddress']
-      "http://#{bridge_ip}/api/#{@client.username}/lights/#{id}"
+      "http://#{@bridge.ip}/api/#{@client.username}/lights/#{id}"
     end
   end
 end

data/lib/hue/version.rb

@@ -1,3 +1,3 @@
 module Hue
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hue
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sam Soffes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -56,6 +56,7 @@ files:
 - bin/hue
 - hue.gemspec
 - lib/hue.rb
+- lib/hue/bridge.rb
 - lib/hue/cli.rb
 - lib/hue/client.rb
 - lib/hue/errors.rb
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Work with Philips Hue light bulbs from Ruby.