coda_standard 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6351da7871b5a7810980fe6e22111fb751a3ff9
-  data.tar.gz: 1bdf0a5f7280aa543ef7e3f0f729dbadacd2e656
+  metadata.gz: 0f877398d2d3037548b41b1c90f4c12409f06c9c
+  data.tar.gz: affb5ec7da939cdbcee9263ab276f664f5e616d0
 SHA512:
-  metadata.gz: 19dfa00474ea5142b1969e7fd0ba436292bb6ba4d9af51f4e0ed2c497060f0f30c3f3c4c49beedb763d78582df0f5fc05a50a47f9f1c94265f4c4fdcf628ef46
-  data.tar.gz: d2a16c6e73b428f70ad8714d9505c8c5cb18706734279bcb16f7603e71df48bd60b52c40ba6fe80200bf60d9680575dec7e0ef0c4187a78c8c8049179f8c8dc1
+  metadata.gz: b220227c53fa1c9030dbea09ac0cd39f2cd4403ebce8dd4b4ef1461e6c791877eb382fd7d823a00c0608d164b03ff50abac42ac579524284647e02a6af3c01be
+  data.tar.gz: a9d455e18abc1dae905ef75d6244f3e389e65883f0e0990aa73b5916ccd40fb09f59ff13e3306d4481a15c776d5208854f0fcf1fa646c49a640267cc1c336dec

data/lib/coda_standard/parser.rb

@@ -12,25 +12,20 @@ module CodaStandard
       File.open(@filename).each do |line|
         record = Record.new(line)
         case
-          when record.header?
-            @transactions.current_bic = record.current_bic
-          when record.data_old_balance?
-            set_account(record.current_account)
-            @transactions.old_balance = record.old_balance
-          when record.data_movement1?
-            @current_transaction = @transactions.create
-            @current_transaction.entry_date         = record.entry_date
-            @current_transaction.reference_number   = record.reference_number
-            @current_transaction.amount             = record.amount
-            @current_transaction.structured_communication = record.structured_communication
-          when record.data_movement2?
-            @current_transaction.bic = record.bic
-          when record.data_movement3?
-            @current_transaction.currency = record.currency
-            @current_transaction.name     = record.name
-            @current_transaction.account  = record.account
-          when record.data_information2?
-            set_address(record.address)
+        when record.header?
+          @transactions.current_bic = record.current_bic
+        when record.data_old_balance?
+          set_account(record.current_account)
+          @transactions.old_balance = record.old_balance
+        when record.data_movement1?
+          create_transaction
+          extract_data_movement1(record)
+        when record.data_movement2?
+          extract_data_movement2(record)
+        when record.data_movement3?
+          extract_data_movement3(record)
+        when record.data_information2?
+          set_address(record.address)
         end
       end
       @transactions
@@ -48,6 +43,27 @@ module CodaStandard
       @transactions.current_account_type = account[:account_type]
     end
 
+    def create_transaction
+      @current_transaction = @transactions.create
+    end
+
+    def extract_data_movement1(record)
+      @current_transaction.entry_date         = record.entry_date
+      @current_transaction.reference_number   = record.reference_number
+      @current_transaction.amount             = record.amount
+      @current_transaction.structured_communication = record.structured_communication
+    end
+
+    def extract_data_movement2(record)
+       @current_transaction.bic = record.bic
+    end
+
+    def extract_data_movement3(record)
+      @current_transaction.currency = record.currency
+      @current_transaction.name     = record.name
+      @current_transaction.account  = record.account
+    end
+
     def show
       parse
       puts "**--Transactions--**\n\n"
@@ -56,7 +72,7 @@ module CodaStandard
       @transactions.each_with_index do |transaction, index|
         puts "-- Transaction n.#{index + 1} - number #{transaction.structured_communication} - in date #{transaction.entry_date}-- \n\n"
         puts "   RN: #{transaction.reference_number} Account: #{transaction.account} BIC: #{transaction.bic}"
-        puts "   Amount: #{transaction.amount} #{transaction.currency}"
+        puts "   Amount: #{transaction.amount_money}"
         puts "   Name: #{transaction.name}"
         puts "   Address: #{transaction.address} #{transaction.postcode} #{transaction.city} #{transaction.country} \n\n"
       end

data/lib/coda_standard/record.rb

@@ -12,19 +12,21 @@ module CodaStandard
       bic: /^22.{96}(.{11})/,
       amount: /^21.{29}(\d{16})/,
       old_balance: /^1.{41}(\d)(\d{15})/,
+      structured_communication: /^21.{60}(.{15})/,
+      currencies: /(^.+)(AED|AFN|ALL|AMD|ANG|AOA|ARS|AUD|AWG|AZN|BAM|BBD|BDT|BGN|BHD|BIF|BMD|BND|BOB|BOV|BRL|BSD|BTN|BWP|BYR|BZD|CAD|CDF|CHE|CHF|CHW|CLF|CLP|CNY|COP|COU|CRC|CUC|CUP|CVE|CZK|DJF|DKK|DOP|DZD|EGP|ERN|ETB|EUR|FJD|FKP|GBP|GEL|GHS|GIP|GMD|GNF|GTQ|GYD|HKD|HNL|HRK|HTG|HUF|IDR|ILS|INR|IQD|IRR|ISK|JMD|JOD|JPY|KES|KGS|KHR|KMF|KPW|KRW|KWD|KYD|KZT|LAK|LBP|LKR|LRD|LSL|LTL|LVL|LYD|MAD|MDL|MGA|MKD|MMK|MNT|MOP|MRO|MUR|MVR|MWK|MXN|MXV|MYR|MZN|NAD|NGN|NIO|NOK|NPR|NZD|OMR|PAB|PEN|PGK|PHP|PKR|PLN|PYG|QAR|RON|RSD|RUB|RWF|SAR|SBD|SCR|SDG|SEK|SGD|SHP|SLL|SOS|SRD|SSP|STD|SVC|SYP|SZL|THB|TJS|TMT|TND|TOP|TRY|TTD|TWD|TZS|UAH|UGX|USD|USN|USS|UYI|UYU|UZS|VEF|VND|VUV|WST|XAF|XAG|XAU|XBA|XBB|XBC|XBD|XCD|XDR|XFU|XOF|XPD|XPF|XPT|XSU|XTS|XUA|XXX|YER|ZAR|ZMW|ZWL)/
+    }
+
+    CLEAN_FIELDS = {
+      clean_zeros: /0*([^0]\d+)(\d{3})/,
       sep_address: /(^.+)(\d{4})\s(\S+)(\s\S+)?$/,
       sep_account: /(^.)(.{3})(.+)/,
+      clean_structured: /.{3}(.{12})/,
       bban_be_account: /(^.{12})/,
       bban_foreign_account: /(^.{34})/,
       iban_be_account: /(^.{31})/,
-      iban_foreign_account: /(^.{34})/,
-      structured_communication: /^21.{60}(.{15})/,
-      clean_structured: /.{3}(.{12})/,
-      currencies: /(^.+)(AED|AFN|ALL|AMD|ANG|AOA|ARS|AUD|AWG|AZN|BAM|BBD|BDT|BGN|BHD|BIF|BMD|BND|BOB|BOV|BRL|BSD|BTN|BWP|BYR|BZD|CAD|CDF|CHE|CHF|CHW|CLF|CLP|CNY|COP|COU|CRC|CUC|CUP|CVE|CZK|DJF|DKK|DOP|DZD|EGP|ERN|ETB|EUR|FJD|FKP|GBP|GEL|GHS|GIP|GMD|GNF|GTQ|GYD|HKD|HNL|HRK|HTG|HUF|IDR|ILS|INR|IQD|IRR|ISK|JMD|JOD|JPY|KES|KGS|KHR|KMF|KPW|KRW|KWD|KYD|KZT|LAK|LBP|LKR|LRD|LSL|LTL|LVL|LYD|MAD|MDL|MGA|MKD|MMK|MNT|MOP|MRO|MUR|MVR|MWK|MXN|MXV|MYR|MZN|NAD|NGN|NIO|NOK|NPR|NZD|OMR|PAB|PEN|PGK|PHP|PKR|PLN|PYG|QAR|RON|RSD|RUB|RWF|SAR|SBD|SCR|SDG|SEK|SGD|SHP|SLL|SOS|SRD|SSP|STD|SVC|SYP|SZL|THB|TJS|TMT|TND|TOP|TRY|TTD|TWD|TZS|UAH|UGX|USD|USN|USS|UYI|UYU|UZS|VEF|VND|VUV|WST|XAF|XAG|XAU|XBA|XBB|XBC|XBD|XCD|XDR|XFU|XOF|XPD|XPF|XPT|XSU|XTS|XUA|XXX|YER|ZAR|ZMW|ZWL)/
+      iban_foreign_account: /(^.{34})/
     }
 
-    CLEAN_ZEROS_REGEX = /0*([^0]\d+)(\d{3})/
-
     def initialize(line)
       @line = line
     end
@@ -107,46 +109,49 @@ module CodaStandard
       result = @line.scan(FIELDS[field]).join.strip
       case field
         when :address
