rmodbus 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 065a16477ec109fd5521d0f33a2965c5687910fe
-  data.tar.gz: b244c0be0566f669b0c13c370cab5b5ea168a2ab
+  metadata.gz: a128d842465a1355308265efa0273d2cb629b26e
+  data.tar.gz: ed76681a42ad97e7fe9284418460ffd6f240babb
 SHA512:
-  metadata.gz: caff21950ba72421c1e05b4572abe39e2b0f3cd90d48b4333ed0a9d1107b94e65dd0ab20c06997b949655afb0c21fab85ecdea4e460852d66cb254fcbcaa2ac6
-  data.tar.gz: 26f021025e08eceb06c889adb6c2fdb522893d920c4b8ff187db0e31e580a128a0d9ef7a1eba348705f47462a790987789d4c8a9d6f62cb8ce108ef5f66cbd32
+  metadata.gz: 3ea5518db02422ac0b7202b7c0a44e1abf38a781ba537d0b1ddc10400bdbe808f9be5d155c5711deb26feb29beb2175382dacf3d849b6f3d5c90c558446f9ea3
+  data.tar.gz: eef59e76702b87da4b515c89ba91bdc65398c475081dbc47b13b9253de77fc6a185e4828565ac19e77c83ad5a6827f2427c34c57aefa9666e320b929e768204a

data/NEWS.md

@@ -1,3 +1,7 @@
+###2015-03-12 Release 1.2.5
+
+1. Fixed issue [#34](https://github.com/flipback/rmodbus/issues/34).
+
 ###2015-01-29 Release 1.2.4
 
 1. Added ruby-2.2 compatibility

data/lib/rmodbus/rtu.rb

@@ -59,7 +59,7 @@ module ModBus
       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
+        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.4'
+  VERSION = '1.2.5'
 end

data/spec/read_rtu_response_spec.rb

@@ -79,7 +79,8 @@ describe "#read_rtu_response" do
   end
 
   it "should raise exception if function is illegal" do
-    resp = make_resp("\xff\x0\x1\x0\x2").should raise_error {
+    resp =  make_resp("\x1f\x0\x1\x0\x2")
+    lambda{ @cl_mb.test_read_method(resp)}.should raise_error {
       ModBus::Errors::IllegalFunction
     }
   end

data/spec/rtu_client_spec.rb

@@ -31,11 +31,7 @@ describe ModBus::RTUClient do
   end
   
   it "should return value of registers"do
-    request = "\x3\x0\x1\x0\x1"
-    @sp.should_receive(:write).with("\1#{request}\xd5\xca")
-    @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")
+    request = stab_valid_request
     @slave.query(request).should == "\xff\xff"
   end
 
@@ -54,6 +50,15 @@ 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
@@ -72,5 +77,15 @@ describe ModBus::RTUClient do
       slave.uid = 1
     end
   end
+
+  def stab_valid_request
+    request = "\x3\x0\x1\x0\x1"
+    @sp.should_receive(:write).with("\1#{request}\xd5\xca")
+    @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")
+
+    request
+  end
 end
 

metadata

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