da_funk 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07b9ea6556472bc92fa259d401df635c5aff47d0
-  data.tar.gz: d891623b931366e85ffcb3de87c34bd0ce2c2dc6
+  metadata.gz: f02750035385ab13f575b3238e23e0d6c52c36ea
+  data.tar.gz: 7004539dee0f72e9f42b7d5fb961362287c400ff
 SHA512:
-  metadata.gz: 54ddb2aff41234bfb11af9267e20ba7bc3982ae7f7bbf7f37cbe4b7fa91e32298ef6489ccec6ac4b079b9b1ffab1b33920ecedb80479fdb305afce1db2d8bf15
-  data.tar.gz: 283903005f42037e3881bc8b4e35e26006e4aeecc30543ca47a3a96d2b995da875bd6152ad8c28ebf6bdebd3f685e6b2a3e48cc063e248872c390d76e23669e9
+  metadata.gz: 639c17f6027557cfc9a9b28a843437dc02da6f27eacb748c3704ed0295d77878712993e79234f888abb11782f49e8b8c4cde7ad8315f1095f98082777a4b19e3
+  data.tar.gz: a0a95c27abefbea7f1a22145e83e0ef8eb72ac7243b416511ee18ee95b3f025ac9060b9677e88065e2a3d734c35e2992753053d1412967fad1b8eb71cfa7dd7f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (1.10.0)
+    da_funk (1.11.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -15,7 +15,7 @@ GEM
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     ast (2.4.0)
-    cloudwalk (1.5.0)
+    cloudwalk (1.9.1)
       bundler
       rake
     cloudwalk_handshake (0.12.0)
@@ -25,22 +25,22 @@ GEM
     funky-tlv (0.2.3)
     io-like (0.3.0)
     parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    posxml_parser (2.3.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    posxml_parser (2.3.3)
       funky-emv (~> 0.3)
     powerpack (0.1.1)
     rainbow (3.0.0)
-    rake (12.3.0)
-    rubocop (0.52.1)
+    rake (12.3.1)
+    rubocop (0.56.0)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.3.2)
     yard (0.9.12)
 
 PLATFORMS

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 1.11.0 - 2018-05-18
+
+- Bug fix String.integer? when string starts with “0”.
+- Increase getc timeout to 10 seconds when communication error.
+- ISO8583 convert bitmap from binary to hex and hex to binary.
+
 ### 1.10.0 - 2018-03-22
 
 - Change Notification format removing repeated values.

data/lib/da_funk/helper.rb

@@ -35,7 +35,7 @@ module DaFunk
           else
             Device::Setting.network_configured = 0 if DaFunk::ParamsDat.file["connection_management"] == "0"
             print_attach(:attach_fail, options.merge(:args => [Device::Network.code.to_s]))
-            getc(4000)
+            getc(10000)
             return false
           end
         else

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="1.10.0"
+  VERSION="1.11.0"
 end
 

data/lib/ext/string.rb

@@ -13,7 +13,7 @@ class String
   def integer?
     !! Integer(self)
   rescue ArgumentError => e
-    if e.message[-19..-1] == "too big for integer"
+    if e.message[-19..-1] == "too big for integer" || (self[0] == "0" && !self.match(/[a-zA-Z]/))
       begin
         self.to_f
         return true

data/lib/iso8583/bitmap.rb

@@ -59,7 +59,21 @@ module ISO8583
 
     # Generate the bytes representing this bitmap.
     def to_bytes
-      self.to_s.to_i(2).to_s(16).upcase
+      # Convert binary to hex, by slicing the binary in 4 bytes chuncks
+      bitmap_hex = ""
+      str = ""
+      self.to_s.chars.reverse.each_with_index do |ch, i|
+        str << ch
+        next if i == 0
+        if (i+1) % 4 == 0
+          bitmap_hex << str.reverse.to_i(2).to_s(16)
+          str = ""
+        end
+      end
+      unless str.empty?
+        bitmap_hex << str.reverse.to_i(2).to_s(16)
+      end
+      bitmap_hex.reverse.upcase
     end
     alias_method :to_b, :to_bytes
 
@@ -85,9 +99,15 @@ module ISO8583
 
     private
 
+    def convert_hex_to_binary(str)
+      str.chars.reverse.inject("") do |string, ch|
+        string + ch.to_i(16).to_s(2).rjust(4, "0").reverse
+      end.reverse
+    end
+
     def initialize_from_message(message)
       bmp = if hex_bitmap?
-              rjust(message[0..15].to_i(16).to_s(2), 64, '0')
+              rjust(convert_hex_to_binary(message[0..15]), 64, '0')
             else
               message.unpack("B64")[0]
             end

data/test/unit/ext/string_test.rb

@@ -32,6 +32,10 @@ class StringTest < DaFunk::Test.case
     assert_false "0A179759".integer?
   end
 
+  def test_interger_check_true_0517030931
+    assert "0517030931".integer?
+  end
+
   def test_interger_check_false_empty
     assert_false "".integer?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake