huey 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4c3837f65eb7ca77400cab890aa464ffa469ca
-  data.tar.gz: e0759a7ecb3d0d038f9972cd94b67561d27640f9
+  metadata.gz: 426fd9b03d93002081cb9226ff446bd7a094baf6
+  data.tar.gz: c54af8d42bcf2bc9d673d594351f059ddbac1b48
 SHA512:
-  metadata.gz: 0d5803ff4f5cc2471da1087578717fe400f8f8c32e972c5d3d1f9b9992a254094a39c78b8c0613ee28eb489bd9e18f3266f1adf6e0876453eb5adbf4a9cf9851
-  data.tar.gz: f718ff168af4ca6130dfe5b7ebba7013258b82950d91cadda06d0b68ac4ec5a1a8b92ec713410bcb66622b880e9866700baa1a3ea7b023b0d1f092df1f3653fb
+  metadata.gz: 729bbc4e6b64c4291d4e8b0b50c4bf9af2619674e1c44a8ab30c29deaee37b6dcded0785ca6031dee37d06d950c005ecdd8c699f3b4b31204e4203ce704e37eb
+  data.tar.gz: ef68f85d7fe6f7d356fad8494dfd69c3192d85a96a63744d50e1681ac532f5a2b03b3537906de09519d48b30bf9614605cee0cc161bc845ff563cb74b0bf8cf6

data/Gemfile

@@ -6,7 +6,8 @@ gem 'color-tools'
 gem 'chronic'
 
 group :development, :test do
+  gem 'minitest'
   gem 'timecop'
   gem 'webmock'
-  gem 'mocha'
-end
+  gem 'mocha', require: false
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    huey (2.0.0)
+    huey (2.0.1)
       chronic (>= 0.9.0)
       color (>= 1.4.1)
       eventmachine (>= 1.0.0)
@@ -22,6 +22,7 @@ GEM
       multi_xml (>= 0.5.2)
     json (1.8.1)
     metaclass (0.0.1)
+    minitest (5.0.8)
     mocha (0.13.1)
       metaclass (~> 0.0.1)
     multi_json (1.8.2)
@@ -41,6 +42,7 @@ DEPENDENCIES
   chronic
   color-tools
   huey!
+  minitest
   mocha
   rake
   timecop

data/README.markdown

@@ -14,21 +14,23 @@ You shouldn't need to initialize anything to make Huey work correctly, but if yo
 
 ```ruby
 Huey.configure do |config|
-  # Huey now uses the Phillips Hue API to discover local bridges, but you can specify the Hue IP
-  # manually if your Huey server is not on your local network.
+  # Huey now uses the Phillips Hue API to discover local bridges, but you can
+  # specify the Hue IP manually if your Huey server is not on your
+  # local network.
   config.hue_ip = '123.456.789.012'
 
-  # SSDP is disabled by default.
+  # SSDP is disabled by default. Do not enable it unless you have a compelling
+  # reason to do so.
   config.ssdp = true
 
-  # For discovering the Hue hub, usually you won't have to change this.
+  # Specify the SSDP IP. Do not use this unless you're using SSDP broadcasting
+  # at a non-standard IP.
   config.ssdp_ip = '239.255.255.250'
 
-  # Also for discovering the Hue hub.
+  # As per the above, but for a non-standard port.
   config.ssdp_port = 1900
 
-  # If you get constant errors about not being able to find the Hue hub and you're sure
-  # it's connected, increase this.
+  # If your SSDP connections keep timing out, increase this.
   config.ssdp_ttl = 1
 
   # Change this if you don't like the included uuid.
@@ -49,25 +51,27 @@ Just like the message says, go press the link button on your Hue hub, and then r
 ### Bulbs
 
 ```ruby
-Huey::Bulb.all # Returns an array of your bulbs
-
 bulb = Huey::Bulb.find(1) # Finds the bulb with the ID of 1
 bulb = Huey::Bulb.find('Living Room') # Finds the bulb with the name 'Living Room'
 
-bulb.alert! # Flashes the bulb in question once and immediately, useful for checking connectivity
+bulb.alert! # Flashes the bulb in question once and immediately, useful
+            # for checking connectivity
 
 bulb.bri = 100 # Let's dim the bulb a little bit
-bulb.ct = 500 # And make it a little more orange
-
-bulb.save # Apply all the changes you've made
+bulb.ct = 500  # And make it a little more orange
+bulb.save      # Apply all the changes you've made
 
 bulb.update(bri: 100, ct: 500) # Set and save in one step
 
 bulb.rgb = '#8FF1F5' # Everyone loves aqua
