huey 1.2.0 → 2.0.0

data/Gemfile

@@ -7,4 +7,6 @@ gem 'chronic'
 
 group :development, :test do
   gem 'timecop'
+  gem 'webmock'
+  gem 'mocha'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    huey (1.1.0)
+    huey (1.2.0)
       chronic (>= 0.9.0)
       color (>= 1.4.1)
       eventmachine (>= 1.0.0)
@@ -39,8 +39,8 @@ DEPENDENCIES
   chronic
   color-tools
   huey!
-  mocha (>= 0.13.1)
+  mocha
   rake
   timecop
-  webmock (>= 1.9.0)
+  webmock
   yard (>= 0.8.3)

data/README.markdown

@@ -14,11 +14,18 @@ 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.
+  config.hue_ip = 123.456.789.012
+
+  # SSDP is disabled by default.
+  config.ssdp = true
+
   # For discovering the Hue hub, usually you won't have to change this
-  config.ssdp_ip = '239.255.255.250' 
+  config.ssdp_ip = '239.255.255.250'
 
   # Also for discovering the Hue hub
-  config.ssdp_port = 1900            
+  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
   config.ssdp_ttl = 1
@@ -72,7 +79,7 @@ For your reference, the attributes on bulb you can change are:
 - **sat**: For hue/saturation mode. Between `0` and `254`.
 - **xy**: For CIE 1931 mode. An array of two floats, like: [0.44, 0.4051]
 - **ct**: For color temperature mode. Expressed in [mireds](http://en.wikipedia.org/wiki/Mired), an integer between `154` and `500`.
-- **transitiontime**: An integer. Tenths of a second, so `10` is 1 second, and `100` is 10 seconds. Use `0` for instantaneous transitions. 
+- **transitiontime**: An integer. Tenths of a second, so `10` is 1 second, and `100` is 10 seconds. Use `0` for instantaneous transitions.
 
 I used [http://rsmck.co.uk/hue](http://rsmck.co.uk/hue) as the source for all this stuff.
 

data/lib/huey.rb

@@ -12,6 +12,7 @@ require 'huey/version'
 require 'huey/config'
 require 'huey/errors'
 require 'huey/ssdp'
+require 'huey/portal'
 require 'huey/request'
 require 'huey/bulb'
 require 'huey/group'

data/lib/huey/config.rb

@@ -9,9 +9,11 @@ module Huey #:nodoc
     extend Options
 
     # All the default options.
+    option :ssdp, default: false
     option :ssdp_ip, default: '239.255.255.250'
     option :ssdp_port, default: 1900
     option :ssdp_ttl, default: 1
+    option :hue_ip, default: nil
     option :uuid, default: '0123456789abdcef0123456789abcdef'
 
     # The default logger for Huey: either the Rails logger or just stdout.

data/lib/huey/portal.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+module Huey
+  module Portal
+    def self.hue_ip
+      return @hue_ip if @hue_ip
+
+      response = HTTParty.get('http://www.meethue.com/api/nupnp').first
+
+      raise Huey::Errors::CouldNotFindHue if response.nil? || response.empty?
+
+      @hue_ip = response['internalipaddress']
+    end
+  end
+end

data/lib/huey/request.rb

@@ -7,7 +7,7 @@ module Huey
       [: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}",
+            "http://#{self.hue_ip}/api/#{Huey::Config.uuid}/#{url}",
             options).parsed_response
 
           if self.error?(response, 1)
@@ -20,7 +20,7 @@ module Huey
       end
 
       def register
-        response = HTTParty.post("http://#{Huey::SSDP.hue_ip}/api",
+        response = HTTParty.post("http://#{self.hue_ip}/api",
           body: MultiJson.dump({username: Huey::Config.uuid,
                                 devicetype: 'Huey'})).parsed_response
 
@@ -50,6 +50,16 @@ module Huey
         end
       end
 
+
+      def hue_ip
+        return Huey::Config.hue_ip if Huey::Config.hue_ip
+
+        if Huey::Config.ssdp
+          Huey::SSDP.hue_ip
+        else
+          Huey::Portal.hue_ip
+        end
+      end
     end
 
   end

data/lib/huey/version.rb

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

data/test/test_helper.rb

@@ -12,7 +12,7 @@ class Test::Unit::TestCase
   end
 
   def set_hue_ip(ip)
-    Huey::SSDP.instance_variable_set(:@hue_ip, ip)
+    Huey::Request.stubs(:hue_ip).returns(ip)
   end
 
   def fake_searcher

data/test/unit/portal_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class PortalTest < Test::Unit::TestCase
+
+  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'})
+
+    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'})
+
+    assert_raises Huey::Errors::CouldNotFindHue do
+      Huey::Portal.hue_ip
+    end
+
+    assert_requested :get, 'http://www.meethue.com/api/nupnp'
+  end
+
+end

data/test/unit/request_test.rb

@@ -38,4 +38,13 @@ class RequestTest < Test::Unit::TestCase
 
     assert_requested :get, "http://0.0.0.0/api/0123456789abdcef0123456789abcdef/"
   end
+
+  def test_uses_configured_ip_instead_of_searching
+    Huey::Request.unstub(:hue_ip)
+    Huey::Config.hue_ip = '123.456.789.012'
+
+    assert_equal '123.456.789.012', Huey::Request.hue_ip
+
+    Huey::Config.hue_ip = nil
+  end
 end

data/test/unit/ssdp_test.rb

@@ -3,8 +3,8 @@ require 'test_helper'
 class SSDPTest < Test::Unit::TestCase
 
   def setup
+    Huey::SSDP.instance_variable_set(:@hue_ip, nil)
     super
-    set_hue_ip(nil)
   end
 
   def test_raises_error_with_no_ip

metadata

@@ -1,125 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: huey
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Veraticus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-05-09 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
@@ -145,6 +162,7 @@ files:
 - lib/huey/errors.rb
 - lib/huey/event.rb
 - lib/huey/group.rb
+- lib/huey/portal.rb
 - lib/huey/request.rb
 - lib/huey/ssdp.rb
 - lib/huey/ssdp/searcher.rb
@@ -155,30 +173,32 @@ files:
 - test/unit/bulb_test.rb
 - test/unit/event_test.rb
 - test/unit/group_test.rb
+- test/unit/portal_test.rb
 - test/unit/request_test.rb
 - 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: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Quick and simple discovery and control of Phillips Hue lightbulbs
 test_files: []
 has_rdoc: 

checksums.yaml

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