-          result = separate_address(result)
+          separate_address(result)
         when :current_account
-          result = clean_account(result)
+          clean_account(result)
         when :old_balance, :amount
-          result = clean_zeros(result)
+          clean_zeros(result)
         when :structured_communication
-          result = check_structured(result)
+          check_structured(result)
+        else
+          result
       end
-      result
     end
 
     def separate_address(address)
-      address_fields = address.scan(FIELDS[:sep_address])[0]
-      {address: address_fields[0].strip, postcode: address_fields[1], city: address_fields[2], country: address_fields[3]}
+      address_fields = address.scan(CLEAN_FIELDS[:sep_address])[0]
+      { address: address_fields[0].strip, postcode: address_fields[1], city: address_fields[2], country: address_fields[3] }
     end
 
     def clean_account(account)
-      account_type = account.scan(FIELDS[:sep_account])[0][0]
-      raw_account = account.scan(FIELDS[:sep_account])[0][2]
+      account_type = account.scan(CLEAN_FIELDS[:sep_account])[0][0]
+      raw_account = account.scan(CLEAN_FIELDS[:sep_account])[0][2]
       case account_type
         when "0" then account_type = "bban_be_account"
         when "1" then account_type = "bban_foreign_account"
         when "2" then account_type = "iban_be_account"
         when "3" then account_type = "iban_foreign_account"
+        else
+          raise "unsupported account_type: '#{account_type}'"
       end
-      account_number = raw_account.scan(FIELDS[account_type.to_sym]).join
-      {account_type: account_type, account_number: account_number}
+      account_number = raw_account.scan(CLEAN_FIELDS[account_type.to_sym]).join
+      { account_type: account_type, account_number: account_number }
     end
 
     def clean_zeros(amount)
       amount[0] == "0" ? amount_sign = "" : amount_sign = "-"
-      amount_integral = amount.scan(CLEAN_ZEROS_REGEX)[0][0]
-      amount_decimals = amount.scan(CLEAN_ZEROS_REGEX)[0][1]
-      separator = ","
+      amount_integral = amount.scan(CLEAN_FIELDS[:clean_zeros])[0][0]
+      amount_decimals = amount.scan(CLEAN_FIELDS[:clean_zeros])[0][1]
+      separator = "."
       amount_sign + amount_integral + separator + amount_decimals
     end
 
     def check_structured(number)
       if number[0] == "1"
-        number.scan(FIELDS[:clean_structured]).join
+        number.scan(CLEAN_FIELDS[:clean_structured]).join
       else
         "not structured"
       end

data/lib/coda_standard/transaction.rb

@@ -1,8 +1,17 @@
 module CodaStandard
   class Transaction
     attr_accessor :name, :currency, :bic, :address, :postcode, :city, :country, :amount, :account, :entry_date, :reference_number, :structured_communication
+
     def match_structured_communication(structured_communication)
       @structured_communication == structured_communication
     end
+
+    def amount_cents
+      (@amount.to_f * 100).to_i
+    end
+
+    def amount_money
+      "#{ amount_cents.to_s.insert(-3, ',') } #{ @currency }"
+    end
   end
 end

data/lib/coda_standard/transaction_list.rb

@@ -16,9 +16,8 @@ module CodaStandard
       @transactions.each_with_index(&blk)
     end
 
-
     def find_by_structured_communication(structured_communication)
-      @transactions.select{|t| t.match_structured_communication(structured_communication)}
+      @transactions.select{ |t| t.match_structured_communication(structured_communication) }
     end
   end
 end

data/lib/coda_standard/version.rb

@@ -1,3 +1,3 @@
 module CodaStandard
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/coda.cod

@@ -1,6 +1,6 @@
 0000031031520005                  MMIF SA/BANK              GEBABEBB   00538839354 00000                                       2
 10016539007547034 EUR0BE                  0000000057900000300315MMIF SA/EVOCURE                                              017
-21000100000001500000103        0000000000500000010415001500001101100000834941                                      31031501601 0
+21000100000001500000103        0000000000500860010415001500001101100000834941                                      31031501601 0
 2200010000                                                                                        GKCCBEBB                   1 0
 2300010000BE53900754703405                  EURLASTNM PERSON                                                                 0 1
 31000100010001500000103        001500001001LASTNM PERSON                                                                     1 0

data/spec/parser_spec.rb

@@ -22,7 +22,7 @@ describe CodaStandard::Parser do
 
   describe "set_address" do
     before :each do
-      address = {:address=>"5 RUE DU CENTCINQUANTENAIRE", :postcode=>"6750", :city=>"MUSSY-LA-VILLE", :country=>" BELGIQUE"}
+      address = { address: "5 RUE DU CENTCINQUANTENAIRE", postcode: "6750", city: "MUSSY-LA-VILLE", country: " BELGIQUE" }
       parser.set_address(address)
     end
 
@@ -45,7 +45,7 @@ describe CodaStandard::Parser do
 
  describe "set_account" do
     before :each do
-      account = {account_number:"035918134040", account_type:"bban_be_account"}
+      account = {account_number: "035918134040", account_type: "bban_be_account"}
       parser.set_account(account)
     end
 
@@ -60,7 +60,7 @@ describe CodaStandard::Parser do
 
   describe "show" do
     it "shows the info from the transactions" do
-      expect{parser.show}.to output("**--Transactions--**\n\nAccount: 539007547034 Account type: bban_be_account BIC: GEBABEBB\nOld balance: 57900,000 \n\n-- Transaction n.1 - number 100000834941 - in date 310315-- \n\n   RN: 0001500000103 Account: BE53900754703405 BIC: GKCCBEBB\n   Amount: 500,000 EUR\n   Name: LASTNM PERSON\n   Address: CHAUSSEE DE BIERE 10 1978 SOMECITY  \n\n-- Transaction n.2 - number 100000835749 - in date 310315-- \n\n   RN: 0001500000104 Account: LU539007547034898400 BIC: BILLLULL\n   Amount: 200,000 EUR\n   Name: M.JOHN DOE\n   Address: 5 STREET 3654 CITY  BELGIQUE \n\n").to_stdout
+      expect{ parser.show }.to output("**--Transactions--**\n\nAccount: 539007547034 Account type: bban_be_account BIC: GEBABEBB\nOld balance: 57900.000 \n\n-- Transaction n.1 - number 100000834941 - in date 310315-- \n\n   RN: 0001500000103 Account: BE53900754703405 BIC: GKCCBEBB\n   Amount: 500,86 EUR\n   Name: LASTNM PERSON\n   Address: CHAUSSEE DE BIERE 10 1978 SOMECITY  \n\n-- Transaction n.2 - number 100000835749 - in date 310315-- \n\n   RN: 0001500000104 Account: LU539007547034898400 BIC: BILLLULL\n   Amount: 200,00 EUR\n   Name: M.JOHN DOE\n   Address: 5 STREET 3654 CITY  BELGIQUE \n\n").to_stdout
     end
   end
 

data/spec/record_spec.rb

@@ -4,8 +4,8 @@ describe CodaStandard::Record do
 
   let(:header_record) { CodaStandard::Record.new("0000031031520005                  MMIF SA/BANK              GEBABEBB   00538839354 00000                                       2")}
   let(:old_balance_data_record) {  CodaStandard::Record.new("10016539007547034 EUR0BE                  0000000057900000300315MMIF SA/EVOCURE                                              017")}
-  let(:data_movement1_record) {  CodaStandard::Record.new("21000100000001500000103        0000000000500000010415001500001101100000834941                                      31031501601 0")}
-  let(:data_movement1b_record) {  CodaStandard::Record.new("21000100000001500000103        0000000000500000010415001500001001100000834941                                      31031501601 0")}
+  let(:data_movement1_record) {  CodaStandard::Record.new("21000100000001500000103        0000000000500860010415001500001101100000834941                                      31031501601 0")}
+  let(:data_movement1b_record) {  CodaStandard::Record.new("21000100000001500000103        0000000000500860010415001500001001100000834941                                      31031501601 0")}
   let(:data_movement2_record) {  CodaStandard::Record.new("2200010000                                                                                        GKCCBEBB                   1 0")}
   let(:data_movement3_record) {  CodaStandard::Record.new("2300010000BE53900754703405                  EURLASTNM PERSON                                                                 0 1")}
   let(:data_information2_record) {  CodaStandard::Record.new("32000200015 STREET                                     3654 CITY BELGIQUE                                                    0 0")}
@@ -84,7 +84,7 @@ describe CodaStandard::Record do
 
   describe "old_balance" do
     it "extracts the old_balance" do
-      expect(old_balance_data_record.old_balance).to eq("57900,000")
+      expect(old_balance_data_record.old_balance).to eq("57900.000")
     end
   end
 
@@ -102,7 +102,7 @@ describe CodaStandard::Record do
 
   describe "amount" do
     it "extracts the amount" do
-      expect(data_movement1_record.amount).to eq("500,000")
+      expect(data_movement1_record.amount).to eq("500.860")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coda_standard
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alvaro Leal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler