rmodbus 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527837e39897ba74bd43ca15325a17e931fea9a8
-  data.tar.gz: e244ecaa6b7ae3d0c2a80798ad4f799f58458a30
+  metadata.gz: 14b716e9730d683db654f82d88e801739a0786e6
+  data.tar.gz: 17f4c3fd6ab5d45f637c4abb032ed752a2930b3d
 SHA512:
-  metadata.gz: 127f4c8fa6f2958425a750f144d70223747dc1b058a1e7954bad9bf1d1a15d8378e592c9f017f38807fbf66683790274a3e0fe9f782ee31a00634a48c95fa3d7
-  data.tar.gz: 54a418c81c178a32890040396f2658fc123d561cfd4821044b3f75168bf254c50a8bf32d388b78f12ac614f0192022dc108040ff55e183363b1d0e8d0d8863cc
+  metadata.gz: 9cfe7c1e4a91739f80ff23647e57f6ff41fba15eda4f1469699331e4d8a11f36bd664005610b195785def7241fcc9bdfa7f14c8852908da54876c6ee040c0d72
+  data.tar.gz: 26ddc5f16f7d175061dc86a5dae065deed8cb542d7b8a9850ff9a0c1e655eeb12d3b1154598e8faf67a5c852c3b5edfd91bf701b56d60f07e12d51855790c382

data/NEWS.md

@@ -1,3 +1,8 @@
+###2017-03-30 Release 1.3.2
+
+1. Fix Fixnum warning on Ruby 2.4
+2. Add extension method to support unpacking 32-bit Int using little-endian order
+
 ###2016-10-18 Release 1.3.0
 
 1. Turn the following dependencies optional: serialport, gserver

data/lib/rmodbus/ext.rb

@@ -39,6 +39,12 @@ class Array
     self.each_slice(2).map { |(lsb, msb)| [msb, lsb].pack('n*').unpack('g')[0] }
   end
 
+  # Given an array of 16bit Fixnum, we turn it into 32bit Int in little-endian order, halving the size
+  def to_32f_le
+    raise "Array requires an even number of elements to pack to 32bits: was #{self.size}" unless self.size.even?
+    self.each_slice(2).map { |(lsb, msb)| [lsb, msb].pack('n*').unpack('g')[0] }
+  end
+
   # Given an array of 32bit Floats, we turn it into an array of 16bit Fixnums, doubling the size
   def from_32f
     self.pack('g*').unpack('n*').each_slice(2).map { |arr| arr.reverse }.flatten

data/lib/rmodbus/proxy.rb

@@ -9,7 +9,7 @@ module ModBus
     # Read single or multiple values from a modbus slave depending on whether a Fixnum or a Range was given.
     # Note that in the case of multiples, a pluralized version of the method is sent to the slave
     def [](key)
-      if key.instance_of?(Fixnum)
+      if key.instance_of?(0.class)
         @slave.send("read_#{@type}", key, 1)
       elsif key.instance_of?(Range)
         @slave.send("read_#{@type}s", key.first, key.count)
@@ -24,7 +24,7 @@ module ModBus
     # Note that in the case of multiples, a pluralized version of the method is sent to the slave. Also when
     # writing multiple values, the number of elements must match the number of registers in the range or an exception is raised
     def []=(key, val)
-      if key.instance_of?(Fixnum)
+      if key.instance_of?(0.class)
         @slave.send("write_#{@type}", key, val)
       elsif key.instance_of?(Range)
         if key.count != val.size

data/lib/rmodbus/version.rb

@@ -1,4 +1,4 @@
 module ModBus
   # Package version
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/spec/ext_spec.rb

@@ -24,10 +24,15 @@ describe Array do
     [20342, 17344, 20342, 17344].to_32i.size.should == 2
   end
 
-  it "should turn an array into 32b floats" do
+  it "should turn an array into 32b floats big endian" do
     [20342, 17344].to_32f[0].should be_within(0.1).of(384.620788574219)
     [20342, 17344, 20342, 17344].to_32f.size.should == 2
   end
+  
+  it "should turn a an array into 32b floats (little endian)" do
+    [17344, 20342].to_32f_le[0].should be_within(0.1).of(384.620788574219)
+    [17344, 20342, 17344, 20342].to_32f_le.size.should == 2
+  end
 
   it "should turn an array from 32b ints into 16b ints, big endian" do
     [1136676726].from_32i.should == [20342, 17344]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - A.Timin, J. Sanders, K. Reynolds, F. Luizão
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: RModBus - free implementation of protocol ModBus