budgetcrmod 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a1ed45d12e5021db3fce47df4b4ba1a5e93d8c9
-  data.tar.gz: 34f6c04868dc0b676e3aba3e9ae681ffb7c95549
+  metadata.gz: 5eb9c1cfe45e04c7b0b7b3900a5f306b3af5821b
+  data.tar.gz: f860ba5fd4e5b1bd729d3b25be7a1c8eed176098
 SHA512:
-  metadata.gz: 65178bcb5e47004f7e8e34500fcbc764821bcf8ac0e2c67f3107d3fc31b6ce9715c5e176077fb6c5728dcdd4ed5c06e8b5b06414d6b93595b3c715a1da6d8cb3
-  data.tar.gz: 5097b5c98f9028f75b90a42280d15d225b9ee3b326060ddd7bfdbb41877c6937e2ed9c47b90862c53d37fda61dc453bbbd85a429ab91ae7ea9514113800ab1ba
+  metadata.gz: 19bea47404cf1e2bd70ca3b65a9aa0bcce84bf83660dde3f89a8b731457536ce4588b70791fb0b0f2b015a293358c759e5dcfb71c97dfdb1a9a60f2753e7f84e
+  data.tar.gz: dfaaccb2045895cd5f4e35f74fbd12da3544c11af9d79eb5ff314797b7214105a5a1b1d596dc8bb5d791ee19f4041a5b7316e3c3723a2e1961fc552cea439bb3

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

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.2.1 ruby lib
+# stub: budgetcrmod 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "budgetcrmod".freeze
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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 = "2018-03-04"
+  s.date = "2018-03-07"
   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

@@ -9,7 +9,7 @@ end
 require 'date'
 class String
 	def latex_escape
-		self.gsub(/(?<!\\)([%_&^])/, '\\\\\1')
+		self.gsub(/(?<!\\)([$%_&^])/, '\\\\\1')
 	end
 	#alias :old_to_f :to_f
 	#def to_f
@@ -105,6 +105,7 @@ class CodeRunner
 			@first_line_string = data[0].dup
 			data = data.map do 	|line| 
 				matches = line.scan(Regexp.new("((?:#{DOUBLE_STRING}|[^,])*)(?:,|$)"))
+        pp matches
 				matches.flatten
 			end
 			#pp data
@@ -175,6 +176,10 @@ class CodeRunner
         [:date,:description,:dummy,:deposit,:balance]
       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
+        [:date,:description,:withdrawal]
+      when /Effective Date,Entered Date,Transaction Description,Amount/ #QudosBank, the first field is blank
+        [:dummy,:date,:description,:deposit]
 			end
 		end
 
@@ -205,7 +210,7 @@ class CodeRunner
 			#end
 			@data.each do |dataset|
 				#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 @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/
 				component = create_component
         ep 'Generating Component', @component_runs.size
@@ -217,7 +222,7 @@ class CodeRunner
 					if [:deposit, :withdrawal, :balance].include? res
             case @first_line_string
             when /^Datum/i # we are dealing with European numbers
-              value = value.gsub(/[."]/, '')
+              value = value.gsub(/[." ]/, '')
               value = value.sub(/[,]/, '.')
             else
               value = value.gsub(/[",]/, '')
@@ -229,8 +234,8 @@ class CodeRunner
 					component.set(res, value)
 					component.set_zeroes
 					component.set(:data_line, reslts.map{|r| component.send(r).to_s}.join(','))
-					component.date_i = component.date.to_datetime.to_time.to_i
 				end
+        component.date_i = component.date.to_datetime.to_time.to_i
         if component.deposit < 0.0 and component.withdrawal == 0.0
           component.withdrawal = -component.deposit
           component.deposit = 0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: budgetcrmod
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner