ofx-parser 1.0.2 → 1.1.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.0
+
+* Works on Ruby 1.9! (Reported by Tim Holmes)
+* Fix time parsing with positive TZ offsets. (libkazz)
+
 == 1.0.2
 
 * Fixed error when header fields were empty. (steveg0493)

data/Manifest.txt

@@ -2,7 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-lib/class-extension.rb
 lib/mcc.rb
 lib/ofx-parser.rb
 lib/ofx.rb

data/lib/ofx-parser.rb

@@ -1,13 +1,14 @@
+require 'rubygems'
 require 'hpricot'
 require 'time'
 require 'date'
 
-%w(class-extension ofx mcc).each do |fn|
+%w(ofx mcc).each do |fn|
   require File.dirname(__FILE__) + "/#{fn}"
 end
 
 module OfxParser
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 
   class OfxParser
 
@@ -55,10 +56,10 @@ module OfxParser
     # Returns a DateTime object. Milliseconds (XXX) are ignored.
     def self.parse_datetime(date)
       if /\A\s*
-          (\d{4})(\d{2})(\d{2})       ?# YYYYMMDD            1,2,3
-          (?:(\d{2})(\d{2})(\d{2}))?  ?# HHMMSS  - optional  4,5,6
-          (?:\.(\d{3}))?              ?# .XXX    - optional  7
-          (?:\[(-?\d+)\:\w{3}\])?     ?# [-n:TZ] - optional  8,9
+          (\d{4})(\d{2})(\d{2})           # YYYYMMDD            1,2,3
+          (?:(\d{2})(\d{2})(\d{2}))?      # HHMMSS  - optional  4,5,6
+          (?:\.(\d{3}))?                  # .XXX    - optional  7
+          (?:\[([-+]?[\.\d]+)\:\w{3}\])?  # [-n:TZ] - optional  8,9
           \s*\z/ix =~ date
         year = $1.to_i
         mon = $2.to_i

data/lib/ofx.rb

@@ -1,14 +1,15 @@
 module OfxParser
-  module MonetarySupport
+  module MonetaryClassSupport
 
-    @@monies ||= []
+    attr_accessor :monies
 
-    class_extension do
-      def monetary_vars(*methods) #:nodoc:
-        @@monies += methods
-      end
+    def monetary_vars(*methods) #:nodoc:
+      self.monies ||= []
+      self.monies += methods
     end
+  end
 
+  module MonetarySupport
     # Returns pennies for a given string amount, i.e:
     #  '-123.45' => -12345
     #  '123' => 12300
@@ -25,7 +26,7 @@ module OfxParser
 
     def monetary_method_call?(meth) #:nodoc:
       orig = original_method(meth)
-      @@monies.include?(orig) && meth.to_s == "#{orig}_in_pennies"
+      self.class.monies.include?(orig) && meth.to_s == "#{orig}_in_pennies"
     end
 
     def method_missing(meth, *args) #:nodoc:
@@ -69,14 +70,15 @@ module OfxParser
   end
 
   class Account
-    attr_accessor :number, :statement, :transaction_uid
+    attr_accessor :number, :statement, :transaction_uid, :routing_number
   end
 
   class BankAccount < Account
     TYPE = [:CHECKING, :SAVINGS, :MONEYMRKT, :CREDITLINE]
-    attr_accessor :routing_number, :type, :balance, :balance_date
+    attr_accessor :type, :balance, :balance_date
 
     include MonetarySupport
+    extend MonetaryClassSupport
     monetary_vars :balance
 
     undef type
@@ -89,6 +91,7 @@ module OfxParser
     attr_accessor :remaining_credit, :remaining_credit_date, :balance, :balance_date
 
     include MonetarySupport
+    extend MonetaryClassSupport
     monetary_vars :remaining_credit, :balance
   end
 
@@ -96,6 +99,7 @@ module OfxParser
     attr_accessor :broker_id, :positions, :margin_balance, :short_balance, :cash_balance
 
     include MonetarySupport
+    extend MonetaryClassSupport
     monetary_vars :margin_balance, :short_balance, :cash_balance
   end
 
@@ -108,6 +112,7 @@ module OfxParser
     attr_accessor :type, :date, :amount, :fit_id, :check_number, :sic, :memo, :payee
 
     include MonetarySupport
+    extend MonetaryClassSupport
     monetary_vars :amount
 
     TYPE = {

data/test/test_ofx_parser.rb

@@ -14,7 +14,7 @@ class OfxParserTest < Test::Unit::TestCase
     ofx = File.read(fixtures_dir + "/#{fn}")
     ofx.gsub!(/\r?\n/,"\r\n") # change line endings to \r\n
 
-    OFX_FILES[fn.scan(/^[^.]*/).to_s.to_sym] = ofx
+    OFX_FILES[fn.scan(/\w+/).first.to_sym] = ofx
   end
 
   def setup
@@ -39,6 +39,7 @@ class OfxParserTest < Test::Unit::TestCase
 
   def test_parse_datetime
     assert_equal DateTime.civil(2007, 6, 22, 19, 0, 0, Rational(-5,24)), @parser.parse_datetime('20070622190000.200[-5:CDT]')
+    assert_equal DateTime.civil(2007, 6, 22, 19, 0, 0, Rational(9,24)), @parser.parse_datetime('20070622190000.200[+9.0:JST]')
     assert_equal DateTime.civil(2007, 6, 22), @parser.parse_datetime('20070622')
     assert_equal DateTime.civil(2007, 6, 22, 19, 0, 0), @parser.parse_datetime('20070622190000')
     assert_equal DateTime.civil(2007, 6, 22, 19, 0, 0), @parser.parse_datetime('20070622190000.200')
@@ -229,6 +230,7 @@ class OfxParserTest < Test::Unit::TestCase
 
   class X
     include OfxParser::MonetarySupport
+    extend OfxParser::MonetaryClassSupport
     attr_accessor :amount
     monetary_vars :amount
   end

metadata

@@ -1,51 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ofx-parser
-version: !ruby/object:Gem::Version 
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Andrew A. Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-05-12 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hpricot
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.6"
-    version: 
-- !ruby/object:Gem::Dependency 
+  requirement: &2159585980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2159585980
+- !ruby/object:Gem::Dependency
   name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.1
-    version: 
-description: "== DESCRIPTION:  ofx-parser is a ruby library to parse a realistic subset of the lengthy OFX 1.x specification.  == FEATURES/PROBLEMS:  * Reads OFX responses - i.e. those downloaded from financial institutions and puts it into a usable object graph. * Supports the 3 main message sets: banking, credit card and investment accounts, as well as the required 'sign on' set. * Knows about SIC codes - if your institution provides them. See http://www.eeoc.gov/stats/jobpat/siccodes.html * Monetary amounts can be retrieved either as a raw string, or in pennies. * Supports OFX timestamps."
+  requirement: &2159585560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: *2159585560
+description: ! "== DESCRIPTION:\n\nofx-parser is a ruby library to parse a realistic
+  subset of the lengthy OFX 1.x specification.\n\n== FEATURES/PROBLEMS:\n\n* Reads
+  OFX responses - i.e. those downloaded from financial institutions and\n  puts it
+  into a usable object graph.\n* Supports the 3 main message sets: banking, credit
+  card and investment\n  accounts, as well as the required 'sign on' set.\n* Knows
+  about SIC codes - if your institution provides them.\n  See http://www.eeoc.gov/stats/jobpat/siccodes.html\n*
+  Monetary amounts can be retrieved either as a raw string, or in pennies.\n* Supports
+  OFX timestamps."
 email: andy@tinnedfruit.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
-- lib/class-extension.rb
 - lib/mcc.rb
 - lib/ofx-parser.rb
 - lib/ofx.rb
@@ -55,32 +62,32 @@ files:
 - test/fixtures/malformed_header.ofx.sgml
 - test/fixtures/with_spaces.ofx.sgml
 - test/test_ofx_parser.rb
-has_rdoc: true
+- .gemtest
 homepage: http://ofx-parser.rubyforge.org/
+licenses: []
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+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: '0'
 requirements: []
-
 rubyforge_project: ofx-parser
-rubygems_version: 1.1.0
+rubygems_version: 1.8.10
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ofx-parser is a ruby library for parsing OFX 1.x data.
-test_files: 
+test_files:
 - test/test_ofx_parser.rb

data/lib/class-extension.rb

@@ -1,154 +0,0 @@
-# = class_extension.rb
-#
-# == Copyright (c) 2006 Daniel Schierbeck
-#
-#   Ruby License
-#
-#   This module is free software. You may use, modify, and/or redistribute this
-#   software under the same terms as Ruby.
-#
-#   This program is distributed in the hope that it will be useful, but WITHOUT
-#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#   FOR A PARTICULAR PURPOSE.
-#
-# == Special Thanks
-#
-# Thanks to Trans, Nobu and Ulysses for their original on this concept.
-#
-# == Authors and Contributors
-#
-# * Daniel Schierbeck
-# * Thomas Sawyer
-# * Nobu Nakada
-# * Ulysses
-
-# Author::    Daniel Schierbeck
-# Copyright:: Copyright (c) 2006 Daniel Schierbeck
-# License::   Ruby License
-
-#
-
-class Module #:nodoc: all
-
-  alias_method :append_features_without_class_extension, :append_features
-
-  # = class_extension
-  #
-  # Normally when including modules, class/module methods are not
-  # extended. To achieve this behavior requires some clever
-  # Ruby Karate. Instead class_extension provides an easy to use
-  # and clean solution. Simply place the extending class methods
-  # in a block of the special module method #class_extension.
-  #
-  #   module Mix
-  #     def inst_meth
-  #       puts 'inst_meth'
-  #     end
-  #
-  #     class_extension do
-  #       def class_meth
-  #         "Class Method!"
-  #       end
-  #     end
-  #   end
-  #
-  #   class X
-  #     include Mix
-  #   end
-  #
-  #   X.class_meth  #=> "Class Method!"
-  #
-
-  def class_extension(&block)
-    @class_extension ||= Module.new do
-      def self.append_features(mod)
-        append_features_without_class_extension(mod)
-      end
-    end
-    @class_extension.module_eval(&block) if block_given?
-    @class_extension
-  end
-
-  private :class_extension
-
-  def append_features(mod)
-    append_features_without_class_extension(mod)
-    mod.extend(class_extension)
-    if mod.instance_of? Module
-      mod.__send__(:class_extension).__send__(:include, class_extension)
-    end
-  end
-
-end
-
-class Class #:nodoc: all
-  undef_method :class_extension
-end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin test
-
-  require 'test/unit'
-
-  class TC_ClassMethods < Test::Unit::TestCase
-
-    # fixture
-
-    module N
-      class_extension do
-        def n ; 43 ; end
-        def s ; self ; end
-      end
-      extend class_extension
-    end
-
-    class X
-      include N
-      def n ; 11 ; end
-    end
-
-    module K
-      include N
-      class_extension do
-        def n ; super + 1 ; end
-      end
-    end
-
-    class Z
-      include K
-    end
-
-    # tests
-
-    def test_01
-      assert_equal( 43, N.n )
-      assert_equal(  N,  N.s )
-    end
-    def test_02
-      assert_equal( 43, X.n )
-      assert_equal(  X, X.s )
-    end
-    def test_03
-      assert_equal( 11, X.new.n )
-    end
-    def test_04
-      assert_equal( 43, K.n )  #notic the difference!
-      assert_equal(  K, K.s )
-    end
-    def test_05
-      assert_equal( 44, Z.n )
-      assert_equal(  Z, Z.s )
-    end
-
-  end
-
-=end
-