hue 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af74df93c5514679bab0613c9c6c87b0a0dfae19b919fc903ad42a8fafe9b681
-  data.tar.gz: 0afb9bd5b7ee11be0a1dce6b56846c6d13fa7cd9a9b67e2f9c8014c8d03f0fb7
+  metadata.gz: 17b9710dcfb0defef023c1adb4c4da4ca86fddc6f2e6c0d971bcb562c57ec61a
+  data.tar.gz: 8d8afd006ca7892d74f33af84f4040aedd0718b13583e1708a6994bb7803c3d9
 SHA512:
-  metadata.gz: 00f64a5fdad18722af090747e6a2dfe2a5fefb556bcd634ee7b498f54df80e23e94975c295a2925a46cf2166e88df0af07dee1999e26446f7e42e66ebbc8778b
-  data.tar.gz: f54f5552bceb7456b0a1d6ccdc29f7ca3cb01636231d83a5f0d7d93b907defce6bfbfcb0e2f96444e49543fbb85f7cda66586f72eedaea912c7a18f5ededb570
+  metadata.gz: 8d3a2e81c450c2d1dd5c94ade3cf146ea4f56f4102f710051c54185902c388f9c9494a6f597f3f0ee05b59d0b0ade9ba837c2a7983df9679ce14ea34dd07e9eb
+  data.tar.gz: eea449790732dbcfcd0795f1e01af3d6d1a19b800c3b41404fe0bd1a12a76fa706f59269f90320365dde650c6425811fca9bd0ea38558945e8d8c0800badcdc4

data/.github/workflows/main.yml

@@ -2,13 +2,28 @@ name: Tests
 on: [push]
 jobs:
   test:
-    name: Test Swift Package
+    name: Test
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-ruby@v1
-      - name: 'Install Dependencies'
-        run: sudo apt-get install libcurl4-openssl-dev && gem install bundler && bundle install
-      - name: 'Test'
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Test
         run: bundle exec rake test
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Test
+        run: bundle exec rake standard

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/Gemfile

@@ -1,5 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-gem 'rake'
+gem "rake", "~> 13.0"
+gem "minitest", "~> 5.0"
+gem "standard", "~> 1.3"
+gem "webmock", "~> 3.19"

data/Rakefile

@@ -1,10 +1,12 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+require "standard/rake"
+
+task default: :test

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hue'
+
+require 'irb'
+IRB.start(__FILE__)

data/hue.gemspec

@@ -1,28 +1,23 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hue/version'
+require "hue/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'hue'
-  spec.version       = Hue::VERSION
-  spec.authors       = ['Sam Soffes']
-  spec.email         = ['sam@soff.es']
-  spec.description   = 'Work with Philips Hue light bulbs.'
-  spec.summary       = 'Work with Philips Hue light bulbs from Ruby.'
-  spec.homepage      = 'https://github.com/soffes/hue'
-  spec.license       = 'MIT'
+  spec.name = "hue"
+  spec.version = Hue::VERSION
+  spec.authors = ["Sam Soffes"]
+  spec.email = ["sam@soff.es"]
+  spec.description = "Work with Philips Hue light bulbs."
+  spec.summary = "Work with Philips Hue light bulbs from Ruby."
+  spec.homepage = "https://github.com/soffes/hue"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.files = `git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1.0'
-  spec.add_dependency 'thor'
-  spec.add_dependency 'json'
-  spec.add_dependency 'log_switch', '0.4.0'
-  spec.add_dependency 'curb'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'webmock'
+  spec.required_ruby_version = ">= 2.1.0"
+  spec.add_dependency "thor"
+  spec.add_dependency "json"
+  spec.add_dependency "color_conversion"
 end

data/lib/hue/bridge.rb

@@ -46,21 +46,21 @@ module Hue
     # Current time stored on the bridge.
     def utc
       json = get_configuration
-      DateTime.parse(json['utc'])
+      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']
+      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']
+      json["portalservices"]
     end
 
     def refresh
@@ -74,7 +74,7 @@ module Hue
     def lights
       @lights ||= begin
         json = JSON(Net::HTTP.get(URI.parse(base_url)))
-        json['lights'].map do |key, value|
+        json["lights"].map do |key, value|
           Light.new(@client, self, key, value)
         end
       end
@@ -84,7 +84,7 @@ module Hue
       uri = URI.parse("#{base_url}/lights")
       http = Net::HTTP.new(uri.host)
       response = http.request_post(uri.path, nil)
-      (response.body).first
+      response.body.first
     end
 
     def groups
@@ -105,27 +105,27 @@ module Hue
       end
     end
 
-  private
+    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,
+      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)
       KEYS_MAP.each do |local_key, remote_key|
         value = hash[remote_key.to_s]
         next unless value
-        instance_variable_set("@#{local_key}", value)
+        instance_variable_set(:"@#{local_key}", value)
       end
     end
 

data/lib/hue/cli.rb

@@ -1,67 +1,67 @@
-require 'thor'
+require "thor"
 
 module Hue
   class Cli < Thor
-    desc 'lights', 'Find all of the lights on your network'
+    desc "lights", "Find all of the lights on your network"
     def lights
       client.lights.each do |light|
         puts light.id.to_s.ljust(6) + light.name
       end
     end
 
-    desc 'add LIGHTS', 'Search for new lights'
+    desc "add LIGHTS", "Search for new lights"
     def add(thing)
       case thing
-      when 'lights'
+      when "lights"
         client.add_lights
       end
     end
 
-    desc 'light ID STATE [COLOR]', 'Access a light'
+    desc "light ID STATE [COLOR]", "Access a light"
     long_desc <<-LONGDESC
     Examples: \n
       hue all on \n
       hue all off \n
       hue all --hue 12345  \n
-      hue all --bri 25 \n
-      hue all --hue 50000 --bri 200 --sat 240 \n
+      hue all --brightness 25 \n
+      hue all --hue 50000 --brightness 200 --saturation 240 \n
       hue all --alert lselect \n
     LONGDESC
-    option :hue, :type => :numeric
-    option :sat, :type => :numeric, :aliases => '--saturation'
-    option :bri, :type => :numeric, :aliases => '--brightness'
-    option :alert, :type => :string
-    desc 'all STATE', 'Send commands to all lights'
-    def all(state = 'on')
+    option :hue, type: :numeric
+    option :sat, type: :numeric, aliases: "--saturation"
+    option :bri, type: :numeric, aliases: "--brightness"
+    option :alert, type: :string
+    desc "all STATE", "Send commands to all lights"
+    def all(state = "on")
       body = options.dup
-      body[:on] = state == 'on'
+      body[:on] = state == "on"
       client.lights.each do |light|
         puts light.set_state body
       end
     end
 
-    desc 'light ID STATE [COLOR]', 'Access a light'
+    desc "light ID STATE [COLOR]", "Access a light"
     long_desc <<-LONGDESC
     Examples: \n
       hue light 1 on --hue 12345  \n
-      hue light 1 --bri 25 \n
+      hue light 1 --brightness 25 \n
       hue light 1 --alert lselect \n
       hue light 1 off
     LONGDESC
-    option :hue, :type => :numeric
-    option :sat, :type => :numeric, :aliases => '--saturation'
-    option :brightness, :type => :numeric, :aliases => '--brightness'
-    option :alert, :type => :string
+    option :hue, type: :numeric
+    option :sat, type: :numeric, aliases: "--saturation"
+    option :bri, type: :numeric, aliases: "--brightness"
+    option :alert, type: :string
     def light(id, state = nil)
       light = client.light(id)
       puts light.name
 
       body = options.dup
-      body[:on] = (state == 'on' || !(state == 'off'))
+      body[:on] = (state == "on" || !(state == "off"))
       puts light.set_state(body) if body.length > 0
     end
 
-    desc 'groups', 'Find all light groups on your network'
+    desc "groups", "Find all light groups on your network"
     def groups
       client.groups.each do |group|
         puts group.id.to_s.ljust(6) + group.name
@@ -71,28 +71,28 @@ module Hue
       end
     end
 
-    desc 'group ID STATE [COLOR]', 'Update a group of lights'
+    desc "group ID STATE [COLOR]", "Update a group of lights"
     long_desc <<-LONGDESC
     Examples: \n
       hue groups 1 on --hue 12345
-      hue groups 1 --bri 25
+      hue groups 1 --brightness 25
       hue groups 1 --alert lselect
       hue groups 1 off
     LONGDESC
-    option :hue, :type => :numeric
-    option :sat, :type => :numeric, :aliases => '--saturation'
-    option :brightness, :type => :numeric, :aliases => '--brightness'
-    option :alert, :type => :string
+    option :hue, type: :numeric
+    option :sat, type: :numeric, aliases: "--saturation"
+    option :bri, type: :numeric, aliases: "--brightness"
+    option :alert, type: :string
     def group(id, state = nil)
       group = client.group(id)
       puts group.name
 
       body = options.dup
-      body[:on] = (state == 'on' || !(state == 'off'))
+      body[:on] = (state == "on" || !(state == "off"))
       puts group.set_state(body) if body.length > 0
     end
 
-  private
+    private
 
     def client
       @client ||= Hue::Client.new

data/lib/hue/client.rb

@@ -1,7 +1,6 @@
-require 'net/http'
-require 'json'
-require 'resolv'
-require 'curb'
+require "net/http"
+require "json"
+require "resolv"
 
 module Hue
   class Client
@@ -24,11 +23,11 @@ module Hue
     end
 
     def bridge
-      @bridge_id = find_bridge_id unless @bridge_id
-      if @bridge_id
-        bridge = bridges.select { |b| b.id == @bridge_id }.first
+      @bridge_id ||= find_bridge_id
+      bridge = if @bridge_id
+        bridges.find { |b| b.id == @bridge_id }
       else
-        bridge = bridges.first
+        bridges.first
       end
       raise NoBridgeFound unless bridge
       bridge
@@ -53,7 +52,7 @@ module Hue
 
     def light(id)
       id = id.to_s
-      lights.select { |l| l.id == id }.first
+      lights.find { |l| l.id == id }
     end
 
     def groups
@@ -64,7 +63,7 @@ module Hue
       return Group.new(self, bridge) if id.nil?
 
       id = id.to_s
-      groups.select { |g| g.id == id }.first
+      groups.find { |g| g.id == id }
     end
 
     def scenes
@@ -73,18 +72,18 @@ module Hue
 
     def scene(id)
       id = id.to_s
-      scenes.select { |s| s.id == id }.first
+      scenes.find { |s| s.id == id }
     end
 
     private
 
     def find_username
-      return ENV['HUE_USERNAME'] if ENV['HUE_USERNAME']
+      return ENV["HUE_USERNAME"] if ENV["HUE_USERNAME"]
 
-      json = JSON(File.read(File.expand_path('~/.hue')))
-      json['username']
+      json = JSON(File.read(File.expand_path("~/.hue")))
+      json["username"]
     rescue
-      return nil
+      nil
     end
 
     def validate_user
@@ -94,38 +93,38 @@ module Hue
         response = response.first
       end
 
-      if error = response['error']
+      if (error = response["error"])
         raise get_error(error)
       end
 
-      response['success']
+      response["success"]
     end
 
     def register_user
       body = JSON.dump({
-        devicetype: 'Ruby'
+        devicetype: "Ruby"
       })
 
       uri = URI.parse("http://#{bridge.ip}/api")
       http = Net::HTTP.new(uri.host)
       response = JSON(http.request_post(uri.path, body).body).first
 
-      if error = response['error']
+      if (error = response["error"])
         raise get_error(error)
       end
 
-      if @username = response['success']['username']
-        File.write(File.expand_path('~/.hue'), JSON.dump({username: @username}))
+      if (@username = response["success"]["username"])
+        File.write(File.expand_path("~/.hue"), JSON.dump({username: @username}))
       end
     end
 
     def find_bridge_id
-      return ENV['HUE_BRIDGE_ID'] if ENV['HUE_BRIDGE_ID']
+      return ENV["HUE_BRIDGE_ID"] if ENV["HUE_BRIDGE_ID"]
 
-      json = JSON(File.read(File.expand_path('~/.hue')))
-      json['bridge_id']
+      json = JSON(File.read(File.expand_path("~/.hue")))
+      json["bridge_id"]
     rescue
-      return nil
+      nil
     end
 
     def discovery_mdns(bs)
@@ -136,8 +135,8 @@ module Hue
         bridge_target = resolver.getresource(bridge_ptr.name, Resolv::DNS::Resource::IN::SRV).target
 
         bridge_hash = {
-        'id' => resolver.getresource(bridge_ptr.name, Resolv::DNS::Resource::IN::TXT).strings[0].split('=')[1],
-        'internalipaddress' => resolver.getresource(bridge_target, Resolv::DNS::Resource::IN::A).address
+          "id" => resolver.getresource(bridge_ptr.name, Resolv::DNS::Resource::IN::TXT).strings[0].split("=")[1],
+          "internalipaddress" => resolver.getresource(bridge_target, Resolv::DNS::Resource::IN::A).address
         }
 
         bs << Bridge.new(self, bridge_hash)
@@ -145,20 +144,18 @@ module Hue
     end
 
     def discovery_meethue(bs)
-      easy = Curl::Easy.new
-      easy.follow_location = true
-      easy.max_redirects = 10
-      easy.url = 'https://discovery.meethue.com/'
-      easy.perform
-      JSON(easy.body).each do |hash|
+      uri = URI("https://discovery.meethue.com/")
+      response = Net::HTTP.get(uri)
+
+      JSON(response).each do |hash|
         bs << Bridge.new(self, hash)
       end
     end
 
     def get_error(error)
       # Find error class and return instance
-      klass = Hue::ERROR_MAP[error['type']] || UnknownError unless klass
-      klass.new(error['description'])
+      klass ||= Hue::ERROR_MAP[error["type"]] || UnknownError
+      klass.new(error["description"])
     end
   end
 end

data/lib/hue/editable_state.rb

@@ -1,7 +1,13 @@
+require "color_conversion"
+
 module Hue
   module EditableState
+    HUE_RANGE = 0..65535
+    SATURATION_RANGE = 0..254
+    BRIGHTNESS_RANGE = 0..254
+
     def on?
-      @state['on']
+      @on || false
     end
 
     def on!
@@ -12,16 +18,47 @@ module Hue
       self.on = false
     end
 
-    %w{on hue saturation brightness color_temperature alert effect}.each do |key|
-      define_method "#{key}=".to_sym do |value|
+    # Turn the light on if it's off and vice versa
+    def toggle!
+      if @on
+        off!
+      else
+        on!
+      end
+    end
+
+    %w[on hue saturation brightness color_temperature alert effect].each do |key|
+      define_method :"#{key}=" do |value|
         set_state({key.to_sym => value})
-        instance_variable_set("@#{key}".to_sym, value)
+        instance_variable_set(:"@#{key}", value)
       end
     end
 
     def set_xy(x, y)
-      set_state({:xy => [x, y]})
+      set_state({xy: [x, y]})
       @x, @y = x, y
     end
+
+    def hex
+      ColorConversion::Color.new(h: hue, s: saturation, b: brightness).hex
+    end
+
+    def hex=(hex)
+      hex = "##{hex}" unless hex.start_with?("#")
+      hsb = ColorConversion::Color.new(hex).hsb
+
+      # Map values from standard HSB to what Hue wants and update state
+      state = {
+        hue: ((hsb[:h].to_f / 360.0) * HUE_RANGE.last.to_f).to_i,
+        saturation: ((hsb[:s].to_f / 100.0) * SATURATION_RANGE.last.to_f).to_i,
+        brightness: ((hsb[:b].to_f / 100.0) * BRIGHTNESS_RANGE.last.to_f).to_i
+      }
+
+      set_state(state)
+
+      @hue = state[:hue]
+      @saturation = state[:saturation]
+      @brightness = state[:brightness]
+    end
   end
 end

data/lib/hue/errors.rb

@@ -2,33 +2,47 @@ module Hue
   class Error < StandardError; end
 
   class UnauthorizedUser < Error; end
+
   class InvalidJSON < Error; end
+
   class ResourceNotAvailable < Error; end
+
   class MethodNotAvailable < Error; end
+
   class MissingBody < Error; end
+
   class ParameterNotAvailable < Error; end
+
   class InvalidValueForParameter < Error; end
+
   class ParameterNotModifiable < Error; end
+
   class InternalError < Error; end
+
   class LinkButtonNotPressed < Error; end
+
   class ParameterNotModifiableWhileOff < ParameterNotModifiable; end
+
   class TooManyGroups < Error; end
+
   class GroupTooFull < Error; end
 
   class InvalidUsername < Error; end
+
   class UnknownError < Error; end
+
   class NoBridgeFound < Error; end
 
   # Status code to exception map
   ERROR_MAP = {
-      1 => Hue::UnauthorizedUser,
-      2 => Hue::InvalidJSON,
-      3 => Hue::ResourceNotAvailable,
-      4 => Hue::MethodNotAvailable,
-      5 => Hue::MissingBody,
-      6 => Hue::ParameterNotAvailable,
-      7 => Hue::InvalidValueForParameter,
-      8 => Hue::ParameterNotModifiable,
+    1 => Hue::UnauthorizedUser,
+    2 => Hue::InvalidJSON,
+    3 => Hue::ResourceNotAvailable,
+    4 => Hue::MethodNotAvailable,
+    5 => Hue::MissingBody,
+    6 => Hue::ParameterNotAvailable,
+    7 => Hue::InvalidValueForParameter,
+    8 => Hue::ParameterNotModifiable,
     901 => Hue::InternalError,
     101 => Hue::LinkButtonNotPressed,
     201 => Hue::ParameterNotModifiableWhileOff,

data/lib/hue/group.rb

@@ -11,19 +11,19 @@ module Hue
     attr_reader :bridge
 
     # A unique, editable name given to the group.
-    attr_accessor :name
+    attr_reader :name
 
     # Hue of the group. This is a wrapping value between 0 and 65535.
     # Both 0 and 65535 are red, 25500 is green and 46920 is blue.
     attr_accessor :hue
 
-    # Saturation of the group. 255 is the most saturated (colored)
+    # Saturation of the group. 254 is the most saturated (colored)
     # and 0 is the least saturated (white).
     attr_accessor :saturation
 
     # Brightness of the group. This is a scale from the minimum
     # brightness the group is capable of, 0, to the maximum capable
-    # brightness, 255. Note a brightness of 0 is not off.
+    # brightness, 254. Note a brightness of 0 is not off.
     attr_accessor :brightness
 
     # The x coordinate of a color in CIE color space. Between 0 and 1.
@@ -58,16 +58,14 @@ module Hue
     end
 
     def lights
-      @lights ||= begin
-        @light_ids.map do |light_id|
-          @client.light(light_id)
-        end
+      @lights ||= @light_ids.map do |light_id|
+        @client.light(light_id)
       end
     end
 
     def name=(name)
-      resp = set_group_state({:name => name})
-      @name = new? ? name : resp[0]['success']["/groups/#{id}/name"]
+      resp = set_group_state({name: name})
+      @name = new? ? name : resp[0]["success"]["/groups/#{id}/name"]
     end
 
     def lights=(light_ids)
@@ -78,17 +76,17 @@ module Hue
       @light_ids = light_ids.uniq
       @lights = nil # resets the memoization
 
-      set_group_state({:lights => @light_ids})
+      set_group_state({lights: @light_ids})
     end
 
     def scene=(scene)
       scene_id = scene.is_a?(Scene) ? scene.id : scene
-      set_group_state({:scene => scene_id})
+      set_group_state({scene: scene_id})
     end
 
     def <<(light_id)
       @light_ids << light_id
-      set_group_state({:lights => @light_ids})
+      set_group_state({lights: @light_ids})
     end
     alias_method :add_light, :<<
 
@@ -120,8 +118,8 @@ module Hue
 
     def create!
       body = {
-        :name => @name,
-        :lights => @light_ids,
+        name: @name,
+        lights: @light_ids
       }
 
       uri = URI.parse("http://#{@bridge.ip}/api/#{@client.username}/groups")
@@ -129,7 +127,7 @@ module Hue
       response = http.request_post(uri.path, JSON.dump(body))
       json = JSON(response.body)
 
-      @id = json[0]['success']['id']
+      @id = json[0]["success"]["id"]
     end
 
     def destroy!
@@ -137,7 +135,7 @@ module Hue
       http = Net::HTTP.new(uri.host)
       response = http.delete(uri.path)
       json = JSON(response.body)
-      @id = nil if json[0]['success']
+      @id = nil if json[0]["success"]
     end
 
     def new?
@@ -147,22 +145,22 @@ module Hue
     private
 
     GROUP_KEYS_MAP = {
-      :name => :name,
-      :light_ids => :lights,
-      :type => :type,
-      :state => :action
+      name: :name,
+      light_ids: :lights,
+      type: :type,
+      state: :action
     }
 
     STATE_KEYS_MAP = {
-      :on => :on,
-      :brightness => :bri,
-      :hue => :hue,
-      :saturation => :sat,
-      :xy => :xy,
-      :color_temperature => :ct,
-      :alert => :alert,
-      :effect => :effect,
-      :color_mode => :colormode,
+      on: :on,
+      brightness: :bri,
+      hue: :hue,
+      saturation: :sat,
+      xy: :xy,
+      color_temperature: :ct,
+      alert: :alert,
+      effect: :effect,
+      color_mode: :colormode
     }
 
     def unpack(data)
@@ -170,7 +168,7 @@ module Hue
 
       unless new?
         unpack_hash(@state, STATE_KEYS_MAP)
-        @x, @y = @state['xy']
+        @x, @y = @state["xy"]
       end
     end
 

data/lib/hue/light.rb

@@ -3,9 +3,6 @@ module Hue
     include TranslateKeys
     include EditableState
 
-    HUE_RANGE = 0..65535
-    SATURATION_RANGE = 0..255
-    BRIGHTNESS_RANGE = 0..255
     COLOR_TEMPERATURE_RANGE = 153..500
 
     # Unique identification number.
@@ -15,19 +12,19 @@ module Hue
     attr_reader :bridge
 
     # A unique, editable name given to the light.
-    attr_accessor :name
+    attr_reader :name
 
     # Hue of the light. This is a wrapping value between 0 and 65535.
     # Both 0 and 65535 are red, 25500 is green and 46920 is blue.
     attr_reader :hue
 
-    # Saturation of the light. 255 is the most saturated (colored)
+    # Saturation of the light. 254 is the most saturated (colored)
     # and 0 is the least saturated (white).
     attr_reader :saturation
 
     # Brightness of the light. This is a scale from the minimum
     # brightness the light is capable of, 0, to the maximum capable
-    # brightness, 255. Note a brightness of 0 is not off.
+    # brightness, 254. Note a brightness of 0 is not off.
     attr_reader :brightness
 
     # The x coordinate of a color in CIE color space. Between 0 and 1.
@@ -84,6 +81,15 @@ module Hue
     # Reserved for future functionality.
     attr_reader :point_symbol
 
+    # The unique ID of the light.
+    attr_reader :uid
+
+    # The hash of capabilities of the light
+    attr_reader :capabilities
+
+    # The config hash
+    attr_reader :config
+
     def initialize(client, bridge, id, hash)
       @client = client
       @bridge = bridge
@@ -92,21 +98,21 @@ module Hue
     end
 
     def name=(new_name)
-      unless (1..32).include?(new_name.length)
-        raise InvalidValueForParameter, 'name must be between 1 and 32 characters.'
+      unless (1..32).cover?(new_name.length)
+        raise InvalidValueForParameter, "name must be between 1 and 32 characters."
       end
 
       body = {
-        :name => new_name
+        name: new_name
       }
 
       uri = URI.parse(base_url)
       http = Net::HTTP.new(uri.host)
       response = http.request_put(uri.path, JSON.dump(body))
       response = JSON(response.body).first
-      if response['success']
+      if response["success"]
         @name = new_name
-      # else
+        # else
         # TODO: Error
       end
     end
@@ -115,7 +121,7 @@ module Hue
     # always returns true, functionality will be added in a future
     # patch.
     def reachable?
-      @state['reachable']
+      @state["reachable"]
     end
 
     # @param transition The duration of the transition from the light’s current
@@ -126,7 +132,7 @@ module Hue
       body = translate_keys(attributes, STATE_KEYS_MAP)
 
       # Add transition
-      body.merge!({:transitiontime => transition}) if transition
+      body[:transitiontime] = transition if transition
 
       uri = URI.parse("#{base_url}/state")
       http = Net::HTTP.new(uri.host)
@@ -140,34 +146,37 @@ module Hue
       unpack(json)
     end
 
-  private
+    private
 
     KEYS_MAP = {
-      :state => :state,
-      :type => :type,
-      :name => :name,
-      :model => :modelid,
-      :software_version => :swversion,
-      :point_symbol => :pointsymbol
+      state: :state,
+      type: :type,
+      name: :name,
+      model: :modelid,
+      software_version: :swversion,
+      point_symbol: :pointsymbol,
+      uid: :uniqueid,
+      capabilities: :capabilities,
+      config: :config
     }
 
     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,
+      on: :on,
+      brightness: :bri,
+      hue: :hue,
+      saturation: :sat,
+      xy: :xy,
+      color_temperature: :ct,
+      alert: :alert,
+      effect: :effect,
+      color_mode: :colormode,
+      reachable: :reachable
     }
 
     def unpack(hash)
       unpack_hash(hash, KEYS_MAP)
       unpack_hash(@state, STATE_KEYS_MAP)
-      @x, @y = @state['xy']
+      @x, @y = @state["xy"]
     end
 
     def base_url

data/lib/hue/scene.rb

@@ -24,19 +24,17 @@ module Hue
     end
 
     def lights
-      @lights ||= begin
-        @light_ids.map do |light_id|
-          @client.light(light_id)
-        end
+      @lights ||= @light_ids.map do |light_id|
+        @client.light(light_id)
       end
     end
 
     private
 
     SCENE_KEYS_MAP = {
-      :name => :name,
-      :light_ids => :lights,
-      :active => :active,
+      name: :name,
+      light_ids: :lights,
+      active: :active
     }
 
     def unpack(data)

data/lib/hue/translate_keys.rb

@@ -14,7 +14,7 @@ module Hue
       map.each do |local_key, remote_key|
         value = hash[remote_key.to_s]
         next unless value
-        instance_variable_set("@#{local_key}", value)
+        instance_variable_set(:"@#{local_key}", value)
       end
     end
   end

data/lib/hue/version.rb

@@ -1,3 +1,3 @@
 module Hue
-  VERSION = '0.3.0'
+  VERSION = "0.3.1"
 end

data/lib/hue.rb

@@ -1,12 +1,12 @@
-require 'hue/version'
-require 'hue/errors'
-require 'hue/client'
-require 'hue/bridge'
-require 'hue/editable_state'
-require 'hue/translate_keys'
-require 'hue/light'
-require 'hue/group'
-require 'hue/scene'
+require "hue/version"
+require "hue/errors"
+require "hue/client"
+require "hue/bridge"
+require "hue/editable_state"
+require "hue/translate_keys"
+require "hue/light"
+require "hue/group"
+require "hue/scene"
 
 module Hue
   USERNAME_RANGE = 10..40

data/test/hue/client_test.rb

@@ -1,25 +1,26 @@
-require 'test_helper'
+require "test_helper"
 
 class ClientTest < Minitest::Test
   def before_setup
     super
 
-    stub_request(:get, "https://discovery.meethue.com/").
-      to_return(:body => '[{"id":"ffa57b3b257200065704","internalipaddress":"192.168.0.1"},{"id":"63c2fc01391276a319f9","internalipaddress":"192.168.0.2"}]')
+    stub_request(:get, "https://discovery.meethue.com/")
+      .to_return(body: '[{"id":"ffa57b3b257200065704","internalipaddress":"192.168.0.1"},{"id":"63c2fc01391276a319f9","internalipaddress":"192.168.0.2"}]')
 
-    stub_request(:get, %r{http://192.168.0.1/api/*}).to_return(:body => '[{"success":true}]')
-    stub_request(:get, %r{http://192.168.0.2/api/*}).to_return(:body => '[{"success":true}]')
+    stub_request(:get, %r{http://192.168.0.1/api}).to_return(body: '[{"success":true}]')
+    stub_request(:get, %r{http://192.168.0.1/api/*}).to_return(body: '[{"success":true}]')
+    stub_request(:get, %r{http://192.168.0.2/api/*}).to_return(body: '[{"success":true}]')
   end
 
   def test_with_bridge_id
     client = Hue::Client.new(use_mdns: false)
-    client.stub :find_bridge_id, '63c2fc01391276a319f9' do
-      assert_equal '63c2fc01391276a319f9', client.bridge.id
+    client.stub :find_bridge_id, "63c2fc01391276a319f9" do
+      assert_equal "63c2fc01391276a319f9", client.bridge.id
     end
   end
 
   def test_without_bridge_id
     client = Hue::Client.new(use_mdns: false)
-    assert_equal 'ffa57b3b257200065704', client.bridge.id
+    assert_equal "ffa57b3b257200065704", client.bridge.id
   end
 end

data/test/hue/light_test.rb

@@ -1,24 +1,44 @@
-require 'test_helper'
+require "test_helper"
 
 class LightTest < Minitest::Test
   def before_setup
     super
 
-    stub_request(:get, "https://discovery.meethue.com/").
-      to_return(:body => '[{"internalipaddress":"localhost"}]')
+    stub_request(:get, "https://discovery.meethue.com/")
+      .to_return(body: '[{"internalipaddress":"localhost"}]')
 
-    stub_request(:get, %r{http://localhost/api/*}).to_return(:body => '[{"success":true}]')
-    stub_request(:post, 'http://localhost/api').to_return(:body => '[{"success":{"username":"ruby"}}]')
-    stub_request(:put, %r{http://localhost/api*}).to_return(:body => '[{}]')
+    stub_request(:get, %r{http://localhost/api/*}).to_return(body: '[{"success":true}]')
+    stub_request(:post, "http://localhost/api").to_return(body: '[{"success":{"username":"ruby"}}]')
+    stub_request(:put, %r{http://localhost/api*}).to_return(body: "[{}]")
   end
 
-  %w{on hue saturation brightness color_temperature alert effect}.each do |attribute|
-    define_method "test_setting_#{attribute}" do
+  %w[on hue saturation brightness color_temperature alert effect].each do |attribute|
+    define_method :"test_setting_#{attribute}" do
       client = Hue::Client.new(use_mdns: false)
       light = Hue::Light.new(client, client.bridge, 0, {"state" => {}})
 
-      light.send("#{attribute}=", 24)
+      light.send(:"#{attribute}=", 24)
       assert_requested :put, %r{http://localhost/api/.*/lights/0}
     end
   end
+
+  def test_toggle_while_off
+    client = Hue::Client.new(use_mdns: false)
+    light = Hue::Light.new(client, client.bridge, 0, {"state" => {}})
+    assert_equal false, light.on?
+
+    light.toggle!
+    assert_requested :put, %r{http://localhost/api/.*/lights/0}
+    assert_equal true, light.on?
+  end
+
+  def test_toggle_while_on
+    client = Hue::Client.new(use_mdns: false)
+    light = Hue::Light.new(client, client.bridge, 0, {"state" => {"on" => true}})
+    assert_equal true, light.on?
+
+    light.toggle!
+    assert_requested :put, %r{http://localhost/api/.*/lights/0}
+    assert_equal false, light.on?
+  end
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'hue'
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "hue"
 
-require 'minitest'
-require 'webmock/minitest'
-require 'minitest/autorun'
+require "minitest"
+require "webmock/minitest"
+require "minitest/autorun"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hue
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sam Soffes
@@ -39,21 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: log_switch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: curb
+  name: color_conversion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,48 +52,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Work with Philips Hue light bulbs.
 email:
 - sam@soff.es
 executables:
+- console
 - hue
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/main.yml"
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/console
 - bin/hue
 - hue.gemspec
 - lib/hue.rb
@@ -147,7 +108,4 @@ rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Work with Philips Hue light bulbs from Ruby.
-test_files:
-- test/hue/client_test.rb
-- test/hue/light_test.rb
-- test/test_helper.rb
+test_files: []