digital-transport 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e8d508990049e22bc47ebe1904cff7eb02fe744
-  data.tar.gz: 18eda2ccc77a27e5b22af89dc0c79e940fe98b53
+  metadata.gz: 7af58d75f82ffdaf6870b242c530685e6285dc16
+  data.tar.gz: cefbffc637bc63cb05eeb4f5c162d5f558322693
 SHA512:
-  metadata.gz: 35b6b983aefa5cc4c006ce1852821b4ba3db115be9ab6b581fbadc692bbe909e2bac36b8267168f965abeece9a19e4f13950627c9f51f0d6b7edea6cc4d56f07
-  data.tar.gz: 4daeb4c8f929557399e230ee6297f51d3cf240595f533e5ff361f75b7cbfd2201967d0784eb45fa5190f0ab1f7306327646c32a53f1d17914a7c07d0afe7e0eb
+  metadata.gz: e1c1a80fefe85d91e10e925cf7e3dcf7202a84460513de4295a8f324d0659e7fd4126f57a2d3da797e37796025a06dbd9c02e3e025e061d992c34da5fe9e2e64
+  data.tar.gz: da4e1ba232ceabe3ace2fae5f576094e22249189cf9a55b4471fcc2aa8b3895767f1b3f0af1b2930f00054eb57b20ad7607a447004196319ebe13a310976f93b

data/lib/digital/transport/adapters/serial.rb

@@ -6,17 +6,10 @@ module Digital
       class Serial
         include Digital::Transport::Errors
         include Digital::Transport::Adapters::Interface
-        include CommPort
         include Functional
+        include Rs232
 
-        DEFAULTS = {
-            timeout: 10,
-            baud_rate: CommPort::BAUD_115200,
-            data_bits: CommPort::DATA_BITS_8,
-            parity: CommPort::PAR_NONE,
-            stop_bits: CommPort::STOP_BITS_1,
-            flow_control: CommPort::FLOW_OFF
-        }.freeze
+        DEFAULTS = { timeout: 10 }.freeze
 
         def initialize(port, opt = {})
           @port = port.freeze
@@ -31,15 +24,7 @@ module Digital
         # @see Adapters#new_serial_adapter
         #
         def connect
-          io = Rs232.new(@port)
-          io.connecting_timeout = @opts[:timeout].to_i if p.respond_to?(:connecting_timeout)
-          io.open
-          io.baud_rate = @opts[:baud_rate].to_i
-          io.data_bits = @opts[:data_bits].to_i
-          io.parity = @opts[:parity].to_i
-          io.stop_bits = @opts[:stop_bits].to_i
-          io.flow_control = @opts[:flow_control].to_i
-          @io = io
+          @io = new_serial_port(@port, @opts).tap(&:connect)
           Either.right(self)
         rescue Exception => ex
           Either.left(ex)
@@ -64,7 +49,7 @@ module Digital
         end
 
         def open?
-          @io && !@io.closed?
+          @io && @io.open?
         end
 
         def read(count, blocking = false)
@@ -84,6 +69,7 @@ module Digital
           end
           Either.right(array.empty? ? nil : array.join)
         rescue => ex
+          @io.close
           Either.left(ex)
         end
 

data/lib/digital/transport/version.rb

@@ -1,5 +1,5 @@
 module Digital
   module Transport
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.8.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: digital-transport
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Roman Lishtaba