ofx 0.2.8 → 0.2.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ofx (0.2.7)
+    ofx (0.2.8)
       nokogiri
 
 GEM

data/lib/ofx.rb

@@ -1,6 +1,9 @@
 require "open-uri"
 require "nokogiri"
 
+require "iconv"
+require "kconv"
+
 require "ofx/errors"
 require "ofx/parser"
 require "ofx/parser/ofx102"

data/lib/ofx/parser.rb

@@ -1,6 +1,3 @@
-require "iconv"
-require "kconv"
-
 module OFX
   module Parser
     class Base
@@ -42,35 +39,35 @@ module OFX
       end
 
       private
-        def prepare(content)
-          # Split headers & body
-          headers, body = content.dup.split(/<OFX>/, 2)
+      def prepare(content)
+        # Split headers & body
+        headers, body = content.dup.split(/<OFX>/, 2)
 
-          # Change single CR's to LF's to avoid issues with some banks
-          headers.gsub!(/\r(?!\n)/, "\n") 
+        # Change single CR's to LF's to avoid issues with some banks
+        headers.gsub!(/\r(?!\n)/, "\n")
 
-          raise OFX::UnsupportedFileError unless body
+        raise OFX::UnsupportedFileError unless body
 
-          # Parse headers. When value is NONE, convert it to nil.
-          headers = headers.to_enum(:each_line).inject({}) do |memo, line|
-            _, key, value = *line.match(/^(.*?):(.*?)(\r?\n)*$/)
-            memo[key] = value == "NONE" ? nil : value
-            memo
-          end
+        # Parse headers. When value is NONE, convert it to nil.
+        headers = headers.to_enum(:each_line).inject({}) do |memo, line|
+          _, key, value = *line.match(/^(.*?):(.*?)(\r?\n)*$/)
+          memo[key] = value == "NONE" ? nil : value
+          memo
+        end
 
-          # Replace body tags to parse it with Nokogiri
-          body.gsub!(/>\s+</m, '><')
-          body.gsub!(/\s+</m, '<')
-          body.gsub!(/>\s+/m, '>')
-          body.gsub!(/<(\w+?)>([^<]+)/m, '<\1>\2</\1>')
+        # Replace body tags to parse it with Nokogiri
+        body.gsub!(/>\s+</m, '><')
+        body.gsub!(/\s+</m, '<')
+        body.gsub!(/>\s+/m, '>')
+        body.gsub!(/<(\w+?)>([^<]+)/m, '<\1>\2</\1>')
 
-          [headers, body]
-        end
-        
-        def convert_to_utf8(string)
-          return string if Kconv.isutf8(string)
-          Iconv.conv('UTF-8', 'LATIN1//IGNORE', string) 
-        end
+        [headers, body]
+      end
+
+      def convert_to_utf8(string)
+        return string if Kconv.isutf8(string)
+        Iconv.conv('UTF-8', 'LATIN1//IGNORE', string)
+      end
     end
   end
 end

data/lib/ofx/parser/ofx102.rb

@@ -4,92 +4,93 @@ module OFX
   module Parser
     class OFX102
       VERSION = "1.0.2"
-      
+
       ACCOUNT_TYPES = {
         "CHECKING" => :checking
       }
-      
+
       TRANSACTION_TYPES = {
         "CREDIT" => :credit,
         "DEBIT" => :debit,
         "OTHER" => :other,
         "DEP" => :dep,
         "XFER" => :xfer,
-        "CASH" => :cash
+        "CASH" => :cash,
+        "CHECK" => :check
       }
-      
+
       attr_reader :headers
       attr_reader :body
       attr_reader :html
-      
+
       def initialize(options = {})
         @headers = options[:headers]
         @body = options[:body]
         @html = Nokogiri::HTML.parse(body)
       end
-      
+
       def account
         @account ||= build_account
       end
-      
+
       private
-        def build_account
-          OFX::Account.new({
-            :bank_id      => html.search("bankacctfrom > bankid").inner_text,
-            :id           => html.search("bankacctfrom > acctid").inner_text,
-            :type         => ACCOUNT_TYPES[html.search("bankacctfrom > accttype").inner_text],
-            :transactions => build_transactions,
-            :balance      => build_balance,
-            :currency     => html.search("bankmsgsrsv1 > stmttrnrs > stmtrs > curdef").inner_text
-          })
-        end
-        
-        def build_transactions
-          html.search("banktranlist > stmttrn").collect do |element|
-            build_transaction(element)
-          end
-        end
-        
-        def build_transaction(element)
-          OFX::Transaction.new({
-            :amount => build_amount(element),
-            :amount_in_pennies => (build_amount(element) * 100).to_i,
-            :fit_id => element.search("fitid").inner_text,
-            :memo => element.search("memo").inner_text,
-            :payee => element.search("payee").inner_text,
-            :check_number => element.search("checknum").inner_text,
-            :ref_number => element.search("refnum").inner_text,
-            :posted_at => build_date(element.search("dtposted").inner_text),
-            :type => build_type(element)
-          })
-        end
+      def build_account
+        OFX::Account.new({
+          :bank_id      => html.search("bankacctfrom > bankid").inner_text,
+          :id           => html.search("bankacctfrom > acctid").inner_text,
+          :type         => ACCOUNT_TYPES[html.search("bankacctfrom > accttype").inner_text],
+          :transactions => build_transactions,
+          :balance      => build_balance,
+          :currency     => html.search("bankmsgsrsv1 > stmttrnrs > stmtrs > curdef").inner_text
+        })
+      end
 
