reckon 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58a745c730c0dfaf022a98c19dfaf8568c0b3091548d70c9202f8f7c0d78ada
-  data.tar.gz: 030d2036524a19c5eff981608133e8aac15f185b57a891e91a6f1fdabd3796c7
+  metadata.gz: a7e9512d0b15c14548a04e80f5dd3a87f50ae9ff2654827b5970def94e174667
+  data.tar.gz: f858c96b4b5f2a7b2c85845803109e566281c0fc945c46ba39758121701d0e9a
 SHA512:
-  metadata.gz: 1daf76a19078f1707e847a7ac54aad5836ee3d49ce9c2f612bfefeb86f8c1bf9c9d1f97b7bbecb309f9f44f8097f8f2dbe0d6b6062bc376a62fc88f45bab1dfc
-  data.tar.gz: 4784ac871dbdb6160dc53ef8a7f5d69f31ccc7f7f7ea876b97bf60941abb2d13a968f5229747dd74d0b574ecc12326485e1eaba7ea368a91162d36d3ef4f9f86
+  metadata.gz: 15526cfe3504d50859de7b652285b31f639b11daecd8536732b97e1f84d03814cb8040c8db830386f803de7836e11712b7069758a77bf290fab26699436440f2
+  data.tar.gz: 99ae732793adeaa40f5c7235e690dfb80d839a31ecba52f989e0dea2d339cf012623f858c926261e4bd5eb731e2a3ff508370509d03560c64c2bd7cf4a737a7e

data/.gitignore

@@ -25,3 +25,6 @@ pkg
 .idea
 reckon_local
 private_tests
+
+## Bundler
+vendor

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reckon (0.5.0)
+    reckon (0.5.1)
       chronic (>= 0.3.0)
       highline (>= 1.5.2)
       rchardet (>= 1.8.0)

data/README.md

@@ -8,7 +8,7 @@ Reckon automagically converts CSV files for use with the command-line accounting
 
 Assuming you have Ruby and [Rubygems](http://rubygems.org/pages/download) installed on your system, simply run
 
-    (sudo) gem install reckon
+    gem install --user reckon
 
 ## Example Usage
 

data/lib/reckon.rb

@@ -10,12 +10,13 @@ require 'terminal-table'
 require 'time'
 require 'logger'
 
-LOGGER = Logger.new(STDOUT)
-LOGGER.level = Logger::ERROR
+LOGGER = Logger.new(STDERR)
+LOGGER.level = Logger::WARN
 
 require_relative 'reckon/version'
 require_relative 'reckon/cosine_similarity'
-require File.expand_path(File.join(File.dirname(__FILE__), "reckon", "app"))
-require File.expand_path(File.join(File.dirname(__FILE__), "reckon", "ledger_parser"))
-require File.expand_path(File.join(File.dirname(__FILE__), "reckon", "csv_parser"))
-require File.expand_path(File.join(File.dirname(__FILE__), "reckon", "money"))
+require_relative 'reckon/date_column'
+require_relative 'reckon/money'
+require_relative 'reckon/ledger_parser'
+require_relative 'reckon/csv_parser'
+require_relative 'reckon/app'

data/lib/reckon/app.rb

@@ -156,6 +156,10 @@ module Reckon
     def each_row_backwards
       rows = []
       (0...@csv_parser.columns.first.length).to_a.each do |index|
+        if @csv_parser.date_for(index).nil?
+          LOGGER.warn("Skipping row: '#{@csv_parser.row(index)}' that doesn't have a valid date")
+          next
+        end
         rows << { :date => @csv_parser.date_for(index),
                   :pretty_date => @csv_parser.pretty_date_for(index),
                   :pretty_money => @csv_parser.pretty_money_for(index),
@@ -163,9 +167,7 @@ module Reckon
                   :money => @csv_parser.money_for(index),
                   :description => @csv_parser.description_for(index) }
       end
-      rows.sort { |a, b| a[:date] <=> b[:date] }.each do |row|
-        yield row
-      end
+      rows.sort_by { |n| n[:date] }.each {|row| yield row }
     end
 
     def most_specific_regexp_match( row )

data/lib/reckon/csv_parser.rb

@@ -12,6 +12,10 @@ module Reckon
       detect_columns
     end
 
+    def row(index)
+      csv_data[index].join(", ")
+    end
+
     def filter_csv
       if options[:ignore_columns]
         new_columns = []
@@ -27,7 +31,10 @@ module Reckon
     end
 
     def pretty_money_for(index, negate = false)
-      money_for( index ).pretty( negate )
+      money = money_for(index)
+      return 0 if money.nil?
+
+      money.pretty(negate)
     end
 
     def pretty_money(amount, negate = false)
@@ -35,7 +42,7 @@ module Reckon
     end
 
     def date_for(index)
-      @date_column.for( index )
+      @date_column.for(index)
     end
 
     def pretty_date_for(index)

data/lib/reckon/date_column.rb

@@ -0,0 +1,60 @@
+module Reckon
+  class DateColumn < Array
+    attr_accessor :endian_precedence
+    def initialize( arr = [], options = {} )
+      arr.each do |value|
+        if options[:date_format]
+          begin
+            value = Date.strptime(value, options[:date_format])
+          rescue
+            puts "I'm having trouble parsing #{value} with the desired format: #{options[:date_format]}"
+            exit 1
+          end
+        else
+          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})\d+\[\d+\:GMT\]$/ # chase format
+          value = [$3, $2, $1].join("/") if value =~ /^(\d{2})\.(\d{2})\.(\d{4})$/            # german format
+          value = [$3, $2, $1].join("/") if value =~ /^(\d{2})\-(\d{2})\-(\d{4})$/            # nordea format
+          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})\-(\d{2})\-(\d{2})$/            # yyyy-mm-dd format
+          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})/                 # yyyymmdd format
+
+
+          unless @endian_precedence # Try to detect endian_precedence
+            reg_match = value.match( /^(\d\d)\/(\d\d)\/\d\d\d?\d?/ )
+            # If first one is not \d\d/\d\d/\d\d\d?\d set it to default
+            if !reg_match
+              @endian_precedence = [:middle, :little]
+            elsif reg_match[1].to_i > 12
+              @endian_precedence = [:little]
+            elsif reg_match[2].to_i > 12
+              @endian_precedence = [:middle]
+            end
+          end
+        end
+        self.push( value )
+      end
+      # if endian_precedence still nil, raise error
+      unless @endian_precedence || options[:date_format]
+        raise( "Unable to determine date format. Please specify using --date-format" )
+      end
+    end
+
+    def for( index )
+      value = self.at( index )
+      guess = Chronic.parse(value, :context => :past,
+                            :endian_precedence => @endian_precedence )
+      if guess.to_i < 953236800 && value =~ /\//
+        guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), :context => :past,
+                              :endian_precedence => @endian_precedence)
+      end
+      guess && guess.to_date
+    end
+
+    def pretty_for(index)
+      date = self.for(index)
+      return "" if date.nil?
+
+      date.iso8601
+    end
+
+  end
+end

data/lib/reckon/money.rb

@@ -112,60 +112,4 @@ module Reckon
       self
     end
   end
-
-  class DateColumn < Array
-    attr_accessor :endian_precedence
-    def initialize( arr = [], options = {} )
-      arr.each do |value|
-        if options[:date_format]
-          begin
-            value = Date.strptime(value, options[:date_format])
-          rescue
-            puts "I'm having trouble parsing #{value} with the desired format: #{options[:date_format]}"
-            exit 1
-          end
-        else
-          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})\d+\[\d+\:GMT\]$/ # chase format
-          value = [$3, $2, $1].join("/") if value =~ /^(\d{2})\.(\d{2})\.(\d{4})$/            # german format
-          value = [$3, $2, $1].join("/") if value =~ /^(\d{2})\-(\d{2})\-(\d{4})$/            # nordea format
-          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})\-(\d{2})\-(\d{2})$/            # yyyy-mm-dd format
-          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})/                 # yyyymmdd format
-
-
-          unless @endian_precedence # Try to detect endian_precedence
-            reg_match = value.match( /^(\d\d)\/(\d\d)\/\d\d\d?\d?/ )
-            # If first one is not \d\d/\d\d/\d\d\d?\d set it to default
-            if !reg_match
-              @endian_precedence = [:middle, :little]
-            elsif reg_match[1].to_i > 12
-              @endian_precedence = [:little]
-            elsif reg_match[2].to_i > 12
-              @endian_precedence = [:middle]
-            end
-          end
-        end
-        self.push( value )
-      end
-      # if endian_precedence still nil, raise error
-      unless @endian_precedence || options[:date_format]
-        raise( "Unable to determine date format. Please specify using --date-format" )
-      end
-    end
-
-    def for( index )
-      value = self.at( index )
-      guess = Chronic.parse(value, :context => :past,
-                            :endian_precedence => @endian_precedence )
-      if guess.to_i < 953236800 && value =~ /\//
-        guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), :context => :past,
-                              :endian_precedence => @endian_precedence)
-      end
-      guess
-    end
-
-    def pretty_for(index)
-      self.for(index).to_date.iso8601
-    end
-
-  end
 end

data/lib/reckon/version.rb

@@ -0,0 +1,3 @@
+module Reckon
+  VERSION = "0.5.1"
+end

data/reckon.gemspec

@@ -1,5 +1,5 @@
 $:.push File.expand_path("../lib", __FILE__)
-require 'reckon/version'
+require_relative 'lib/reckon/version'
 
 Gem::Specification.new do |s|
   s.name = %q{reckon}
@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/cantino/reckon}
   s.description = %q{Reckon automagically converts CSV files for use with the command-line accounting tool Ledger.  It also helps you to select the correct accounts associated with the CSV data using Bayesian machine learning.}
   s.summary = %q{Utility for interactively converting and labeling CSV files for the Ledger accounting tool.}
+  s.licenses = ['MIT']
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/data_fixtures/test_money_column.csv

@@ -0,0 +1,3 @@
+"Date","Note","Amount"
+"2012/3/22","DEPOSIT","50.00"
+"2012/3/23","TRANSFER TO SAVINGS","-10.00"

data/spec/reckon/app_spec.rb

@@ -107,6 +107,20 @@ describe Reckon::App do
     end
   end
 
+  context "Issue #64 - regression test" do
+    it 'should work for simple file' do
+      rows = []
+      app =  Reckon::App.new(file: fixture_path('test_money_column.csv'))
+      expect { app.each_row_backwards { |n| rows << n } }
+        .to output(/Skipping row: 'Date, Note, Amount'/).to_stderr_from_any_process
+      expect(rows.length).to eq(2)
+      expect(rows[0][:pretty_date]).to eq('2012-03-22')
+      expect(rows[0][:pretty_money]).to eq(' $50.00')
+      expect(rows[1][:pretty_date]).to eq('2012-03-23')
+      expect(rows[1][:pretty_money]).to eq('-$10.00')
+    end
+  end
+
   #DATA
   BANK_CSV = (<<-CSV).strip
     DEBIT,20091224120000[0:GMT],"HOST 037196321563 MO        12/22SLICEHOST",-85.00

data/spec/reckon/date_column_spec.rb

@@ -20,23 +20,22 @@ describe Reckon::DateColumn do
   end
   describe "for" do
     it "should detect the date" do
-      Reckon::DateColumn.new( ["13/12/2013"] ).for( 0 ).should ==
-        Time.new( 2013, 12, 13, 12 )
-      Reckon::DateColumn.new( ["01/14/2013"] ).for( 0 ).should ==
-        Time.new( 2013, 01, 14, 12 )
-      Reckon::DateColumn.new( ["13/12/2013", "21/11/2013"] ).for( 1 ).should ==
-        Time.new( 2013, 11, 21, 12 )
-      Reckon::DateColumn.new( ["2013-11-21"] ).for( 0 ).should ==
-        Time.new( 2013, 11, 21, 12 )
+      expect(Reckon::DateColumn.new(%w[13/12/2013]).for(0))
+        .to eq(Date.new(2013, 12, 13))
+      expect(Reckon::DateColumn.new(%w[01/14/2013]).for(0))
+        .to eq(Date.new(2013, 1, 14))
+      expect(Reckon::DateColumn.new(%w[13/12/2013 21/11/2013]).for(1))
+        .to eq(Date.new(2013, 11, 21))
+      expect(Reckon::DateColumn.new( ["2013-11-21"] ).for( 0 ))
+        .to eq(Date.new(2013, 11, 21))
 
     end
 
     it "should correctly use endian_precedence" do
-      Reckon::DateColumn.new( ["01/02/2013", "01/14/2013"] ).for(0).should ==
-        Time.new( 2013, 01, 02, 12 )
-      Reckon::DateColumn.new( ["01/02/2013", "14/01/2013"] ).for(0).should ==
-        Time.new( 2013, 02, 01, 12 )
+      expect(Reckon::DateColumn.new(%w[01/02/2013 01/14/2013]).for(0))
+        .to eq(Date.new(2013, 1, 2))
+      expect(Reckon::DateColumn.new(%w[01/02/2013 14/01/2013]).for(0))
+        .to eq(Date.new(2013, 2, 1))
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Andrew Cantino
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -135,8 +135,10 @@ files:
 - lib/reckon/app.rb
 - lib/reckon/cosine_similarity.rb
 - lib/reckon/csv_parser.rb
+- lib/reckon/date_column.rb
 - lib/reckon/ledger_parser.rb
 - lib/reckon/money.rb
+- lib/reckon/version.rb
 - reckon.gemspec
 - spec/data_fixtures/73-sample.csv
 - spec/data_fixtures/73-tokens.yml
@@ -160,6 +162,7 @@ files:
 - spec/data_fixtures/some_other.csv
 - spec/data_fixtures/spanish_date_example.csv
 - spec/data_fixtures/suntrust.csv
+- spec/data_fixtures/test_money_column.csv
 - spec/data_fixtures/tokens.yaml
 - spec/data_fixtures/two_money_columns.csv
 - spec/data_fixtures/yyyymmdd_date_example.csv
@@ -172,7 +175,8 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: https://github.com/cantino/reckon
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []