baa_chan 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dd4992c1495048ce9123656452c1d9e2ed8ce3dffd2c7f070172c958f748cca
-  data.tar.gz: b6a55877a52d39e01aeb3bb6f11d54a6f7f9a86e5622b70ba4e82e13e1302701
+  metadata.gz: ad4af573c534fad3d66d4a911a0fbe8aa686e762931585417707e4b43a3f6e10
+  data.tar.gz: 5315df0e4cd0089e2aa72a95ae38be5ac5aa9e44be98901944e333f6e7f9f9d2
 SHA512:
-  metadata.gz: 392c751ceccd693dfb2a85d6140b69c8d1bfea4f08088917f8de8e0965deef3234b839aaba431a35ea996041cf0c4a50932b3353039e184cfda1a3b2fd178869
-  data.tar.gz: 62c4a801ea57f5ff746a3edec50458ae18ad4e3ca8d01330bbdbf259ebe3d4eb3dd7132b4e46e654807558c6fe2aafdf77543c7f1d768c9f3d9c7524c96dc5fb
+  metadata.gz: b2e3a5f740bb75ece4b2d029a0eb13a14d7a14b4fd7dee8b604034aa1fb35f1393415ac9ee6cac2be69407569a7e86397c4757cf839fdc03e06926ce418204e7
+  data.tar.gz: dbcd2a27cfbd79ec0ab5e050f69fed9b9488785c4b68a4c0320677e1e1620f8f954b3d80728bd265796ac5dc06d19d4b7b986c137350b60b5623e20b1c8061b8

data/lib/baa_chan/layout.rb

@@ -8,24 +8,36 @@ class Layout
   end
 
   def attributes
-    @attributes ||= YAML.safe_load(File.read(File.join(LAYOUTS_PATH, "#{@broker}.yml")))
+    @attributes ||= YAML.safe_load(
+      File.read(File.join(LAYOUTS_PATH, "#{@broker}.yml")), aliases: true
+    )
   end
 
   def line
     attributes[caller_locations.first.label]['line'].to_i
   end
 
-  def index(attr_name = nil)
-    attr = attr_name || caller_locations.first.label
+  def index(attr_name = caller_locations.first.label)
+    attributes[attr_name]['index'].to_i
+  end
+
+  def regexp_for(attr)
+    attributes[attr]['regexp']
+  end
 
-    attributes[attr]['index'].to_i
+  def trade
+    @trade ||= attributes['trades']
   end
 
   def trade_prefix
-    attributes['trades']['prefix']
+    trade['prefix']
   end
 
-  def regexp_for(attr)
-    attributes[attr]['regexp']
+  def trade_index(asset)
+    trade[asset][caller_locations.first.label]['index'].to_i
+  end
+
+  def trade_regexp(asset)
+    trade[asset][caller_locations.first.label]['regexp']
   end
 end

data/lib/baa_chan/layouts/clear.yml

@@ -6,16 +6,28 @@ trade_confirmation_number:
 trade_date:
   line: 2
   index: 2
+
 trades:
   prefix: 1-BOVESPA
-operation:
-  index: 1
-ticker:
-  index: 3
-quantity:
-  index: 7
-price:
-  index: 8
+
+  default: &default
+    operation:
+      index: 1
+    ticker:
+      index: 2
+    quantity:
+      regexp: \s\d{1,3}(?:\.\d+{3})*\s
+    price:
+      regexp: \s{2,}\d{1,3}(?:\.\d{3})*,\d{2,}\s{2,}
+
+  stock:
+    <<: *default
+
+  option:
+    <<: *default
+    ticker:
+      index: 4
+
 clearing_fee:
   regexp: .*Taxa de liquidação.*
   index: 7

data/lib/baa_chan/layouts/genial.yml

@@ -6,16 +6,28 @@ trade_confirmation_number:
 trade_date:
   line: 2
   index: 2
+
 trades:
   prefix: 1-BOVESPA
