rmodbus 1.2.0 → 1.2.1

data/NEWS.md

@@ -1,3 +1,7 @@
+###2013-06-28 Release 1.2.1
+
+1. Fixed issue [#27](https://github.com/flipback/rmodbus/issues/24) for read_nonblock error on Windows
+
 ###2013-03-12 Release 1.2.0
 
 1. Transaction number mismatch doesn't throw exception in TCPSlave#query method. 

data/lib/rmodbus/rtu.rb

@@ -17,6 +17,8 @@ module ModBus
   module RTU
     private
 
+    CHUNK_SIZE = 1500
+
     # We have to read specific amounts of numbers of bytes from the network depending on the function code and content
     def read_rtu_response(io)
 	    # Read the slave_id and function code
@@ -45,13 +47,19 @@ module ModBus
     end
 
     def clean_input_buff
+      win_platform = RUBY_PLATFORM.include? "mingw"
       begin
-        # Read up to 1500 bytes of trash.
-        @io.read_nonblock(1500)
+        # Read up to CHUNK_SIZE bytes of trash.
+        if win_platform
+          # non-blocking reads are not supported by Windows
+          @io.readpartial(CHUNK_SIZE)
+        else
+          @io.read_nonblock(CHUNK_SIZE)
+        end
       rescue Errno::EAGAIN
         # Ignore the fact we couldn't read.
       rescue Exception => e
-        raise e
+        raise e unless win_platform && e.is_a?(EOFError) # EOFError means we are done
       end
     end
 

data/lib/rmodbus/version.rb

@@ -13,5 +13,5 @@
 # GNU General Public License for more details.
 module ModBus
   # Package version
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RModBus - free implementation of protocol ModBus