huey 1.0.1 → 1.1.0

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    huey (1.0.0)
+    huey (1.0.1)
       chronic (>= 0.9.0)
+      color (>= 1.4.1)
       eventmachine (>= 1.0.0)
       httparty (>= 0.9.0)
 
@@ -11,9 +12,10 @@ GEM
   specs:
     addressable (2.3.2)
     chronic (0.9.0)
+    color (1.4.1)
     color-tools (1.3.0)
     crack (0.3.1)
-    eventmachine (1.0.0)
+    eventmachine (1.0.3)
     httparty (0.10.2)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)

data/huey.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency('eventmachine', '>=1.0.0')
   s.add_dependency('httparty', '>=0.9.0')
   s.add_dependency('chronic', '>=0.9.0')
+  s.add_dependency('color', '>= 1.4.1')
 
   s.add_development_dependency('bundler', '>=0')
   s.add_development_dependency('yard', '>=0.8.3')

data/lib/huey/bulb.rb

@@ -4,7 +4,7 @@ module Huey
 
   # An actual object for a bulb.
   class Bulb
-    Attributes = [:on, :bri, :hue, :sat, :xy, :ct, :name, :transitiontime, :colormode]
+    ATTRIBUTES = [:on, :bri, :hue, :sat, :xy, :ct, :name, :transitiontime, :colormode, :effect, :reachable, :alert]
     attr_reader :id
 
     def self.all
@@ -18,7 +18,7 @@ module Huey
     end
 
     def self.find_all(id)
-      self.all.select {|b| b.name.include?(id)}
+      self.all.select {|b| b.id == id || b.name.include?(id.to_s)}
     end
 
     def initialize(id, hash)
@@ -26,22 +26,22 @@ module Huey
       @changes = {}
       @name = hash['name']
 
-      (Huey::Bulb::Attributes - [:name]).each do |attribute|
+      (Huey::Bulb::ATTRIBUTES - [:name]).each do |attribute|
         instance_variable_set("@#{attribute}".to_sym, hash['state'][attribute.to_s])
       end
     end
 
-    Huey::Bulb::Attributes.each do |attribute|
+    Huey::Bulb::ATTRIBUTES.each do |attribute|
       define_method(attribute) do
         instance_variable_get("@#{attribute}".to_sym)
       end
 
       define_method("#{attribute}=".to_sym) do |new_value|
-        return true if self.send(attribute) == new_value
+        return new_value if self.send(attribute) == new_value
 
         @changes[attribute] = new_value
         instance_variable_set("@#{attribute}".to_sym, new_value)
-      end unless attribute == :colormode
+      end unless [:colormode, :reachable].include?(attribute)
     end
 
     def save
@@ -74,12 +74,12 @@ module Huey
       v = max * 100
 
       if (max != 0.0)
-        s = delta / max *100
+        s = delta / max * 100
       else
         s = 0.0
       end
 
-      if (s == 0.0) 
+      if (s == 0.0)
         h = 0.0
       else
         if (r == max)
@@ -103,8 +103,8 @@ module Huey
     end
 
     def alert!
-      Huey::Request.put("lights/#{self.id}/state", body: MultiJson.dump({alert: 'select'}))
+      self.update(alert: 'select')
     end
 
   end
-end
+end

data/lib/huey/group.rb

@@ -4,7 +4,7 @@ module Huey
 
   # A group is a collection of bulbs.
   class Group
-    Attributes = Huey::Bulb::Attributes - [:name] + [:rgb]
+    ATTRIBUTES = Huey::Bulb::ATTRIBUTES - [:name, :reachable] + [:rgb]
     attr_accessor :bulbs, :name
 
     def self.import(file)
@@ -39,7 +39,7 @@ module Huey
       self
     end
 
-    Huey::Group::Attributes.each do |attribute|
+    Huey::Group::ATTRIBUTES.each do |attribute|
       define_method("#{attribute}=".to_sym) do |new_value|
         @attributes_to_write[attribute] = new_value
       end

data/lib/huey/version.rb

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

data/test/unit/bulb_test.rb

@@ -28,7 +28,7 @@ class BulbTest < Test::Unit::TestCase
   end
 
   def test_bulb_get_attributes
-    Huey::Bulb::Attributes.each do |attr|
+    Huey::Bulb::ATTRIBUTES.each do |attr|
       assert @bulb.respond_to?(attr), "#{attr} is not set"
       assert @bulb.instance_variable_defined?("@#{attr}".to_sym), "#{attr} has no instance variable"
     end
@@ -37,8 +37,8 @@ class BulbTest < Test::Unit::TestCase
   def test_bulb_set_attributes
     assert @bulb.instance_variable_defined?(:@changes), "@changes has no instance variable"
 
-    Huey::Bulb::Attributes.each do |attr|
-      assert @bulb.respond_to?("#{attr}="), "#{attr} is not set" unless attr == :colormode
+    Huey::Bulb::ATTRIBUTES.each do |attr|
+      assert @bulb.respond_to?("#{attr}="), "#{attr} is not set" unless [:colormode, :reachable].include?(attr)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huey
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !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