-        def build_type(element)
-          TRANSACTION_TYPES[element.search("trntype").inner_text]
+      def build_transactions
+        html.search("banktranlist > stmttrn").collect do |element|
+          build_transaction(element)
         end
+      end
 
-        def build_amount(element)
-          BigDecimal.new(element.search("trnamt").inner_text)
-        end
-        
-        def build_date(date)
-          _, year, month, day, hour, minutes, seconds = *date.match(/(\d{4})(\d{2})(\d{2})(?:(\d{2})(\d{2})(\d{2}))?/)
-          
-          date = "#{year}-#{month}-#{day} "
-          date << "#{hour}:#{minutes}:#{seconds}" if hour && minutes && seconds
-          
-          Time.parse(date)
-        end
-        
-        def build_balance
-          amount = html.search("ledgerbal > balamt").inner_text.to_f
-          
-          OFX::Balance.new({
-            :amount => amount,
-            :amount_in_pennies => (amount * 100).to_i,
-            :posted_at => build_date(html.search("ledgerbal > dtasof").inner_text)
-          })
-        end
+      def build_transaction(element)
+        OFX::Transaction.new({
+          :amount            => build_amount(element),
+          :amount_in_pennies => (build_amount(element) * 100).to_i,
+          :fit_id            => element.search("fitid").inner_text,
+          :memo              => element.search("memo").inner_text,
+          :payee             => element.search("payee").inner_text,
+          :check_number      => element.search("checknum").inner_text,
+          :ref_number        => element.search("refnum").inner_text,
+          :posted_at         => build_date(element.search("dtposted").inner_text),
+          :type              => build_type(element)
+        })
+      end
+
+      def build_type(element)
+        TRANSACTION_TYPES[element.search("trntype").inner_text]
+      end
+
+      def build_amount(element)
+        BigDecimal.new(element.search("trnamt").inner_text)
+      end
+
+      def build_date(date)
+        _, year, month, day, hour, minutes, seconds = *date.match(/(\d{4})(\d{2})(\d{2})(?:(\d{2})(\d{2})(\d{2}))?/)
+
+        date = "#{year}-#{month}-#{day} "
+        date << "#{hour}:#{minutes}:#{seconds}" if hour && minutes && seconds
+
+        Time.parse(date)
+      end
+
+      def build_balance
+        amount = html.search("ledgerbal > balamt").inner_text.to_f
+
+        OFX::Balance.new({
+          :amount => amount,
+          :amount_in_pennies => (amount * 100).to_i,
+          :posted_at => build_date(html.search("ledgerbal > dtasof").inner_text)
+        })
+      end
     end
   end
 end

data/lib/ofx/version.rb

@@ -2,7 +2,7 @@ module OFX
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 8
+    PATCH = 9
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/ofx.gemspec

@@ -21,8 +21,6 @@ Usage:
   end
 TXT
 
-  s.rubyforge_project = "ofx"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/fixtures/bb.ofx

@@ -40,6 +40,14 @@ NEWFILEUID:NONE
 	<BANKTRANLIST>
 	 <DTSTART>20100930 
 	 <DTEND>20101025 
+	 <STMTTRN>
+	  <TRNTYPE>CHECK 
+	  <DTPOSTED>20100826 
+	  <TRNAMT>-836.30 
+	  <FITID>20100826183630 
+	  <CHECKNUM>850076 
+	  <MEMO>CHEQUE COMPENSADO         
+	 </STMTTRN>
 	 <STMTTRN>
 	  <TRNTYPE>DEBIT 
 	  <DTPOSTED>20101001 

data/spec/ofx/transaction_spec.rb

@@ -114,20 +114,25 @@ describe OFX::Transaction do
     end
 
     it "should return dep" do
-      @transaction = @account.transactions[8]
+      @transaction = @account.transactions[9]
       @transaction.type.should == :dep
     end
 
     it "should return xfer" do
-      @transaction = @account.transactions[17]
+      @transaction = @account.transactions[18]
       @transaction.type.should == :xfer
     end
 
     it "should return cash" do
-      @transaction = @account.transactions[44]
+      @transaction = @account.transactions[45]
       @transaction.type.should == :cash
     end
 
+    it "should return check" do
+      @transaction = @account.transactions[0]
+      @transaction.type.should == :check
+    end
+
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -02:00
+date: 2010-11-10 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: ofx
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3