da_funk 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ecfc56704e73c282ee07fba23ce1fd9b80a3999
-  data.tar.gz: 23a3e8272e9b54cf3f83eb50f61935fda1c480d4
+  metadata.gz: 4ec3525c8b86df99abedcdc53570b5566932e225
+  data.tar.gz: e9a9f6add66d948a31ccf63353a8b104a3b5f508
 SHA512:
-  metadata.gz: 6332262e7d61471e94141fba3358a43130d35c64504fafb74ab494c8572ad9a9d29f185dc641fd7f3df35096232ef75b7b8082297f9b1ff2244c9669d7909dee
-  data.tar.gz: 750db4f4957e904bf1800c786cefcf5b7784c13cc6b0a0da041934c15f5ec9a4adbe3495d84aff5cc443f421d3160960db5d6021154ba4401d7c54b5c5d65cb3
+  metadata.gz: dd7f60bf1c62851bc4ce07cb0fcf7f8b1d2e7ee9657a5184e686a9593a58a41629e870371393c6bb776e2d945898385663cfcdcaba462bbf2f9f793f77a18a72
+  data.tar.gz: 053fbb6613d76a2d8125b012597e49ba61d7b5ba100cc7eb1f26b74f5971e1a892da9b5d369c4c371a43c77a57ade4db9e16a540efe2ba5a953d2ee7d9c366e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (0.6.7)
+    da_funk (0.7.0)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.5)
       posxml_parser (~> 0.6)
@@ -13,7 +13,7 @@ GEM
   specs:
     cloudwalk_handshake (0.5.4)
     funky-simplehttp (0.4.4)
-    posxml_parser (0.7.3)
+    posxml_parser (0.7.7)
     rake (10.5.0)
     yard (0.8.7.6)
 

data/RELEASE_NOTES.md

@@ -1,5 +1,17 @@
 # DaFunk
 
+### 0.7.0 - 2016-03-10 - EventListener and EventHandler
+
+- Implemented method each for FileDb.
+- Implement method to_json to array and hash on an extension.
+- Extract app_loop method from Device to DaFunk::Engine.
+- Implement method Magnetic#bin? to change range read.
+- Implement EventListener and EventHandler to deal with custom events.
+- Remove Notification setup from app_loop and DaFunk responsibility.
+- Change status bar update timeout to 60 seconds.
+- Implemented Magnetic#read? to check if status is STATUS_SUCCESSFUL_READ.
+- Update posxml_parser to version 0.7.6.
+
 ### 0.6.7 - 2016-02-29 - DaFunk::Engine and DaFunk::StatusBar
 
 - Refactoring screen string manipulation.

data/Rakefile

@@ -9,6 +9,10 @@ DA_FUNK_ROOT = File.dirname(File.expand_path(__FILE__))
 FileUtils.cd DA_FUNK_ROOT
 
 FILES = FileList[
+  "lib/ext/kernel.rb",
+  "lib/ext/string.rb",
+  "lib/ext/array.rb",
+  "lib/ext/hash.rb",
   "lib/device/version.rb",
   "lib/da_funk/version.rb",
   "lib/da_funk/helper.rb",
@@ -21,6 +25,8 @@ FILES = FileList[
   "lib/da_funk/i18n.rb",
   "lib/da_funk/file_parameter.rb",
   "lib/da_funk/helper/status_bar.rb",
+  "lib/da_funk/event_listener.rb",
+  "lib/da_funk/event_handler.rb",
   "lib/da_funk/engine.rb",
   "lib/device.rb",
   "lib/device/audio.rb",
@@ -58,9 +64,7 @@ FILES = FileList[
   "lib/device/notification.rb",
   "lib/device/application.rb",
   "lib/zip.rb",
-  "lib/device/magnetic.rb",
-  "lib/ext/kernel.rb",
-  "lib/ext/string.rb"
+  "lib/device/magnetic.rb"
 ]
 
 DaFunk::RakeTask.new do |t|

data/lib/da_funk/engine.rb

@@ -1,15 +1,23 @@
 module DaFunk
   class Engine
-    def self.setup
-      Device::Display.clear
-      puts "SETUP NOTIFICATIONS..."
-      Device::Notification.setup
-    end
-
     def self.check
+      DaFunk::EventListener.check
       Device::Notification.check
       DaFunk::Helper::StatusBar.check
     end
+
+    def self.app_loop(&block)
+      @stop = false
+      loop do
+        self.check
+        break if @stop
+        block.call
+      end
+    end
+
+    def self.stop!
+      @stop = true
+    end
   end
 end
 

data/lib/da_funk/event_handler.rb

@@ -0,0 +1,21 @@
+module DaFunk
+  class EventHandler
+    attr_reader :option, :type
+
+    def initialize(type, option, &block)
+      @type          = type
+      @option        = option
+      @perform_block = block
+      self.register
+    end
+
+    def register
+      EventListener.add_handler(self)
+    end
+
+    def perform(*parameter)
+      @perform_block.call(*parameter)
+    end
+  end
+end
+

data/lib/da_funk/event_listener.rb

@@ -0,0 +1,80 @@
+module DaFunk
+  class EventListener
+    class << self
+      attr_accessor :listeners
+    end
+
+    self.listeners = {}
+
+    def self.check
+      self.listeners.each { |type, listener| listener.check }
+    end
+
+    def self.register(event_listener)
+      self.listeners[event_listener.type] = event_listener
+    end
+
+    def self.delete(event_listener)
+      self.listeners.delete(self.type)
+    end
+
+    def self.add_handler(handler)
+      if listener = self.listeners[handler.type]
+        listener.handlers[handler.option] = handler
+      end
+    end
+
+    attr_accessor :block_start, :block_check, :block_finish, :handlers
+    attr_reader :type
+
+    def initialize(type)
+      @type     = type
+      @handlers = {}
+      yield self if block_given?
+      self.register
+      self.start
+    end
+
+    def register
+      EventListener.register(self)
+    end
+
+    def delete
+      self.finish if sel.started?
+      EventListener.delete(self)
+    end
+
+    def start(&block)
+      if block_given?
+        @block_start = block
+      else
+        @started = true
+        @block_start.call if @block_start
+      end
+    end
+
+    def check(&block)
+      if block_given?
+        @block_check = block
+      else
+        if @block_check && ! self.handlers.empty?
+          @block_check.call
+        end
+      end
+    end
+
+    def finish(&block)
+      if block_given?
+        @block_finish = block
+      else
+        @started = false
+        @block_finish.call if @block_finish
+      end
+    end
+
+    def started?
+      @started
+    end
+  end
+end
+

data/lib/da_funk/helper/status_bar.rb

@@ -1,7 +1,7 @@
 module DaFunk
   module Helper
     class StatusBar
-      STATUS_TIMEOUT  = 10
+      STATUS_TIMEOUT  = 60
       SLOT_CONNECTION = 0
       SLOT_BATTERY    = 7
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="0.6.7"
+  VERSION="0.7.0"
 end
 

data/lib/device.rb

@@ -17,13 +17,5 @@ class Device
 
   def self.call(*args)
   end
-
-  def self.app_loop(&block)
-    DaFunk::Engine.setup
-    loop do
-      DaFunk::Engine.check
-      block.call(self)
-    end
-  end
 end
 

data/lib/device/io.rb

@@ -50,7 +50,7 @@ class Device
 
     # Setup Keyboard Map
     #
-    # @param key_map [Array] contains the key map from 1 to 0 (0..9)
+    # @param map [Array] contains the key map from 1 to 0 (0..9)
     # @return [NilClass] nil.
     #
     # @example
@@ -138,7 +138,7 @@ class Device
           text = text[0..-2]
         elsif key == ENTER || key == KEY_TIMEOUT
           return text
-        elsif key ==  F1 || key == DOWN || key == UP
+        elsif key == F1 || key == DOWN || key == UP
           change_next(text, check_mask_type(text, options))
           next
         elsif text.size >= max

data/lib/device/magnetic.rb

@@ -52,6 +52,10 @@ class Device
       false
     end
 
+    def read?
+      @status == STATUS_SUCCESSFUL_READ
+    end
+
     def read
       adapter.read
     end
@@ -65,6 +69,16 @@ class Device
       @tracks
     end
 
+    def bin?(value)
+      tracks if STATUS_SUCCESSFUL_READ
+      digits = track2.to_s[0..3]
+      if value.is_a?(Range) && ! digits.empty? && digits.integer?
+        value.include? digits.to_f
+      else
+        digits.to_s == value.to_s
+      end
+    end
+
     private
     def read_tracks
       @tracks = adapter.tracks

data/lib/device/notification.rb

@@ -48,23 +48,6 @@ class Device
       end
     end
 
-    def self.setup
-      NotificationCallback.new "APP_UPDATE", :on => Proc.new { Device::ParamsDat.update_apps(true) }
-      NotificationCallback.new "SETUP_DEVICE_CONFIG", :on => Proc.new { Device::ParamsDat.update_apps(true) }
-      NotificationCallback.new "RESET_DEVICE_CONFIG", :on => Proc.new { Device::ParamsDat.format! }
-
-      NotificationCallback.new "SYSTEM_UPDATE", :on => Proc.new { |file| }
-      NotificationCallback.new "CANCEL_SYSTEM_UPDATE", :on => Proc.new { }
-      NotificationCallback.new "TIMEZONE_UPDATE", :on => Proc.new { Device::Setting.cw_pos_timezone = "" }
-      NotificationCallback.new "SHOW_MESSAGE", :on => Proc.new { |message, datetime|
-        Device::Display.clear
-        date = datetime.sub(" ", "-").split("-")
-        Device::Display.print_line("#{date[1]}/#{date[0]}/#{date[2]} #{date[3]}", 0)
-        Device::Display.print_line("#{message}", 2)
-        getc(0)
-      }
-    end
-
     def self.create_fiber?
       (! Device::Setting.company_name.empty?) && (! Device::Setting.logical_number.empty?) && self.valid_creation_interval?
     end
@@ -87,6 +70,7 @@ class Device
 
     # Check if there is any notification
     def check
+      # TODO check if should execute this(because of connection exception)
       if valid_check_interval? && Device::Network.connected? == Device::Network::SUCCESS
         if @fiber.alive?
           if (notification = @fiber.resume)

data/lib/ext/array.rb

@@ -0,0 +1,6 @@
+class Array
+  def to_json
+    JSON::stringify(self)
+  end
+end
+

data/lib/ext/hash.rb

@@ -0,0 +1,6 @@
+class Hash
+  def to_json
+    JSON::stringify(self)
+  end
+end
+

data/lib/file_db.rb

@@ -25,6 +25,10 @@ class FileDb
     end
   end
 
+  def each(&block)
+    @hash.each(&block)
+  end
+
   def save
     file_new = File.open(@path, "w+")
     @hash.each do |line_key, line_value|

data/lib/serfx/connection.rb

@@ -64,8 +64,8 @@ module Serfx
     # @return [Hash]
     def read_data(read_timeout = self.timeout)
       buf = read_buffer(read_timeout)
-      return if buf.nil?
-      return {'Error' => "Socket closed"} if buf.empty?
+      return {'Error' => "Socket closed"} if buf.nil?
+      return if buf.empty?
       parse_package(buf)
     end
 
@@ -85,9 +85,9 @@ module Serfx
         bytes = socket.bytes_available
         return socket.recv_nonblock(bytes) if bytes > 0
         break unless time_timeout > Time.now
-        sleep 1
+        usleep 200_000
       end
-      nil
+      ""
     end
 
     # takes raw RPC command name and an optional request body

data/test/unit/da_funk/event_listener_test.rb

@@ -0,0 +1,5 @@
+
+class DaFunkEventListenerTest < DaFunk::Test.case
+  def setup
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -112,6 +112,8 @@ files:
 - lib/da_funk.rb
 - lib/da_funk/callback_flow.rb
 - lib/da_funk/engine.rb
+- lib/da_funk/event_handler.rb
+- lib/da_funk/event_listener.rb
 - lib/da_funk/file_parameter.rb
 - lib/da_funk/helper.rb
 - lib/da_funk/helper/status_bar.rb
@@ -145,6 +147,8 @@ files:
 - lib/device/transaction/emv.rb
 - lib/device/transaction/iso.rb
 - lib/device/version.rb
+- lib/ext/array.rb
+- lib/ext/hash.rb
 - lib/ext/kernel.rb
 - lib/ext/string.rb
 - lib/file_db.rb
@@ -170,6 +174,7 @@ files:
 - test/integration/params_dat_test.rb
 - test/resources/shared/bitmap.dat
 - test/test_helper.rb
+- test/unit/da_funk/event_listener_test.rb
 - test/unit/device/application_test.rb
 - test/unit/device/display_test.rb
 - test/unit/device/helper_test.rb
@@ -215,6 +220,7 @@ test_files:
 - test/integration/params_dat_test.rb
 - test/resources/shared/bitmap.dat
 - test/test_helper.rb
+- test/unit/da_funk/event_listener_test.rb
 - test/unit/device/application_test.rb
 - test/unit/device/display_test.rb
 - test/unit/device/helper_test.rb