journala 0.1.2 → 0.1.3

data/journala.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "journala"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert Kaufman"]

data/lib/journala.rb

@@ -5,3 +5,5 @@ require 'journala/journal'
 require 'journala/entry'
 require 'journala/row'
 require 'journala/value'
+
+require 'journala/parsers'

data/lib/journala/journal.rb

@@ -48,7 +48,7 @@ module Journala
       other_journal.entries.each do |entry|
         transaction_id = entry.description.match(/\(transaction id: (\d+)\)/)[1]
 
-        if @entries.none? {|e| e.description.match(/\(transaction id: \d+\)/) }
+        if @entries.none? {|e| e.description.match(/\(transaction id: #{transaction_id}\)/) }
           @entries << entry
         end
       end
@@ -60,6 +60,7 @@ module Journala
         file = File.open(filename, 'r')
 
         journal = Journal.new
+        current_entry = nil
 
         file.each_line do |line|
           if line =~ /^$/
@@ -69,25 +70,28 @@ module Journala
             confirmed = $2
             description = $3
     
-            entry = Entry.new(:date => date, :confirmed => confirmed.present?, :description => description)
+            current_entry = Entry.new(:date => date, :confirmed => confirmed.present?, :description => description)
 
-            journal.entries << entry
+            journal.entries << current_entry
 
           # row with amount
-          elsif line =~ /\s+(.*)\s{2,}\$(.*)/
-            row = Row.new(:account => $1, :amount => $2)
-            journal.entries.last.rows << row
+          elsif line =~ /\s+(.*)\s{2,}(-?)\$?([\d\.]+)/
+            row = Row.new(:account => $1, :amount => $2.blank? ? $3 : (0.0 - $3.to_f))
+            current_entry.rows << row
 
           # row without amount
           elsif line =~ /\s+(.*)/
-            other_amount = journal.entries.last.rows.first.amount
+            # already have 2 rows and try to do one without an amount? sorry, that's not allowed
+            raise "Must specify amount for each row for entries with more than 2 rows" if current_entry.rows.count >= 2
+            
+            other_amount = current_entry.rows.first.amount
             row = Row.new(:account => $1, :amount => 0-other_amount)
-            journal.entries.last.rows << row
+            current_entry.rows << row
           end
     
         end
 
-        f.close
+        file.close
 
         journal
       end

data/lib/journala/row.rb

@@ -18,7 +18,7 @@ module Journala
     end
 
     def to_s
-      spaces = ' ' * (70 - @account.length - @amount.length)
+      spaces = ' ' * [(70 - @account.length - @amount.length), 5].max
       "    #{@account}#{spaces}#{@amount}"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: journala
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70249718265780 !ruby/object:Gem::Requirement
+  requirement: &70099074010140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249718265780
+  version_requirements: *70099074010140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70249718265300 !ruby/object:Gem::Requirement
+  requirement: &70099074009560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249718265300
+  version_requirements: *70099074009560
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70249718264820 !ruby/object:Gem::Requirement
+  requirement: &70099074008780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249718264820
+  version_requirements: *70099074008780
 description: a library that reads and write ledger format ledger files
 email: rob.m.kaufman@gmail.com
 executables: []
@@ -75,9 +75,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -389571128459184875
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,3 +88,4 @@ signing_key:
 specification_version: 3
 summary: inspired by ledger
 test_files: []
+has_rdoc: