hue 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 392c6116951d5bc531a34f0ef2c52d5fb5f82ad8
-  data.tar.gz: 3a5e4de39857bd328c5e69deb2866266d709fcc7
+  metadata.gz: 06f9987573ff54e807b7cb86f72237c6ed8c825f
+  data.tar.gz: 1150180432174f58f9e19d4f9fa45cb8f98ddd99
 SHA512:
-  metadata.gz: e21f6cc541aa058b4a5502f7699f0bb67c46ecf63d07c45c4ea036b037a20ced5372db75cb6d2b9d06fa3796badab290eb2639d3d2084487f9038c09e98899e4
-  data.tar.gz: 2d95c4b7a772fbbb966f368f0967ea1d20a9c36b6ee677927a6644548ffde7d93cff812cea376b691f11d72c1180972e31d63bd71e07b0373b1bdb2c0ec5a1f7
+  metadata.gz: d5b848f3b17020b64327b235be4ef897b3c31d41aadb69b245b14ab8b0b7caa3a7b2e0469bd8cac8deb20cf1bfdaa67d27f52f5f7ec9e598d48b44f5e2a7a892
+  data.tar.gz: a01dcd6e0385d5b327c34fa308d6fd37381073b22270af0a692e498ef2f2172dab8a045e3d90f24fd0850d29f2684765705f44b3a2eb68c7202f902f3b5d9b49

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Rakefile

@@ -1 +1,10 @@
 require 'bundler/gem_tasks'
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+  # no rspec available
+end

data/Readme.markdown

@@ -64,7 +64,7 @@ group = client.group(1)
 
 # Accessing group lights
 group.lights.first.on!
-group.lights.each { |light| light.hue = rand(0...65535) }
+group.lights.each { |light| light.hue = rand(Hue::Light::HUE_RANGE) }
 
 # Creating groups
 group = client.group # Don't specify an ID

data/hue.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
   spec.add_dependency 'log_switch', '0.4.0'
   spec.add_dependency 'curb'
+  spec.add_development_dependency 'rspec', '~> 3.2.0'
+  spec.add_development_dependency 'webmock'
 end

data/lib/hue/client.rb

@@ -6,16 +6,18 @@ module Hue
   class Client
     attr_reader :username
 
-    def initialize(username = '1234567890')
-      unless USERNAME_RANGE.include?(username.length)
-        raise InvalidUsername, "Usernames must be between #{USERNAME_RANGE.first} and #{USERNAME_RANGE.last}."
-      end
+    def initialize(username = nil)
+      username = find_username unless @username
 
       @username = username
 
-      begin
-        validate_user
-      rescue Hue::UnauthorizedUser
+      if @username
+        begin
+          validate_user
+        rescue Hue::UnauthorizedUser
+          register_user
+        end
+      else
         register_user
       end
     end
@@ -75,44 +77,53 @@ module Hue
       scenes.select { |s| s.id == id }.first
     end
 
-  private
+    private
 
-  def validate_user
-    response = JSON(Net::HTTP.get(URI.parse("http://#{bridge.ip}/api/#{@username}")))
-
-    if response.is_a? Array
-      response = response.first
-    end
+    def find_username
+      return ENV['HUE_USERNAME'] if ENV['HUE_USERNAME']
 
-    if error = response['error']
-      raise get_error(error)
+      json = JSON(File.read(File.expand_path('~/.hue')))
+      json['username']
+    rescue
+      return nil
     end
 
-    response['success']
-  end
+    def validate_user
+      response = JSON(Net::HTTP.get(URI.parse("http://#{bridge.ip}/api/#{@username}")))
 
-  def register_user
-    body = JSON.dump({
-      devicetype: 'Ruby',
-      username: @username
-    })
+      if response.is_a? Array
+        response = response.first
+      end
 
-    uri = URI.parse("http://#{bridge.ip}/api")
-    http = Net::HTTP.new(uri.host)
-    response = JSON(http.request_post(uri.path, body).body).first
+      if error = response['error']
+        raise get_error(error)
+      end
 
-    if error = response['error']
-      raise get_error(error)
+      response['success']
     end
 
-    response['success']
-  end
+    def register_user
+      body = JSON.dump({
+        devicetype: 'Ruby'
+      })
 
