huey 0.1.0 → 0.2.0

data/README.markdown

@@ -38,7 +38,9 @@ The first time you issue any Huey command, you're likely to see something like t
 Huey::Errors::PressLinkButton: 'Press the link button and try your request again'
 ```
 
-Just like the message says, go press the link button on your Hue hub, and then reissue the request. It should work the second time. Then you can get to the exciting stuff:
+Just like the message says, go press the link button on your Hue hub, and then reissue the request. It should work the second time. Then you can get to the exciting stuff.
+
+### Bulbs
 
 ```ruby
 Huey::Bulb.all # Returns an array of your bulbs
@@ -78,6 +80,32 @@ I've added in some convenience attributes as well:
 
 - **rgb**: An HTML hex value. Will automatically convert to hue/saturation.
 
+### Groups
+
+You can also simply and sensibly create groups of bulbs.
+
+```ruby
+Huey::Group.new('Living Room') # Contains all bulbs that have 'Living Room' in their name
+Huey::Group.new('Living Room', 'Foyer') # All bulbs that have either 'Living Room' or 'Foyer' in their name
+g = Huey::Group.new(Huey::Bulb.find(1), Huey::Bulb.find(3)) # A group specifically containing bulbs 1 and 3
+g.name = 'My Bulbs' # Name your group to find it later
+
+Huey::Group.import('groups.yml') # Import many groups at once from a YAML file.
+# The file should look like this:
+#
+# living_room: [TV, Living Room - Fireplace]
+# foyer: [Foyer]
+# bedroom: [Bedroom]
+
+group = Huey::Group.find('My Bulbs')
+
+group.bri = 200
+group.on = true
+group.save # All changes you've made are committed to all the bulbs in a group
+
+group.update(bri: 200, ct: 500) # Set and save in one step
+```
+
 ## Attribution
 
 The structure of the configuration files and the modules are taken from [Mongoid](https://github.com/mongoid/mongoid), which had some really great ideas.

data/lib/huey.rb

@@ -4,6 +4,7 @@ require 'eventmachine'
 require 'logger'
 require 'httparty'
 require 'color'
+require 'yaml'
 
 require 'huey/version'
 
@@ -12,6 +13,7 @@ require 'huey/errors'
 require 'huey/ssdp'
 require 'huey/request'
 require 'huey/bulb'
+require 'huey/group'
 
 module Huey
   extend self

data/lib/huey/bulb.rb

@@ -14,7 +14,11 @@ module Huey
     end
 
     def self.find(id)
-      self.all.find {|b| b.id == id || b.name == id}
+      self.all.find {|b| b.id == id || b.name.include?(id)}
+    end
+
+    def self.find_all(id)
+      self.all.select {|b| b.name.include?(id)}
     end
 
     def initialize(id, hash)

data/lib/huey/group.rb

@@ -0,0 +1,70 @@
+# encoding: utf-8
+
+module Huey
+
+  # A group is a collection of bulbs.
+  class Group
+    Attributes = Huey::Bulb::Attributes - [:name] + [:rgb]
+    attr_accessor :bulbs, :name
+
+    def self.import(file)
+      hash = YAML.load_file(file)
+
+      hash.each do |key, value|
+        g = Huey::Group.new(value)
+        g.name = key
+      end
+      Huey::Group.all
+    end
+
+    def self.all
+      @all ||= []
+    end
+
+    def self.find(name)
+      Huey::Group.all.find {|g| g.name == name}
+    end
+
+    def initialize(*string_or_array)
+      string_or_array = string_or_array.first if string_or_array.first.is_a?(Array)
+
+      self.bulbs = if string_or_array.first.is_a?(Bulb)
+        string_or_array
+      else
+        string_or_array.collect {|s| Huey::Bulb.find_all(s)}.flatten.uniq
+      end
+
+      @attributes_to_write = {}
+      Huey::Group.all << self
+      self
+    end
+
+    Huey::Group::Attributes.each do |attribute|
+      define_method("#{attribute}=".to_sym) do |new_value|
+        @attributes_to_write[attribute] = new_value
+      end
+    end
+
+    def save
+      response = bulbs.collect {|b| b.update(@attributes_to_write)}
+      @attributes_to_write = {}
+      response
+    end
+    alias :commit :save
+
+    def update(attrs)
+      bulbs.collect {|b| b.update(attrs)}
+    end
+
+    def method_missing(meth, *args, &block)
+      if !self.bulbs.empty? && self.bulbs.first.respond_to?(meth)
+        h = {}
+        bulbs.each {|b| h[b.id] = b.send(meth, *args, &block)}
+        h
+      else
+        super
+      end
+    end
+  end
+
+end

data/lib/huey/version.rb

@@ -1,3 +1,3 @@
 module Huey
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/fixtures/group.yml

@@ -0,0 +1,3 @@
+living_room: [TV, Living Room - Fireplace]
+foyer: [Foyer]
+bedroom: [Bedroom]

data/test/test_helper.rb

@@ -8,7 +8,7 @@ class Test::Unit::TestCase
   def setup
     super
     # Prevent real connections to the hub
-    # EM.stubs(:open_datagram_socket).returns(fake_searcher)
+    EM.stubs(:open_datagram_socket).returns(fake_searcher)
   end
 
   def set_hue_ip(ip)
@@ -22,4 +22,14 @@ class Test::Unit::TestCase
     searcher.stubs(:discovery_responses).returns(responses)
     searcher
   end
+
+  def light_response(id = "1", name = "Living Room")
+    {id => {"state"=>{"on"=>false, "bri"=>127, "hue"=>54418, "sat"=>158, "xy"=>[0.509, 0.4149], "ct"=>459, "alert"=>"none", "effect"=>"none", "colormode"=>"hue", "reachable"=>true}, "type"=>"Extended color light", "name"=>name, "modelid"=>"LCT001", "swversion"=>"65003148", "pointsymbol"=>{"1"=>"none", "2"=>"none", "3"=>"none", "4"=>"none", "5"=>"none", "6"=>"none", "7"=>"none", "8"=>"none"}}}
+  end
+
+  def init_bulb(id = "1", name = "Living Room")
+    light = light_response(id, name)
+    Huey::Bulb.new(light.keys.first, light.values.first)
+  end
+
 end

data/test/unit/bulb_test.rb

@@ -76,12 +76,4 @@ class BulbTest < Test::Unit::TestCase
     assert_equal 245, @bulb.bri
   end
 
-  def light_response(id = "1", name = "Living Room")
-    {id => {"state"=>{"on"=>false, "bri"=>127, "hue"=>54418, "sat"=>158, "xy"=>[0.509, 0.4149], "ct"=>459, "alert"=>"none", "effect"=>"none", "colormode"=>"hue", "reachable"=>true}, "type"=>"Extended color light", "name"=>name, "modelid"=>"LCT001", "swversion"=>"65003148", "pointsymbol"=>{"1"=>"none", "2"=>"none", "3"=>"none", "4"=>"none", "5"=>"none", "6"=>"none", "7"=>"none", "8"=>"none"}}}
-  end
-
-  def init_bulb
-    Huey::Bulb.new(light_response.keys.first, light_response.values.last)
-  end
-
 end

data/test/unit/group_test.rb

@@ -0,0 +1,88 @@
+require 'test_helper'
+
+class GroupTest < Test::Unit::TestCase
+
+  def setup
+    super
+    @bulb1 = init_bulb('1', 'Living Room - TV')
+    @bulb2 = init_bulb('2', 'Living Room - Fireplace')
+    @bulb3 = init_bulb('3', 'Foyer')
+    @bulb4 = init_bulb('4', 'Bedroom')
+
+    Huey::Bulb.stubs(:all).returns([@bulb1, @bulb2, @bulb3, @bulb4])
+  end
+
+  def test_initializes_group_from_bulbs
+    @group = Huey::Group.new(@bulb1, @bulb2, @bulb3)
+
+    assert_equal [@bulb1, @bulb2, @bulb3], @group.bulbs
+  end
+
+  def test_initializes_group_from_name
+    @group = Huey::Group.new('Living Room')
+
+    assert_equal [@bulb1, @bulb2], @group.bulbs
+  end
+
+  def test_initialzes_group_from_names
+    @group = Huey::Group.new('Living Room', 'Foyer')
+
+    assert_equal [@bulb1, @bulb2, @bulb3], @group.bulbs
+  end
+
+  def test_initializes_groups_from_yml
+    Huey::Group.instance_variable_set(:@all, [])
+
+    Huey::Group.import('test/fixtures/group.yml')
+
+    assert_equal 3, Huey::Group.all.count
+    assert_equal [@bulb1, @bulb2], Huey::Group.all[0].bulbs
+    assert_equal [@bulb3], Huey::Group.all[1].bulbs
+    assert_equal [@bulb4], Huey::Group.all[2].bulbs
+  end
+
+  def test_find_group_by_name
+    g = Huey::Group.new('Living Room')
+    g.name = 'Living Room'
+
+    assert_equal g, Huey::Group.find('Living Room')
+  end
+
+  def test_delegates_save_to_bulbs
+    @group = Huey::Group.new(@bulb1, @bulb2, @bulb3)
+
+    [@bulb1, @bulb2, @bulb3].each do |bulb|
+      Huey::Request.expects(:put).with("lights/#{bulb.id}/state", body: MultiJson.dump({on: true, bri: 100})).once.returns(true)
+    end
+
+    @group.on = true
+    @group.bri = 100
+    @group.save
+
+    [@bulb1, @bulb2, @bulb3].each do |bulb|
+      assert_equal true, bulb.on
+      assert_equal 100, bulb.bri
+    end
+  end
+
+  def test_delegates_update_to_bulbs
+    @group = Huey::Group.new(@bulb1, @bulb2, @bulb3)
+
+    [@bulb1, @bulb2, @bulb3].each do |bulb|
+      Huey::Request.expects(:put).with("lights/#{bulb.id}/state", body: MultiJson.dump({on: true, bri: 100})).once.returns(true)
+    end
+
+    @group.update(on: true, bri: 100)
+
+    [@bulb1, @bulb2, @bulb3].each do |bulb|
+      assert_equal true, bulb.on
+      assert_equal 100, bulb.bri
+    end
+  end
+
+  def test_returns_all_bulb_attrs_for_method_missing
+    @group = Huey::Group.new(@bulb1, @bulb2, @bulb3)
+
+    assert_equal @group.bri, {1=>127, 2=>127, 3=>127}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huey
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -128,12 +128,15 @@ files:
 - lib/huey/config.rb
 - lib/huey/config/options.rb
 - lib/huey/errors.rb
+- lib/huey/group.rb
 - lib/huey/request.rb
 - lib/huey/ssdp.rb
 - lib/huey/ssdp/searcher.rb
 - lib/huey/version.rb
+- test/fixtures/group.yml
 - test/test_helper.rb
 - test/unit/bulb_test.rb
+- test/unit/group_test.rb
 - test/unit/request_test.rb
 - test/unit/ssdp_test.rb
 homepage: https://github.com/Veraticus/huey
@@ -154,12 +157,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1646308313904845457
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Quick and simple discovery and control of Phillips Hue lightbulbs