timex_datalink_client 0.12.1 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3dd9589b7f2f90dd6916170d80c7d201a3f11a1d3ffbc6f40dd04c6f16bf9d9
-  data.tar.gz: 35e091660c40e0e5257f8ee6e9772d1e84c3eb8b7051ad6cf4b6f30d850480c4
+  metadata.gz: cf947122caab09ed616e7a81dc9e88c2b1d3a210814e4c40d340de888684826c
+  data.tar.gz: de8330a9394d9fe2e1a54bc1a4eed14e2655e419a488ca6f1479f7598afcc9e0
 SHA512:
-  metadata.gz: f075ce75b8f807beaa941be6b7ce59d57f4f7c4e55054fbfc94bf710ad196b9ce5f45431c8ca28e3dcedf55f59b0433c4eba67717bcd4905c5aa9d82527ec0a8
-  data.tar.gz: 1f20f4d972357c05f0d571a5e901e913ba26b48afd51c91c03aa83e1c257beff5dbf42845f532cd6ffb1ffd0fe304c748242bb2e676c7ff2c9947ff4ed12252e
+  metadata.gz: 3e9f46a09af303087acbd25f0b50b04bfa1dc176a8b78fcb31fd21b0d2da7157f83ea56540530b1eaea0e42a0b8c8627f5a333763f35da9f3fdf888d83b0f9fe
+  data.tar.gz: 6ccb2e3fc79f077e09e1b5c215046c02adc059c66e5fbcae8752c918d6115c68b31c108c732f3a9b022fc7d07ac07e81fa06ffa737e531d2a37ec97e37c6eb4e

data/lib/timex_datalink_client/notebook_adapter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rubyserial"
+require "serialport"
 
 class TimexDatalinkClient
   class NotebookAdapter
@@ -32,7 +32,7 @@ class TimexDatalinkClient
         packet.each do |byte|
           printf("%.2X ", byte) if verbose
 
-          serial.write(byte.chr)
+          serial_port.write(byte.chr)
 
           sleep(byte_sleep)
         end
@@ -45,8 +45,8 @@ class TimexDatalinkClient
 
     private
 
-    def serial
-      @serial ||= Serial.new(serial_device)
+    def serial_port
+      @serial_port ||= SerialPort.new(serial_device)
     end
   end
 end

data/lib/timex_datalink_client/protocol_6/time.rb

@@ -141,23 +141,23 @@ class TimexDatalinkClient
       end
 
       def second
-        flex_time ? 0 : formatted_time.sec
+        flex_time ? 0 : time.sec
       end
 
       def hour
-        flex_time ? 0 : formatted_time.hour
+        flex_time ? 0 : time.hour
       end
 
       def minute
-        flex_time ? 0 : formatted_time.min
+        flex_time ? 0 : time.min
       end
 
       def month
-        flex_time ? 0 : formatted_time.month
+        flex_time ? 0 : time.month
       end
 
       def day
-        flex_time ? 0 : formatted_time.day
+        flex_time ? 0 : time.day
       end
 
       def formatted_name
@@ -169,15 +169,11 @@ class TimexDatalinkClient
       end
 
       def year_mod_1900
-        flex_time ? 0 : formatted_time.year % 100
+        flex_time ? 0 : time.year % 100
       end
 
       def wday_from_monday
-        flex_time ? 0 : (formatted_time.wday + 6) % 7
-      end
-
-      def formatted_time
-        time.dst? ? time + 3600 : time
+        flex_time ? 0 : (time.wday + 6) % 7
       end
 
       def formatted_utc_offset

data/lib/timex_datalink_client/protocol_7/eeprom/calendar/event.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_model"
+
 require "timex_datalink_client/helpers/lsb_msb_formatter"
 
 class TimexDatalinkClient
@@ -7,16 +9,23 @@ class TimexDatalinkClient
     class Eeprom
       class Calendar
         class Event
+          include ActiveModel::Validations
           include Helpers::LsbMsbFormatter
 
           FIVE_MINUTES_SECONDS = 300
 
-          attr_accessor :time, :phrase
+          validates :time, comparison: {
+            greater_than_or_equal_to: :device_time,
+            message: "%{value} must be greater or equal to device time!"
+          }
+
+          attr_accessor :time, :phrase, :device_time
 
           # Create an Event instance.
           #
           # @param time [::Time] Time of event.
           # @param phrase [Array<Integer>] Phrase for event.
+          # @raise [ActiveModel::ValidationError] One or more model values are invalid.
           # @return [Event] Event instance.
           def initialize(time:, phrase:)
             @time = time
@@ -24,6 +33,10 @@ class TimexDatalinkClient
           end
 
           def time_formatted(device_time)
+            @device_time = device_time
+
+            validate!
+
             device_time_midnight = Time.new(device_time.year, device_time.month, device_time.day)
             seconds = (time - device_time_midnight).to_i
             five_minutes = seconds / FIVE_MINUTES_SECONDS

data/lib/timex_datalink_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class TimexDatalinkClient
-  VERSION = "0.12.1"
+  VERSION = "0.12.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timex_datalink_client
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.3
 platform: ruby
 authors:
 - Maxwell Pray
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: rubyserial
+  name: serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.3.2
 description:
 email: synthead@gmail.com
 executables: []
@@ -150,7 +150,7 @@ files:
 - lib/timex_datalink_client/protocol_9/time_name.rb
 - lib/timex_datalink_client/protocol_9/timer.rb
 - lib/timex_datalink_client/version.rb
-homepage: https://github.com/synthead/timex_datalink_client/tree/v0.12.1
+homepage: https://github.com/synthead/timex_datalink_client/tree/v0.12.3
 licenses:
 - MIT
 metadata: {}
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="