huey 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 01536b0adcdaeb163bebe6af4ffff2dc7cce1d1f
+  data.tar.gz: d66a6dffc76bf8a9bbecd0f4d2e4ecae8011cdf6
+SHA512:
+  metadata.gz: 16f00680f0a1b9dfca733b0e2a261080b077984a03e43bb817360030ec4cc6b9c3f8f4487eed2176fbadda629812cd0b39a07626117f83d356f66968c22ef978
+  data.tar.gz: 79572a3a755f36b8db109c12d1aea9acaa8246b5749555ea86dcdc5fdef9bf2fd24bd0df5ae5279d6fb930d151acb7e04fc55e1a1c8b5e0b590cd907d3d94a77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    huey (1.0.1)
+    huey (1.1.0)
       chronic (>= 0.9.0)
       color (>= 1.4.1)
       eventmachine (>= 1.0.0)
@@ -11,7 +11,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.2)
-    chronic (0.9.0)
+    chronic (0.9.1)
     color (1.4.1)
     color-tools (1.3.0)
     crack (0.3.1)
@@ -22,7 +22,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.13.1)
       metaclass (~> 0.0.1)
-    multi_json (1.6.1)
+    multi_json (1.7.2)
     multi_xml (0.5.3)
     rake (0.9.5)
     timecop (0.5.9.2)

data/README.markdown

@@ -58,6 +58,8 @@ bulb.update(bri: 100, ct: 500) # Set and save in one step
 bulb.rgb = '#8FF1F5' # Everyone loves aqua
 
 bulb.commit # Alias for save
+
+bulb.reload # Refresh changes to the bulb, made perhaps with another app
 ```
 
 Changes to the bulb only take effect when you call `save` on it. If you prefer, `save` is aliased as `commit`.
@@ -157,6 +159,12 @@ The SSDP discovery driver is lifted whole cloth from turboladen's [UPNP](https:/
 
 I am not affiliated with Phillips or the Phillips Hue in any way. I just think it's neat. While this Gem works for me, if it causes your lights to catastrophically fail it's not my fault. (Though I think the chances of this happening are pretty unlikely, you never know.)
 
+## Contributors
+
+Many thanks to the following diligent contributors, without whom this project would not be nearly as awesome:
+
+* [sankage](https://github.com/sankage)
+
 ## Copyright
 
 Copyright (c) 2012 Josh Symonds.

data/lib/huey.rb

@@ -24,7 +24,7 @@ module Huey
     block_given? ? yield(Huey::Config) : Huey::Config
   end
   alias :config :configure
-  
+
   def logger
     Huey::Config.logger
   end

data/lib/huey/bulb.rb

@@ -26,9 +26,17 @@ module Huey
       @changes = {}
       @name = hash['name']
 
+      reload(hash)
+    end
+
+    def reload(hash = nil)
+      hash ||= Huey::Request.get("lights/#{self.id}")
+
       (Huey::Bulb::ATTRIBUTES - [:name]).each do |attribute|
         instance_variable_set("@#{attribute}".to_sym, hash['state'][attribute.to_s])
       end
+
+      self
     end
 
     Huey::Bulb::ATTRIBUTES.each do |attribute|
@@ -103,6 +111,7 @@ module Huey
     end
 
     def alert!
+      self.update(alert: 'none') if self.alert != 'none'
       self.update(alert: 'select')
     end
 

data/lib/huey/config/options.rb

@@ -44,7 +44,7 @@ module Huey #:nodoc
           def #{name}?
             #{name}
           end
-          
+
           def reset_#{name}
             settings[#{name.inspect}] = defaults[#{name.inspect}]
           end

data/lib/huey/errors.rb

@@ -1,19 +1,30 @@
 # encoding: utf-8
 
 module Huey
-  
   # All the error specific to Huey.
   module Errors
-    
+
     # Generic error class.
     class Error < StandardError; end
-    
+
     # CouldNotFindHub is raised when no IP address can be found for Hue.
-    class CouldNotFindHue < Error; end    
+    class CouldNotFindHue < Error; end
 
     # PressLinkButton is raised if the link button hasn't been pressed yet.
     class PressLinkButton < Error; end
 
+    # The bulb can't be updated since it is off
+    class BulbOff < Error; end
+
+    # Cannot add bulb to group since it is full
+    class GroupTableFull < Error; end
+
+    # Cannot make request due to missing parameters
+    class MissingParameters < Error; end
+
+    # Error occured in the bridge, not the request
+    class InternalBridgeError < Error; end
+
     # HueResponseError is raised if we receive an odd response from the Hue.
     class HueResponseError < Error; end
   end

data/lib/huey/event.rb

@@ -14,7 +14,7 @@ module Huey
         value.each do |k, v|
           options[k.to_sym] = v
         end
-        
+
         Huey::Event.new(options)
       end
       Huey::Event.all

data/lib/huey/request.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
 
 module Huey
-
   # Wraps requests to the actual Hue itself
   class Request
     class << self
-
       [:get, :post, :put, :delete].each do |method|
         define_method(method) do |url = '', options = {}|
-          response = HTTParty.send(method, "http://#{Huey::SSDP.hue_ip}/api/#{Huey::Config.uuid}/#{url}", options).parsed_response
+          response = HTTParty.send(method,
+            "http://#{Huey::SSDP.hue_ip}/api/#{Huey::Config.uuid}/#{url}",
+            options).parsed_response
 
           if self.error?(response, 1)
             self.register
-            return self.send(method, url, options) 
+            return self.send(method, url, options)
           end
 
           response
@@ -20,7 +20,9 @@ module Huey
       end
 
       def register
-        response = HTTParty.post("http://#{Huey::SSDP.hue_ip}/api", body: MultiJson.dump({username: Huey::Config.uuid, devicetype: 'Huey'})).parsed_response
+        response = HTTParty.post("http://#{Huey::SSDP.hue_ip}/api",
+          body: MultiJson.dump({username: Huey::Config.uuid,
+                                devicetype: 'Huey'})).parsed_response
 
         raise Huey::Errors::PressLinkButton, 'Press the link button and try your request again' if self.error?(response, 101)
 
@@ -32,7 +34,18 @@ module Huey
           if response.first['error']['type'] == type
             true
           else
-            raise Huey::Errors::HueResponseError, response
+            case response.first['error']['type']
+            when 5
+              raise Huey::Errors::MissingParameters, response
+            when 201
+              raise Huey::Errors::BulbOff, response
+            when 301..302
+              raise Huey::Errors::GroupTableFull, response
+            when 901
+              raise Huey::Errors::InternalBridgeError, response
+            else
+              raise Huey::Errors::HueResponseError, response
+            end
           end
         end
       end

data/lib/huey/version.rb

@@ -1,3 +1,3 @@
 module Huey
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/unit/bulb_test.rb

@@ -27,6 +27,15 @@ class BulbTest < Test::Unit::TestCase
     @bulb.alert!
   end
 
+  def test_send_second_alert_to_bulb
+    @bulb.alert = 'select'
+
+    Huey::Request.expects(:put).with("lights/1/state", body: MultiJson.dump({alert: 'none'})).once.returns(true)
+    Huey::Request.expects(:put).with("lights/1/state", body: MultiJson.dump({alert: 'select'})).once.returns(true)
+
+    @bulb.alert!
+  end
+
   def test_bulb_get_attributes
     Huey::Bulb::ATTRIBUTES.each do |attr|
       assert @bulb.respond_to?(attr), "#{attr} is not set"
@@ -76,4 +85,16 @@ class BulbTest < Test::Unit::TestCase
     assert_equal 245, @bulb.bri
   end
 
+  def test_refresh_state
+    response = light_response('2', 'Bedroom').values.first
+    response['state'].merge!('on' => true)
+    Huey::Request.expects(:get).once.returns(response)
+
+    @bulb = Huey::Bulb.find(2)
+    assert_equal false, @bulb.on
+
+    @bulb.reload
+    assert_equal true, @bulb.on
+  end
+
 end

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: huey
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Veraticus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: color
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.9.0
 description: Everything you could want for making Phillips Hue lightbulbs obey your
@@ -176,27 +159,26 @@ files:
 - test/unit/ssdp_test.rb
 homepage: https://github.com/Veraticus/huey
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Quick and simple discovery and control of Phillips Hue lightbulbs
 test_files: []
 has_rdoc: