budgetcrmod 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2015715dae350f93b7931297fa1696a27ab988f3
-  data.tar.gz: 719be9cb86645aa5a7ecc46c4588fb6baa2b17d4
+  metadata.gz: ade57698dee820f0d4b39a986ad8a9555d8bc34b
+  data.tar.gz: b829613b148110c54e7010359742e45134712f59
 SHA512:
-  metadata.gz: 11dfb82752c234ca805a69b9abe16456201adf18adc849c29799ea927d0e317705f30dba08c9907f041a536da483980ee7fffc1d6c6664b9c876b5d01a9de432
-  data.tar.gz: 969c97060b903b1c2661823f3c4df19d05700a4724249b41e9a03f9219a7b2dc111d549b9cce62dc4597be274785b01a0aaded206b0d815a84c84ae8133a32fe
+  metadata.gz: ec7c3854ffd4db2524a51dae9530c7c967c23aef7aed80bce76fcf94a6dc5dfac1221c48ae83fcfce46e3a42e71e951fe7a27b564f029d85f0e90fe7ff17d674
+  data.tar.gz: eb4a325310776a2cacd4a6e178eca7d4137a07d80f75c7cce644ddf31bd1f8b9623f803f87b5e256ea6e0e081c6d08920625e8b5772fd592d28bedb0e26be316

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

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.3.0 ruby lib
+# stub: budgetcrmod 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "budgetcrmod".freeze
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   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-04-10"
+  s.date = "2018-06-30"
   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/account_choices.rb

@@ -7,15 +7,25 @@ class CodeRunner::Budget
   def external_account
     return @external_account if @external_account
     ext_account = false
+    unless @runner
+      raise "No runner for " + data_line
+    end
     Dir.chdir(@runner.root_folder) do
       chosen = false
       Hash.phoenix('account_choices.rb') do |choices_hash|
-        if choices_hash[data_line] 
+        if choices_hash[signature]
+          chosen = choices_hash[signature][:external_account]
+        elsif choices_hash[data_line] 
           #choices_hash[data_line][:external_account] = 
           #choices_hash[data_line][:external_account].to_sym #fixes earlier bug
           #choices_hash[data_line][:sub_account] = 
           #choices_hash[data_line][:sub_account].to_sym #fixes earlier bug
           chosen = choices_hash[data_line][:external_account]
+          choices_hash[signature] = choices_hash[data_line]
+          choices_hash.delete(data_line)
+        elsif choices_hash[old_data_line]
+          chosen = choices_hash[old_data_line][:external_account]
+          choices_hash[signature] = choices_hash[old_data_line]
         end
       end
       return @external_account = chosen if chosen
@@ -29,9 +39,11 @@ class CodeRunner::Budget
           puts Terminal.default_colour
           puts
           puts "-" * data_line.size
-          puts data_line
+          puts signature.inspect
           puts "-" * data_line.size
           puts
+          puts "Account: " + account
+          puts
           puts choices.inspect
           puts
           puts "Please choose from the above external accounts for this transaction."
@@ -117,7 +129,7 @@ class CodeRunner::Budget
         end
         next if not chosen
         Hash.phoenix('account_choices.rb') do |choices_hash|
-          choices_hash[data_line] = {external_account: ext_account, sub_account: chosen}
+          choices_hash[signature] = {external_account: ext_account, sub_account: chosen}
         end
       end #while not chosen
 
@@ -134,9 +146,10 @@ class CodeRunner::Budget
   # well can be very helpful in showing a breakdown of expenditure.
   def sub_account
     return @sub_account if @sub_account
+    puts "SIGNATURE ", signature.inspect
     Dir.chdir(@runner.root_folder) do
       external_account until (
-        choices = Hash.phoenix('account_choices.rb'){|choices_hash| choices_hash[data_line]}
+        choices = Hash.phoenix('account_choices.rb'){|choices_hash| choices_hash[signature]}
         p [choices, data_line]
       ) and choices[:sub_account]
       @sub_account = choices[:sub_account]

data/lib/budgetcrmod/budget.rb

@@ -1,7 +1,7 @@
 require 'date'
 class String
   def latex_escape
-    self.gsub(/(?<!\\)([$%_&^])/, '\\\\\1')
+    self.gsub(/(?<!\\)([$%_&^#])/, '\\\\\1')
   end
   #alias :old_to_f :to_f
   #def to_f
@@ -40,7 +40,8 @@ class CodeRunner
     @code_module_folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
 
     @component_results = [:date, :type, :sc, :ac, :description, :deposit, :withdrawal, :balance]	
-    @results = [:date_i, :data, :data_line, :dataset] + @component_results
+    @results = [:date_i, :data, :data_line, :dataset, :description2, :given_withdrawal, :given_deposit] + @component_results
+    @signature_fields = [:date,:description,:deposit,:withdrawal,:account]
     def generate_input_file
       FileUtils.cp @data_file.sub(/~/, ENV['HOME']), @directory + '/data.cvs'
     end
@@ -161,10 +162,14 @@ class CodeRunner
         [:date,:description,:dummy,:deposit,:dummy]
       when /Datum,Text,Belopp/ #Ecster Credit Card
         [:date,:description,:deposit]
+      when /Effective Date,Entered Date,Transaction Description,Amount,Balance/ #QudosBank new format the first field is blank
+        [:dummy,:date,:description,:deposit,:balance]
       when /Effective Date,Entered Date,Transaction Description,Amount/ #QudosBank, the first field is blank
         [:dummy,:date,:description,:deposit]
       when /Date,Amount,Currency,Description,"Payment Reference","Running Balance","Exchange Rate","Payer Name","Payee Name","Payee Account Number",Merchant/ #TransferWise
         [: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]
       end
     end
 
@@ -196,11 +201,11 @@ class CodeRunner
       @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.find{|k,v| v.dataset == dataset} # and Date.parse(dataset[0]) > Date.parse("1/1/2013")
         next if @first_line_string =~ /^Datum/ and dataset[1] =~ /Reservation/
-        component = create_component
-        component.set_zeroes
-        ep 'Generating Component', @component_runs.size
+        h = {}
+        h[:withdrawal] = 0.0
+        h[:deposit] = 0.0
+        h[:account] = @account
         reslts = csv_data_fields
         reslts.each_with_index do |res,index|
           value = dataset[index]
@@ -217,16 +222,43 @@ class CodeRunner
             next unless value =~ /\d/
             value = value.to_f 
           end
-          component.set(res, value)
+          #component.set(res, value)
+          h[res] = value
         end
-        component.set(:data_line, reslts.map{|r| component.send(r).to_s}.join(','))
+        h[:data_line] =  reslts.map{|r| h[r].to_s}.join(',')
+
+        if h[:description2] and h[:description]
+          h[:description] += ":" + h[:description2]
+        end
+
+        h[:given_withdrawal] = h[:withdrawal]
+        h[:given_deposit] = h[:deposit]
+        if h[:deposit] < 0.0 and h[:withdrawal] == 0.0
+          h[:withdrawal] = -h[:deposit]
+          h[:deposit] = 0.0
+        end
+        if h[:withdrawal] < 0.0 and h[:deposit] == 0.0
+          h[:deposit] = -h[:withdrawal]
+          h[:withdrawal] = 0.0
+        end
+        next if @runner.component_run_list.find{|k,v| 
+          v.signature == rcp.signature_fields.map{|res| h[res]}
+        } # and Date.parse(dataset[0]) > Date.parse("1/1/2013")
+
+        component = create_component
+        #component.set_zeroes
+        h.each{|k,v| component.set(k,v)}
+        ep 'Generating Component', @component_runs.size
         component.set(:dataset, dataset)
         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
-        end
-        @runner.cache[:data].push dataset
+        #if component.description2 and component.description
+          #component.description += ":" + component.description2
+        #end
+        #if component.deposit < 0.0 and component.withdrawal == 0.0
+          #component.withdrawal = -component.deposit
+          #component.deposit = 0.0
+        #end
+        #@runner.cache[:data].push dataset
         component.external_account; component.sub_account # Triggers interactive account choices
         #component.account = @account
       end
@@ -240,6 +272,19 @@ class CodeRunner
     def ds
       description
     end
+    def signature
+      #[date,description,deposit,withdrawal,account]
+      rcp.signature_fields.map{|res| send(res)}
+    end
+
+    def old_data_line # For backwards compatibility issues when csv formats change
+      case @first_line_string
+      when /Effective Date,Entered Date,Transaction Description,Amount,Balance/ #QudosBank new format the first field is blank
+        data_line.sub(/,[^,]*?$/, '')
+      else
+        nil
+      end
+    end
 
 
     def self.predictable_component_ids(runner)

metadata

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