-
-bulb.commit # Alias for save
+bulb.commit          # Alias for save
 
 bulb.reload # Refresh changes to the bulb, made perhaps with another app
+
+Huey::Bulb.all # Returns an array of your bulbs
+Huey::Bulb.all.alert! # Makes all your bulbs start flashing
+Huey::Bulb.all.update(bri: 255, on: true) # Turn on all your bulbs and
+                                          # increase brightness to max
 ```
 
 Changes to the bulb only take effect when you call `save` on it. If you prefer, `save` is aliased as `commit`.
@@ -90,7 +94,9 @@ I've added in some convenience attributes as well:
 
 ### Groups
 
-You can also simply and sensibly create groups of bulbs.
+Returned arrays of bulbs are grouped into a convenience class called `Huey::Group`. It acts like an array, but any huey-specific method you pass in will be invoked on all the bulbs.
+
+You can also simply and sensibly create groups of bulbs yourself if you like.
 
 ```ruby
 Huey::Group.new('Living Room') # Contains all bulbs that have 'Living Room' in their name

data/lib/huey/bulb.rb

@@ -8,9 +8,13 @@ module Huey
     attr_reader :id
 
     def self.all
-      @all ||= Huey::Request.get['lights'].collect do |id, hash|
-        Bulb.new(id, hash)
+      return @all if @all
+
+      @all = Huey::Group.new
+      Huey::Request.get['lights'].collect do |id, hash|
+        @all.bulbs << Bulb.new(id, hash)
       end
+      @all
     end
 
     def self.find(id)
@@ -18,7 +22,9 @@ module Huey
     end
 
     def self.find_all(id)
-      self.all.select {|b| b.id == id || b.name.include?(id.to_s)}
+      group = Huey::Group.new
+      self.all.select {|b| b.id == id || b.name.include?(id.to_s)}.each {|b| group.bulbs << b}
+      group
     end
 
     def initialize(id, hash)

data/lib/huey/group.rb

@@ -4,6 +4,7 @@ module Huey
 
   # A group is a collection of bulbs.
   class Group
+    include Enumerable
     ATTRIBUTES = Huey::Bulb::ATTRIBUTES - [:name, :reachable] + [:rgb]
     attr_accessor :bulbs, :name
 
@@ -26,6 +27,7 @@ module Huey
     end
 
     def initialize(*string_or_array)
+      @bulbs = []
       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)
@@ -35,7 +37,7 @@ module Huey
       end
 
       @attributes_to_write = {}
-      Huey::Group.all << self
+      Huey::Group.all << self unless self.bulbs.nil? || self.bulbs.empty?
       self
     end
 
@@ -46,21 +48,27 @@ module Huey
     end
 
     def save
-      response = bulbs.collect {|b| b.update(@attributes_to_write)}
+      response = self.collect {|b| b.update(@attributes_to_write)}
       @attributes_to_write = {}
       response
     end
     alias :commit :save
 
     def update(attrs)
-      bulbs.collect {|b| b.update(attrs)}
+      self.collect {|b| b.update(attrs)}
+    end
+
+    def each(&block)
+      bulbs.each {|b| block.call(b)}
     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)}
+        self.each {|b| h[b.id] = b.send(meth, *args, &block)}
         h
+      elsif self.bulbs.respond_to?(meth)
+        bulbs.send(meth, *args, &block)
       else
         super
       end

data/lib/huey/version.rb

@@ -1,3 +1,3 @@
 module Huey
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/test/test_helper.rb

@@ -1,10 +1,11 @@
-require 'test/unit'
-require 'webmock/test_unit'
-require "mocha/setup"
+require 'minitest/autorun'
+require 'webmock/minitest'
 require 'timecop'
 require 'huey'
+require "mocha/setup"
+
 
-class Test::Unit::TestCase
+class MiniTest::Test
   def setup
     super
     # Prevent real connections to the hub

data/test/unit/bulb_test.rb

@@ -1,10 +1,11 @@
 require 'test_helper'
 
-class BulbTest < Test::Unit::TestCase
+class BulbTest < MiniTest::Test
 
   def setup
     super
     @bulb = init_bulb
+    Huey::Bulb.instance_variable_set(:@all, nil)
   end
 
   def test_initializes_bulb_from_hash
@@ -86,9 +87,11 @@ class BulbTest < Test::Unit::TestCase
   end
 
   def test_refresh_state
-    response = light_response('2', 'Bedroom').values.first
-    response['state'].merge!('on' => true)
-    Huey::Request.expects(:get).once.returns(response)
+    off_response = light_response('2', 'Bedroom').values.first
+    Huey::Request.expects(:get).with(nil).once.returns('lights' => {'2' => off_response})
+    on_response = light_response('2', 'Bedroom').values.first
+    on_response['state'].merge!('on' => true)
+    Huey::Request.expects(:get).with("lights/2").once.returns(on_response)
 
     @bulb = Huey::Bulb.find(2)
     assert_equal false, @bulb.on

data/test/unit/event_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EventTest < Test::Unit::TestCase
+class EventTest < MiniTest::Test
 
   def setup
     super

data/test/unit/group_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class GroupTest < Test::Unit::TestCase
+class GroupTest < MiniTest::Test
 
   def setup
     super
@@ -48,6 +48,12 @@ class GroupTest < Test::Unit::TestCase
     assert_equal g, Huey::Group.find('Living Room')
   end
 
+  def test_not_included_in_all_if_empty
+    g = Huey::Group.new
+
+    assert !Huey::Group.all.include?(g)
+  end
+
   def test_delegates_save_to_bulbs
     @group = Huey::Group.new(@bulb1, @bulb2, @bulb3)
 
@@ -85,4 +91,30 @@ class GroupTest < Test::Unit::TestCase
 
     assert_equal @group.bri, {1=>127, 2=>127, 3=>127}
   end
+
+  def test_implements_each
+    @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: 101})).once.returns(true)
+    end
+
+
+    @group.each {|bulb| bulb.update(on: true, bri: 101)}
+
+    [@bulb1, @bulb2, @bulb3].each do |bulb|
+      assert_equal true, bulb.on
+      assert_equal 101, bulb.bri
+    end
+  end
+
+  def test_includes_enumerable
+    @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: 102})).once.returns(true)
+    end
+
+    assert_equal [true, true, true], @group.collect {|bulb| bulb.update(on: true, bri: 102)}
+  end
 end

data/test/unit/portal_test.rb

@@ -1,17 +1,21 @@
 require 'test_helper'
 
-class PortalTest < Test::Unit::TestCase
+class PortalTest < MiniTest::Test
+  def setup
+    super
+    Huey::Portal.instance_variable_set(:@hue_ip, nil)
+  end
 
   def test_gets_local_bridge_ip
-    stub_request(:get, 'http://www.meethue.com/api/nupnp').to_return(body: MultiJson.dump([{"id" => "001788fffe0931a2", "internalipaddress" => "192.168.123.123", "macaddress" => "00:17:88:09:31:a2"}]), headers: {"Content-Type" => 'application/json'})
+    stub_request(:get, 'http://www.meethue.com/api/nupnp').to_return(body: MultiJson.dump([{"id" => "001788fffe0931a2", "internalipaddress" => "192.168.123.123", "macaddress" => "00:17:88:09:31:a2"}]), headers: {"Content-Type" => 'application/json'}).times(2)
 
     assert_equal Huey::Portal.hue_ip, '192.168.123.123'
 
     assert_requested :get, 'http://www.meethue.com/api/nupnp'
   end
 
-  def test_does_not_find_local_bride
-    stub_request(:get, 'http://www.meethue.com/api/nupnp').to_return(body: MultiJson.dump([]), headers: {"Content-Type" => 'application/json'})
+  def test_does_not_find_local_bridge
+    stub_request(:get, 'http://www.meethue.com/api/nupnp').to_return(body: MultiJson.dump([]), headers: {"Content-Type" => 'application/json'}).times(2)
 
     assert_raises Huey::Errors::CouldNotFindHue do
       Huey::Portal.hue_ip

data/test/unit/request_test.rb

@@ -1,10 +1,11 @@
 require 'test_helper'
 
-class RequestTest < Test::Unit::TestCase
+class RequestTest < MiniTest::Test
 
   def setup
     super
     set_hue_ip('0.0.0.0')
+    Huey::Config.hue_port = 80
   end
 
   [:get, :post, :put, :delete].each do |m|
@@ -48,7 +49,7 @@ class RequestTest < Test::Unit::TestCase
     Huey::Config.hue_ip = nil
   end
 
-  def test_uses_configured_ip_
+  def test_uses_configured_ip
     Huey::Config.hue_port = 12345
 
     stub_request(:any, "http://0.0.0.0:12345/api/0123456789abdcef0123456789abcdef/")

data/test/unit/ssdp_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SSDPTest < Test::Unit::TestCase
+class SSDPTest < MiniTest::Test
 
   def setup
     Huey::SSDP.instance_variable_set(:@hue_ip, nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huey
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Veraticus