ledger_web 1.4.3 → 1.4.4

data/bin/ledger_web

@@ -3,6 +3,8 @@
 require 'rubygems'
 require 'optparse'
 
+STDOUT.sync = true
+
 begin
   require 'ledger_web'
 rescue LoadError => e
@@ -27,5 +29,7 @@ OptionParser.new do |opts|
   end
 end.parse!
 
+LedgerWeb::Database.connect
+
 LedgerWeb::Watcher.run!
 LedgerWeb::Application.run!(:port => LedgerWeb::Config.instance.get(:port))

data/lib/ledger_web/app.rb

@@ -11,8 +11,6 @@ module LedgerWeb
     set :views, LedgerWeb::Config.instance.get(:report_directories) + [File.join(File.dirname(__FILE__), 'views')]
     set :reload_templates, true
 
-    LedgerWeb::Database.connect
-
     helpers Sinatra::Capture
     helpers LedgerWeb::Helpers
 

data/lib/ledger_web/db.rb

@@ -32,15 +32,15 @@ module LedgerWeb
       ledger_bin_path = LedgerWeb::Config.instance.get :ledger_bin_path
       ledger_file = LedgerWeb::Config.instance.get :ledger_file
       ledger_format = LedgerWeb::Config.instance.get :ledger_format
-      
-      print "    dumping ledger to file...."
+
+      puts "Dumping ledger to file..."
       file = Tempfile.new('ledger')
       system "#{ledger_bin_path} -f #{ledger_file} --format='#{ledger_format}' reg > #{file.path}"
       replaced_file = Tempfile.new('ledger')
       replaced_file.write(file.read.gsub('\"', '""'))
       replaced_file.flush
 
-      puts "done"
+      puts "Dump finished"
       return replaced_file
     end
       
@@ -49,12 +49,12 @@ module LedgerWeb
       @@db.transaction do
     
         LedgerWeb::Config.instance.run_hooks(:before_load, @@db)
-    
-        print "    clearing ledger table...."
+
+        puts "Clearing ledger table...."
         @@db["DELETE FROM ledger"].delete
-        puts "done"
+        puts "Done clearing ledger table"
     
-        print "    loading into database...."
+        puts "Loading into database...."
 
         CSV.foreach(file.path) do |row|
           counter += 1
@@ -75,21 +75,31 @@ module LedgerWeb
     
           row[:xtn_month] = xtn_date.strftime('%Y/%m/01')
           row[:xtn_year]  = xtn_date.strftime('%Y/01/01')
-          row[:cost] = row[:cost].gsub(/[^\d\.-]/, '')
+          row[:cost] = parse_cost(row[:cost])
     
           row = LedgerWeb::Config.instance.run_hooks(:before_insert_row, row)
           @@db[:ledger].insert(row)
           LedgerWeb::Config.instance.run_hooks(:after_insert_row, row)
         end
     
-        puts "    Running after_load hooks"
+        puts "Running after_load hooks"
         LedgerWeb::Config.instance.run_hooks(:after_load, @@db)
       end
-      puts "    analyzing ledger table"
+      puts "Analyzing ledger table"
       @@db.fetch('VACUUM ANALYZE ledger').all
-      puts "done"
+      puts "Done!"
       counter
     end
+
+    def self.parse_cost(cost)
+      match = cost.match(/([\d\.-]+) (.+) {(.+)} \[(.+)\]/)
+      if match
+        amount = match[1].to_f
+        price = match[3].gsub(/[^\d\.-]/, '').to_f
+        return price * amount
+      end
+      cost.gsub(/[^\d\.-]/, '')
+    end
     
     def self.load_prices
       query = <<HERE
@@ -113,7 +123,7 @@ module LedgerWeb
         ) x
 HERE
     
-      puts "Deleting prices"
+      puts "    Deleting prices"
       @@db["DELETE FROM prices"].delete
     
       rows = @@db.fetch(query)

data/lib/ledger_web/version.rb

@@ -1,3 +1,3 @@
 module LedgerWeb
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
 end

data/lib/ledger_web/watcher.rb

@@ -15,11 +15,12 @@ module LedgerWeb
       @@dw.interval = LedgerWeb::Config.instance.get :watch_interval
       @@dw.stable = LedgerWeb::Config.instance.get :watch_stable_count
 
+      LedgerWeb::Database.connect
+
       @@dw.add_observer do |*args|
         args.each do |event|
           if event[0] == :stable
             puts "Loading database"
-            LedgerWeb::Database.connect
             LedgerWeb::Database.run_migrations
             file = LedgerWeb::Database.dump_ledger_to_csv
             count = LedgerWeb::Database.load_database(file)

data/test/database_load_spec.rb

@@ -218,5 +218,31 @@ describe LedgerWeb::Database do
       ])
 
     end
+
+    it "should load the database from csv with a complicated cost string" do
+      count = 0
+      File.open(fixture('complex_costs')) do |file|
+        count = LedgerWeb::Database.load_database(file)
+      end
+      count.should eq(1)
+
+      convert_bd_to_string(LedgerWeb::Database.handle[:ledger].all()).should eq([
+        {
+          :xtn_date => Date.new(2011,8,30),
+          :checknum => nil,
+          :note => 'Tttttttttt Pagamento',
+          :account => 'Liabilities:Funds:Retirement Plan',
+          :commodity => '"B PGBL F10"',
+          :amount => "103.59",
+          :tags => '',
+          :xtn_month => Date.new(2011,8,1),
+          :xtn_year => Date.new(2011,1,1),
+          :virtual => true,
+          :xtn_id => 7288,
+          :cleared => false,
+          :cost => "442.33"
+        },                                                                                 
+      ])
+    end
   end
 end

data/test/fixtures/complex_costs.dat

@@ -0,0 +1 @@
+"7288","2011/08/30","Tttttttttt Pagamento","Liabilities:Funds:Retirement Plan","""B PGBL F10""","103.59","false","true","","103.59 ""B PGBL F10"" {R$4.2701032918} [2011/08/30]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger_web
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000Z
+date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -297,6 +297,7 @@ files:
 - lib/ledger_web/watcher.rb
 - test/config_spec.rb
 - test/database_load_spec.rb
+- test/fixtures/complex_costs.dat
 - test/fixtures/quoted.dat
 - test/fixtures/small.dat
 - test/report_spec.rb
@@ -329,6 +330,7 @@ summary: A web-based, sql-backed front-end for the Ledger command-line accountin
 test_files:
 - test/config_spec.rb
 - test/database_load_spec.rb
+- test/fixtures/complex_costs.dat
 - test/fixtures/quoted.dat
 - test/fixtures/small.dat
 - test/report_spec.rb