aranha-parsers 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a24e93c2727f9cdb6e187eb6f2c15719591c70c0afa5e04be790cc0cdaba7d
-  data.tar.gz: b56ba940af2dadeacca0ca2dd67fce81d28af267b768d80927d157b5a94d8f88
+  metadata.gz: 990eaaf39db15ed3c74d22039dd4c10ef005a5f46d8e6325087a7517f9795ae9
+  data.tar.gz: 895b5ab2673ff4663576e6a41bfaba3fe96d324df59617e8cfc4f9f116929af2
 SHA512:
-  metadata.gz: 6951921ada5daca5e9a0f6fc70726b447da1308d11334fc8e92639953c6a12c617ded89b969e3561e38d3f4f697a25673c981c945ea79f55fc23d06d580f6726
-  data.tar.gz: 9a201a0e54ae982da2b4f78ba24c2acb188637c370a03e1b9e92cceab27ab0f9991b35ba948de27e6a5564b14a5f6b3ee8591fa4e16691e9c5949677030a84b4
+  metadata.gz: 1387956a1035e8984ec724ddff13933b567ca1a8155eec4b7d61c52374d0d9ec398966e146bb46356d57b68cab5926e4ce7a610aed52dac77f5a87eeba5b0d55
+  data.tar.gz: 34f475e75e54677aad15a5650f112acf72a16e50dc4729e8226705181c82d4dc813cc8dbf79493d0a184f4039d947a943cc91bd62e830f797153021194809594

data/lib/aranha/parsers.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
 module Aranha
   module Parsers
-    require 'aranha/parsers/base'
-    require 'aranha/parsers/html'
-    require 'aranha/parsers/invalid_state_exception'
-    require 'aranha/parsers/source_address'
-    require 'aranha/parsers/version'
+    ::EacRubyUtils.require_sub __FILE__
   end
 end

data/lib/aranha/parsers/base.rb

@@ -30,12 +30,14 @@ module Aranha
         path = log_file(suffix)
 
         return unless path
+
         File.open(path, 'wb') { |file| file.write(content) }
       end
 
       def log_file(suffix)
         dir = log_parsers_dir
         return nil unless dir
+
         f = ::File.join(dir, "#{self.class.name.parameterize}#{suffix}.log")
         FileUtils.mkdir_p(File.dirname(f))
         f
@@ -44,6 +46,7 @@ module Aranha
       def log_parsers_dir
         return ENV[LOG_DIR_ENVVAR] if ENV[LOG_DIR_ENVVAR]
         return ::Rails.root.join('log', 'parsers') if rails_root_exist?
+
         nil
       end
 
@@ -51,7 +54,7 @@ module Aranha
         ::Rails.root
         true
       rescue NameError
-        return false
+        false
       end
     end
   end

data/lib/aranha/parsers/html.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
 module Aranha
   module Parsers
     module Html
-      require 'aranha/parsers/html/base'
-      require 'aranha/parsers/html/item'
-      require 'aranha/parsers/html/item_list'
-      require 'aranha/parsers/html/node'
+      ::EacRubyUtils.require_sub __FILE__
     end
   end
 end

data/lib/aranha/parsers/html/item.rb

@@ -14,6 +14,7 @@ module Aranha
           @item_node ||= begin
             r = item_xpath ? nokogiri.at_xpath(item_xpath) : nokogiri
             raise "Item node not found (Item xpath: #{item_xpath})" unless r
+
             r
           end
         end

data/lib/aranha/parsers/html/item_list.rb

@@ -21,7 +21,7 @@ module Aranha
         end
 
         def items_xpath
-          raise "Class #{self.class} has no method \"item_xpath\". Implement it"
+          raise "Class #{self.class} has no method \"#{__method__}\". Implement it"
         end
       end
     end

data/lib/aranha/parsers/html/node.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
 module Aranha
   module Parsers
     module Html
       module Node
-        require 'aranha/parsers/html/node/base'
-        require 'aranha/parsers/html/node/default'
+        ::EacRubyUtils.require_sub __FILE__
       end
     end
   end

data/lib/aranha/parsers/html/node/default.rb

@@ -19,11 +19,13 @@ module Aranha
             root = node.at_xpath(xpath)
             if root.blank?
               return nil unless required
+
               raise "No node found (Xpath: #{xpath})"
             end
             result = string_recursive(root)
-            return result unless result.blank?
+            return result if result.present?
             return nil unless required
+
             raise "String blank (Xpath: #{xpath})"
           end
 
@@ -109,6 +111,7 @@ module Aranha
 
           def string_recursive(node)
             return sanitize_string(node.text) if node.is_a?(::Nokogiri::XML::Text)
+
             s = ''
             node.children.each do |child|
               child_s = string_recursive(child)

data/lib/aranha/parsers/patches.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module Aranha
+  module Parsers
+    module Patches
+      ::EacRubyUtils.require_sub __FILE__
+    end
+  end
+end

data/lib/aranha/parsers/patches/ofx_parser.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'ofx-parser'
+
+module Aranha
+  module Parsers
+    module Patches
+      module OfxParser
+        module OfxParser
+          def self.included(base)
+            base.class_eval do
+              class << self
+                prepend ClassMethods
+              end
+            end
+          end
+
+          module ClassMethods
+            def build_transaction(transaction)
+              r = super
+              r.currate = (transaction / 'CURRENCY/CURRATE').inner_text
+              r
+            end
+          end
+        end
+
+        module Transaction
+          attr_accessor :currate, :cursym
+        end
+      end
+    end
+  end
+end
+
+require 'eac_ruby_utils/patch'
+
+::EacRubyUtils.patch(::OfxParser::OfxParser, ::Aranha::Parsers::Patches::OfxParser::OfxParser)
+::EacRubyUtils.patch(::OfxParser::Transaction, ::Aranha::Parsers::Patches::OfxParser::Transaction)

data/lib/aranha/parsers/source_address.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'yaml'
 require 'active_support/core_ext/module/delegation'
-require 'aranha/parsers/source_address/hash_http_get'
-require 'aranha/parsers/source_address/hash_http_post'
-require 'aranha/parsers/source_address/http_get'
-require 'aranha/parsers/source_address/file'
+require 'eac_ruby_utils/require_sub'
+require 'yaml'
 
 module Aranha
   module Parsers
     class SourceAddress
+      ::EacRubyUtils.require_sub __FILE__
+
       class << self
         SUBS = [
           ::Aranha::Parsers::SourceAddress::HashHttpGet,
@@ -20,6 +19,7 @@ module Aranha
 
         def detect_sub(source)
           return source.sub if source.is_a?(self)
+
           SUBS.each do |sub|
             return sub.new(source) if sub.valid_source?(source)
           end
@@ -27,7 +27,7 @@ module Aranha
         end
 
         def deserialize(string)
-          new(string =~ %r{\A[a-z]+://} ? string.strip : ::YAML.load(string))
+          new(string =~ %r{\A[a-z]+://} ? string.strip : ::YAML.load(string)) # rubocop:disable Security/YAMLLoad
         end
 
         def from_file(path)

data/lib/aranha/parsers/source_address/http_get.rb

@@ -33,8 +33,10 @@ module Aranha
 
         def content
           c = ::Curl::Easy.new(url)
+          c.follow_location = true
           raise "Curl perform failed (URL: #{url})" unless c.perform
           return c.body_str if c.status.to_i == 200
+
           raise "Get #{url} returned #{c.status.to_i}"
         end
 

data/lib/aranha/parsers/source_target_fixtures.rb

@@ -1,9 +1,7 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/string'
-require 'yaml'
 
 module Aranha
   module Parsers
@@ -37,6 +35,14 @@ module Aranha
         r
       end
 
+      def target_files
+        r = []
+        source_target_files.each do |st|
+          r << st.target if st.target
+        end
+        r
+      end
+
       def target_file(basename)
         fixture_file(basename, 'target')
       end
@@ -50,7 +56,7 @@ module Aranha
       def fixture_file(basename, suffix)
         prefix = "#{basename}.#{suffix}"
         Dir.foreach(fixtures_directory) do |item|
-          next if item == '.' || item == '..'
+          next if %w[. ..].include?(item)
           return File.expand_path(item, fixtures_directory) if item.starts_with?(prefix)
         end
         nil
@@ -59,7 +65,8 @@ module Aranha
       def sources_targets_basenames
         basenames = Set.new
         Dir.foreach(fixtures_directory) do |item|
-          next if item == '.' || item == '..'
+          next if %w[. ..].include?(item)
+
           b = self.class.source_target_basename(item)
           basenames << b if b.present?
         end

data/lib/aranha/parsers/spec/source_target_fixtures_example.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'aranha/parsers/source_target_fixtures'
+require 'yaml'
 
 RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable Metrics/BlockLength
   let(:spec_file) { spec_file }
@@ -9,13 +10,13 @@ RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable
     expect(::File.directory?(fixtures_dir)).to be true
   end
 
-  context 'in fixtures directory' do
-    it 'should have at least one file' do
-      expect(source_target_fixtures.source_target_files.count).to be > 0
+  context 'with fixtures directory' do
+    it 'has at least one file' do
+      expect(source_target_fixtures.source_target_files.count).to be > 0 # rubocop:disable Style/NumericPredicate
     end
 
     if ENV['WRITE_TARGET_FIXTURES']
-      it 'should write target data for all files' do
+      it 'writes target data for all files' do
         source_target_fixtures.source_files.each do |source_file|
           sd = sort_results(source_data(source_file))
           basename = ::Aranha::Parsers::SourceTargetFixtures.source_target_basename(source_file)
@@ -24,11 +25,11 @@ RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable
         end
       end
     else
-      it 'should parse data for all files' do
+      it 'parses data for all files' do
         source_target_fixtures.source_target_files.each do |st|
           assert_source_target_complete(st)
           sd = source_data(st.source)
-          td = YAML.load_file(st.target)
+          td = target_data(st.target)
           expect(sort_results(sd)).to eq(sort_results(td))
         end
       end
@@ -39,9 +40,9 @@ RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable
     @source_target_fixtures ||= ::Aranha::Parsers::SourceTargetFixtures.new(fixtures_dir)
   end
 
-  def assert_source_target_complete(st)
-    expect(st.source).to(be_truthy, "Source not found (Target: #{st.target})")
-    expect(st.target).to(be_truthy, "Target not found (Source: #{st.source})")
+  def assert_source_target_complete(source_target)
+    expect(source_target.source).to(be_truthy, "Source not found (Target: #{source_target.target})")
+    expect(source_target.target).to(be_truthy, "Target not found (Source: #{source_target.source})")
   end
 
   def source_data(source_file)
@@ -55,7 +56,11 @@ RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable
     )
   end
 
-  def sort_results(r)
-    r
+  def sort_results(results)
+    results
+  end
+
+  def target_data(target_file)
+    ::YAML.load_file(target_file)
   end
 end

data/lib/aranha/parsers/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Aranha
   module Parsers
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-parsers
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.10
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.33'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.33.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.33'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.33.1
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -73,19 +93,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.8.3
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ofx-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.1'
 description: 
 email: 
 executables: []
@@ -103,6 +137,8 @@ files:
 - lib/aranha/parsers/html/node/base.rb
 - lib/aranha/parsers/html/node/default.rb
 - lib/aranha/parsers/invalid_state_exception.rb
+- lib/aranha/parsers/patches.rb
+- lib/aranha/parsers/patches/ofx_parser.rb
 - lib/aranha/parsers/source_address.rb
 - lib/aranha/parsers/source_address/file.rb
 - lib/aranha/parsers/source_address/hash_http_get.rb