abank 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cdbf5848f71477ac0335fce39e8b98eec16ec5fbf0cce20d71d45100759779d
-  data.tar.gz: 0ca9a3cd18bbe22522695bb6de305bb238c5f9bf9166e8f3b1a8bf65258a58c3
+  metadata.gz: e73d10cac74d20be439fdf8439853e31cfe952a9bdc8af90c9c2466c990b0b58
+  data.tar.gz: f7ba43125296cd98b4ef0d1c91ac9c292d5967fb2c022ad515e479a5cd495af4
 SHA512:
-  metadata.gz: e613799e22925d9ab3af9ff414c6a5b66e8d37f4deb56c2a86cadd032a4ae62bb3fee6e4ec62c54490b9dd8f3626f54dd5407272aa9796354010b149e014acff
-  data.tar.gz: cb51cb9d37401a738ac8a83b294f24e48bc7a89ea06dc885d4b72ca5ddd09a05d521a049d878456e48880ffeb80303daf10c44eb0fa537e392e214667b69f4f1
+  metadata.gz: 23c72b6f7df54b2b6e1226ae2598d69e8302f55a6b6f874bb4d3815a97412a8023d933b2c67506224ee4a36f05e4521e926c1bb43a90fd8c80682f2ca97fd5d0
+  data.tar.gz: f71a7f5a3e0ff2f407d30cceca0816704591e5000828657617d0584eee54fcb435732e1cce5ce645c6a1e90586e5fb411e59f0531d406956a561667907827bae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abank (0.7.1)
+    abank (0.7.3)
       google-cloud-bigquery
       roo
       thor
@@ -54,7 +54,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    google-apis-bigquery_v2 (0.84.0)
+    google-apis-bigquery_v2 (0.85.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-core (0.16.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -80,7 +80,7 @@ GEM
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.5.0)
     google-logging-utils (0.1.0)
-    googleauth (1.13.1)
+    googleauth (1.14.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
@@ -107,10 +107,10 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    nokogiri (1.18.3)
+    nokogiri (1.18.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-gnu)
+    nokogiri (1.18.4-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     os (1.1.4)
@@ -154,7 +154,7 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
+    rubocop-ast (1.39.0)
       parser (>= 3.3.1.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)

data/lib/abank/big.rb

@@ -41,20 +41,103 @@ module Abank
     # @return [Big] acesso a base dados abank no bigquery
     def mv_delete
       @ctlct = []
-      return self if mvkys.empty? && docnt.zero?
+      return self if mvkys.empty? && contadel.zero?
 
       # obtem lista contratos arrendamento associados aos movimentos a apagar
       @ctlct =
-        if docnt.zero?
+        if contadel.zero?
           sql("select distinct ct from #{BD}.gmr where ky IN UNNEST(@kys)", kys: mvkys)
         else
-          sql("select distinct ct from #{BD}.gmr where nc=@nc", nc: docnt)
+          sql("select distinct ct from #{BD}.gmr where nc=@nc", nc: contadel)
         end
       re_apaga
       mv_delete_dml
       self
     end
 
+    # mostra dados movimentos classificacao
+    def mc_show
+      if opcao[:c].to_s.empty?
+        puts("\ndados movimentos NAO classificados")
+        cp1 = sql("select distinct p1 from #{BD}.cc where p1 is not null").map { |p| p[:p1] }
+        cp2 = sql("select distinct p2 from #{BD}.cc where p2 is not null").map { |p| p[:p2] }
+        sql("select * from #{BD}.gpl where ct is null order by 1 desc limit @lm", lm: opcao[:n])
+      else
+        puts("\ndados movimentos JA classificados por:")
+        cc_show
+        cp1 = []
+        cp2 = []
+        sql("select * from #{BD}.gpl where ct=@ct order by 1 desc limit @lm", lm: opcao[:n], ct: opcao[:c])
+      end
+      bqres.reject! do |h|
+        h[:p1s] = h[:p1s] - cp1
+        h[:p2s] = h[:p2s] - cp2 - h[:p1s] - cp1
+        h[:p1s].empty? && h[:p2s].empty?
+      end
+      return if bqres.empty?
+
+      puts('      data         t1    valor palavras p1s/p2s')
+      bqres.each { |l| puts(format('%<dl>10s %<t1>10s %<vl>8.2f %<p1>s%<p2>s', dl: l[:dl].strftime(DF), t1: l[:p1], vl: l[:vl], p1: fpls(l[:p1s], 'p1 '), p2: fpls(l[:p2s], '; p2 '))) }
+    end
+
+    # mostra classificador
+    def cc_show
+      if opcao[:c].to_s.empty? && opcao[:p1].empty? && opcao[:p2].empty?
+        sql("SELECT * FROM #{BD}.cc")
+      elsif opcao[:c].to_s.empty? && opcao[:p1].empty?
+        sql("select * from #{BD}.cc WHERE p2 in unnest(@p2s)", p2s: opcao[:p2])
+      elsif opcao[:c].to_s.empty? && opcao[:p2].empty?
+        sql("select * from #{BD}.cc WHERE p1 in unnest(@p1s)", p1s: opcao[:p1])
+      elsif opcao[:p1].empty? && opcao[:p2].empty?
+        sql("select * from #{BD}.cc WHERE ct=@ct", ct: opcao[:c])
+      elsif opcao[:p1].empty?
+        sql("select * from #{BD}.cc WHERE ct=@ct and p2 in unnest(@p2s)", ct: opcao[:c], p2s: opcao[:p2])
+      elsif opcao[:p2].empty?
+        sql("select * from #{BD}.cc WHERE ct=@ct and p1 in unnest(@p1s)", ct: opcao[:c], p1s: opcao[:p1])
+      else
+        sql("select * from #{BD}.cc WHERE ct=@ct and p1 in unnest(@p1s) and p2 in unnest(@p2s)", ct: opcao[:c], p1s: opcao[:p1], p2s: opcao[:p2])
+      end
+      if bqres.empty?
+        puts('CLASSIFICADOR NAO EXISTE')
+      else
+        @bqres = bqres.group_by { |c| c[:ct] }.map { |k, v| {ct: k, p1s: fplo(v)} }
+        puts('        id palavras p1s/t1s/p2s ')
+        bqres.sort_by { |i| i[:ct] }.each do |l|
+          puts(format('%<ct>8s p %<p1>s', ct: l[:ct], p1: fpls(l[:p1s])))
+        end
+      end
+    end
+
+    # apaga classificador
+    # @return [Big] acesso a base dados abank no bigquery
+    def cc_apaga
+      cc_show
+      return self if bqres.empty?
+
+      if opcao[:p1].empty? && opcao[:p2].empty?
+        dml("delete from #{BD}.cc WHERE ct=@ct", ct: opcao[:c])
+      elsif opcao[:p1].empty?
+        dml("delete from #{BD}.cc WHERE ct=@ct and p2 IN UNNEST(@p2s)", ct: opcao[:c], p2s: opcao[:p2])
+      else
+        dml("delete from #{BD}.cc WHERE ct=@ct and p1 IN UNNEST(@p1s)", ct: opcao[:c], p1s: opcao[:p1])
+      end
+      puts("CLASSIFICADORES APAGADOS #{bqnrs}")
+      return self unless opcao[:t]
+
+      dml("update #{BD}.mv set ct=null,p1=null WHERE ct=@ct", ct: opcao[:c])
+      puts("MOVIMENTOS DES-CLASSIFICADOS #{bqnrs}")
+      self
+    end
+
+    # cria classificador
+    # @return [Big] acesso a base dados abank no bigquery
+    def cc_cria
+      vls = opcao[:p1].map.with_index { |p1, i| "('#{opcao[:c]}',#{fpli(p1)},#{fpli(opcao[:p2][i])},#{fpli(opcao[:t1][i])})" }
+      dml("insert #{BD}.cc values#{vls.join(',')}")
+      puts("CLASSIFICADORES CRIADOS #{bqnrs}")
+      self
+    end
+
     # classifica movimentos no bigquery
     # @return [Big] acesso a base dados abank no bigquery
     def mv_classifica
@@ -64,6 +147,24 @@ module Abank
       self
     end
 
+    # mostra contrato arrendamento
+    def ct_mostra
+      sql("SELECT * FROM #{BD}.ca WHERE ct=@ct", ct: opcao[:c])
+      if bqres.empty?
+        puts('CONTRATO NAO EXISTE')
+        return
+      end
+
+      @bqres = bqres.first
+      puts(' crontrato       data    renda')
+      puts(format('%<ct>10s %<dc>10s %<vr>8.2f', ct: bqres[:ct], dc: bqres[:dc].strftime(DF), vr: bqres[:vr]))
+      return unless opcao[:t]
+
+      sql("SELECT * FROM #{BD}.gca WHERE ct=@ct order by ano desc,cnt desc", ct: opcao[:c])
+      puts("\n      data  ano cnt dias")
+      bqres.each { |l| puts(format('%<dl>10s %<a>4d %<c>3d %<d>4d', dl: l[:dl].strftime(DF), a: l[:ano], c: l[:cnt], d: l[:dias])) }
+    end
+
     # cria contrato arrendamento no bigquery
     # @return [Big] acesso a base dados abank no bigquery
     def ct_cria
@@ -125,9 +226,25 @@ module Abank
 
     private
 
-    # @return [Integer] numero conta movimentos apagar
-    def docnt
-      @docnt ||= opcao[:n] > 3 ? opcao[:n] : 0
+    # @param [Array<Hash>] acc classificadores (cc)
+    # @return [Array<String]> array palavras formatadas
+    def fplo(acc)
+      acc.map { |p| "#{p[:p1]}#{'[' + p[:t1] + ']' unless p[:t1].to_s.empty?}#{'[2:' + p[:p2] + ']' unless p[:p2].to_s.empty?}" }
+    end
+
+    # @param [Array<String>] apl palavras
+    # @param [String] ini pre-texto final
+    # @return [String] palavras juntas filtradas para mostrar
+    def fpls(apl, ini = '')
+      return '' if apl.empty?
+
+      "#{ini}#{apl.join(' ')}"
+    end
+
+    # @param [String] pla palavra
+    # @return [String] palavra formatada para insert
+    def fpli(pla)
+      pla.to_s.empty? ? 'null' : "'#{pla}'"
     end
 
     # @return [Google::Cloud::Bigquery] API bigquery
@@ -135,6 +252,11 @@ module Abank
       @bqapi ||= Google::Cloud::Bigquery.new
     end
 
+    # @return [Integer] numero conta apagar movimentos
+    def contadel
+      @contadel ||= opcao[:n] > 3 ? opcao[:n] : 0
+    end
+
     # @return [String] movimentos a apagar (keysin.mv)
     def mvkys
       @mvkys ||= opcao[:k].to_s.scan(/[-+]?\d+/).map(&:to_i)
@@ -215,10 +337,10 @@ module Abank
 
     # apaga movimentos no bigquery
     def mv_delete_dml
-      if docnt.zero?
+      if contadel.zero?
         dml("delete from #{BD}.mv where #{BD}.ky(dl,dv,ds,vl,nc,ex) IN UNNEST(@kys)", kys: mvkys)
       else
-        dml("delete from #{BD}.mv where nc=@nc", nc: docnt)
+        dml("delete from #{BD}.mv where nc=@nc", nc: contadel)
       end
       puts("MOVIMENTOS APAGADOS #{bqnrs}")
     end

data/lib/abank/folha.rb

@@ -35,7 +35,7 @@ module Abank
 
     # carrega/mostra folha calculo
     def processa_xls
-      puts("\n#{folha.info}")
+      puts("\n#{opcao[:f]}")
       mvs = sql("select * from #{BD}.gmv where nc=@nc", nc: conta).group_by { |m| [m[:dl], m[:vl].to_f] }
       folha.sheet(0).parse(header_search: ['Data Lanc.', 'Data Valor', 'Descrição', 'Valor']) do |r|
         next unless valid?(r.values)
@@ -60,37 +60,47 @@ module Abank
 
     private
 
-    # @return [Roo::Excelx] folha calculo a processar
+    # @return [Roo::Excelx] folha a processar
     def folha
       @folha ||= Roo::Spreadsheet.open(opcao[:f])
     rescue StandardError
       raise("Erro ao abrir a folha de cálculo: #{opcao[:f]}")
     end
 
-    # @return [Integer] obter numero conta a partir das opcoes
-    def fconta
-      return opcao[:n] if opcao[:n] > 2
-
-      opcao[:f].match?(/card/i) ? 2 : 1
+    # @return [Integer] multiplicador valores
+    def sig
+      @sig ||= cartao? ? -1 : 1
     end
 
     # @example
-    #   mov*.xlsx     --> 1 --> conta-corrente
-    #   movCard*.xlsx --> 2 --> conta-cartao
-    #   opcao[:n]     --> 3 --> conta-cash
-    #   opcao[:n]     --> n --> conta-outras
-    # @return [Integer] numero conta associado a folha calculo
+    #   mov*.xlsx     1 --> corrente
+    #   movCard*.xlsx 2 --> cartao
+    #   opcao[:n]     3 --> cash
+    #   opcao[:n]     n --> outras
+    # @return [Integer] numero conta
     def conta
       @conta ||= fconta
     end
 
+    # @return [Boolean] folha cartao credito
+    def cartao?
+      opcao[:f].match?(/card/i)
+    end
+
+    # @return [Integer] obter numero conta
+    def fconta
+      return opcao[:n] if opcao[:n] > 2
+
+      cartao? ? 2 : 1
+    end
+
     # @param [Array] row folha calculo em processamento
     # @return [Boolean] linha com valores correctos para processar?
     def valid?(row)
       return false unless row[0].is_a?(Date) && row[1].is_a?(Date)
 
       row[2] = row[2].to_s.strip.gsub("'", '').gsub('\\', '') # Descrição
-      row[3] = row[3].to_f * (conta == 2 ? -1 : 1) # Valor
+      row[3] = row[3].to_f * sig # Valor
       @rowfc = row
       true
     rescue StandardError => e
@@ -105,7 +115,7 @@ module Abank
 
     # @return [String] novo texto base formatado para display
     def lnexi
-      @mvvls << "('#{rowfc[0].iso8601}','#{dvc.iso8601}','#{rowfc[2]}',#{rowfc[3]},#{conta},#{dvc.year},#{dvc.month},'#{tpc}',#{ctc},null,null)"
+      @mvvls << "('#{rowfc[0].iso8601}','#{dvc.iso8601}','#{rowfc[2]}',#{rowfc[3]},#{conta},#{dvc.year},#{dvc.month},#{ctc},null,null)"
       "#{lbase} NOVO"
     end
 
@@ -143,10 +153,5 @@ module Abank
       cmv = opcao[:g].to_s
       cmv.empty? ? 'null' : "'#{cmv}'"
     end
-
-    # @return [String] tipo movimento c[redito] ou d[ebito]
-    def tpc
-      rowfc[3].positive? ? 'c' : 'd'
-    end
   end
 end

data/lib/abank/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abank
-  VERSION = '0.7.1'
+  VERSION = '0.7.3'
 end

data/lib/abank.rb

@@ -18,60 +18,105 @@ module Abank
       Big.new(options.to_h).mv_classifica.ct_dados.re_insert
     end
 
-    desc 'apagamv', 'apaga movimentos keys|conta'
+    desc 'amv', 'apaga movimentos keys|conta'
     option :k, banner: 'KEY[,KEY...]', default: '', desc: 'keys movimentos apagar'
     option :n, banner: 'CONTA', type: :numeric, default: 0, desc: 'conta movimentos apagar (>3 outras)'
     # apaga movimentos
-    def apagamv
+    def amv
       Big.new(options.transform_keys(&:to_sym)).mv_delete.ct_dados.re_insert
     end
 
-    desc 'apagact', 'apaga contrato arrendamento'
-    option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
+    desc 'sct', 'mostra contrato arrendamento'
+    option :c, banner: 'CONTRATO', required: true, desc: 'identificador contrato arrendamento'
+    option :t, type: :boolean, default: true, desc: 'mostra todas as rendas?'
+    # mostra contrato arrendamento
+    def sct
+      Big.new(options.transform_keys(&:to_sym)).ct_mostra
+    end
+
+    desc 'act', 'apaga contrato arrendamento'
+    option :c, banner: 'CONTRATO', required: true, desc: 'identificador contrato arrendamento'
     option :t, type: :boolean, default: false,     desc: 'apaga todas as rendas?'
     # apaga contrato arrendamento
-    def apagact
+    def act
       Big.new(options.transform_keys(&:to_sym)).ct_apaga
     end
 
-    desc 'criact', 'cria contrato arrendamento'
-    option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
+    desc 'cct', 'cria contrato arrendamento'
+    option :c, banner: 'CONTRATO', required: true, desc: 'identificador contrato arrendamento'
     option :d, banner: 'DATA', default: '',        desc: 'data contrato arrendamento'
     option :t, type: :boolean, default: true,      desc: 'cria todas as rendas?'
     # cria contrato arrendamento
-    def criact
+    def cct
       Big.new(options.transform_keys(&:to_sym)).ct_cria
     end
 
-    desc 'recriact', 'atualiza rendas de contrato arrendamento'
-    option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
+    desc 'rct', 'atualiza rendas de contrato arrendamento'
+    option :c, banner: 'CONTRATO', required: true, desc: 'identificador contrato arrendamento'
     # atualiza rendas de contrato arrendamento
-    def recriact
+    def rct
       opc = options[:c]
       Big.new(c: opc, t: false).ct_apaga
       Big.new(c: opc, t: true).ct_cria
     end
 
-    desc 'recriare', 'atualiza rendas dos contratos ativos'
+    desc 'rre', 'atualiza rendas dos contratos ativos'
     # atualiza rendas dos contratos ativos
-    def recriare
+    def rre
       Big.new.re_atualiza
     end
 
-    desc 'work', 'carrega/apaga dados da folha calculo'
+    desc 'ccc', 'cria classificador'
+    option :c, banner: 'TAG', required: true, desc: 'identificador classificacao'
+    option :p1, banner: 'P1s', required: true, type: :array, desc: 'array palavras p1'
+    option :p2, banner: 'P2s', default: [], type: :array, desc: 'array palavras p2'
+    option :t1, banner: 'T1s', default: [], type: :array, desc: 'array traducoes t1'
+    # cria classificador
+    def ccc
+      Big.new(options.transform_keys(&:to_sym)).cc_cria.mv_classifica.ct_dados.re_insert
+    end
+
+    desc 'acc', 'apaga classificador'
+    option :c, banner: 'TAG', required: true, desc: 'identificador classificacao'
+    option :t, type: :boolean, default: false, desc: 're-classifica movimentos?'
+    option :p1, banner: 'P1s', default: [], type: :array, desc: 'array palavras p1'
+    option :p2, banner: 'P2s', default: [], type: :array, desc: 'array palavras p2'
+    # apaga classificador
+    def acc
+      Big.new(options.transform_keys(&:to_sym)).cc_apaga.mv_classifica.ct_dados.re_insert
+    end
+
+    desc 'scc', 'mostra classificador'
+    option :c, banner: 'TAG', default: '', desc: 'identificador classificacao'
+    option :p1, banner: 'P1s', default: [], type: :array, desc: 'array palavras p1'
+    option :p2, banner: 'P2s', default: [], type: :array, desc: 'array palavras p2'
+    # mostra classificador
+    def scc
+      Big.new(options.transform_keys(&:to_sym)).cc_show
+    end
+
+    desc 'smc', 'mostra dados movimentos classificacao'
+    option :c, banner: 'TAG', default: '', desc: 'identificador classificacao'
+    option :n, banner: 'LIMIT', type: :numeric, default: 20, desc: 'numero movimentos a mostrar'
+    # mostra dados classificacao
+    def smc
+      Big.new(options.transform_keys(&:to_sym).merge(p1: [], p2: [])).mc_show
+    end
+
+    desc 'work', 'carrega/apaga dados folha calculo'
     option :s, type: :boolean, default: false, desc: 'apaga movimento similar (=data,=valor,<>descricao)'
     option :e, type: :boolean, default: false, desc: 'apaga movimento igual'
     option :n, banner: 'CONTA', type: :numeric, default: 0, desc: 'conta destino (0 auto,1 corrente,2 cartao,3 chash,> outras)'
     option :v, banner: 'DATA', default: '',    desc: 'data lancamento para movimentos a carregar'
     option :g, banner: 'TAG',  default: '',    desc: 'classificacao para movimentos a carregar'
-    # carrega/apaga dados da folha calculo
+    # carrega/apaga dados folha calculo
     def work
       Dir.glob("#{DR}/*.xlsx").each do |file|
         Folha.new(options.transform_keys(&:to_sym).merge(f: file, i: true)).processa_xls
       end
     end
 
-    desc 'show', 'mostra dados da folha calculo'
+    desc 'show', 'mostra dados folha calculo'
     option :n, banner: 'CONTA', type: :numeric, default: 0, desc: 'conta destino (0 auto,1 corrente,2 cartao,3 chash,> outras)'
     # mostra folha calculo
     def show

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: abank
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 bindir: exe
 cert_chain: []
-date: 2025-03-14 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler