da_funk 3.12.0 → 3.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ffde433da3076be7fa1b4744b927c148a832a7422a3f49bc6d8ddef0077bcc9
-  data.tar.gz: 13f551cab79ffb6ea0cba2b79ce04508b9a59ffe1559e7d8aee5a055f9eebcec
+  metadata.gz: bf1e09c7b265c6d83c0c814363022ef3a1174d27c244cb1127ca01559379d6b9
+  data.tar.gz: dd20f648a94b48075b07de6d339c0ec562e29f9054d6a447a37e7fbb780ba1b8
 SHA512:
-  metadata.gz: 98fa3b9a68ebed4f1257c6774568e5afa19ca5024395344e598c8dfb75d0d4301ae8d48fa0f58430af5d39d2757409d62e7b3c7866e6e54d35f62a81229e03b9
-  data.tar.gz: 7f6817f2c22d7abb575ea0745c50b0eddd8f3ce56814f3fc8b10008426b058c3c6a261252a1db87cf32876e7b02e2436c9aed4d8dacc81d6eb3abfc2b496a457
+  metadata.gz: 680b0551574b980502fdde24a8e1cfa5f436aabdcdca16378e0f4a3334964effc80db10a0e47b5cd5e102279235184a5b1e0874927c980e4aec4d7224269b293
+  data.tar.gz: b9b0a9103cd380b2caec892a8011c94caae587d191d666930fb6b9eea8ec587c51fc1d4f69088e4388ee541981fef77cda0cdfa3c8c167aeae2f47da5745087b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.12.0)
+    da_funk (3.12.2)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -29,7 +29,7 @@ GEM
     parallel (1.17.0)
     parser (2.6.4.1)
       ast (~> 2.4.0)
-    posxml_parser (2.24.0)
+    posxml_parser (2.24.1)
       funky-emv (~> 1)
     rainbow (3.0.0)
     rake (13.0.0)

data/RELEASE_NOTES.md

@@ -1,5 +1,13 @@
 # DaFunk
 
+### 3.12.2 - 2019-11-18
+
+- Bug fix undefined method 'x' on parse_touchscreen_event. This method was not receiving x and y which were local variables.
+
+### 3.12.1 - 2019-11-18
+
+- Bug fix local jump error: unexpected return. Error found on methods added to touch screen operations (Helper).
+
 ### 3.12.0 - 2019-11-14
 
 - Added DaFunk::Helper#wait_touchscreen_or_keyboard_event.

data/lib/da_funk/helper.rb

@@ -102,7 +102,7 @@ module DaFunk
       keys = [keys].flatten
       time = Time.now + timeout / 1000 if (timeout != 0)
       while (! keys.include?(key)) do
-        return Device::IO::KEY_TIMEOUT if (timeout != 0 && time < Time.now)
+        break(key = Device::IO::KEY_TIMEOUT) if (timeout != 0 && time < Time.now)
         key = getc(timeout)
       end
       key
@@ -222,11 +222,8 @@ module DaFunk
         break([:timeout, Device::IO::KEY_TIMEOUT]) if Time.now > time
         x, y = getxy_stream(100)
         if x && y
-          menu_itens.each do |key, value|
-            if value[:x].include?(x) && value[:y].include?(y)
-              return([:touchscreen, key])
-            end
-          end
+          event = parse_touchscreen_event(menu_itens, x, y)
+          break(event) if event
         elsif key = getc(100)
           if key != Device::IO::KEY_TIMEOUT
             if keys.include?(key)
@@ -439,6 +436,15 @@ module DaFunk
     end
 
     private
+    def parse_touchscreen_event(menu_itens, x, y)
+      menu_itens.each do |key, value|
+        if value[:x].include?(x) && value[:y].include?(y)
+          return([:touchscreen, key])
+        end
+      end
+      nil
+    end
+
     def form_default(options = {})
       options[:default] ||= ""
       options[:mode]    ||= Device::IO::IO_INPUT_ALPHA

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.12.0"
+  VERSION="3.12.2"
 end
 

metadata

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