nstrct 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccf2a504724afc56fa86576ce25a3acf31ed62db
-  data.tar.gz: ba444fb4a80331bf4f0e6360c6163febcfaaa358
+  metadata.gz: e06a8f8d192ef2bfd7ef1b08ac24a51673c70d59
+  data.tar.gz: 96188fdf46de1a6d1d010c50da43ad1806c183a4
 SHA512:
-  metadata.gz: f0c61d1f31d7cf262efd8eaabbf25ad4039caa964b85c6c14ac0118b9dda3c5847143e73a3ce65a1a7b544e274a92e388b406c18143c8fc13f64c3a52e61593f
-  data.tar.gz: 6a79eb757a4b12c3288c2b40f4b849a1df59288ea93e3b03526a8bad62262603c73a535cdd9624bcaee3edfed8600eb80c59707e40cfac75e2d70065f15b10d0
+  metadata.gz: a47bdd20de56a8417d0800f3a0c206c6f4d34ca0f26413403a23166a42a4d739c5d09054a53f20dee3d662944ced8ba47c90010a805fa657715085a9c57f8455
+  data.tar.gz: d063f5752aa2297dd706c10690f01a122eebaf1fe97e238a4ef4b7d22ac7febaf18d047036b2cb7cbb4b889f9ce0935e5969c6b1b0306c83a5441c78754b6fce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nstrct (0.1.2)
+    nstrct (0.1.3)
       digest-crc
 
 GEM

data/lib/nstrct/argument.rb

@@ -86,7 +86,7 @@ module Nstrct
     def pack_value datatype, value, data
       case datatype
         when :boolean
-          data += [value.to_i ? 1 : 0].pack('C')
+          data += [to_boolean(value) ? 1 : 0].pack('C')
         when :int8
           data += [value.to_i].pack('c')
         when :int16
@@ -118,15 +118,26 @@ module Nstrct
       data
     end
 
+    def to_boolean(value)
+      return value if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      return Integer(value) >= 1
+    rescue
+      return value == 'true'
+    end
+
     # Pack a single argument in a buffer
     def pack
       data = ''
       if @array
         data += [DATATYPES[:array]].pack('C')
         data += [DATATYPES[@datatype]].pack('C')
-        data += [@value.size].pack('C')
-        @value.each do |val|
-          data = pack_value(@datatype, val, data)
+        if @value.is_a?(Array)
+          data += [@value.size].pack('C')
+          @value.each do |val|
+            data = pack_value(@datatype, val, data)
+          end
+        else
+          data += [0].pack('C')
         end
       else
         data += [DATATYPES[datatype]].pack('C')

data/lib/nstrct/instruction.rb

@@ -44,7 +44,7 @@ module Nstrct
 
     # get all elements in arrays
     def array_elements
-      @arguments.inject(0){ |sum, a| sum + (a.array ? a.value.size : 0) }
+      @arguments.inject(0){ |sum, a| sum + (a.array ? a.value.is_a?(Array) ? a.value.size : 0 : 0) }
     end
 
     # Pack a single instruction in a buffer

data/lib/nstrct/version.rb

@@ -1,3 +1,3 @@
 module Nstrct
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/protocol_spec.rb

@@ -1,5 +1,23 @@
 require 'spec_helper'
 
+describe Nstrct::Argument do
+
+  it 'should coerce string booleans' do
+    Nstrct::Argument.new(:boolean, 'true', false).pack.should == "\x01\x01"
+    Nstrct::Argument.new(:boolean, 'false', false).pack.should == "\x01\x00"
+    Nstrct::Argument.new(:boolean, true, false).pack.should == "\x01\x01"
+    Nstrct::Argument.new(:boolean, false, false).pack.should == "\x01\x00"
+    Nstrct::Argument.new(:boolean, 1, false).pack.should == "\x01\x01"
+    Nstrct::Argument.new(:boolean, 0, false).pack.should == "\x01\x00"
+    Nstrct::Argument.new(:boolean, 2, false).pack.should == "\x01\x01"
+  end
+
+  it 'should treat wrong arrays' do
+    Nstrct::Argument.new(:boolean, 'no-array-value', true).pack.should == " \x01\x00"
+  end
+
+end
+
 describe Nstrct::Instruction do
 
   it 'should pack and unpack an empty instruction' do
@@ -9,7 +27,7 @@ describe Nstrct::Instruction do
   end
 
   it 'should pack and unpack an instructionw with arguments' do
-    instruction1 = Nstrct::Instruction.build(232, [:float32, 1.0 ], [:boolean, true], [:int8, 2], [:float32, 1.0], [[:uint16], [54, 23, 1973]])
+    instruction1 = Nstrct::Instruction.build(232, [:float32, 1.0 ], [[:boolean], []], [:boolean, true], [:int8, 2], [:float32, 1.0], [[:uint16], [54, 23, 1973]])
     instruction2 = Nstrct::Instruction.parse(instruction1.pack)
     instruction1.inspect.should == instruction2.inspect
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nstrct
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joël Gähwiler