abank 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c8f2e23f108186002062bd359c2cf0337482d047aa3a99403246ca422f6cb41
-  data.tar.gz: 8fab5a499cc2def4cfa33ff0b390057420235a6570629190e7e0e4982788012f
+  metadata.gz: f4fa823dd3a80abdd91cd205a521b1f00ab236cfd91150a16e1a85ac62af10b3
+  data.tar.gz: a138ebd1ba1cf321429c5d65d219ccaf7549c8489c6ca3d4cf043f026e15a0aa
 SHA512:
-  metadata.gz: a93348dc58a5d01eae3e07dc2d05038da4d471f31be24c010c66ec95ebbdc978b203312278cfc8f78c0a2f08934f660ce38a827bd036634de3cc3dd11d2db668
-  data.tar.gz: bbf052744b6fc95ad1c7ed1febd165435d1b099ca48b0bdc183f6015696456b9433d386ce5dffc465ed387ac82e117028ef3e7081c3ba3108d25575f69a243f6
+  metadata.gz: e8429fbe87e9fbeb10e64b55e3fd0b42b3e84d9e9305532663ff8991d0716185bce299ce23362fb2de7c35c26584ea37556c3a816945c2fff89367d48cc04b27
+  data.tar.gz: 25279212f35408690c174205720fed6d6a9641ae8cdb78ed4d63eeab2767933dd940b95493d2bbb164a82c1c6719caf405099641566118efaf21e2501cb9f78d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abank (0.1.8)
+    abank (0.1.9)
       google-cloud-bigquery
       roo
       thor

data/README.md

@@ -1,6 +1,6 @@
 # Abank [![Build Status](https://travis-ci.com/hernanirvaz/abank.svg?branch=master)](https://travis-ci.com/hernanirvaz/abank)
 
-Arquiva conta-corrente.xlsx, conta-cartao.xlsx no bigquery. Pode apagar movimentos similares/existentes ja no bigquery. Pode ainda classificar movimentos ja no bigquery.
+Arquiva movimentos conta-corrente, conta-cartao do activobank no bigquery. Permite apagar movimentos similares/existentes ja no bigquery. Permite ainda classificar movimentos ja no bigquery.
 
 ## Installation
 
@@ -31,15 +31,6 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/abank. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/abank/blob/master/CODE_OF_CONDUCT.md).
-
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Abank project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/abank/blob/master/CODE_OF_CONDUCT.md).

data/lib/abank.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'abank/version'
 require 'abank/bigquery'
 require 'abank/folhacalculo'
+require 'abank/version'
 
+# @author Hernani Rodrigues Vaz
 module Abank
   ID = `whoami`.chomp
 
@@ -18,15 +19,16 @@ module Abank
     option :x, banner: 'EXT', default: '.xlsx',
                desc: 'Extensao das folhas calculo'
     option :s, type: :boolean, default: false,
-               desc: 'apaga linhas similares no bigquery'
+               desc: 'apaga linha similar no bigquery'
     option :e, type: :boolean, default: false,
-               desc: 'apaga linhas existentes no bigquery'
-    # processa xlsx
+               desc: 'apaga linha igual no bigquery'
+    option :m, type: :boolean, default: false,
+               desc: 'apaga linhas existencia multipla no bigquery'
+    # processa folha calculo
     def load
-      # opcoes apagar linhas
-      d = options.select { |_, v| [true, false].include?(v) }
       Dir.glob("#{options[:d]}/*#{options[:x]}").sort.each do |f|
-        Bigquery.new(f, d).processa
+        Bigquery.new(f, { s: options[:s], e: options[:e],
+                          m: options[:m], i: true }).processa
       end
     end
 
@@ -35,17 +37,17 @@ module Abank
                desc: 'Onde procurar folhas calculo'
     option :x, banner: 'EXT', default: '.xlsx',
                desc: 'Extensao das folhas calculo'
-    # mostra xlsx
+    # mostra folha calculo
     def mostra
       Dir.glob("#{options[:d]}/*#{options[:x]}").sort.each do |f|
-        Bigquery.new(f).show
+        Bigquery.new(f).processa
       end
     end
 
     desc 'classifica', 'classifica arquivo no bigquery'
-    # classifica bigquery
+    # classifica arquivo no bigquery
     def classifica
-      Bigquery.new.sql_update
+      Bigquery.new.classifica
     end
 
     default_task :mostra

data/lib/abank/bigquery.rb

@@ -6,45 +6,47 @@ require 'google/cloud/bigquery'
 module Abank
   DF = '%Y-%m-%d'
 
-  # folhas calculo comuns no bigquery
+  # (see Bigquery)
   class Bigquery
+    # @return [Google::Cloud::Bigquery] API bigquery
+    attr_reader :apibq
     # @return [Roo::Excelx] folha calculo a processar
-    attr_reader :book
+    attr_reader :folha
+    # @return [Hash<Symbol, Boolean>] opcoes trabalho com linhas
+    attr_reader :linha
+    # @return [Integer] numero conta
+    attr_reader :conta
+
     # @return [Array] row folha calculo em processamento
     attr_reader :row
-    # @return [Google::Cloud::Bigquery] API bigquery
-    attr_reader :api
     # @return [Google::Cloud::Bigquery::QueryJob] job bigquery
     attr_reader :job
     # @return (see sql_select)
     attr_reader :sql
-    # @return [Integer] numero conta
-    attr_reader :num
-    # @return [Hash<String, Boolean>] opcoes apagar linhas
-    attr_reader :apaga
 
-    # permite processa folhas calculo comuns no bigquery
-    #
     # @param [String] xls folha calculo para processar
-    # @param [Hash<String, Boolean>] apaga opcoes apagar linhas
-    # @option apaga [Boolean] s apaga linhas similares sim/nao?
-    # @option apaga [Boolean] e apaga linhas existentes sim/nao?
-    # @return [Bigquery] acesso folha calculo & bigquery
-    def initialize(xls = '', apaga = {})
-      @book = Roo::Spreadsheet.open(xls) if xls.size.positive?
-      @num = xls.match?(/card/i) ? 2 : 1
-      @apaga = apaga
+    # @param [Hash<Symbol, Boolean>] ops opcoes trabalho com linhas
+    # @option ops [Boolean] :s (false) apaga linha similar?
+    # @option ops [Boolean] :e (false) apaga linha igual?
+    # @option ops [Boolean] :m (false) apaga linhas existencia multipla?
+    # @option ops [Boolean] :i (false) insere linha nova?
+    # @return [Bigquery] acesso folhas calculo activobank
+    #  & correspondente bigquery dataset
+    def initialize(xls = '', ops = { s: false, e: false, m: false, i: false })
       # usa env GOOGLE_APPLICATION_CREDENTIALS para obter credentials
       # @see https://cloud.google.com/bigquery/docs/authentication/getting-started
-      @api = Google::Cloud::Bigquery.new
+      @apibq = Google::Cloud::Bigquery.new
+      @folha = Roo::Spreadsheet.open(xls) if xls.size.positive?
+      @linha = ops
+      @conta = xls.match?(/card/i) ? 2 : 1
     end
 
     # cria job bigquery & verifica execucao
     #
-    # @param [String] sql para executar
+    # @param [String] sql a executar
     # @return [Boolean] job ok?
     def job_bigquery?(sql)
-      @job = api.query_job(sql)
+      @job = apibq.query_job(sql)
       @job.wait_until_done!
       puts @job.error['message'] if @job.failed?
       @job.failed?
@@ -58,39 +60,50 @@ module Abank
       job_bigquery?(sql) ? 0 : job.num_dml_affected_rows
     end
 
-    # cria sql job bigquery com resultados
+    # pesquisa existencia linha folha calculo no bigquery
     #
-    # @return [Array<Hash>] resultado sql
+    # @return [Google::Cloud::Bigquery::Data] resultado do sql num array<hash>
     def sql_select
-      # se array.count > 1 => nao fazer nada
+      # array.count = 0 ==> pode carregar esta linha
+      # array.count = 1 ==> mais testes necessarios
+      # array.count > 1 ==> nao carregar esta linha
       @sql = job_bigquery?('select * ' + sql_where) ? [{}, {}] : job.data
     end
 
     # @return [String] parte sql para processamento linhas similares
     def sql_where
-      "from ab.mv where nc=#{num}" \
+      "from hernanilr.ab.mv where nc=#{conta}" \
       " and dl='#{row[0].strftime(DF)}'" \
       " and vl=#{row[3]}"
     end
 
-    # classifica linhas
-    def sql_update
+    # (see CLI#classifica)
+    def classifica
+      return unless linha[:i]
+
       puts 'LINHAS CLASSIFICADAS ' +
-           dml('update ab.mv set mv.ct=tt.nct' \
-               ' from (select * from ab.cl) as tt ' \
-               'where mv.dl=tt.dl and mv.dv=tt.dv' \
-               ' and mv.ds=tt.ds and mv.vl=tt.vl').to_s
+           dml('update hernanilr.ab.mv set mv.ct=tt.nct' \
+               '  from (select * from hernanilr.ab.cl) as tt' \
+               ' where mv.dl=tt.dl and mv.dv=tt.dv' \
+               '   and mv.ds=tt.ds and mv.vl=tt.vl').to_s
     end
 
     # @return [Integer] numero linhas inseridas
     def sql_insert
-      dml('insert ab.mv(dl,dv,ds,vl,nc,ano,mes,ct,tp) VALUES(' \
-        "'#{row[0].strftime(DF)}','#{row[1].strftime(DF)}','#{row[2]}'," \
-        "#{row[3]},#{num}" + sql_insert_calculado)
+      return 1 unless linha[:i]
+
+      dml('insert hernanilr.ab.mv(dl,dv,ds,vl,nc,ano,mes,ct,tp) VALUES(' \
+        "'#{row[0].strftime(DF)}','#{row[1].strftime(DF)}','#{row[2]}'" +
+        str_insert1)
+    end
+
+    # @return [String] campos extra da linha bigquery
+    def str_insert1
+      ",#{row[3]},#{conta}" + str_insert2
     end
 
     # @return [String] campos calculados da linha bigquery
-    def sql_insert_calculado
+    def str_insert2
       ",#{row[1].year},#{row[1].month},null,'#{row[3].positive? ? 'c' : 'd'}')"
     end
 

data/lib/abank/folhacalculo.rb

@@ -4,60 +4,41 @@ module Abank
   HT = ['Data Lanc.', 'Data Valor', 'Descrição', 'Valor'].freeze
   RF = '%<v3>-50.50s %<v4>8.2f'
 
-  # folhas calculo comuns no bigquery
+  # classifica & arquiva dados das folhas calculo activobank no bigquery
   class Bigquery
-    # prepara linha folha calculo para processamento
+    # corrige linha folha calculo para processamento
     #
     # @param [Hash] has da linha em processamento
     def corrige_hash(has)
       @row = has.values
       @row[2] = row[2].strip
-      @row[3] = -1 * row[3] if num > 1
+      @row[3] = -1 * row[3] if conta > 1
     end
 
-    # processa linhas folha calculo
+    # processa linhas folha calculo & classifica bigquery
     def processa
       n = 0
-      # usada somente a primeira sheet
-      book.sheet(0).parse(header_search: HT) do |r|
+      folha.sheet(0).parse(header_search: HT) do |r|
         n += 1
-        puts n == 1 ? "\n" + book.info : processa_row(r)
-      end
-      sql_update
-    end
-
-    # mostra linhas folha calculo
-    def show
-      n = 0
-      # usada somente a primeira sheet
-      book.sheet(0).parse(header_search: HT) do |r|
-        n += 1
-        puts n == 1 ? "\n" + book.info : show_row(r)
+        puts n == 1 ? "\n" + folha.info : processa_row(r)
       end
+      classifica
     end
 
     # processa linha folha calculo para arquivo
     #
     # @param (see corrige_hash)
-    # @return [String] linha folha calculo processada
+    # @return [String] texto informativo do processamento
     def processa_row(has)
       corrige_hash(has)
       sql_select
-      if rnaoexiste? then row_str + (sql_insert == 1 ? ' NOVA' : ' ERRO')
-      elsif rsimila? then row_similar
-      elsif rexiste? then row_existente
+      if row_naoexiste? then row_str + (sql_insert == 1 ? ' NOVA' : ' ERRO')
+      elsif row_simila? then row_similar
+      elsif row_existe? then row_existente
+      else                   row_multiplas
       end
     end
 
-    # obtem linha folha calculo para apresentacao
-    #
-    # @param (see corrige_hash)
-    # @return (see row_str)
-    def show_row(has)
-      corrige_hash(has)
-      row_str
-    end
-
     # @return [String] linha folha calculo formatada
     def row_str
       "#{row[0].strftime(DF)} #{row[1].strftime(DF)} " \
@@ -66,28 +47,40 @@ module Abank
 
     # @return [String] linha folha calculo similar
     def row_similar
-      d = apaga['s'] ? sql_delete : 0
-      row_str + " SIMILAR#{d.zero? ? ' ' : ' APAGADA '}#{sql.first[:ds].strip}"
+      d = linha[:s] ? sql_delete : 0
+      row_str + ' SIMILAR' + str_apagadas(d) + sql.first[:ds].strip
     end
 
     # @return [String] linha folha calculo existente
     def row_existente
-      d = apaga['e'] ? sql_delete : 0
-      row_str + " EXISTENTE#{d.zero? ? '' : ' APAGADA'}"
+      d = linha[:e] ? sql_delete : 0
+      row_str + ' EXISTENTE' + str_apagadas(d)
+    end
+
+    # @return [String] linha folha calculo existencia multipla
+    def row_multiplas
+      d = linha[:m] ? sql_delete : 0
+      row_str + ' MULTIPLAS ' + sql.count.to_s + str_apagadas(d)
+    end
+
+    # @param [Integer] numero linhas apagadas
+    # @return [String] texto formatado linhas apagadas
+    def str_apagadas(num)
+      num.positive? ? ' & ' + num.to_s + ' APAGADA(S) ' : ' '
     end
 
     # @return [Boolean] linha folha calculo nao existe no bigquery?
-    def rnaoexiste?
+    def row_naoexiste?
       sql.count.zero?
     end
 
     # @return [Boolean] linha folha calculo existe no bigquery?
-    def rexiste?
+    def row_existe?
       sql.count == 1 && sql.first[:ds].strip == row[2]
     end
 
-    # @return [Boolean] linha folha calculo parecida no bigquery?
-    def rsimila?
+    # @return [Boolean] linha folha calculo existe parecida no bigquery?
+    def row_simila?
       sql.count == 1 && sql.first[:ds].strip != row[2]
     end
   end

data/lib/abank/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abank
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at hernanirvaz@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [https://contributor-covenant.org/version/1/4][version]
-
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/