rmodbus 1.0.3-java → 1.0.4-java

data/NEWS.md

@@ -1,3 +1,16 @@
+2011-08-10 Release 1.0.4
+====================================
+1. Fixed issue [#11](https://github.com/flipback/rmodbus/issues/11)
+
+
+2011-07-17 Release 1.0.3
+====================================
+
+1. Fixed issue #10
+2. Added new options for TCPServer#new and RTUViaTCPServer#new
+   :host - ip of host server (default 127.0.0.1)
+   :max_connection - maximum (client default 4)
+
 2011-07-1 Release 1.0.2
 ====================================
 

data/lib/rmodbus.rb

@@ -33,3 +33,4 @@ require 'rmodbus/rtu_via_tcp_slave'
 require 'rmodbus/rtu_via_tcp_client'
 require 'rmodbus/rtu_via_tcp_server'
 require 'rmodbus/proxy'
+require 'rmodbus/version'

data/lib/rmodbus/rtu.rb

@@ -38,7 +38,7 @@ module ModBus
         when 22 then
           msg += io.read(8)
         when 0x80..0xff then
-          msg += io.read(4)
+          msg += io.read(3)
         else
           raise ModBus::Errors::IllegalFunction, "Illegal function: #{function_code}"
       end

data/lib/rmodbus/version.rb

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

data/spec/rtu_via_tcp_server_spec.rb

@@ -0,0 +1,14 @@
+require "rmodbus"
+describe ModBus::RTUViaTCPServer do
+  it "should have options :host" do
+    host = '192.168.0.1'
+    srv = ModBus::RTUViaTCPServer.new(1010, 1, :host => '192.168.0.1')
+    srv.host.should eql(host)
+  end
+
+  it "should have options :max_connection" do
+    max_conn = 5
+    srv = ModBus::RTUViaTCPServer.new(1010, 1, :max_connection => 5)
+    srv.maxConnections.should eql(max_conn)
+  end
+end

data/spec/tcp_server_spec.rb

@@ -17,7 +17,7 @@ describe TCPServer do
     @cl.close
     ModBus::TCPClient.connect('127.0.0.1', 8502) do |cl|
       lambda { cl.with_slave(2).read_coils(1,3) }.should raise_exception(
-        ModBus::Errors::ModBusException, 
+        ModBus::Errors::ModBusException,
         "Server did not respond"
       )
     end
@@ -26,20 +26,20 @@ describe TCPServer do
   it "should send exception if function not supported" do
     lambda { @slave.query('0x43') }.should raise_exception(
       ModBus::Errors::IllegalFunction,
-      "The function code received in the query is not an allowable action for the server" 
+      "The function code received in the query is not an allowable action for the server"
     )
   end
 
   it "should send exception if quanity of out more 0x7d" do
     lambda { @slave.read_coils(0, 0x7e) }.should raise_exception(
-      ModBus::Errors::IllegalDataValue, 
+      ModBus::Errors::IllegalDataValue,
       "A value contained in the query data field is not an allowable value for server"
     )
   end
 
   it "should send exception if addr not valid" do
     lambda { @slave.read_coils(2, 8) }.should raise_exception(
-      ModBus::Errors::IllegalDataAddress, 
+      ModBus::Errors::IllegalDataAddress,
       "The data address received in the query is not an allowable address for the server"
     )
   end
@@ -90,10 +90,22 @@ describe TCPServer do
     @server.holding_registers.should == [1,2,3,1,2,3,4,5,9]
   end
 
+  it "should have options :host" do
+    host = '192.168.0.1'
+    srv = ModBus::TCPServer.new(1010, 1, :host => '192.168.0.1')
+    srv.host.should eql(host)
+  end
+
+  it "should have options :max_connection" do
+    max_conn = 5
+    srv = ModBus::TCPServer.new(1010, 1, :max_connection => 5)
+    srv.maxConnections.should eql(max_conn)
+  end
+
   after do
-    @cl.close 
+    @cl.close
     @server.stop unless @server.stopped?
-    while GServer.in_service?(8502) 
+    while GServer.in_service?(8502)
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: rmodbus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.3
+  version: 1.0.4
 platform: java
 authors: 
   - A.Timin, J. Sanders, K. Reynolds
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-16 00:00:00 +06:00
+date: 2011-08-10 00:00:00 +06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -120,6 +120,7 @@ files:
   - spec/rtu_via_tcp_client_spec.rb
   - spec/rtu_server_spec.rb
   - spec/tcp_client_spec.rb
+  - spec/rtu_via_tcp_server_spec.rb
   - spec/exception_spec.rb
   - spec/rtu_client_spec.rb
   - spec/slave_spec.rb