rmodbus 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a128d842465a1355308265efa0273d2cb629b26e
-  data.tar.gz: ed76681a42ad97e7fe9284418460ffd6f240babb
+  metadata.gz: 32a45f98ff103499e6446a926f9819928716602a
+  data.tar.gz: 0f883902d6eb8a80330769ca519e69915343d857
 SHA512:
-  metadata.gz: 3ea5518db02422ac0b7202b7c0a44e1abf38a781ba537d0b1ddc10400bdbe808f9be5d155c5711deb26feb29beb2175382dacf3d849b6f3d5c90c558446f9ea3
-  data.tar.gz: eef59e76702b87da4b515c89ba91bdc65398c475081dbc47b13b9253de77fc6a185e4828565ac19e77c83ad5a6827f2427c34c57aefa9666e320b929e768204a
+  metadata.gz: e050abe8430ef0b8f58bc953c249b6b8143d90e673889c3ec91723deba0888d8ddf081ba7efcfbba7a3517a1287bce028386e203505156c5cb00a40005fa2ad2
+  data.tar.gz: 0badca7a5158d6ab27d094c27f3c1b030a14c70e50079fedf4533041d5f340e6fa871d8383ab3e3f5cfb53fa8dea413efca44bb217e8525b2bec602b01dd81d7

data/NEWS.md

@@ -1,3 +1,7 @@
+###2015-03-21 Release 1.2.6
+
+1. Fixed issue [#35](https://github.com/flipback/rmodbus/issues/35).
+
 ###2015-03-12 Release 1.2.5
 
 1. Fixed issue [#34](https://github.com/flipback/rmodbus/issues/34).

data/lib/rmodbus/rtu.rb

@@ -17,8 +17,6 @@ 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
@@ -47,20 +45,8 @@ module ModBus
     end
 
     def clean_input_buff
-      win_platform = RUBY_PLATFORM.include? "mingw"
-      begin
-        # 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 unless win_platform || e.is_a?(EOFError) # EOFError means we are done
-      end
+      # empty the input buffer
+      @io.flush_input
     end
 
     def send_rtu_pdu(pdu)

data/lib/rmodbus/version.rb

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

data/spec/logging_spec.rb

@@ -68,7 +68,7 @@ begin
     it 'should log rec\send bytes' do
       request = "\x3\x0\x1\x0\x1"
       @sp.should_receive(:write).with("\1#{request}\xd5\xca")
-      @sp.should_receive(:read_nonblock).and_return("\xff\xff") # Clean a garbage
+      @sp.should_receive(:flush_input)  # Clean a garbage
       @sp.should_receive(:read).with(2).and_return("\x1\x3")
       @sp.should_receive(:read).with(1).and_return("\x2")
       @sp.should_receive(:read).with(4).and_return("\xff\xff\xb9\xf4")

data/spec/rtu_client_spec.rb

@@ -7,7 +7,7 @@ describe ModBus::RTUClient do
     SerialPort.should_receive(:new).with("/dev/port1", 9600, 8, 1, 0).and_return(@sp)    
     @sp.stub!(:read_timeout=)
     @sp.should_receive(:flow_control=).with(SerialPort::NONE)
-    @sp.stub!(:read_nonblock)
+    @sp.stub!(:flush_input)
 
     @cl = ModBus::RTUClient.new("/dev/port1", 9600, :data_bits => 8, :stop_bits => 1, :parity => SerialPort::NONE)
     @slave = @cl.with_slave(1)
@@ -50,15 +50,6 @@ describe ModBus::RTUClient do
     end
   end
 
-  unless RUBY_PLATFORM.include? "mingw"
-    it 'should ignore EOFError during clearing the buffer' do
-      @sp.should_receive(:read_nonblock).and_raise(EOFError)
-
-      request = stab_valid_request
-      lambda { @slave.query(request)}.should_not raise_error(EOFError)
-    end
-  end
-
   it 'should have closed? method' do
     @sp.should_receive(:closed?).and_return(false)
     @cl.closed?.should == false

data/spec/rtu_via_tcp_client_spec.rb

@@ -7,7 +7,7 @@ describe ModBus::RTUViaTCPClient do
       @sock = mock('Socked')
       TCPSocket.should_receive(:new).with("127.0.0.1", 10002).and_return(@sock)    
       @sock.stub!(:read_timeout=)
-      @sock.stub!(:read_nonblock)
+      @sock.stub!(:flush_input)
       
       @cl = ModBus::RTUViaTCPClient.new("127.0.0.1")
       @slave = @cl.with_slave(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - A.Timin, J. Sanders, K. Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake