abank 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919ed7397ffc15a6ff4f0f99865da47b8a090f6bf838798f1ca122e667e7f0a2
-  data.tar.gz: cf1d5cc84cc1bbc765969e183ff4cda28c70ca19de7a9c59c95da56ca3e41830
+  metadata.gz: d761d5fef0e23fff5c5b9f8b8fe7fcc20d763da37a1e2e0739ee67dc8fa944d1
+  data.tar.gz: 974801c5d97d31803a390bcc2b2f58ee83bd327faa9ae2307a7a6673e033915e
 SHA512:
-  metadata.gz: d7bb91bb62ec11e4051d06e4b007dec13a3f6cd904da1cdc7c1096c07e6b95676f756f8cac5faee0dc732f4f2abf50f7fe72760efcf82e909743f64f4dcf182e
-  data.tar.gz: 9750de979e437b44cf210b9245bb22b91b39d289049a84f373ab714632d4ab6c15e55688a17c8d8b8c61df8a4add2663cc8b9b3b606986a888152ebc5ada9d2d
+  metadata.gz: 9abd56522474b5c67ec18b690ec81a195b97dec3591549c241266d94467713d20e6f30c2b34dae2d833ab9751fc73ab022114adc13221573e40a69f736f93a6f
+  data.tar.gz: 4c7386cf7f96b3aacee3b5a79f2f6101ae3f07f6df77016df3202a2944886e53f068e948e742acf74760446871daecd2e57686821d69223e7549d08ebcf5cf2c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abank (0.4.5)
+    abank (0.4.7)
       google-cloud-bigquery
       roo
       thor
@@ -57,7 +57,7 @@ GEM
       net-http (>= 0.5.0)
     google-apis-bigquery_v2 (0.83.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-core (0.15.1)
+    google-apis-core (0.16.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
       httpclient (>= 2.8.3, < 3.a)

data/lib/abank/big.rb

@@ -119,6 +119,7 @@ module Abank
       ctlct.map! do |ctr|
         opcao[:c] = ctr[:ct]
         lre = sql(sql_last_re)[0]
+        lre[:dl] += -1 if lre[:cnt] == 0
         ctr.merge(lre, mv: sql(sql_novo_mv(lre[:dl])))
       end
       self
@@ -151,14 +152,14 @@ module Abank
 
     # @return [String] sql para obter ultima renda do contrato arrendamento
     def sql_last_re
-      'select ct,DATE_SUB(DATE_SUB(dl,INTERVAL dias DAY),INTERVAL IF(cnt=0,0,cnt-1) MONTH) dc,ano,cnt,dl'\
-            ',CAST(REGEXP_EXTRACT(ct,r"\d+") as numeric)/100 vr '\
-        "from #{BD}.re where ct='#{opcao[:c]}' order by ano desc,cnt desc limit 1"
+      'select r1.ct,r0.dl dc,r1.ano,r1.cnt,r1.dl,CAST(REGEXP_EXTRACT(r1.ct,r"\d+") as numeric)/100 vr '\
+        "from #{BD}.re r1 join hernanilr.ab.re r0 on (r0.ct=r1.ct and r0.cnt=0)"\
+      " where r1.ct='#{opcao[:c]}' order by r1.ano desc,r1.cnt desc limit 1"
     end
 
     # @return [String] sql para obter movimentos novos (depois da ultima renda do contrato arrendamento)
     def sql_novo_mv(mdl)
-      "select dl,vl from #{BD}.mv where ct='#{opcao[:c]}' and dl>='#{(mdl + 1).strftime(DF)}' order by dl,dv"
+      "select dl,vl from #{BD}.mvgem where ct='#{opcao[:c]}' and dl>='#{(mdl + 1).strftime(DF)}' order by dl,dv"
     end
 
     # @return [String] sql para obter dados do inicio contrato arrendamento
@@ -225,7 +226,7 @@ module Abank
     def re_proximos_dados
       # valor renda paga retirada do movimento
       re_atual_mv[:vl] -= re_atual[:vr]
-      dre = cnt.zero? ? Date.new(ano, 1, 1) : Date.new(ano, cnt, 1) >> 1
+      dre = cnt.zero? ? Date.new(re_atual[:dc].year, re_atual[:dc].month, 1) : Date.new(ano, cnt, 1) >> 1
       re_atual.merge!(ano: dre.year, cnt: dre.month)
     end
 
@@ -262,7 +263,7 @@ module Abank
 
     # @return [Integer] dias atraso/antecipo neste pagamento renda
     def dias
-      re_atual_mv[:dl].mjd - (Date.new(ano, cnt, 1) >> (re_atual[:dc].month - 1)).mjd
+      re_atual_mv[:dl].mjd - Date.new(ano, cnt, 1).mjd
     end
 
     # @param [String] cmd comando a executar

data/lib/abank/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abank
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler