budgetcrmod 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b952374d995bedfedab50af519862104a7ee1056a72043a1759f7197f57331
-  data.tar.gz: c0624eea270b06dbad63456e5b92c2f2bd4d6ad4f9dc4d6f1a4c8ff47108cb37
+  metadata.gz: 564f811bf31f0c1cdf6ad1a8854c7a8735d480ac5b079a9da6aea8e9c4647cbf
+  data.tar.gz: d3839555241d6862be8ea4a7d8ea486759212d159fdafc3b1e152bcce6449375
 SHA512:
-  metadata.gz: 1c17613d1be4629cfcaa10564a36ae6df45f1c23bc6f7ae132b1acec040d2a61a2d3161dd7260a4c0f6f470669c566ede97e3e77893a105366c63c7746fc9393
-  data.tar.gz: e2210b83b2829b057cac88bf83f3444806d2fdb7397f49f0096e9fb447ed163c0e6c0456f2154b83aafa99c01a4d0a3c6b26f7991a952fe56f7e74b6774cad20
+  metadata.gz: 21f3c06fc81c93ace4ffd67702dc994fcce662e23d48fd768bb59ad7773f2ec1880213c3ceeac48a0ce3880496cadba39ab950f1d182432f982f7d3182202354
+  data.tar.gz: 249f92fbe9e1ab28ff32c69f3591141504ae0f1f38908895d5755e17f304a63974d555762c5faa7ce81b731603549c920cf190beec020f26682a0ea7d08d3177

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/budgetcrmod.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: budgetcrmod 0.5.0 ruby lib
+# stub: budgetcrmod 0.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "budgetcrmod".freeze
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Edmund Highcock".freeze]
-  s.date = "2020-02-08"
+  s.date = "2020-02-09"
   s.description = "A CodeRunner module to help you do your budget".freeze
   s.email = "edmundhighcock@users.sourceforge.net".freeze
   s.extra_rdoc_files = [

data/lib/budgetcrmod/budget.rb

@@ -84,11 +84,22 @@ class CodeRunner
       end
       if data[0] =~ /^\d{2} \w{3} \d\d,/ # BarclayCard format
         data.unshift 'date,description,type,user,expensetype,withdrawal,withdrawal'
+      elsif data[0] == ""
+        data.shift
       end
 
+
+
       @first_line_string = data[0].dup
+      separator = case @first_line_string
+                  when /Bokf.*ringsdag;Belopp;/
+                    ";"
+                  else
+                    ","
+                  end
+      puts "Separator is: " + separator
       data = data.map do 	|line| 
-        matches = line.scan(Regexp.new("((?:#{DOUBLE_STRING}|[^,])*)(?:,|$)"))
+        matches = line.scan(Regexp.new("((?:#{DOUBLE_STRING}|[^#{separator}])*)(?:#{separator}|$)"))
         pp matches
         matches.flatten
       end
@@ -158,6 +169,8 @@ class CodeRunner
         [:date,:description,:type,:dummy,:dummy, :withdrawal, :withdrawal]
       when /Datum,Transaktion,Kategori,Belopp,Saldo/ # Nordea.se privat, Belopp is positive when the asset increases
         [:date,:description,:dummy,:deposit,:balance]
+      when /Bokföringsdag;Belopp;Avsändare;Mottagare;Namn;Rubrik;Saldo;Valuta/ # Nordea new
+        [:date,:deposit,:dummy,:dummy,:dummy,:description,:balance,:dummy]
       when /Bokföringsdatum,Transaktionsreferens,Mottagare,Belopp,Valuta/ # Forex.se privat, Belopp is positive when the asset increases
         [:date,:description,:dummy,:deposit,:dummy]
       when /Datum,Text,Belopp/ #Ecster Credit Card
@@ -170,6 +183,8 @@ class CodeRunner
         [:date,:deposit,:dummy,:description,:dummy,:balance,:dummy,:dummy,:dummy,:dummy,:dummy]
       when /"TransferWise ID",Date,Amount,Currency,Description,"Payment Reference","Running Balance","Exchange From","Exchange To","Exchange Rate","Payer Name","Payee Name","Payee Account Number",Merchant,"Total fees"/ #TransferWise New
         [:dummy,:date,:deposit,:dummy,:description,:description2,:balance,:dummy,:dummy,:dummy,:dummy,:dummy,:dummy,:dummy,:dummy]
+      else
+        raise "unknown data format for #@id: #@first_line_string, #{@data.slice(0,[4,@data.size].min)}"
       end
     end
 
@@ -202,6 +217,7 @@ class CodeRunner
         #next if @runner.cache[:data].include? dataset and Date.parse(dataset[0]) > Date.parse("1/1/2013")
         #next if @runner.component_run_list.map{|k,v| v.instance_variable_get(:@dataset)}.include? dataset # and Date.parse(dataset[0]) > Date.parse("1/1/2013")
         next if @first_line_string =~ /^Datum/ and dataset[1] =~ /Reservation/
+        next if @first_line_string =~ /Bokf/ and dataset[0] =~ /Invalid/
         h = {}
         h[:withdrawal] = 0.0
         h[:deposit] = 0.0
@@ -213,7 +229,7 @@ class CodeRunner
           value = Date.parse value if res == :date
           if [:deposit, :withdrawal, :balance].include? res
             case @first_line_string
-            when /^Datum/i # we are dealing with European numbers
+            when /^Datum/i, /Bokföringsdag;Belopp;/ # we are dealing with European numbers
               value = value.gsub(/[." ]/, '')
               value = value.sub(/[,]/, '.')
             else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: budgetcrmod
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner