da_funk 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6283b1f5436f7661428d301ee750654403e45f87
-  data.tar.gz: f1193803e324172e17984ac55fa8c7aa8ca5583e
+  metadata.gz: c452e3101a2c8ae40cd60a9b27a1c55c2b1e7fab
+  data.tar.gz: 5093a4afe56432c4d93bd217a479d6961893bad7
 SHA512:
-  metadata.gz: ffc92e7a99799bdccae9930160602f93f3f15304cdd6108cf16ed85779e193d9e7efdaa9c2cdf209b5b1f60e8594c8c17eaee1935df9b4dbeda105ff94879b93
-  data.tar.gz: c9115e1aeda2292e6317c1c5bc4ae033c7c012b08a155efc65381ce203343638e202cef0bb1090de1c90dba62704487af70c577b2982ede62adeb4fa87630325
+  metadata.gz: 888af27fe3acd3e2d711a7cf6a147b16e9b13def9ef3bcaa2047466c3a4e700da6c0245cdd81ddd25442ea0116f02fa80c315e12f497858fa710293f5cd9e54f
+  data.tar.gz: 1b92d0282ac7bb0757a01d0a224e4bf180e75e459adc129ee3f90c4612bf6ba4d6f242efc1ed0b28b92ceb025ea10045781c87f8da637e744b5067c49a1baf03

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.2.1)
+    da_funk (3.3.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -18,9 +18,9 @@ GEM
     cloudwalk (1.14.1)
       bundler
       rake
-    cloudwalk_handshake (1.2.2)
+    cloudwalk_handshake (1.2.3)
       funky-simplehttp (~> 0.6)
-    funky-emv (0.23.0)
+    funky-emv (0.23.3)
       funky-tlv (~> 0.2)
     funky-simplehttp (0.6.0)
     funky-tlv (0.2.3)
@@ -29,7 +29,7 @@ GEM
     parallel (1.17.0)
     parser (2.6.2.1)
       ast (~> 2.4.0)
-    posxml_parser (2.17.0)
+    posxml_parser (2.18.0)
       funky-emv (~> 0.3)
     psych (3.1.0)
     psych (3.1.0-x64-mingw32)

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 3.3.0 - 2019-05-07
+
+- Remove communication errors from PaymentChannel;
+- Remove unnecessary MAC address log;
+- Implement ConnectionManager.check (from PaymentChannel).
+
 ### 3.2.1 - 2019-04-11
 
 - Fix Dir removal on Application.delete.

data/lib/da_funk/connection_management.rb

@@ -6,11 +6,26 @@ module DaFunk
     self.drops = 0
     DEFAULT_DROP_LIMIT = 2
 
+    def self.check
+      if Device::Network.connected?
+        if primary_try?
+          :primary_communication
+        end
+      else
+        if fallback?
+          :fallback_communication
+        else
+          :attach_registration_fail
+        end
+      end
+    end
+
     def self.fallback?
       if ! Device::Network.connected? && self.fallback_valid? && self.conn_automatic_management? &&
           Device::Setting.media_primary == Device::Setting.media
         self.drops += 1
         if self.drops >= self.conn_fallback_drops_limit
+          self.drops = 0
           return true
         end
       end

data/lib/da_funk/payment_channel.rb

@@ -42,16 +42,6 @@ module DaFunk
       @client
     end
 
-    def self.error
-      if self.configured?
-        if ConnectionManagement.fallback?
-          :fallback_communication
-        elsif ConnectionManagement.conn_automatic_management?
-          :attach_registration_fail
-        end
-      end
-    end
-
     def self.payment_channel_limit?
       DaFunk::ParamsDat.exists? && DaFunk::ParamsDat.file["payment_channel_check_limit"] == "1"
     end
@@ -86,11 +76,7 @@ module DaFunk
             if message = @client.check || @client.handshake?
               self.print_info(I18n.t(:attach_connected), display_message)
               message
-            else
-              self.error
             end
-          else
-            self.error
           end
         end
       else
@@ -198,12 +184,8 @@ module DaFunk
 
     def check
       if Device::Network.connected? && self.connected? && self.handshake?
-        message = self.read
-      end
-      if message.nil? && ConnectionManagement.primary_try?
-        return :primary_communication
+        self.read
       end
-      message
     end
 
     private

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.2.1"
+  VERSION="3.3.0"
 end
 

data/lib/device/network.rb

@@ -116,7 +116,6 @@ class Device
     #   Device::Network.mac_address(Device::Network::MEDIA_GPRS)
     #   # => "AA:BB:CC:DD:EE:FF"
     def self.mac_address(media = nil)
-      ContextLog.info "mac_address"
       unless media
         self.adapter.mac_address(media2klass(Device::Setting.media))
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake