ofx_reader 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 412056e9bc0138a1aa7612277e4678942fa1e8a514ef3af9c84133e337cba320
-  data.tar.gz: c2a011b0b3d7002fecc96b7923bf827969fb9c7db28e5deb02bb59dad2da1bc6
+  metadata.gz: 7a6ac416c757355d3778f28d52cb2316ae348ef00fe43fee01afba99aac927c5
+  data.tar.gz: 6e49a814941761ecf810494ca558cc4d7b7b34e06ab60549844092f955e02b0e
 SHA512:
-  metadata.gz: 3f4a500d8b8d3d7dccc9601d1a97ab572c7d4506a990ed0198b1e004a70aa3987a196467c5d30d09ad6561fcb6b6ce9e93fec3a16aa3ae6fdd74c414e67aa2cb
-  data.tar.gz: 74c34eb7b255ab0438d5ba9bacc9861efc45734ff0f079f88cecf3ad129f0e7671dca56e3875ab02c1e0304d8987136c22dbf75a0ab300a55ac070594e4e8493
+  metadata.gz: 48a4ac09429acc7d5b335bdcf37641081d1224412fb5d3e6bc46e78ecb163159b25ec3055acab754a2c51a89dfc987402837c9742f9b35649232fcfc3ea4e1ae
+  data.tar.gz: 57048f3e3040131aa1b0b6286cb6fecbf49cc585a32d3d2c9056a7d02931b0f9bcf7420e65a954770b1936e0f05b16202dd790a92a7252b4290e65e854a891ab

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 *.gem
+.DS_Store

data/Gemfile.lock

@@ -2,17 +2,27 @@ PATH
   remote: .
   specs:
     ofx_reader (0.1.3)
+      activesupport (> 4)
       nokogiri (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     coderay (1.1.2)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     docile (1.1.5)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
+    minitest (5.10.3)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     pry (0.11.3)
@@ -37,6 +47,9 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/exe/ofx_reader

@@ -6,7 +6,7 @@ require 'ofx_reader'
 if ARGV[0]
   if File.exist?(ARGV[0])
     ofx_text = File.read(ARGV[0])
-    ofx = OFXReader::Parser::OFX102.new(ofx_text)
+    ofx = OFXReader.(ofx_text)
     pp ofx.headers
     pp ofx.account
     pp ofx.transactions

data/lib/ofx_reader/errors/ofx_without_bank_account_error.rb

@@ -0,0 +1,4 @@
+module OFXReader
+  class OFXWithoutBankAccountError < StandardError
+  end
+end

data/lib/ofx_reader/errors/unsupported_ofx_version_error.rb

@@ -1,2 +1,4 @@
-class UnsupportedOFXVersionError < StandardError
+module OFXReader
+  class UnsupportedOFXVersionError < StandardError
+  end
 end

data/lib/ofx_reader/parser/base.rb

@@ -5,10 +5,12 @@ module OFXReader
       require 'time'
 
       attr_reader :header, :body
+      attr_reader :strict
       attr_reader :headers, :account, :transactions
 
-      def initialize(content)
+      def initialize(content, strict: false)
         content = content.encode("UTF-8", "ISO-8859-1")
+        @strict = strict
         @header, @body = content.dup.split(/(?=<OFX>)/, 2)
         @headers = parse_headers(header)
         @account, @transactions = parse_body(body)
@@ -16,19 +18,24 @@ module OFXReader
 
       private
 
-      def parse_headers(headers)
-        headers.each_line.with_object({}) do |line, hash|
+      def parse_headers(header)
+        header.gsub("\r", "\n").each_line.with_object({}) do |line, hash|
           _, k, v = *line.match(/^(.*?):(.*?)\s*(\r?\n)*$/)
           hash[k.downcase.to_sym] = v unless v.nil?
         end
       end
 
       def parse_body(body)
-        body.gsub!(/>\s+</m, '><')
-        body.gsub!(/\s+</m, '<')
-        body.gsub!(/>\s+/m, '>')
-        body.gsub!(/<(\w+?)>([^<]+)/m, '<\1>\2</\1>')
-        parser.new(::Nokogiri::XML(body)).parse
+        doc = ::Nokogiri::XML(body)
+        if doc.errors.any?
+          body.gsub!(/>\s+</m, '><')
+          body.gsub!(/\s+</m, '<')
+          body.gsub!(/>\s+/m, '>')
+          body.gsub!(/<(\w+?)>([^<]+)/m, '<\1>\2</\1>')
+        end
+        doc = ::Nokogiri::XML(body)
+
+        parser.new(doc, strict).parse
       end
 
       def parser

data/lib/ofx_reader/parser/ofx_102.rb

@@ -1,30 +1,50 @@
 module OFXReader
   module Parser
-    class OFX102 < Struct.new(:ofx_body)
+    class OFX102 < Struct.new(:ofx_body, :strict)
       def parse
+        raise OFXReader::OFXWithoutBankAccountError if empty_account?
         [account, transactions]
       end
 
       def account
-        {
-          bank_id: ofx_body.search('BANKACCTFROM BANKID').inner_text,
-          account_id: ofx_body.search('BANKACCTFROM ACCTID').inner_text,
-        }
+        build_account(
+          build(ofx_body.search('BANKACCTFROM'))
+        )
+      end
+
+      def build_account(hash)
+        full_account = [
+          hash.dig(:branchid),
+          hash.dig(:acctid)
+        ].compact.join(' - ')
+
+        hash.merge!({
+          full_account: full_account
+        }) if hash.dig(:acctid).present?
+
+        hash
       end
 
       def transactions
         ofx_body.search('BANKTRANLIST STMTTRN').map do |node|
-          build_transaction(node)
+          build(node)
         end
       end
 
       private
 
-      def build_transaction(node)
+      def build(node)
         node.children.map.with_object({}) do |field, hash|
-          hash[field.name.downcase.to_sym] = field.text
+          # Avoid Nokogiri::XML::Text
+          if field.is_a?(Nokogiri::XML::Element)
+            hash[field.name.downcase.to_sym] = field.text
+          end
         end
       end
+
+      def empty_account?
+        (account.dig(:bankid).blank? && account.dig(:acctid).blank?) && strict
+      end
     end
   end
 end

data/lib/ofx_reader/version.rb

@@ -1,3 +1,3 @@
 module OFXReader
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/ofx_reader.rb

@@ -1,4 +1,5 @@
 require "ofx_reader/version"
+require "active_support/core_ext/object"
 
 begin
   require "pry"
@@ -6,6 +7,7 @@ rescue LoadError
 end
 
 require "ofx_reader/errors/unsupported_ofx_version_error"
+require "ofx_reader/errors/ofx_without_bank_account_error"
 require "ofx_reader/parser/base"
 require "ofx_reader/parser/ofx_102"
 
@@ -25,7 +27,7 @@ module OFXReader
 #   'REPEATPMT', 'SRVCHG', 'XFER',
 # ]
 
-  def self.call(ofx_text)
-    OFXReader::Parser::Base.new(ofx_text)
+  def self.call(ofx_text, strict: false)
+    OFXReader::Parser::Base.new(ofx_text, strict: strict)
   end
 end

data/ofx_reader.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "nokogiri", "~> 1.8"
+  spec.add_dependency "activesupport", "> 4"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ofx_reader
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Francisco Martins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +113,7 @@ files:
 - bin/setup
 - exe/ofx_reader
 - lib/ofx_reader.rb
+- lib/ofx_reader/errors/ofx_without_bank_account_error.rb
 - lib/ofx_reader/errors/unsupported_ofx_version_error.rb
 - lib/ofx_reader/parser/base.rb
 - lib/ofx_reader/parser/ofx_102.rb