-operation:
-  index: 1
-ticker:
-  index: 3
-quantity:
-  index: 6
-price:
-  index: 7
+
+  default: &default
+    operation:
+      index: 1
+    ticker:
+      index: 3
+    quantity:
+      regexp: \s\d{1,3}(?:\.\d+{3})*\s
+    price:
+      regexp: \s{2,}\d{1,3}(?:\.\d{3})*,\d{2,}\s{2,}
+
+  stock:
+    <<: *default
+
+  option:
+    <<: *default
+    ticker:
+      index: 4
+
 clearing_fee:
   regexp: .*Taxa de liquidação.*
   index: 7

data/lib/baa_chan/layouts/singulare.yml

@@ -6,16 +6,26 @@ trade_confirmation_number:
 trade_date:
   line: 2
   index: 2
+
 trades:
   prefix: BM&FBOVESPA S/A.
-operation:
-  index: 2
-ticker:
-  index: 6
-quantity:
-  index: 9
-price:
-  index: 10
+
+  default: &default
+    operation:
+      index: 2
+    ticker:
+      index: 4
+    quantity:
+      regexp: \s\d{1,3}(?:\.\d+{3})*\s
+    price:
+      regexp: \s{2,}\d{1,3}(?:\.\d{3})*,\d{2,}\s{2,}
+
+  stock:
+    <<: *default
+
+  option:
+    <<: *default
+
 clearing_fee:
   regexp: .*Taxa de Liquidação.*
   index: 7

data/lib/baa_chan/parser.rb

@@ -6,6 +6,7 @@ require 'baa_chan/costs'
 require 'date'
 require 'yaml'
 
+require 'pry-byebug'
 module BaaChan
   class CostsParserError < StandardError; end
 
@@ -52,6 +53,8 @@ module BaaChan
       @lines.each_with_object([]) do |line, trades|
         next unless line.include? @layout.trade_prefix
 
+        @asset = line.include?('OPCAO') ? 'option' : 'stock'
+
         @trade_line = line
         trades << Trade.new(operation, ticker, quantity, price)
       end
@@ -60,19 +63,19 @@ module BaaChan
     private
 
     def operation
-      @trade_line.split[@layout.index] == 'V' ? 'Sell' : 'Buy'
+      @trade_line.split[@layout.trade_index(@asset)] == 'V' ? 'Sell' : 'Buy'
     end
 
     def ticker
-      @trade_line.split[@layout.index]
+      @trade_line.split(/\s{2,}/)[@layout.trade_index(@asset)]
     end
 
     def quantity
-      @trade_line.split[@layout.index].to_i
+      @trade_line.scan(Regexp.new(@layout.trade_regexp(@asset)))[0].strip.gsub('.', '').to_i
     end
 
     def price
-      @trade_line.split[@layout.index].gsub(',', '.').to_f
+      @trade_line.scan(Regexp.new(@layout.trade_regexp(@asset)))[0].gsub(',', '.').to_f
     end
   end
 

data/lib/baa_chan/reader.rb

@@ -35,17 +35,15 @@ module BaaChan
     end
 
     def detect_layout(lines)
-      broker = if lines[3] == BROKER_LIST[:singulare]
-                 'singulare'
-               elsif lines[4] == BROKER_LIST[:genial]
-                 'genial'
-               elsif lines[4] == BROKER_LIST[:clear]
-                 'clear'
-               else
-                 raise UnknownLayoutError
-               end
-
-      return broker
+      if lines[3] == BROKER_LIST[:singulare]
+        'singulare'
+      elsif lines[4] == BROKER_LIST[:genial]
+        'genial'
+      elsif lines[4] == BROKER_LIST[:clear]
+        'clear'
+      else
+        raise UnknownLayoutError
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baa_chan
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Diogo Noda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -74,10 +74,11 @@ files:
 - lib/baa_chan/reader.rb
 - lib/baa_chan/trade.rb
 - lib/baa_chan/trade_confirmation.rb
-homepage: https://rubygems.org/gems/baa_chan
+homepage: https://github.com/diogonoda/baa_chan
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/diogonoda/baa_chan
 post_install_message:
 rdoc_options: []
 require_paths: