budgetcrmod 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1d0b4f3a58bce91cd2ad56229fed7e745a73fb
-  data.tar.gz: 9e7aa5398882fa4f219eb78fcb6f97e518550b88
+  metadata.gz: 9a1ed45d12e5021db3fce47df4b4ba1a5e93d8c9
+  data.tar.gz: 34f6c04868dc0b676e3aba3e9ae681ffb7c95549
 SHA512:
-  metadata.gz: 13cb28562e021786af1945ad3e050dfdb016d3effd719fab216edb58d0330bb400243abf8b303bc71326ea5dcddd60120e49d2897ef109268b8603a3f3ec5313
-  data.tar.gz: 4fa8496fb757cdffdba9eaf10a480ed2d2942723c82ce6690eb62b676951fa4bb2ac16947611d5815f9c8b032d2a8c4acfc16d3d0fbfaeb3597cff276b4cfa50
+  metadata.gz: 65178bcb5e47004f7e8e34500fcbc764821bcf8ac0e2c67f3107d3fc31b6ce9715c5e176077fb6c5728dcdd4ed5c06e8b5b06414d6b93595b3c715a1da6d8cb3
+  data.tar.gz: 5097b5c98f9028f75b90a42280d15d225b9ee3b326060ddd7bfdbb41877c6937e2ed9c47b90862c53d37fda61dc453bbbd85a429ab91ae7ea9514113800ab1ba

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/budgetcrmod.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: budgetcrmod 0.1.0 ruby lib
+# stub: budgetcrmod 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "budgetcrmod"
-  s.version = "0.1.0"
+  s.name = "budgetcrmod".freeze
+  s.version = "0.2.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Edmund Highcock"]
-  s.date = "2014-06-02"
-  s.description = "A CodeRunner module to help you do your budget"
-  s.email = "edmundhighcock@users.sourceforge.net"
+  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.description = "A CodeRunner module to help you do your budget".freeze
+  s.email = "edmundhighcock@users.sourceforge.net".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -32,33 +32,33 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_budgetcrmod.rb"
   ]
-  s.homepage = "http://github.com/edmundhighcock/budgetcrmod"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "A CodeRunner module to help you do your budget"
+  s.homepage = "http://github.com/edmundhighcock/budgetcrmod".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.8".freeze
+  s.summary = "A CodeRunner module to help you do your budget".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<coderunner>, [">= 0.11.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
+      s.add_runtime_dependency(%q<coderunner>.freeze, [">= 0.11.0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, ["> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 1.8.4"])
     else
-      s.add_dependency(%q<coderunner>, [">= 0.11.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+      s.add_dependency(%q<coderunner>.freeze, [">= 0.11.0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["> 1.0.0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 1.8.4"])
     end
   else
-    s.add_dependency(%q<coderunner>, [">= 0.11.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["> 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+    s.add_dependency(%q<coderunner>.freeze, [">= 0.11.0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, ["> 1.0.0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 1.8.4"])
   end
 end
 

data/lib/budgetcrmod/budget.rb

@@ -1,8 +1,20 @@
+class Float
+	def to_str
+		sprintf("%.2f", self)
+	end
+	def to_s
+		sprintf("%.2f", self)
+	end
+end
 require 'date'
 class String
 	def latex_escape
 		self.gsub(/(?<!\\)([%_&^])/, '\\\\\1')
 	end
+	#alias :old_to_f :to_f
+	#def to_f
+		#gsub(/,/, '').old_to_f
+	#end
 end
 
 class Date
@@ -45,7 +57,7 @@ class CodeRunner
 #			  "4506.80"]
 #
 		@component_results = [:date, :type, :sc, :ac, :description, :deposit, :withdrawal, :balance]	
-		@results = [:data, :data_line] + @component_results
+		@results = [:date_i, :data, :data_line] + @component_results
 		def generate_input_file
 			FileUtils.cp @data_file.sub(/~/, ENV['HOME']), @directory + '/data.cvs'
 		end
@@ -69,23 +81,46 @@ class CodeRunner
 		def process_directory_code_specific
 			@status=:Complete
 			data = File.read('data.cvs')
-			data = data.split("\n").map do 	|line| 
+      #p ['encoding', data.encoding]
+      #data.encode(Encoding::UTF_8)
+      tries = 1 
+      begin
+        data = data.split(/\n\r|\r\n|\n|\r/)
+      rescue
+        #require 'ensure/encoding.rb'
+        if tries > 0
+          if tries==1
+            #data.force_encoding('iso-8859-1')
+            data = File.read('data.cvs', encoding: "ISO-8859-1")
+            data = data.encode('utf-8')
+          end
+          tries-=1
+          retry
+        end
+      end
+			if data[0] =~ /^\d{2} \w{3} \d\d,/ # BarclayCard format
+				data.unshift 'date,description,type,user,expensetype,withdrawal,withdrawal'
+			end
+
+			@first_line_string = data[0].dup
+			data = data.map do 	|line| 
 				matches = line.scan(Regexp.new("((?:#{DOUBLE_STRING}|[^,])*)(?:,|$)"))
 				matches.flatten
 			end
 			#pp data
 			@data = data
 			@first_line = @data.shift.join(',')
+      generate_component_runs
 		end
-		def reversed?
+		#def reversed?
 			#case account_type(@account)
 			#when :Asset
-				@first_line =~ /Debit.*Credit/
+				#@first_line =~ /Debit.*Credit/
 			#end
-		end
+		#end
 		def print_out_line
 			if @is_component
-				sprintf("%4d. %10s %10s %3s  %-30s %8s %8s %8s %8s %8s", id, account, *rcp.component_results.find_all{|r| r!=:ac and r!=:sc}.map{|res| send(res)}, budget, external_account)
+				sprintf("%4d. %10s %10s %3s  %-40s %8s %8s %8s %8s %8s", id, account, *rcp.component_results.find_all{|r| r!=:ac and r!=:sc}.map{|res| send(res).to_s.gsub(/\s+/, ' ')}, external_account, sub_account)
 			else
 				#pr = component_runs.sort_by{|r| r.id}
 				"#{sprintf("%3d", @id)}. #{sprintf("%-20s", @account)} Start: #{start_date}   End: #{end_date}   Final Balance: #{final_balance} "
@@ -108,36 +143,108 @@ class CodeRunner
 		def parameter_string
 			""
 		end
+    #def external_account
+      #name = super
+      #if ACCOUNT_INFO[name] and ACCOUNT_INFO[name][:currencies].size > 2
+    #end
+    #def sub_account
+    #end
+
+		def sub_account
+			cache[:sub_account] ||= super
+		end
+		def external_account
+			cache[:external_account] ||= super
+		end
 
 		#def external_account
-			#(sub_account.to_s + '_' + budget.to_s).to_sum
+			#(budget.to_s + '_' + sub_account.to_s).to_sym
 		#end
 		
+		def csv_data_fields
+			case @first_line_string
+			when /Date,Type,Sort Code,Account Number,Description,In,Out,Balance/ # Old Lloyds Bank Format
+				[:date, :type, :sc, :ac, :description, :deposit, :withdrawal, :balance]
+			when /Transaction Date,Transaction Type,Sort Code,Account Number,Transaction Description,Debit Amount,Credit Amount,Balance/ # 2013 Lloyds Bank Format, NB they are using debit and credit as if the account is an equity account (when of course a bank account is really an asset)
+				[:date, :type, :sc, :ac, :description, :withdrawal, :deposit, :balance]
+			when /Date,Date entered,Reference,Description,Amount/ # Lloyds Credit Card statement
+				[:date, :dummy, :dummy, :description, :withdrawal]
+			when /date,description,type,user,expensetype,withdrawal,withdrawal/
+				[: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öringsdatum,Transaktionsreferens,Mottagare,Belopp,Valuta/ # Forex.se privat, Belopp is positive when the asset increases
+        [:date,:description,:dummy,:deposit,:dummy]
+			end
+		end
+
+		#def withdrawn
+			#@withdrawn||0.0
+		#end
+
+		def has_balance? 
+			@has_balance ||= csv_data_fields.include? :balance
+		end
+
+		attr_accessor :dummy
+
+
+		def set_zeroes
+			@withdrawal||=0.0
+			@deposit||=0.0
+		end
 		def generate_component_runs
+      #puts Kernel.caller
+      #p ['generate_component_runs', @component_runs.class, (@component_runs.size rescue nil), @runner.component_run_list.size, @directory]
+      return if @component_runs and @component_runs.size > 0
 			@runner.cache[:data] ||= []
-			reslts = rcp.component_results
-			if reversed?
-				reslts[5] = :withdrawal
-				reslts[6] = :deposit
-			end
+			#reslts = rcp.component_results
+			#if reversed?
+				#reslts[5] = :withdrawal
+				#reslts[6] = :deposit
+			#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.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/
 				component = create_component
+        ep 'Generating Component', @component_runs.size
+				reslts = csv_data_fields
 				reslts.each_with_index do |res,index|
 					value = dataset[index]
-#					ep value
+					#ep value
 					value = Date.parse value if res == :date
-					value = value.to_f if [:deposit, :withdrawal, :balance].include? res
+					if [:deposit, :withdrawal, :balance].include? res
+            case @first_line_string
+            when /^Datum/i # we are dealing with European numbers
+              value = value.gsub(/[."]/, '')
+              value = value.sub(/[,]/, '.')
+            else
+              value = value.gsub(/[",]/, '')
+            end
+						next unless value =~ /\d/
+						value = value.to_f 
+					end
+          component.instance_variable_set(:@dataset, dataset)
 					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
+        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
 		end
 		def days_ago(today = Date.today)
 			#ep ['today', today, date]
 #			sprintf("%04d%02d%02d", date.year, date.month, date.day).to_i
+			#cache[:days_ago] ||= {}
+			#cache[:days_ago][today.to_s] ||=
 			- ((date.to_datetime.to_time.to_i - today.to_datetime.to_time.to_i) / 24 / 3600).to_i
 		end
 		def idate
@@ -312,8 +419,10 @@ class CodeRunner
 			 kit.data.each{|dk| dk.gp.using = "1:2"}
 			 kit.gp.xdata = "time"
 			 kit.gp.format = %[x "%d %B %Y"]
+			 kit.gp.format = %[x "%b %Y"]
+       kit.gp.mxtics = "30"
 			 kit.gp.xtics = "rotate by 340 offset 0,-0.5 #{24*3600*14}"
-			 kit.gp.xtics = "rotate by 340 offset 0,-0.5 "
+			 kit.gp.xtics = "rotate by 340 offset 0,-0.5 2629746"
 		end
 
 		def self.print_budget(options={})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: budgetcrmod
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A CodeRunner module to help you do your budget