digital-transport 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7af58d75f82ffdaf6870b242c530685e6285dc16
-  data.tar.gz: cefbffc637bc63cb05eeb4f5c162d5f558322693
+  metadata.gz: 7210be7b3f3b38e00cd8e5bf1e9f45a4c641d506
+  data.tar.gz: 8cfdac45b4518b7cad332922ffe4d34d6f4853a2
 SHA512:
-  metadata.gz: e1c1a80fefe85d91e10e925cf7e3dcf7202a84460513de4295a8f324d0659e7fd4126f57a2d3da797e37796025a06dbd9c02e3e025e061d992c34da5fe9e2e64
-  data.tar.gz: da4e1ba232ceabe3ace2fae5f576094e22249189cf9a55b4471fcc2aa8b3895767f1b3f0af1b2930f00054eb57b20ad7607a447004196319ebe13a310976f93b
+  metadata.gz: aa7617898078749f5951ecccce2e8dcd945a177ad060081c8c4e3c4964e29298eda61b3bb4a0d8260a83883a65f8be7bcd065834cc6bee2a19e5b13c9134160a
+  data.tar.gz: 0b7d162b828715896ad015fc15df1d341f927c3597f143962f53926187aa985d987d564fae26d31118247eaf54c7bf8c2d74a74dfb99472a0d2064d7b1193a33

data/digital-transport.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.4'
 
   spec.add_dependency 'functional-ruby'
-  spec.add_dependency 'rs_232', '~>3.0.0.pre2' unless RUBY_PLATFORM === /java/
+  spec.add_dependency 'rs_232', '~>3.0.0.pre3' unless RUBY_PLATFORM === /java/
 end

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

@@ -1,4 +1,5 @@
 require 'rs_232'
+require 'timeout'
 
 module Digital
   module Transport
@@ -54,20 +55,8 @@ module Digital
 
         def read(count, blocking = false)
           raise NotConnected unless open?
-          array = []
-
-          bytes_count = (count == -1) ? @io.available? : count
-
-          if blocking
-            bytes = read_io_until(count, count)
-            array.push bytes if bytes
-          else
-            bytes_count.times do
-              byte = @io.read(1)
-              array.push byte if byte
-            end
-          end
-          Either.right(array.empty? ? nil : array.join)
+          f = blocking ? method(:read_blocking) : method(:read_non_blocking)
+          Either.right f.(count)
         rescue => ex
           @io.close
           Either.left(ex)
@@ -75,32 +64,18 @@ module Digital
 
         private
 
-        # @api private
-        #
-        # simulate blocking function
-        #
-        # @param [Fixnum] count
-        # @param [Fixnum] up_to
-        #
-        # no direct ruby usage
-        #
-        def block_io_until(count, up_to)
-          up_to -= 1 while @io.available? < count && up_to > 0
-          up_to > 0
+        def read_non_blocking(count)
+          @io.read(count)
         end
 
-        # @api private
-        #
-        # simulate blocking function
-        #
-        # @param [Fixnum] count
-        # @param [Fixnum] up_to
-        #
-        # no direct ruby usage
-        #
-        def read_io_until(count, up_to)
-          sleep 0.001 until block_io_until(count, up_to)
-          read(count)
+        # todo: shouldn't block forever.
+        def read_blocking(count)
+          bytes = ''
+          while bytes.length < count
+            bytes += read_non_blocking(count).to_s
+            sleep 0.001
+          end
+          bytes
         end
       end
     end

data/lib/digital/transport/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digital-transport
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Roman Lishtaba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre2
+        version: 3.0.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre2
+        version: 3.0.0.pre3
 description: Library intended to unify interface between multiple transport adapters
 email:
 - roman@lishtaba.com
@@ -187,3 +187,4 @@ signing_key:
 specification_version: 4
 summary: interface between multiple transport adapters
 test_files: []
+has_rdoc: