reckon 0.3.7 → 0.3.8

data/CHANGES.md

@@ -1,5 +1,6 @@
 # Changes
 
+* 7/02/13 - Customizable date parsing contributed by @mauromorales.
 * 6/26/13 - Multi-currency support contributed by @zebh.
 * 4/27/13 - Add --account commandline option
 * 3/24/13 - Force encoding to UTF-8 when unknown characters are encountered.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reckon (0.3.7)
+    reckon (0.3.8)
       chronic (>= 0.3.0)
       fastercsv (>= 1.5.1)
       highline (>= 1.5.2)

data/lib/reckon/app.rb

@@ -1,3 +1,4 @@
+#coding: utf-8
 require 'pp'
 
 module Reckon
@@ -179,16 +180,25 @@ module Reckon
 
     def date_for(index)
       value = columns[date_column_index][index]
-      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})/                 # yyyymmdd format
-      begin
-        guess = Chronic.parse(value, :context => :past)
-        if guess.to_i < 953236800 && value =~ /\//
-          guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), :context => :past)
+      if options[:date_format].nil?
+        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})/                 # yyyymmdd format
+      else
+        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
-        guess
+      end
+      begin
+          guess = Chronic.parse(value, :context => :past)
+          if guess.to_i < 953236800 && value =~ /\//
+            guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), :context => :past)
+          end
+          guess
       rescue
         puts "I'm having trouble parsing #{value}, which I thought was a date.  Please report this so that we"
         puts "can make this parser better!"
@@ -409,10 +419,14 @@ module Reckon
           options[:encoding] = e
         end
 
-        opts.on("-c", "--currency", "Currency symbol to use, defaults to $. ex.) $, EUR") do |e|
+        opts.on("-c", "--currency '$'", "Currency symbol to use, defaults to $ (£, EUR)") do |e|
           options[:currency] = e
         end
 
+        opts.on("", "--date-format '%d/%m/%Y'", "Force the date format (see Ruby DateTime strftime)") do |d|
+          options[:date_format] = d
+        end
+
         opts.on("", "--suffixed", "If --currency should be used as a suffix. Defaults to false.") do |e|
           options[:suffixed] = e
         end

data/reckon.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{reckon}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
   s.authors = ["Andrew Cantino"]
   s.email = %q{andrew@iterationlabs.com}
   s.homepage = %q{https://github.com/cantino/reckon}

data/spec/reckon/app_spec.rb

@@ -16,6 +16,8 @@ describe Reckon::App do
     @german_date = Reckon::App.new(:string => GERMAN_DATE_EXAMPLE)
     @danish_kroner_nordea = Reckon::App.new(:string => DANISH_KRONER_NORDEA_EXAMPLE, :csv_separator => ';', :comma_separates_cents => true)
     @yyyymmdd_date = Reckon::App.new(:string => YYYYMMDD_DATE_EXAMPLE)
+    @spanish_date = Reckon::App.new(:string => SPANISH_DATE_EXAMPLE, :date_format => '%d/%m/%Y')
+    @english_date = Reckon::App.new(:string => ENGLISH_DATE_EXAMPLE)
   end
   
   it "should be in testing mode" do
@@ -141,6 +143,12 @@ describe Reckon::App do
       @yyyymmdd_date.date_for(0).year.should == Time.parse("2012/12/31").year
       @yyyymmdd_date.date_for(0).month.should == Time.parse("2012/12/31").month
       @yyyymmdd_date.date_for(0).day.should == Time.parse("2012/12/31").day
+      @spanish_date.date_for(1).year.should == Time.parse("2009/12/02").year
+      @spanish_date.date_for(1).month.should == Time.parse("2009/12/02").month
+      @spanish_date.date_for(1).day.should == Time.parse("2009/12/02").day
+      @english_date.date_for(1).year.should == Time.parse("2009/12/24").year
+      @english_date.date_for(1).month.should == Time.parse("2009/12/24").month
+      @english_date.date_for(1).day.should == Time.parse("2009/12/24").day
     end
   end
 
@@ -271,4 +279,16 @@ describe Reckon::App do
     DEBIT,20121231,"ODESK***BAL-27DEC12 650-12345 CA 12/28",-123.45
   CSV
 
+  SPANISH_DATE_EXAMPLE = (<<-CSV).strip
+    02/12/2009,Check - 0000000122,122,-$76.00,"","$1,750.06"
+    02/12/2009,BLARG    R SH 456930,"","",+$327.49,"$1,826.06"
+    02/12/2009,Check - 0000000112,112,-$800.00,"","$1,498.57"
+  CSV
+
+  ENGLISH_DATE_EXAMPLE = (<<-CSV).strip
+    24/12/2009,Check - 0000000122,122,-$76.00,"","$1,750.06"
+    24/12/2009,BLARG    R SH 456930,"","",+$327.49,"$1,826.06"
+    24/12/2009,Check - 0000000112,112,-$800.00,"","$1,498.57"
+  CSV
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 989806142141775865
+      hash: -1602098812968474489
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 989806142141775865
+      hash: -1602098812968474489
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25