light_me_up 0.2.1 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94afbedabf39a83db771b9a256796bd9e13cfe80e5abdca791ae7b159e43dfeb
-  data.tar.gz: 5d5fd8d91160cb31c185811381c01d78519f8a14d7aec8a406232216d4737a9d
+  metadata.gz: a8d795fa88a021f974ba2ef80b74326b1222f1f41a20ba71dbd4ea3be643f468
+  data.tar.gz: 92aec84e39354826ec8bc195e8286bd073b414f96bfe4c51ad437f3406f0972f
 SHA512:
-  metadata.gz: c860756fc6ffca76099547d55ec864b38c33e43513d357731e2c724e77ad2b04a1f48d6d7fdeb6ad38ead151046a6f80bd47c8f83618f23d08b2dc22204eb78f
-  data.tar.gz: d74ae4c379dae3c76d76f4fc4bc936b628999d137915f07c2f64bf55c491893b6b9bea859a9e8df79dbe97590fe965d7aed4c3f8469d3d578be93ecc9e8a71b7
+  metadata.gz: 2f7a7b3c45989710a289136eb7ef2f2bc6b2999bfa8951679bad760b7c7d3bae01e713ac57e57a365b113439f7cf783c201283c4f210e4917710b9b024518dda
+  data.tar.gz: 956f1e24553299defa116ff3107eab99d285ce02c44378d0f1ed436fefd334d4a39cec8e7c34da0c0846a5a36f7b039f55c3de8dcea6b5fdb4c7150da1487c19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    light_me_up (0.2.1)
+    light_me_up (0.2.5)
       optimist (~> 3.0)
 
 GEM

data/bin/light-me-up

@@ -30,10 +30,10 @@ end
 options = options.select { |_k, v| v }
 options[:on] = false if options.delete(:off)
 if options.delete(:defaults)
-  options.reverse_merge!(
+  options = {
     brightness: ENV["ELGATO_DEFAULT_BRIGHTNESS"].to_i,
     temperature: ENV["ELGATO_DEFAULT_TEMPERATURE"].to_i
-  )
+  }.merge(options)
 end
 
 api_client = LightMeUp::ApiClient.new(ip_address: options[:ip_address])
@@ -42,7 +42,8 @@ begin
   LightMeUp::SettingsUpdate.new(api_client, options).perform
 rescue LightMeUp::SettingsUpdate::ToggleIncompatible => e
   Optimist.die :toggle, e.message
-rescue LightMeUp::NoOptionsGiven
+rescue LightMeUp::SettingsUpdate::InvalidOptions => e
+  warn e.message
   Optimist.educate
 rescue LightMeUp::Error => e
   warn e.message

data/lib/light_me_up/api_client.rb

@@ -10,6 +10,8 @@ module LightMeUp
     OPEN_TIMEOUT = 2 # seconds
     READ_TIMEOUT = 2 # seconds
 
+    TEMPERATURE_RANGE = (143..344).freeze
+
     def initialize(ip_address:, port: DEFAULT_PORT)
       raise Error, "No ip_address specified." unless ip_address && ip_address != ""
 
@@ -22,14 +24,14 @@ module LightMeUp
       LightSerializer.deserialize(response).first
     end
 
-    def toggle
+    def toggle(brightness: nil, temperature: nil)
       with_connection do |_http|
         current_status = status
 
         if current_status.on
-          turn_light_off
+          update(on: false, brightness: brightness, temperature: temperature)
         else
-          turn_light_on
+          update(on: true, brightness: brightness, temperature: temperature)
         end
       end
     end

data/lib/light_me_up/light.rb

@@ -5,7 +5,7 @@ module LightMeUp
     attr_reader :on, :brightness, :temperature
 
     BRIGHTNESS_RANGE = (0..100).freeze
-    TEMPERATURE_RANGE = (143..344).freeze
+    TEMPERATURE_RANGE = (0..100).freeze
 
     class << self
       def max_brightness

data/lib/light_me_up/light_serializer.rb

@@ -13,7 +13,7 @@ module LightMeUp
         {
           on: on_as_int,
           brightness: light.brightness,
-          temperature: light.temperature,
+          temperature: to_api_temperature(light.temperature),
         }.compact
       end
 
@@ -22,10 +22,25 @@ module LightMeUp
           Light.new(
             on: light["on"] == 1,
             brightness: light["brightness"],
-            temperature: light["temperature"]
+            temperature: to_readable_temperature(light["temperature"])
           )
         end
       end
+
+      private
+
+      def to_readable_temperature(api_temperature)
+        scale_value(api_temperature, ApiClient::TEMPERATURE_RANGE, Light::TEMPERATURE_RANGE)
+      end
+
+      def to_api_temperature(readable_temperature)
+        scale_value(readable_temperature, Light::TEMPERATURE_RANGE, ApiClient::TEMPERATURE_RANGE)
+      end
+
+      def scale_value(value, src_range, dest_range)
+        scale_ratio = dest_range.size.to_f / src_range.size.to_f
+        (dest_range.min + scale_ratio * (value - src_range.min)).round
+      end
     end
   end
 end

data/lib/light_me_up/settings_update.rb

@@ -5,7 +5,7 @@ module LightMeUp
     attr_reader :api_client, :options
 
     class ToggleIncompatible < Error; end
-    class NoOptionsGiven < Error; end
+    class InvalidOptions < Error; end
 
     def initialize(api_client, options)
       @api_client = api_client
@@ -13,23 +13,16 @@ module LightMeUp
     end
 
     def perform
-      if options[:toggle]
-        raise ToggleIncompatible, "is not compatible with setting other options" if settings_options.any?
+      settings_options = options.slice(:toggle, :on, :brightness, :temperature)
+      if settings_options.delete(:toggle)
+        raise ToggleIncompatible, "is not compatible with on or off" if settings_options.key?(:on)
 
-        api_client.toggle
-      end
-
-      if settings_options.any?
-        api_client.set(**settings_options)
+        api_client.toggle(**settings_options)
+      elsif settings_options.any?
+        api_client.update(**settings_options)
       else
-        raise NoOptionsGiven, "provide at least one option"
+        raise InvalidOptions, "At least one option must be provided"
       end
     end
-
-    private
-
-    def settings_options
-      @settings_options ||= options.slice(:on, :brightness, :temperature)
-    end
   end
 end

data/lib/light_me_up/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LightMeUp
-  VERSION = "0.2.1"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light_me_up
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.5
 platform: ruby
 authors:
 - Peter McCracken
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist