da_funk 3.18.1 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ce9673172b8ee5806e0b9e798fc82ecb6c485f4d17ce42b9da09dd8819078376
-  data.tar.gz: 8fe7ccbeaa715ac1e3753755c442a346e9f10dc99c43db72eb781691f88a595c
+SHA1:
+  metadata.gz: a61984983d2f7c168e0a4e84d60ac44d3060f7be
+  data.tar.gz: 490ef400806c5e7329d28426ca95fa4284c3ea02
 SHA512:
-  metadata.gz: 22e35877246d833aa5c459061a78cc31528342a3e3c508790d1b5143d722b84dc5f516a600a449196ad931a8e561d0376cd852b0a75a010f286e6d3e77b5fc8c
-  data.tar.gz: 51f09c79c484aba8fd8d788763195a11c892f025b5857106c60707186e15f1277f6e302f05eca10a971fddd774dc8c25d731877747d9c809d27923a1bc5880df
+  metadata.gz: c0f22c650827eec86b2fb87251771d519c1132d6a8b488b76ad940fb2e66491810e7235033cfe1ac0f4191058520b39022546ba789fa1dedd279f0cebb52f7d3
+  data.tar.gz: 11da367af36fc688bce9ccc0f7979fc17491b5102d4cd056df675b0e69699e7ff79a817f7f25926aa8ab3e25d58ef7da7b3f63066aedde0de7780e09f0884579

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.18.1)
+    da_funk (3.20.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -18,7 +18,7 @@ GEM
     cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.13.0)
+    cloudwalk_handshake (1.13.1)
       funky-simplehttp (~> 0.6)
     funky-emv (1.2.2)
       funky-tlv (~> 0.2)

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # DaFunk
 
+### 3.20.0 - 2020-05-28
+
+- Rename PaymentChannel::client to ::current;
+- Fix status bar change link to cache old value.
+
 ### 3.18.1 - 2020-05-20
 
 - Fix issue on DaFunk::Helper#menu_image_touchscreen_or_keyboard it was not checking for special keys

data/lib/da_funk/helper.rb

@@ -15,7 +15,7 @@ module DaFunk
     end
 
     def attach_options(enable_txt_ui = true)
-      if DaFunk::PaymentChannel.client == Context::CommunicationChannel
+      if DaFunk::PaymentChannel.current == Context::CommunicationChannel
         {:print_last => true, :enable_txt_ui => enable_txt_ui}
       else
         {:print_last => false, :enable_txt_ui => enable_txt_ui}

data/lib/da_funk/helper/status_bar.rb

@@ -58,14 +58,14 @@ module DaFunk
       end
 
       def self.change_link
-        if Device::Network.connected?
-          if DaFunk::PaymentChannel.alive?
+        info = (!! DaFunk::PaymentChannel.alive?)
+        if self.link.nil? || self.link != info
+          self.link = info
+          if info
             PAX::Display.print_status_bar(SLOT_LINK, "./shared/link.png")
           else
             PAX::Display.print_status_bar(SLOT_LINK, "./shared/unlink.png")
           end
-        else
-          PAX::Display.print_status_bar(SLOT_LINK, "./shared/unlink.png")
         end
       end
 

data/lib/da_funk/payment_channel.rb

@@ -3,11 +3,29 @@ module DaFunk
     DEFAULT_HEARBEAT = "180"
 
     class << self
-      attr_accessor :client, :app
+      attr_accessor :current, :app
     end
 
     attr_accessor :handshake_response, :handshake_request, :client, :host, :port
 
+    # Backward compatibility
+    def self.client
+      self.current
+    end
+
+    # Backward compatibility
+    def self.client=(obj)
+      self.current = obj
+    end
+
+    def self.current
+      @current
+    end
+
+    def self.current=(obj)
+      @current = obj
+    end
+
     def self.ready?
       Device::Network.connected? && self.configured?
     end
@@ -22,8 +40,8 @@ module DaFunk
       if @app != application
         @app = application
         # if Context::CommunicationChannel send application name thought threads
-        if @client == Context::CommunicationChannel
-          @client.app = application
+        if self.current == Context::CommunicationChannel
+          self.current.app = application
         else
           Device::System.klass = application
         end
@@ -48,11 +66,11 @@ module DaFunk
         self.print_info(I18n.t(:attach_attaching), display_message)
         create
         self.print_info(I18n.t(:attach_authenticate), display_message)
-        @client.handshake
+        self.current.handshake
       else
         client_clear!
       end
-      @client
+      self.current
     end
 
     def self.payment_channel_limit?
@@ -84,18 +102,16 @@ module DaFunk
       if self.dead?
         unless self.channel_limit_exceed?
           PaymentChannel.connect(display_message)
-          if @client
+          if self.current
             self.print_info(I18n.t(:attach_waiting), display_message)
-            if message = @client.check || @client.handshake?
+            if message = self.current.check || self.current.handshake?
               self.print_info(I18n.t(:attach_connected), display_message)
               message
             end
           end
         end
       else
-        if @client
-          @client.check
-        end
+        self.current&.check
       end
     end
 
@@ -104,11 +120,11 @@ module DaFunk
     end
 
     def self.alive?
-      Device::Network.connected? && @client && @client.connected?
+      Device::Network.connected? && self.current&.connected?
     end
 
     def self.close!
-      @client && @client.close
+      self.current&.close
     ensure
       client_clear!
     end
@@ -133,16 +149,16 @@ module DaFunk
     end
 
     def self.create
-      if @client != Context::CommunicationChannel
+      if self.current != Context::CommunicationChannel
         payment_channel_increment_attempts
-        @client = PaymentChannel.new
+        self.current = PaymentChannel.new
       else
-        @client.connect
+        self.current.connect
       end
     end
 
     def self.client_clear!
-      @client = nil unless @client == Context::CommunicationChannel
+      self.current = nil unless self.current == Context::CommunicationChannel
     end
 
     def initialize(client = nil)
@@ -180,13 +196,13 @@ module DaFunk
     end
 
     def close
-      @client.close if @client
+      @client&.close
       @client = nil
-      PaymentChannel.client = nil
+      PaymentChannel.current = nil
     end
 
     def connected?
-      self.client && self.client.connected?
+      self.client&.connected?
     end
 
     def handshake?
@@ -215,7 +231,7 @@ module DaFunk
       if Context.development?
         ContextLog.exception(exception, exception.backtrace, "PaymentChannel error")
       end
-      PaymentChannel.client = nil
+      PaymentChannel.current = nil
       @client = nil
     end
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.18.1"
+  VERSION="3.20.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.18.1
+  version: 3.20.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -253,7 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: MRuby Embedded System Framework