-  def get_error(error)
-    # Find error class and return instance
-    klass = Hue::ERROR_MAP[error['type']] || UnknownError unless klass
-    klass.new(error['description'])
-  end
+      uri = URI.parse("http://#{bridge.ip}/api")
+      http = Net::HTTP.new(uri.host)
+      response = JSON(http.request_post(uri.path, body).body).first
+
+      if error = response['error']
+        raise get_error(error)
+      end
 
+      if @username = response['success']['username']
+        File.write(File.expand_path('~/.hue'), JSON.dump({username: @username}))
+      end
+    end
+
+    def get_error(error)
+      # Find error class and return instance
+      klass = Hue::ERROR_MAP[error['type']] || UnknownError unless klass
+      klass.new(error['description'])
+    end
   end
 end

data/lib/hue/light.rb

@@ -19,16 +19,16 @@ module Hue
 
     # Hue of the light. This is a wrapping value between 0 and 65535.
     # Both 0 and 65535 are red, 25500 is green and 46920 is blue.
-    attr_accessor :hue
+    attr_reader :hue
 
     # Saturation of the light. 255 is the most saturated (colored)
     # and 0 is the least saturated (white).
-    attr_accessor :saturation
+    attr_reader :saturation
 
     # Brightness of the light. This is a scale from the minimum
     # brightness the light is capable of, 0, to the maximum capable
     # brightness, 255. Note a brightness of 0 is not off.
-    attr_accessor :brightness
+    attr_reader :brightness
 
     # The x coordinate of a color in CIE color space. Between 0 and 1.
     #
@@ -44,7 +44,7 @@ module Hue
     # are capable of 153 (6500K) to 500 (2000K).
     #
     # @see http://en.wikipedia.org/wiki/Mired
-    attr_accessor :color_temperature
+    attr_reader :color_temperature
 
     # The alert effect, which is a temporary change to the bulb’s state.
     # This can take one of the following values:
@@ -58,12 +58,12 @@ module Hue
     # current state in an upcoming patch.
     #
     # @see http://developers.meethue.com/coreconcepts.html#some_extra_fun_stuff
-    attr_accessor :alert
+    attr_reader :alert
 
     # The dynamic effect of the light, can either be `none` or
     # `colorloop`. If set to colorloop, the light will cycle through
     # all hues using the current brightness and saturation settings.
-    attr_accessor :effect
+    attr_reader :effect
 
     # Indicates the color mode in which the light is working, this is
     # the last command type it received. Values are `hs` for Hue and

data/lib/hue/version.rb

@@ -1,3 +1,3 @@
 module Hue
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

data/spec/hue/light_spec.rb

@@ -0,0 +1,24 @@
+RSpec.describe Hue::Light do
+  %w{on hue saturation brightness color_temperature alert effect}.each do |attribute|
+    before do
+      stub_request(:get, "https://www.meethue.com/api/nupnp").
+        to_return(:body => '[{"internalipaddress":"localhost"}]')
+
+      stub_request(:get, %r{http://localhost/api/*}).
+        to_return(:body => '[{"success":true}]')
+
+      stub_request(:put, %r{http://localhost/api*}).
+        to_return(:body => '[{}]')
+    end
+
+    describe "##{attribute}=" do
+      it "PUTs the new attribute value" do
+        client = Hue::Client.new
+        light = Hue::Light.new(client, client.bridge, 0, {"state" => {}})
+
+        light.send("#{attribute}=", 24)
+        expect(a_request(:put, %r{http://localhost/api/.*/lights/0})).to have_been_made
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,94 @@
+require_relative '../lib/hue'
+require 'webmock/rspec'
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hue
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Sam Soffes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Work with Philips Hue light bulbs.
 email:
 - sam@soff.es
@@ -75,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Contributing.markdown
 - Gemfile
 - LICENSE
@@ -94,6 +123,8 @@ files:
 - lib/hue/scene.rb
 - lib/hue/translate_keys.rb
 - lib/hue/version.rb
+- spec/hue/light_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/soffes/hue
 licenses:
 - MIT
@@ -114,8 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Work with Philips Hue light bulbs from Ruby.
-test_files: []
+test_files:
+- spec/hue/light_spec.rb
+- spec/spec_helper.rb