rmodbus 1.2.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: 7439565bc235bd2e35e610083325a8946e6f0ff1c46df6582bee852366555745ba7af9f1d7d50a5e4d6cdf45be288ff177588d74b09d97603e36338b18fec9ad
+  data.tar.gz: a81c7ce89ff654f5faf43be3b9cfda5c6130d0470e3e20f56a418049984ff3c9cb9215361877c928b648a1e1b80cdac533d3ef1e9d90a01a11f866aea4d33cf5
+SHA1: 
+  metadata.gz: 0e1df248725aa3e1f6c90f39096062e99511f9cb
+  data.tar.gz: 08414de5199b5bee7e053faa6fa57f2ad34ae4de

data/NEWS.md

@@ -1,12 +1,16 @@
+###2013-10-28 Release 1.2.2
+
+1. Fixed issue [#29](https://github.com/flipback/rmodbus/pull/29). The server part supports 2000 of coils/discrete inputs for reading instead of 125.
+
 ###2013-06-28 Release 1.2.1
 
-1. Fixed issue [#27](https://github.com/flipback/rmodbus/issues/24) for read_nonblock error on Windows
+1. Fixed issue [#27](https://github.com/flipback/rmodbus/issues/27) 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. 
 Now this method will wait correct transaction until timeout breaks waiting.  
-2. Added ruby-2.0 experemental compatibility
+2. Added ruby-2.0 experimental compatibility
 
 ###2012-07-17 Release 1.1.5
 

data/Rakefile

@@ -22,16 +22,8 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   end
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-  spec.rcov = true
-end
-
 task :default => :spec
 
-require 'yard'
-YARD::Rake::YardocTask.new
-
 task :pry do
   sh "bundle exec pry -r ./lib/rmodbus.rb"
 end

data/lib/rmodbus/server.rb

@@ -35,13 +35,13 @@ module ModBus
 
       case func
         when 1
-          params = parse_read_func(req, coils)
+          params = parse_read_func(req, coils, 2000)
           if params[:err] == 0
             val = coils[params[:addr],params[:quant]].pack_to_word
             pdu = func.chr + val.size.chr + val
           end
         when 2
-          params = parse_read_func(req, discrete_inputs)
+          params = parse_read_func(req, discrete_inputs, 2000)
           if params[:err] == 0
             val = discrete_inputs[params[:addr],params[:quant]].pack_to_word
             pdu = func.chr + val.size.chr + val
@@ -89,10 +89,10 @@ module ModBus
       end
     end
 
-    def parse_read_func(req, field)
+    def parse_read_func(req, field, quant_max=0x7d)
       quant = req[3,2].unpack('n')[0]
 
-      return { :err => 3} unless quant <= 0x7d
+      return { :err => 3} unless quant <= quant_max
 
       addr = req[1,2].unpack('n')[0]
       return { :err => 2 } unless addr + quant <= field.size

data/lib/rmodbus/version.rb

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

data/spec/tcp_server_spec.rb

@@ -2,7 +2,7 @@
 require "rmodbus"
 
 describe ModBus::TCPServer do
-  before do
+  before :all do
     @server = ModBus::TCPServer.new(8502,1)
     @server.coils = [1,0,1,1]
     @server.discrete_inputs = [1,1,0,0]
@@ -29,8 +29,15 @@ describe ModBus::TCPServer do
     )
   end
 
-  it "should send exception if quanity of out more 0x7d" do
-    lambda { @slave.read_coils(0, 0x7e) }.should raise_exception(
+  it "should send exception if quanity of registers are more than 0x7d" do
+    lambda { @slave.read_holding_registers(0, 0x7e) }.should raise_exception(
+      ModBus::Errors::IllegalDataValue,
+      "A value contained in the query data field is not an allowable value for server"
+    )
+  end
+
+  it "shouldn't send exception if quanity of coils are more than 0x7d0" do
+    lambda { @slave.read_coils(0, 0x7d1) }.should raise_exception(
       ModBus::Errors::IllegalDataValue,
       "A value contained in the query data field is not an allowable value for server"
     )
@@ -53,6 +60,11 @@ describe ModBus::TCPServer do
     @slave.read_coils(0,3).should == @server.coils[0,3]
   end
 
+  it "should supported function 'read coils' with more than 125 in one request" do
+    @server.coils = Array.new( 1900, 1 )
+    @slave.read_coils(0,1900).should == @server.coils[0,1900]
+  end
+
   it "should supported function 'read discrete inputs'" do
     @slave.read_discrete_inputs(1,3).should == @server.discrete_inputs[1,3]
   end
@@ -101,7 +113,7 @@ describe ModBus::TCPServer do
     srv.maxConnections.should eql(max_conn)
   end
 
-  after do
+  after :all do
     @cl.close unless @cl.closed?
     @server.stop unless @server.stopped?
     while GServer.in_service?(8502)

metadata

@@ -1,168 +1,79 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rmodbus
-version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 1.2.2
 platform: ruby
-authors:
+authors: 
 - A.Timin, J. Sanders, K. Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-10-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: pry
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: serialport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: serialport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :development
+  version_requirements: *id007
 description: 
 email: atimin@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
 - NEWS.md
-files:
+files: 
 - lib/rmodbus/rtu_client.rb
 - lib/rmodbus/rtu_via_tcp_slave.rb
 - lib/rmodbus/rtu_server.rb
@@ -210,33 +121,31 @@ files:
 - README.md
 - NEWS.md
 homepage: http://rmodbus.flipback.net
-licenses: []
+licenses: 
+- GPL v2.0
+metadata: {}
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --title
 - RModBus
 - --inline-source
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RModBus - free implementation of protocol ModBus
 test_files: []
-has_rdoc: 
+