quickpep 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b97633e4858dbf3bb2de75706b1d46b21720f03fdae7ae403900cce56fa0db33
-  data.tar.gz: b54fb051c4849b6dc7b1632e3335db8cb790abbd6041501db1b25793a9a67491
+  metadata.gz: ba6bbfc5378de882fbd79dede0771a1642b66f417adecd3fde7857197f519d52
+  data.tar.gz: d5a58051fb491a039c2e966de835114e9d90a21dd4d0f3b672f3f5c202b01585
 SHA512:
-  metadata.gz: e82606e40d2cca4b1318382afe68a45330f27206c2a4fffc9dbd67a0b6bd3698c4a9673fcee92caacf43be4b4685007b6a66f757975665569afb143f219ec0cc
-  data.tar.gz: d1d3f7097e8887b68127ba4984aeba58b544c78fa11273fcb9c9286e55ca4408e99853e6b5196020e63e4b449f81131edf98b19ce562bc889cd8b8881b9e900d
+  metadata.gz: 84abeb9fab3e92961eedafea2da109ef0259df304b3ce037c7fa897070266f13368cdcdf864de7414d5e5d400ff2fab8f7974d18486588cf776d7dd1b81490cd
+  data.tar.gz: e4fab26e76fb49fc7620b0b5a32a6d7593c87a674fbea45dcc858e6799b4070f158682994d9abd52d4b01c24f8713dce8c73ab1d86bb5abc9346e20d4e0fdd00

data/lib/quickpep.rb

@@ -6,18 +6,25 @@ require 'dynarex'
 require 'event_nlp'
 
 # Quick Personal Expenses Planner - for people too lazy to use a
-#                                   spreadsheet or finance app
+#                                   spreadsheet or sfinance app
 #
 class QuickPep
+  using ColouredText
 
   attr_reader :to_s
 
   def initialize(s, balance: 0, currency: '', debug: false)
 
     @balance, @currency, @debug = balance, currency, debug
-    
+    @warnings = []
     @to_s = calc_expenses(s)
 
+    warnings() if @warnings.any?
+
+  end
+
+  def warnings()
+    @warnings.each {|warning| puts warning.warn }
   end
 
   private
@@ -47,23 +54,52 @@ class QuickPep
 
     a = date_events.map do |date, title|
 
-      puts '2. title: '  + title.inspect if @debug
+      if @debug then
+        puts '2. title: '  + title.inspect
+        puts 'date: '  + date.inspect
+      end
+
       credit, debit = 0.0, 0.0
       amount = h[title].amount
 
       if amount[0] == '+' then
+
         credit = amount.gsub(/\D/,'').to_f
+
+        if @debug then
+          puts 'credit: ' + credit.inspect
+          puts 'balance: ' + bal.inspect
+        end
+
         bal +=credit
+        puts 'after credit, balance: ' + bal.inspect if @debug
+
       else
+
         debit = amount.gsub(/\D/,'').to_f
+
+        if @debug then
+          puts 'debit: ' + debit.inspect
+          puts 'balance: ' + bal.inspect
+        end
+
         bal -= debit
+
+        puts 'after debug, balance: ' + bal.inspect if @debug
+
+        if bal < 0 then
+          @warnings << "date: %s, balance is below zero at %s" % [date,
+                                            bal.to_s.sub(/-/,'-' + @currency)]
+        end
+
       end
 
       [date, title, debit, credit, bal]
 
     end
 
-    dx2 = Dynarex.new('items/item(date, title, debit, credit, balance)')
+    dx2 = Dynarex.new('items/item(date, title, debit, credit, balance)', debug: @debug)
+    dx2.default_key = :uid
 
     a.each do |date, title, debit, credit, balance|
 
@@ -74,14 +110,14 @@ class QuickPep
         title: title,
         debit: debit > 0 ? (@currency + "%.2f" % debit) : '',
         credit: credit > 0 ? (@currency + "%.2f" % credit) : '',
-        balance: @currency + "%.2f" % balance
+        balance: (@currency + "%.2f" % balance).sub(/#{@currency}-/, + '-' + @currency)
       }
 
       dx2.create row
     end
 
-    dx2.to_table
+    dx2.to_table #(fields: %i(date title debit: credit: balance:))
+
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quickpep
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson