abank 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cdbf5848f71477ac0335fce39e8b98eec16ec5fbf0cce20d71d45100759779d
-  data.tar.gz: 0ca9a3cd18bbe22522695bb6de305bb238c5f9bf9166e8f3b1a8bf65258a58c3
+  metadata.gz: 18f8a44c8a32fc138ee5184b0bab2b57608041f74960cba12061cd4e00294e21
+  data.tar.gz: a0278c5241cbed5417f1be08bf7fe0c9f7dd3957c6e059866d5eec2fd5f1512d
 SHA512:
-  metadata.gz: e613799e22925d9ab3af9ff414c6a5b66e8d37f4deb56c2a86cadd032a4ae62bb3fee6e4ec62c54490b9dd8f3626f54dd5407272aa9796354010b149e014acff
-  data.tar.gz: cb51cb9d37401a738ac8a83b294f24e48bc7a89ea06dc885d4b72ca5ddd09a05d521a049d878456e48880ffeb80303daf10c44eb0fa537e392e214667b69f4f1
+  metadata.gz: ad0df9fa07cbacf1e63bf02863d912ce4ebbe963ae3dece73c3d5f61ff07552d848f6625891d7a600452ddc97faf8a816bc69a61099380c359b5f4b0d13ff9f8
+  data.tar.gz: bcb08fcba8e4299d3e87d35cc814c5bda1781c98e0f866fba9f4f9017e5ae33e45c307380747f8916d9ab3565c160f84aad3c6056b15183e60ffc9ffba5bbe1c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abank (0.7.1)
+    abank (0.7.2)
       google-cloud-bigquery
       roo
       thor
@@ -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)

data/lib/abank/big.rb

@@ -41,14 +41,14 @@ 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
@@ -125,16 +125,16 @@ module Abank
 
     private
 
-    # @return [Integer] numero conta movimentos apagar
-    def docnt
-      @docnt ||= opcao[:n] > 3 ? opcao[:n] : 0
-    end
-
     # @return [Google::Cloud::Bigquery] API bigquery
     def bqapi
       @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 +215,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.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abank
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz