reckon 0.5.1 → 0.6.1

data/spec/reckon/money_column_spec.rb

@@ -8,13 +8,13 @@ require 'reckon'
 describe Reckon::MoneyColumn do
   describe "initialize" do
     it "should convert strings into Money" do
-      Reckon::MoneyColumn.new( ["1.00", "-2.00"] ).should == [ 
+      Reckon::MoneyColumn.new( ["1.00", "-2.00"] ).should == [
         Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
     end
     it "should convert empty string into nil" do
-      Reckon::MoneyColumn.new( ["1.00", ""] ).should == [ 
+      Reckon::MoneyColumn.new( ["1.00", ""] ).should == [
         Reckon::Money.new( 1.00 ), nil ]
-      Reckon::MoneyColumn.new( ["", "-2.00"] ).should == [ 
+      Reckon::MoneyColumn.new( ["", "-2.00"] ).should == [
         nil, Reckon::Money.new( -2.00 ) ]
     end
   end
@@ -32,33 +32,33 @@ describe Reckon::MoneyColumn do
 
   describe "merge" do
     it "should merge two columns" do
-      Reckon::MoneyColumn.new( ["1.00", ""] ).merge!( 
-        Reckon::MoneyColumn.new( ["", "-2.00"] ) ).should == [ 
-          Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
-      Reckon::MoneyColumn.new( ["1.00", "0"] ).merge!( 
-        Reckon::MoneyColumn.new( ["0", "-2.00"] ) ).should == [ 
-          Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
-      Reckon::MoneyColumn.new( ["AB1.00C", ""] ).merge!( 
-        Reckon::MoneyColumn.new( ["", "AB-2.00C"] ) ).should == [ 
-          Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
-      Reckon::MoneyColumn.new( ["AB1.00C", "AB0C"] ).merge!( 
-        Reckon::MoneyColumn.new( ["AB0C", "AB-2.00C"] ) ).should == [ 
-          Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
-     end
+      m1 = Reckon::MoneyColumn.new(["1.00", ""])
+      m2 = Reckon::MoneyColumn.new(["", "-2.00"])
+      expect(m1.merge!(m2)).to(
+        eq([Reckon::Money.new(1.00), Reckon::Money.new(-2.00)])
+      )
+
+      m1 = Reckon::MoneyColumn.new(["1.00", "0"])
+      m2 = Reckon::MoneyColumn.new(["0", "-2.00"])
+      expect(m1.merge!(m2)).to(
+        eq([Reckon::Money.new(1.00), Reckon::Money.new(-2.00)])
+      )
+    end
 
     it "should return nil if columns cannot be merged" do
-      Reckon::MoneyColumn.new( ["1.00", ""] ).merge!( 
-        Reckon::MoneyColumn.new( ["1.00", "-2.00"] ) ).should == nil
+      m1 = Reckon::MoneyColumn.new(["1.00", ""])
+      m2 = Reckon::MoneyColumn.new(["1.00", "-2.00"])
+      expect(m1.merge!(m2)).to eq([Reckon::Money.new(0), Reckon::Money.new(-2)])
 
-      Reckon::MoneyColumn.new( ["From1", "Names"] ).merge!( 
-          Reckon::MoneyColumn.new( ["Acc", "NL28 INGB 1200 3244 16,21817"] ) ).should == nil
+      m1 = Reckon::MoneyColumn.new(["From1", "Names"])
+      m2 = Reckon::MoneyColumn.new(["Acc", "NL28 INGB 1200 3244 16,21817"])
+      expect(m1.merge!(m2)).to eq([Reckon::Money.new(-1), Reckon::Money.new("NL28 INGB 1200 3244 16,21817")])
     end
 
     it "should invert first column if both positive" do
-      Reckon::MoneyColumn.new( ["1.00", ""] ).merge!( 
-        Reckon::MoneyColumn.new( ["", "2.00"] ) ).should == [ 
-          Reckon::Money.new( -1.00 ), Reckon::Money.new( 2.00 ) ]
+      expect(
+        Reckon::MoneyColumn.new(["1.00", ""]).merge!(Reckon::MoneyColumn.new( ["", "2.00"]))
+      ).to eq([Reckon::Money.new(-1.00), Reckon::Money.new(2.00)])
     end
   end
 end
- 

data/spec/reckon/money_spec.rb

@@ -6,81 +6,75 @@ require 'rubygems'
 require 'reckon'
 
 describe Reckon::Money do
-  describe "from_s" do
+  describe "parse" do
     it "should handle currency indicators" do
-      Reckon::Money::from_s( "$2.00" ).should == 2.00
-      Reckon::Money::from_s( "-$1025.67" ).should == -1025.67 
-      Reckon::Money::from_s( "$-1025.67" ).should == -1025.67 
+      expect(Reckon::Money.new( "$2.00" )).to eq(2.00)
+      expect(Reckon::Money.new("-$1025.67")).to eq(-1025.67)
+      expect(Reckon::Money.new("$-1025.67")).to eq(-1025.67)
     end
 
     it "should handle the comma_separates_cents option correctly" do
-      Reckon::Money::from_s( "$2,00", :comma_separates_cents => true ).should == 2.00
-      Reckon::Money::from_s( "-$1025,67", :comma_separates_cents => true ).should == -1025.67 
-      Reckon::Money::from_s( "$-1025,67", :comma_separates_cents => true ).should == -1025.67 
+      expect(Reckon::Money.new("$2,00", comma_separates_cents: true)).to eq(2.00)
+      expect(Reckon::Money.new("-$1025,67", comma_separates_cents: true)).to eq(-1025.67)
+      expect(Reckon::Money.new("$-1025,67", comma_separates_cents: true)).to eq(-1025.67)
     end
 
     it "should return 0 for an empty string" do
-      Reckon::Money::from_s( "" ).should == 0
+      expect(Reckon::Money.new("")).to eq(0)
     end
 
     it "should handle 1000 indicators correctly" do
-      Reckon::Money::from_s( "$2.000,00", :comma_separates_cents => true ).should == 2000.00
-      Reckon::Money::from_s( "-$1,025.67" ).should == -1025.67 
-    end
-
-    it "should keep numbers together" do
-      Reckon::Money::from_s( "1A1" ).should == 1
-    end
-
-    it "should prefer numbers with precision of two" do
-      Reckon::Money::from_s( "1A2.00" ).should == 2
-      Reckon::Money::from_s( "2.00A1" ).should == 2
-    end
-
-    it "should handle arbitrary prefixes and postfixes" do
-      Reckon::Money::from_s( "AB1.00C" ).should == 1
-      Reckon::Money::from_s( "AB0C" ).should == 0
-      Reckon::Money::from_s( "AB-2.00C" ).should == -2
-    end
-
-    it "should return nil if no numbers are found" do
-      Reckon::Money::from_s( "BAC" ).should == nil
+      expect(Reckon::Money.new("$2.000,00", comma_separates_cents: true)).to eq(2000.00)
+      expect(Reckon::Money.new("-$1,025.67")).to eq(-1025.67)
     end
   end
 
   describe "pretty" do
     it "work with negative and positive numbers" do
-      Reckon::Money.new( -20.00 ).pretty.should == "-$20.00"
-      Reckon::Money.new( 1558.52 ).pretty.should == " $1558.52"
+      expect(Reckon::Money.new(-20.00).pretty).to eq("-$20.00")
+      expect(Reckon::Money.new(1558.52).pretty).to eq(" $1558.52")
     end
 
     it "work with other currencies such as €" do
-      Reckon::Money.new( -20.00, :currency => "€", :suffixed => false ).pretty.should == "-€20.00"
-      Reckon::Money.new( 1558.52, :currency => "€", :suffixed => false ).pretty.should == " €1558.52"
+      expect(Reckon::Money.new(-20.00, currency: "€", suffixed: false).pretty).to eq("-€20.00")
+      expect(Reckon::Money.new(1558.52, currency: "€", suffixed: false).pretty).to eq(" €1558.52")
     end
 
     it "work with suffixed currencies such as SEK" do
-      Reckon::Money.new( -20.00, :currency => "SEK", :suffixed => true ).pretty.should == "-20.00 SEK"
-      Reckon::Money.new( 1558.52, :currency => "SEK", :suffixed => true ).pretty.should == " 1558.52 SEK"
+      expect(Reckon::Money.new(-20.00, currency: "SEK", suffixed: true).pretty).to eq("-20.00 SEK")
+      expect(Reckon::Money.new(1558.52, currency: "SEK", suffixed: true).pretty).to eq(" 1558.52 SEK")
     end
   end
 
   describe "likelihood" do
     it "should return the likelihood that a string represents money" do
-      Reckon::Money::likelihood( "$20.00" ).should == 45
+      expect(Reckon::Money::likelihood("$20.00")).to eq(65)
+    end
+
+    it "should return neutral for empty string" do
+      expect(Reckon::Money::likelihood("")).to eq(0)
+    end
+
+    it "should recognize non-us currencies" do
+      expect(Reckon::Money::likelihood("£480.00")).to eq(30)
+      expect(Reckon::Money::likelihood("£1.480,00")).to eq(30)
+    end
+
+    it 'should not identify date columns as money' do
+      expect(Reckon::Money::likelihood("22.01.2014")).to eq(0)
     end
   end
 
   describe "equality" do
     it "should be comparable to other money" do
-      Reckon::Money.new( 2.0 ).should == Reckon::Money.new( 2.0 )
-      Reckon::Money.new( 1.0 ).should <= Reckon::Money.new( 2.0 )
-      Reckon::Money.new( 3.0 ).should > Reckon::Money.new( 2.0 )
+      expect(Reckon::Money.new(2.0)).to eq(Reckon::Money.new(2.0))
+      expect(Reckon::Money.new(1.0)).to be <= Reckon::Money.new(2.0)
+      expect(Reckon::Money.new(3.0)).to be > Reckon::Money.new(2.0)
     end
     it "should be comparable to other float" do
-      Reckon::Money.new( 2.0 ).should == 2.0
-      Reckon::Money.new( 1.0 ).should <= 2.0
-      Reckon::Money.new( 3.0 ).should > 2.0
+      expect(Reckon::Money.new(2.0)).to eq(2.0)
+      expect(Reckon::Money.new(1.0)).to be <= 2.0
+      expect(Reckon::Money.new(3.0)).to be > 2.0
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,26 @@ require 'rspec'
 require 'reckon'
 
 RSpec.configure do |config|
+  config.before(:all, &:silence_output)
+  config.after(:all,  &:enable_output)
   def fixture_path(file)
     File.expand_path(File.join(File.dirname(__FILE__), "data_fixtures", file))
   end
 end
+
+public
+
+# Redirects stderr and stout to /dev/null.txt
+def silence_output
+  # Store the original stderr and stdout in order to restore them later
+  @original_stdout = $stdout
+
+  # Redirect stderr and stdout
+  $stdout = File.new(File.join(File.dirname(__FILE__), 'test_log.txt'), 'w')
+end
+
+# Replace stderr and stdout so anything else is output correctly
+def enable_output
+  $stdout = @original_stdout
+  @original_stdout = nil
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Cantino
 - BlackEdder
 - Ben Prew
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -82,20 +82,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rchardet
   requirement: !ruby/object:Gem::Requirement
@@ -120,10 +106,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -137,12 +123,16 @@ files:
 - lib/reckon/csv_parser.rb
 - lib/reckon/date_column.rb
 - lib/reckon/ledger_parser.rb
+- lib/reckon/logger.rb
 - lib/reckon/money.rb
 - lib/reckon/version.rb
 - reckon.gemspec
+- spec/data_fixtures/51-sample.csv
+- spec/data_fixtures/51-tokens.yml
 - spec/data_fixtures/73-sample.csv
 - spec/data_fixtures/73-tokens.yml
 - spec/data_fixtures/73-transactions.ledger
+- spec/data_fixtures/85-date-example.csv
 - spec/data_fixtures/austrian_example.csv
 - spec/data_fixtures/bom_utf8_file.csv
 - spec/data_fixtures/broker_canada_example.csv
@@ -166,6 +156,92 @@ files:
 - spec/data_fixtures/tokens.yaml
 - spec/data_fixtures/two_money_columns.csv
 - spec/data_fixtures/yyyymmdd_date_example.csv
+- spec/integration/another_bank_example/input.csv
+- spec/integration/another_bank_example/output.ledger
+- spec/integration/another_bank_example/test_args
+- spec/integration/austrian_example/input.csv
+- spec/integration/austrian_example/output.ledger
+- spec/integration/austrian_example/test_args
+- spec/integration/bom_utf8_file/input.csv
+- spec/integration/bom_utf8_file/output.ledger
+- spec/integration/bom_utf8_file/test_args
+- spec/integration/broker_canada_example/input.csv
+- spec/integration/broker_canada_example/output.ledger
+- spec/integration/broker_canada_example/test_args
+- spec/integration/chase/account_tokens_and_regex/output.ledger
+- spec/integration/chase/account_tokens_and_regex/test_args
+- spec/integration/chase/account_tokens_and_regex/tokens.yml
+- spec/integration/chase/default_account_names/output.ledger
+- spec/integration/chase/default_account_names/test_args
+- spec/integration/chase/input.csv
+- spec/integration/chase/learn_from_existing/learn.ledger
+- spec/integration/chase/learn_from_existing/output.ledger
+- spec/integration/chase/learn_from_existing/test_args
+- spec/integration/chase/simple/output.ledger
+- spec/integration/chase/simple/test_args
+- spec/integration/danish_kroner_nordea_example/input.csv
+- spec/integration/danish_kroner_nordea_example/output.ledger
+- spec/integration/danish_kroner_nordea_example/test_args
+- spec/integration/english_date_example/input.csv
+- spec/integration/english_date_example/output.ledger
+- spec/integration/english_date_example/test_args
+- spec/integration/extratofake/input.csv
+- spec/integration/extratofake/output.ledger
+- spec/integration/extratofake/test_args
+- spec/integration/french_example/input.csv
+- spec/integration/french_example/output.ledger
+- spec/integration/french_example/test_args
+- spec/integration/german_date_example/input.csv
+- spec/integration/german_date_example/output.ledger
+- spec/integration/german_date_example/test_args
+- spec/integration/harder_date_example/input.csv
+- spec/integration/harder_date_example/output.ledger
+- spec/integration/harder_date_example/test_args
+- spec/integration/ing/input.csv
+- spec/integration/ing/output.ledger
+- spec/integration/ing/test_args
+- spec/integration/intuit_mint_example/input.csv
+- spec/integration/intuit_mint_example/output.ledger
+- spec/integration/intuit_mint_example/test_args
+- spec/integration/invalid_header_example/input.csv
+- spec/integration/invalid_header_example/output.ledger
+- spec/integration/invalid_header_example/test_args
+- spec/integration/inversed_credit_card/input.csv
+- spec/integration/inversed_credit_card/output.ledger
+- spec/integration/inversed_credit_card/test_args
+- spec/integration/nationwide/input.csv
+- spec/integration/nationwide/output.ledger
+- spec/integration/nationwide/test_args
+- spec/integration/regression/issue_51_account_tokens/input.csv
+- spec/integration/regression/issue_51_account_tokens/output.ledger
+- spec/integration/regression/issue_51_account_tokens/test_args
+- spec/integration/regression/issue_51_account_tokens/tokens.yml
+- spec/integration/regression/issue_64_date_column/input.csv
+- spec/integration/regression/issue_64_date_column/output.ledger
+- spec/integration/regression/issue_64_date_column/test_args
+- spec/integration/regression/issue_73_account_token_matching/input.csv
+- spec/integration/regression/issue_73_account_token_matching/output.ledger
+- spec/integration/regression/issue_73_account_token_matching/test_args
+- spec/integration/regression/issue_73_account_token_matching/tokens.yml
+- spec/integration/regression/issue_85_date_example/input.csv
+- spec/integration/regression/issue_85_date_example/output.ledger
+- spec/integration/regression/issue_85_date_example/test_args
+- spec/integration/spanish_date_example/input.csv
+- spec/integration/spanish_date_example/output.ledger
+- spec/integration/spanish_date_example/test_args
+- spec/integration/suntrust/input.csv
+- spec/integration/suntrust/output.ledger
+- spec/integration/suntrust/test_args
+- spec/integration/test.sh
+- spec/integration/test_money_column/input.csv
+- spec/integration/test_money_column/output.ledger
+- spec/integration/test_money_column/test_args
+- spec/integration/two_money_columns/input.csv
+- spec/integration/two_money_columns/output.ledger
+- spec/integration/two_money_columns/test_args
+- spec/integration/yyyymmdd_date_example/input.csv
+- spec/integration/yyyymmdd_date_example/output.ledger
+- spec/integration/yyyymmdd_date_example/test_args
 - spec/reckon/app_spec.rb
 - spec/reckon/csv_parser_spec.rb
 - spec/reckon/date_column_spec.rb
@@ -178,7 +254,7 @@ homepage: https://github.com/cantino/reckon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -193,9 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Utility for interactively converting and labeling CSV files for the Ledger
   accounting tool.

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  # Mac High Sierra
-  - 2.0.0-p648
-  # Mac Mojave
-  - 2.3.7
-  # Ubuntu 19.10
-  - 2.5
-  # Mac Catalina
-  - 2.6
-script: "bundle exec rake"
-before_install:
-  - sudo apt-get -y install ledger