rmodbus 1.1.0 → 1.1.1

data/NEWS.md

@@ -1,18 +1,26 @@
+2012-04-12 Release 1.1.1
+==================================
+1. Fixed issue [#15](https://github.com/flipback/rmodbus/issues/15) 
+
 2011-10-29 Release 1.1.0
 ===================================
 1. Fixed issue [#12](https://github.com/flipback/rmodbus/issues/12). Added option Slave#raise_exception_on_mismatch to turn to check response and raise exception
    if it's mismatch.
 2. Added pass options :debug, :raise_exception_on_mismatch, :read_retry_timeout, :read_retries from clients to slaves
-  `ruby
+
+  ```ruby
     @cl.debug = true
+    
     @cl.with_slave(1) do |slave_1|
       slave_1.debug #=> true
     end
+    
     @cl.with_slave(2) do |slave_2|
       slave_2.debug = false
       slave_2.debug #=> false
     end
-  ` 
+  ```
+
 3. Deleted dependency with `serialport` gem. Install it manual for using RTU
 
 2011-08-10 Release 1.0.4
@@ -44,7 +52,8 @@ New API for client part of library
 ---------------------------------------
 
 Example:
-  `ruby
+
+  ```ruby
     require 'rmodbus'
 
     ModBus::TCPClient.new('127.0.0.1', 8502) do |cl|
@@ -62,7 +71,8 @@ Example:
         slave.holding_registers[16..20] = [1, 2, 3, 4, 5]
       end
     end
-  `
+   ```
+
 for more information [see](http://rdoc.info/gems/rmodbus/1.0.0/frames)
 
 Conversion to/from 32bit registers
@@ -71,7 +81,8 @@ Conversion to/from 32bit registers
 Some modbus devices use two registers to store 32bit values.
 RModbus provides some helper functions to go back and forth between these two things when reading/writing.
 The built-in examples assume registers in a particular order but it's trivial to change.
-  `ruby
+
+  ```ruby
     # Reading values in multiple registers (you can read more than 2 and convert them all so long as they are in multiples of 2)
     res = slave.holding_registers[0..1]
     res.inspect => [20342, 17344]
@@ -83,7 +94,8 @@ The built-in examples assume registers in a particular order but it's trivial to
     cl.holding_registers[0..1] => [20342, 17344]
     cl.holding_registers[2..3] = [384.620788574219].from_32f
     cl.holding_registers[2..3] => [20342, 17344]
-  `
+  ```
+  
 Support JRuby
 --------------------------------------
 Now you could use RModBus on JRuby without RTU implementation.

data/lib/rmodbus/proxy.rb

@@ -27,7 +27,7 @@ module ModBus
       elsif key.instance_of?(Range)
         @slave.send("read_#{@type}s", key.first, key.count)
       else
-        raise ProxyException, "Invalid argument, must be integer or range. Was #{key.class}"
+        raise ModBus::Errors::ProxyException, "Invalid argument, must be integer or range. Was #{key.class}"
       end
     end
   end
@@ -41,12 +41,12 @@ module ModBus
         @slave.send("write_#{@type}", key, val)
       elsif key.instance_of?(Range)
         if key.count != val.size
-          raise ProxyException, "The size of the range must match the size of the values (#{key.count} != #{val.size})"
+          raise ModBus::Errors::ProxyException, "The size of the range must match the size of the values (#{key.count} != #{val.size})"
         end
 
         @slave.send("write_#{@type}s", key.first, val)
       else
-        raise ProxyException, "Invalid argument, must be integer or range. Was #{key.class}"
+        raise ModBus::Errors::ProxyException, "Invalid argument, must be integer or range. Was #{key.class}"
       end
     end
   end

data/lib/rmodbus/version.rb

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

data/spec/exception_spec.rb

@@ -13,6 +13,10 @@ describe ModBus::TCPClient do
     @slave = @cl.with_slave(1)
   end
 
+  it "should raise ProxException" do
+    lambda { @slave.holding_registers[0..2] = [0,0] }.should raise_error(ModBus::Errors::ProxyException)
+  end
+
   # Read coil status
   it "should read coil status" do
     @slave.read_coils(0, 4).should == [0] * 4

metadata

@@ -1,241 +1,196 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rmodbus
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.1.1
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - A.Timin, J. Sanders, K. Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-29 00:00:00 +06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19883060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *19883060
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &19882460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *19882460
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &19881800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *19881800
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &19881340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *19881340
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &19880720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *19880720
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &19880140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *19880140
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &19879640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: serialport
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *19879640
+- !ruby/object:Gem::Dependency
+  name: serialport
+  requirement: &19811420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *19811420
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &19810480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *19810480
 description: 
 email: atimin@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - NEWS.md
-files: 
-- lib/rmodbus.rb
-- lib/rmodbus/version.rb
+files:
+- lib/rmodbus/slave.rb
 - lib/rmodbus/errors.rb
+- lib/rmodbus/rtu_via_tcp_server.rb
+- lib/rmodbus/tcp_client.rb
+- lib/rmodbus/rtu.rb
+- lib/rmodbus/tcp_slave.rb
+- lib/rmodbus/version.rb
+- lib/rmodbus/server.rb
+- lib/rmodbus/client.rb
 - lib/rmodbus/ext.rb
+- lib/rmodbus/rtu_slave.rb
+- lib/rmodbus/rtu_client.rb
 - lib/rmodbus/rtu_via_tcp_client.rb
 - lib/rmodbus/sp.rb
-- lib/rmodbus/tcp.rb
-- lib/rmodbus/client.rb
-- lib/rmodbus/slave.rb
+- lib/rmodbus/rtu_server.rb
 - lib/rmodbus/tcp_server.rb
-- lib/rmodbus/tcp_client.rb
+- lib/rmodbus/rtu_via_tcp_slave.rb
 - lib/rmodbus/proxy.rb
+- lib/rmodbus/tcp.rb
 - lib/rmodbus/debug.rb
-- lib/rmodbus/rtu_slave.rb
-- lib/rmodbus/rtu_server.rb
-- lib/rmodbus/rtu.rb
-- lib/rmodbus/rtu_client.rb
 - lib/rmodbus/options.rb
-- lib/rmodbus/rtu_via_tcp_server.rb
-- lib/rmodbus/server.rb
-- lib/rmodbus/rtu_via_tcp_slave.rb
-- lib/rmodbus/tcp_slave.rb
+- lib/rmodbus.rb
 - examples/simple-xpca-gateway.rb
+- examples/perfomance_rtu.rb
 - examples/perfomance_tcp.rb
-- examples/use_tcp_modbus.rb
 - examples/use_rtu_via_tcp_modbus.rb
-- examples/perfomance_rtu.rb
-- spec/tcp_server_spec.rb
+- examples/use_tcp_modbus.rb
+- spec/rtu_client_spec.rb
 - spec/logging_spec.rb
-- spec/rtu_via_tcp_client_spec.rb
+- spec/slave_spec.rb
+- spec/tcp_server_spec.rb
 - spec/rtu_server_spec.rb
-- spec/response_mismach_spec.rb
+- spec/read_rtu_response_spec.rb
 - spec/spec_helper.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
 - spec/client_spec.rb
-- spec/read_rtu_response_spec.rb
-- spec/proxy_spec.rb
+- spec/exception_spec.rb
 - spec/ext_spec.rb
+- spec/proxy_spec.rb
+- spec/rtu_via_tcp_client_spec.rb
+- spec/rtu_via_tcp_server_spec.rb
+- spec/response_mismach_spec.rb
 - Rakefile
 - README.md
 - NEWS.md
-has_rdoc: true
 homepage: http://rmodbus.flipback.net
 licenses: []
-
 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 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: RModBus - free implementation of protocol ModBus
 test_files: []
-
+has_rdoc: