light_me_up 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f637eabb588a28dd7f5582e8e750488a6ff28a857351b3cc382ce36a84885cac
-  data.tar.gz: 69a40d452a72b23134fa62d56764f27f2a95a4e85120fd43aa0044a8023a3e22
+  metadata.gz: 39bab362a47cb5f1704bca0ee1d34a6e2324e3028f1d4ddd84f8d0481e1e760c
+  data.tar.gz: 6f397b96f59f316cb94ee1d8f0ba32a1e5cf6207b565e53ad4ce63c9d3395cb0
 SHA512:
-  metadata.gz: 15b23d0d80fe5eb21bdbeaf1b525fb2882a66c09492d8701e54ca5d6f755e8049894341494556e97e1d6c95dad5af6ddd13a6a2515466ba2c18f2448ef1e57fe
-  data.tar.gz: 0dd7599491f2157d6cc36fe473d2d4c8c9efb606a8eb277ab0933d7aa741ecc07f790c3b99d329b52098745f151e117a87fb938da4fd648541b548d38bb78c85
+  metadata.gz: 526ffbfeec68b717b54d04a0faaad6937c94254d92efe97adf6a77a19a77eb4a80e9d4d2d9d37394b7b67c9a6172d6b07f927b6ee2ac27b4dde9f854dfd9ecfb
+  data.tar.gz: 5a3e21a2acd5517ffa548411e47c1acf18e29f516d15434fef9e6e7020b48c72f5d3479950df93b1ae6b7a3d9fc8d69cf09830059ae6b115aab63791caecab52

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    light_me_up (0.2.2)
+    light_me_up (0.2.6)
       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::SettingsUpdate::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,27 @@ 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)
+        return nil unless value
+
+        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,21 +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
+        api_client.toggle(**settings_options)
       elsif settings_options.any?
-        api_client.set(**settings_options)
+        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.2"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light_me_up
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 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