qif 1.1.1 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 05d7562d52dc8df636d290de9e2cce5f412a6013
+  data.tar.gz: f47615d7c5077148c7c508bab6f14839730e49ad
+SHA512:
+  metadata.gz: 4514f7c2a458fb6989ca943a5f8050f905f81e449ced6adfd79daab2ab97bbb033cb2125f42f8e576bdec73a1a0fa08657e23b77bf91f2d9c5759f8717664973
+  data.tar.gz: 87fe80e1d2b395d875121fdea2a3679e53269fa4b632cafcaca467c02bc89ddb43630c5fe113c34d0a694976386ccbc8ed2d89898f6006d99f167f03a4bee146

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://travis-ci.org/jemmyw/Qif.png?branch=master" alt="Build Status" />}[https://travis-ci.org/jemmyw/Qif]
+
 = Library for reading Quicken Interchange Format (QIF) files
 
 * http://github.com/jemmyw/Qif
@@ -49,7 +51,7 @@
 
 === LICENSE:
 
-Copyright (c) 2010 Jeremy Wells
+Copyright (c) 2011 Jeremy Wells
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -1,12 +1,5 @@
-require 'echoe'
 require 'rspec/core/rake_task'
 
-Echoe.new('qif') do |gem|
-  gem.author = "Jeremy Wells"
-  gem.summary = "A library for reading and writing quicken QIF files."
-  gem.email = "jemmyw@gmail.com"
-end
-
 desc "Run specs"
 RSpec::Core::RakeTask.new :spec
 

data/lib/qif/date_format.rb

@@ -3,59 +3,46 @@ require 'time'
 module Qif
   class DateFormat
     attr_reader :format
-    
+
+    SUPPORTED_DATEFORMAT = {
+      "dd/mm/yyyy"  => "%d/%m/%Y",
+      "d/mm/yyyy"   => "%d/%m/%Y",
+      "dd/m/yyyy"   => "%d/%m/%Y",
+      "d/m/yyyy"    => "%d/%m/%Y",
+
+      "dd/mm/yy"    => "%d/%m/%y",
+      "d/mm/yy"     => "%d/%m/%y",
+      "dd/m/yy"     => "%d/%m/%y",
+      "d/m/yy"      => "%d/%m/%y",
+
+      "mm/dd/yyyy"  => "%m/%d/%Y",
+      "m/dd/yyyy"   => "%m/%d/%Y",
+      "mm/d/yyyy"   => "%m/%d/%Y",
+      "m/d/yyyy"    => "%m/%d/%Y",
+
+      "mm/dd/yy"    => "%m/%d/%y",
+      "m/dd/yy"     => "%m/%d/%y",
+      "mm/d/yy"     => "%m/%d/%y",
+      "m/d/yy"      => "%m/%d/%y",
+    }
+
     def initialize(format = 'dd/mm/yyyy')
       @format = format
     end
-    
+
     def parse(date)
-      regex = convert_format_to_regex
-      order = date_order
-      
-      if match = regex.match(date)
-				year = match[order.index('y')+1].to_i
-			
-				if year < 100
-					start_year = Time.now.year - 50
-					start_cent = (start_year/100).to_i*100
-					if year > start_year-start_cent
-						year += start_cent
-					else
-						year += ((Time.now.year/100).to_i*100)
-					end
-				end
-        
-				Time.mktime(year, *%w(m d).map{|t| match[order.index(t) + 1].to_i })
-      end
+      Date.strptime(date, convert_format_to_strftime)
     end
-    
+
     def format(date)
       date.strftime(convert_format_to_strftime)
     end
-    
+
     private
-    
-    def date_order
-      %w(d m y).sort{|a,b| @format.index(a) <=> @format.index(b) }
-    end
-    
+
     def convert_format_to_strftime
-      format = @format.dup
-      format.gsub!('dd', '%d')
-      format.gsub!('mm', '%m')
-      format.gsub!('yyyy', '%Y')
-      format.gsub!('yy', '%y')
-      format
-    end
-    
-    def convert_format_to_regex
-      format = @format.dup
-      format.gsub!('dd', '([0-3][0-9])')
-      format.gsub!('mm', '([0-1][0-9])')
-      format.gsub!('yyyy', '([1-2][0-9]{3})')
-      format.gsub!('yy', '([0-9]{2})')
-      
-      /#{format}/mi
+      SUPPORTED_DATEFORMAT[@format]
     end
+
   end
 end

data/lib/qif/reader.rb

@@ -15,6 +15,8 @@ module Qif
   #   end
   class Reader
     include Enumerable
+
+    attr_reader :index
   
     SUPPORTED_ACCOUNTS = {
       "!Type:Bank" => "Bank account transactions",
@@ -31,7 +33,7 @@ module Qif
     # either an IO object or a String containing the Qif file data.
     #
     # The optional format argument specifies the date format in the file. 
-    # Giving a format will force it, otherwise the format will guissed 
+    # Giving a format will force it, otherwise the format will guessed 
     # reading the transactions in the file, this defaults to 'dd/mm/yyyy' 
     # if guessing method fails.
     def initialize(data, format = nil)
@@ -78,17 +80,29 @@ module Qif
       begin
         line = @data.gets
         break if line.nil?
-        date = line.strip.scan(/^D(\d{1,2}).(\d{1,2}).(\d{2,4})/).flatten
-        if date.count == 3 
-          guessed_format = date[0].to_i.between?(1, 12) ? (date[1].to_i.between?(1, 12) ? nil : 'mm/dd') : 'dd/mm'
-          guessed_format += '/' + 'y'*date[2].length if guessed_format
-        end
+
+        date = line[1..-1]
+        guessed_format = Qif::DateFormat::SUPPORTED_DATEFORMAT.find { |format_string, format|
+          test_date_with_format?(date, format_string, format)
+        }
       end until guessed_format
+
       @data.rewind
-      guessed_format
+
+      guessed_format ? guessed_format.first : @fallback_format
     end
 
     private
+
+    def test_date_with_format?(date, format_string, format)
+      parsed_date = Date.strptime(date, format)
+      if parsed_date > Date.strptime('01/01/1900', '%d/%m/%Y')
+        @fallback_format ||= format_string
+        parsed_date.day > 12
+      end
+    rescue
+      false
+    end
   
     def read_all_transactions
       while next_transaction; end

data/spec/fixtures/3_records_spaced.qif

@@ -0,0 +1,19 @@
+!Type:Bank
+D1/ 1/10
+T-10.00
+LDebit
+PDescription
+MReference
+^
+D6/ 1/10
+T-20.00
+LDebit
+PDescription
+MReference
+^
+D12/29/10
+T30.00
+LCredit
+PDescription
+MReference
+^

data/spec/lib/date_format_spec.rb

@@ -4,16 +4,16 @@ describe Qif::DateFormat do
   it 'should work with 2 digit years in mm/dd/yy format' do
     reader = Qif::DateFormat.new('mm/dd/yy')
     time = reader.parse('09/28/10')
-    time.should == Time.mktime(2010, 9, 28)
+    time.should == Date.strptime('09/28/10', '%m/%d/%y')
 		time = reader.parse('09/28/94')
-		time.should == Time.mktime(1994, 9, 28)
+		time.should == Date.strptime('09/28/94', '%m/%d/%y')
   end
 
   it 'should work with 2 digit years in dd/mm/yy format' do
     reader = Qif::DateFormat.new('dd/mm/yy')
     time = reader.parse('28/09/10')
-    time.should == Time.mktime(2010, 9, 28)
+    time.should == Date.strptime('28/09/10', '%d/%m/%y')
 		time = reader.parse('28/09/94')
-		time.should == Time.mktime(1994, 9, 28)
+		time.should == Date.strptime('28/09/94', '%d/%m/%y')
   end
 end

data/spec/lib/reader_spec.rb

@@ -6,21 +6,21 @@ shared_examples_for "3 record files" do
   end
 
   it 'should have a debit of $10 on the 1st of January 2010' do
-    transaction = instance.transactions.detect{|t| t.date == Time.mktime(2010, 1, 1)}
+    transaction = instance.transactions.detect{|t| t.date == Date.new(2010, 1, 1)}
     transaction.should_not be_nil
     transaction.category.should == 'Debit'
     transaction.amount.should == -10.0
   end
 
   it 'should have a debit of $20 on the 1st of June 1020' do
-    transaction = instance.transactions.detect{|t| t.date == Time.mktime(2010, 6, 1)}
+    transaction = instance.transactions.detect{|t| t.date == Date.new(2010, 6, 1)}
     transaction.should_not be_nil
     transaction.category.should == 'Debit'
     transaction.amount.should == -20.0
   end
 
   it 'should have a credit of $30 on the 29th of December 2010' do
-    transaction = instance.transactions.detect{|t| t.date == Time.mktime(2010, 12, 29)}
+    transaction = instance.transactions.detect{|t| t.date == Date.new(2010, 12, 29)}
     transaction.should_not be_nil
     transaction.category.should == 'Credit'
     transaction.amount.should == 30.0
@@ -46,6 +46,12 @@ describe Qif::Reader do
     end
   end
 
+  context "when format has spaces" do
+    it_behaves_like "3 record files" do
+      let(:instance) { Qif::Reader.new(open('spec/fixtures/3_records_spaced.qif').read) }
+    end
+  end
+
   context "it should still work when the record header is followed by an invalid transaction terminator" do
     it_behaves_like "3 record files" do
       let(:instance) { Qif::Reader.new(open('spec/fixtures/3_records_invalid_header.qif'), 'dd/mm/yy') }
@@ -58,29 +64,30 @@ describe Qif::Reader do
   it 'should reject the wrong file and raise an UnrecognizedData exception' do
     expect{ Qif::Reader.new(open('spec/fixtures/not_a_QIF_file.txt')) }.to raise_error(Qif::Reader::UnrecognizedData)
   end
-  it 'should guess the date format dd/mm/yyyy' do
-    @instance = Qif::Reader.new(open('spec/fixtures/3_records_ddmmyyyy.qif'))
-    @instance.guess_date_format.should == 'dd/mm/yyyy'
-  end
 
-  it 'should guess the date format mm/dd/yy' do
-    @instance = Qif::Reader.new(open('spec/fixtures/3_records_mmddyy.qif'))
-    @instance.guess_date_format.should == 'mm/dd/yy'
-  end
+  describe '#guess_date_format' do
+    it 'should guess the date format dd/mm/yyyy' do
+      @instance = Qif::Reader.new(open('spec/fixtures/3_records_ddmmyyyy.qif'))
+      @instance.guess_date_format.should == 'dd/mm/yyyy'
+    end
+
+    it 'should guess the date format mm/dd/yy' do
+      @instance = Qif::Reader.new(open('spec/fixtures/3_records_mmddyy.qif'))
+      @instance.guess_date_format.should == 'mm/dd/yy'
+    end
 
-  it 'shouldn\t guess the date format because transactions are ambiguious, fall back on default dd/mm/yyyy and fail' do
-    @instance = Qif::Reader.new(open('spec/fixtures/quicken_non_investement_account.qif'))
-    @instance.guess_date_format.should == nil
-    @instance.size.should == 0
+    it 'should fall back to best guess if the date are ambiguious' do
+      @instance = Qif::Reader.new(open('spec/fixtures/quicken_non_investement_account.qif'))
+      @instance.guess_date_format.should == 'dd/mm/yy'
+    end
+
+    it 'should guess the date format d/m/yy' do
+      @instance = Qif::Reader.new(open('spec/fixtures/3_records_dmyy.qif'))
+      @instance.guess_date_format.should == 'dd/mm/yy'
+    end
   end
-  
-# TODO Date parser should be more flexible and efficient, probably using Date.strptime(str, format)
-#  it 'should initialize if leading zeros are missing too' do
-#    @instance = Qif::Reader.new(open('spec/fixtures/3_records_dmyy.qif'))
-#    @instance.size.should == 3
-#  end
 
-  it 'should should parse amounts with comma separator too' do
+  it 'should parse amounts with comma separator too' do
     @instance = Qif::Reader.new(open('spec/fixtures/3_records_separator.qif'))
     @instance.size.should == 3
     @instance.collect(&:amount).should == [-1010.0, -30020.0, 30.0]

data/spec/lib/writer_spec.rb

@@ -11,7 +11,7 @@ describe Qif::Writer do
   describe '::open' do
     before do
       @path = '/tmp/test'
-      File.stub!(:open).and_yield @io
+      File.stub(:open).and_yield @io
     end
     
     it 'should yield a Qif::Writer' do

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: qif
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Jeremy Wells
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-07 00:00:00.000000000Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212876609680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70212876609680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 description: A library for reading and writing quicken QIF files.
 email: jemmyw@gmail.com
 executables: []
@@ -52,6 +54,7 @@ files:
 - spec/fixtures/3_records_mmddyy.qif
 - spec/fixtures/3_records_mmddyyyy.qif
 - spec/fixtures/3_records_separator.qif
+- spec/fixtures/3_records_spaced.qif
 - spec/fixtures/not_a_QIF_file.txt
 - spec/fixtures/quicken_investment_account.qif
 - spec/fixtures/quicken_non_investement_account.qif
@@ -63,6 +66,7 @@ files:
 - spec/spec_helper.rb
 homepage: http://qif.github.com/qif
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -74,21 +78,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: qif
-rubygems_version: 1.8.6
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library for reading and writing quicken QIF files.
 test_files: []
+has_rdoc: