da_funk 0.5.4 → 0.6.0

data/lib/iso8583/file_parser.rb

@@ -11,16 +11,16 @@ module ISO8583
       end
     end
 
-    def create_mti(klass, mti_format, mti_messages)
-      klass.mti_format *mti_format
+    def self.create_mti(klass, format, mti_messages)
+      klass.mti_format(*format)
       mti_messages.each do |number, description|
         klass.mti number, description
       end
     end
 
-    def parse_file(filepath)
-      return [] unless File.exists?(path)
-      file = File.open(path, "r")
+    def self.parse_file(filepath)
+      return [] unless File.exists?(filepath)
+      file = File.open(filepath, "r")
 
       file.readlines.inject([]) do |array, line|
         data = line.match(/([0-9]+)=\"ATT_([a-zA-Z]+);([0-9A-Z]+)/)
@@ -28,17 +28,15 @@ module ISO8583
         array << mount_parameters(data)
       end
     ensure
-      file.close
+      file.close if file
     end
 
     def self.build_klass(mti_format, mti_messages, filepath = PATH_DEFAULT)
       Class.new(ISO8583::Message) do |klass|
         klass.include ISO8583
-        #klass.mti_format ISO8583::N, :length => 4
-        #klass.mti 200, "Authorization Request Acquirer Gateway"
-        create_mti(klass, mti_format, mti_messages)
+        FileParser.create_mti(klass, mti_format, mti_messages)
 
-        parse_file(filepath).each do |parameters|
+        FileParser.parse_file(filepath).each do |parameters|
           klass.bmp(*parameters)
         end
       end

data/lib/iso8583/message.rb

@@ -40,7 +40,7 @@ module ISO8583
   # be accessed later either via their name or value:
   #
   #    mes = MyMessage.new 1100
-  # 
+  #
   # or
   #    mes = MyMessage.new "Authorization Request Acquirer Gateway"
   #
@@ -75,7 +75,7 @@ module ISO8583
   #
   # Constructing own messages works as follows:
   #
-  #     mes = MyMessage.new 1100 
+  #     mes = MyMessage.new 1100
   #     mes[2]= 474747474747
   #     # Alternatively
   #     mes["Primary Account Number (PAN)"]= 4747474747
@@ -106,17 +106,17 @@ module ISO8583
   # Most of the work in implementing a new set of message type lays in
   # figuring out the correct fields to use defining the Message class via
   # bmp.
-  #    
+  #
   class Message
 
     # The value of the MTI (Message Type Indicator) of this message.
-    attr_reader :mti 
+    attr_reader :mti
 
     # ISO8583 allows hex or binary bitmap, so it should be configurable
     attr_reader :use_hex_bitmap
 
     # Instantiate a new instance of this type of Message
-    # optionally specifying an mti. 
+    # optionally specifying an mti.
     def initialize(mti = nil, use_hex_bitmap = false)
       # values is an internal field used to collect all the
       # bmp number | bmp name | field en/decoders | values
@@ -245,7 +245,7 @@ module ISO8583
 
     class << self
 
-      # Defines how the message type indicator is encoded into bytes. 
+      # Defines how the message type indicator is encoded into bytes.
       # ===Params:
       # * field    : the decoder/encoder for the MTI
       # * opts     : the options to pass to this field
@@ -268,7 +268,7 @@ module ISO8583
 
       # Defines the message types allowed for this type of message and
       # gives them names
-      # 
+      #
       # === Example
       #    class MyMessage < Message
       #      (...)
@@ -300,8 +300,8 @@ module ISO8583
       #      (...)
       #    end
       #
-      # creates a class MyMessage that allows for a bitmap 2 which 
-      # is named "PAN" and encoded by an LLVAR_N Field. The maximum 
+      # creates a class MyMessage that allows for a bitmap 2 which
+      # is named "PAN" and encoded by an LLVAR_N Field. The maximum
       # length of the value is 19. This class may be used as follows:
       #
       #    mes = MyMessage.new

data/lib/zip.rb

@@ -3,9 +3,9 @@ module Zip
     Miniz.zip(*args)
   end
 
-  def self.uncompress(filezip, path = ".")
-    dir = "#{path}/#{filezip.split(".")[0]}"
-    clean(dir)
+  def self.uncompress(filezip, path = ".", application = true, clear_dir = true)
+    dir = "#{path}/#{filezip.split(".").first}" if application
+    clean(dir) if clear_dir
     Miniz.unzip(filezip, path)
   end
 

data/test/resources/shared/bitmap.dat

@@ -0,0 +1,128 @@
+001="ATT_B;128"
+002="ATT_AN;LLVAR"
+003="ATT_N;6"
+004="ATT_N;12"
+005="ATT_N;12"
+006="ATT_N;12"
+007="ATT_N;10"
+008="ATT_N;8"
+009="ATT_N;8"
+010="ATT_N;8"
+011="ATT_N;6"
+012="ATT_N;6"
+013="ATT_N;4"
+014="ATT_ANS;16"
+015="ATT_N;4"
+016="ATT_N;4"
+017="ATT_N;4"
+018="ATT_N;4"
+019="ATT_N;3"
+020="ATT_N;3"
+021="ATT_N;3"
+022="ATT_N;3"
+023="ATT_N;3"
+024="ATT_N;4"
+025="ATT_N;2"
+026="ATT_N;2"
+027="ATT_N;1"
+028="ATT_XN;8"
+029="ATT_XN;8"
+030="ATT_XN;8"
+031="ATT_XN;8"
+032="ATT_N;LLVAR"
+033="ATT_N;LLVAR"
+034="ATT_N;LLVAR"
+035="ATT_ANS;LLVAR"
+036="ATT_Z;LLLVAR"
+037="ATT_AN;24"
+038="ATT_N;6"
+039="ATT_AN;2"
+040="ATT_AN;3"
+041="ATT_ANS;8"
+042="ATT_ANS;15"
+043="ATT_ANS;40"
+044="ATT_ANS;LLVAR"
+045="ATT_ANS;LLVAR"
+046="ATT_ANS;LLLVAR"
+047="ATT_ANS;LLLVAR"
+048="ATT_ANS;LLLVAR"
+049="ATT_AN;3"
+050="ATT_AN;3"
+051="ATT_AN;3"
+052="ATT_ANS;16"
+053="ATT_ANS;LLVAR"
+054="ATT_ANS;LLLVAR"
+055="ATT_B;LLLVAR"
+056="ATT_ANS;LLLVAR"
+057="ATT_ANS;LLLVAR"
+058="ATT_ANS;LLVAR"
+059="ATT_ANS;LLLVAR"
+060="ATT_ANS;LLLVAR"
+061="ATT_ANS;LLLVAR"
+062="ATT_ANS;LLLVAR"
+063="ATT_ANS;LLLVAR"
+064="ATT_ANS;LLLVAR"
+065="UNKNOWN;0"
+066="ATT_N;1"
+067="ATT_N;2"
+068="ATT_N;3"
+069="ATT_N;3"
+070="ATT_N;3"
+071="ATT_N;4"
+072="ATT_N;4"
+073="ATT_N;6"
+074="ATT_N;10"
+075="ATT_N;10"
+076="ATT_N;10"
+077="ATT_N;10"
+078="ATT_N;10"
+079="ATT_N;10"
+080="ATT_N;10"
+081="ATT_N;10"
+082="ATT_N;12"
+083="ATT_N;12"
+084="ATT_N;12"
+085="ATT_N;12"
+086="ATT_N;16"
+087="ATT_N;16"
+088="ATT_N;16"
+089="ATT_N;16"
+090="ATT_N;20"
+091="ATT_AN;1"
+092="ATT_AN;2"
+093="ATT_AN;5"
+094="ATT_AN;7"
+095="ATT_AN;42"
+096="ATT_B;8"
+097="ATT_XN;16"
+098="ATT_ANS;25"
+099="ATT_N;LLVAR"
+100="ATT_N;LLVAR"
+101="ATT_ANS;LLVAR"
+102="ATT_ANS;LLVAR"
+103="ATT_ANS;LLVAR"
+104="ATT_ANS;LLLVAR"
+105="ATT_ANS;LLLVAR"
+106="ATT_ANS;LLLVAR"
+107="ATT_ANS;LLLVAR"
+108="ATT_ANS;LLLVAR"
+109="ATT_ANS;LLLVAR"
+110="ATT_ANS;LLLVAR"
+111="ATT_ANS;LLLVAR"
+112="ATT_ANS;LLLVAR"
+113="ATT_ANS;LLLVAR"
+114="ATT_ANS;LLLVAR"
+115="ATT_ANS;LLLVAR"
+116="ATT_ANS;LLLVAR"
+117="ATT_ANS;LLLVAR"
+118="ATT_ANS;LLLVAR"
+119="ATT_ANS;LLLVAR"
+120="ATT_ANS;LLLVAR"
+121="ATT_ANS;LLLVAR"
+122="ATT_ANS;LLLVAR"
+123="ATT_ANS;LLLVAR"
+124="ATT_ANS;LLLVAR"
+125="ATT_ANS;LLLVAR"
+126="ATT_ANS;LLLVAR"
+127="ATT_ANS;LLLVAR"
+128="ATT_B;8"

data/test/unit/iso8583_build_klass.rb

@@ -0,0 +1,44 @@
+
+class MessageA < ISO8583::Message
+  include ISO8583
+  mti_format N, :length => 4
+
+  mti 800, ""
+  mti 810, ""
+
+  bmp 1  , "" , N   , :length => 128
+  bmp 7  , "" , N   , :length => 10
+  bmp 11 , "" , N   , :length => 6
+  bmp 12 , "" , N   , :length => 6
+  bmp 13 , "" , N   , :length => 4
+  bmp 41 , "" , ANS , :length => 8
+  bmp 42 , "" , ANS , :length => 15
+  bmp 70 , "" , N   , :length => 3
+end
+
+class DeviceISO8583BuildKlassTest < DaFunk::Test.case
+  def setup
+    @iso_a = MessageA.new 800
+    @klass = ISO8583::FileParser.build_klass([ISO8583::N, {length: 4}], {800 => ""}, "./shared/bitmap.dat")
+    @iso_b = @klass.new 800
+  end
+
+  def test_compare
+    @iso_a[7]  = @iso_b[7]  = 201175436
+    @iso_a[11] = @iso_b[11] = 2
+    @iso_a[12] = @iso_b[12] = 175436
+    @iso_a[13] = @iso_b[13] = 201
+    @iso_a[41] = @iso_b[41] = "00009815"
+    @iso_a[42] = @iso_b[42] = "636500050001800"
+    @iso_a[70] = @iso_b[70] = 1
+
+    assert_equal @iso_a.to_b, @iso_b.to_b
+  end
+
+  def test_parse_from_build_klass
+    iso = "08100038000002401004000043005016020300636500050001800924F7E771BC0F3C20690090020306376550063765599SS23S0EE0N00006043230060432399SS03S0FE0N0000"
+    @klass.mti 810, ""
+    assert_equal @klass.parse(iso, true)[42], "636500050001800"
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,10 +110,15 @@ files:
 - guides/sample_transaction_iso8583.rb
 - imgs/daft-punk-da-funk.jpg
 - lib/da_funk.rb
+- lib/da_funk/callback_flow.rb
+- lib/da_funk/file_parameter.rb
 - lib/da_funk/helper.rb
+- lib/da_funk/i18n.rb
+- lib/da_funk/i18n_error.rb
 - lib/da_funk/iso8583.rb
 - lib/da_funk/rake_task.rb
 - lib/da_funk/screen.rb
+- lib/da_funk/screen_flow.rb
 - lib/da_funk/test.rb
 - lib/device.rb
 - lib/device/application.rb
@@ -160,6 +165,7 @@ files:
 - test/integration/mrb_eval_test.rb
 - test/integration/notification_test.rb
 - test/integration/params_dat_test.rb
+- test/resources/shared/bitmap.dat
 - test/test_helper.rb
 - test/unit/device/application_test.rb
 - test/unit/device/display_test.rb
@@ -170,6 +176,7 @@ files:
 - test/unit/device/notification_test.rb
 - test/unit/ext/string_test.rb
 - test/unit/file_db_test.rb
+- test/unit/iso8583_build_klass.rb
 - test/unit/iso8583_test.rb
 - test/unit/params_dat_test.rb
 - utils/command_line_platform.rb
@@ -203,6 +210,7 @@ test_files:
 - test/integration/mrb_eval_test.rb
 - test/integration/notification_test.rb
 - test/integration/params_dat_test.rb
+- test/resources/shared/bitmap.dat
 - test/test_helper.rb
 - test/unit/device/application_test.rb
 - test/unit/device/display_test.rb
@@ -213,6 +221,7 @@ test_files:
 - test/unit/device/notification_test.rb
 - test/unit/ext/string_test.rb
 - test/unit/file_db_test.rb
+- test/unit/iso8583_build_klass.rb
 - test/unit/iso8583_test.rb
 - test/unit/params_dat_test.rb
 has_rdoc: