br_danfe 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6957c52fda8133d7dbb9ddf4ae9f29f20bb45bb6ec41127c546ae93bd2221f2c
-  data.tar.gz: 2b5031a95eb542e75f457723dee23d193f8f3407d22ba26dd85ded6400f55c35
+  metadata.gz: 262bed0c378422071afeb0a12ce50e4c4f4a5633266dd7893f2d0c280316a55e
+  data.tar.gz: 412bdf1269d5d8c542d1ce5504e3b219621215da71019c3e37b0441ddb06d28f
 SHA512:
-  metadata.gz: 5ec5cf3a1c2ded1acc9c010c440328052a6a9660f1aaddd0bf1dcd1b1ea7ddd42f356ca433462743bb2f5443d75fd383f91d8aba8437f8fbc183f24c78a4f017
-  data.tar.gz: 49b1f817299513b9ba693b2b19bb0d23971578c433193e980824046ae9900a69d63207b422f93046d9c68dba14874a9414c8e8039598baf6c478fce8f384cc9f
+  metadata.gz: 811c26b219e61e7a125e9c212ee3750c3ab6016ae6937456397acafd9dce1a03da762f2f50b645b8784ed6c6f8334159933f9aae7b681857e9b439816936cc51
+  data.tar.gz: f396a32db9d675a68b87d62aa12d412e73930251c6278d3361cd34db6b7ba7a76048f4c8250335663dca19bac263dddde56f1a6a7506855469a8b715d09daa13

data/.github/workflows/config.yml

@@ -38,12 +38,10 @@ jobs:
           bundler-cache: true
 
       - run: |
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            chmod +x ./cc-test-reporter
+            curl https://qlty.sh | sh
 
       - run: |
-            ./cc-test-reporter before-build
             bundle exec rspec
-            ./cc-test-reporter after-build -r $CC_TEST_REPORTER_ID --exit-code $?
+            ~/.qlty/bin/qlty coverage publish coverage/coverage.json
         env:
-           CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
+           QLTY_COVERAGE_TOKEN: ${{secrets.QLTY_COVERAGE_TOKEN}}

data/Gemfile

@@ -14,4 +14,5 @@ group :development, :test do
   gem 'rubocop-rspec', '~> 2.25.0'
   gem 'simplecov', '0.22.0'
   gem 'simplecov-html', '0.13.1'
+  gem 'simplecov-json', '0.2.3'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    br_danfe (2.0.0)
+    br_danfe (2.1.0)
       barby (= 0.6.9)
       br_documents (>= 0.1.3)
       i18n (>= 0.8.6)
@@ -164,6 +164,9 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.1)
+    simplecov-json (0.2.3)
+      json
+      simplecov
     simplecov_json_formatter (0.1.4)
     thor (1.3.2)
     ttfunk (1.8.0)
@@ -190,6 +193,7 @@ DEPENDENCIES
   rubocop-rspec (~> 2.25.0)
   simplecov (= 0.22.0)
   simplecov-html (= 0.13.1)
+  simplecov-json (= 0.2.3)
 
 BUNDLED WITH
    2.5.5

data/config/locales/pt-BR.yml

@@ -47,7 +47,8 @@ pt-BR:
       IM: "INSCRIÇÃO MUNICIPAL"
       IE: "INSCRIÇÃO ESTADUAL"
       IEST: "INSC.ESTADUAL DO SUBST. TRIBUTÁRIO"
-      CNPJ: "CNPJ"
+      CNPJ: "CNPJ/CPF"
+      CPF: "CNPJ/CPF"
     dup:
       title: "FATURA / DUPLICATAS"
       nDup: "NRO"
@@ -146,8 +147,8 @@ pt-BR:
         document: "NF-e\nN°. %{nNF}\nSÉRIE %{serie}"
     entrega:
       title: "INFORMAÇÕES DO LOCAL DE ENTREGA"
-      CNPJ: "CNPJ"
-      CPF:  "CPF"
+      CNPJ: "CNPJ/CPF"
+      CPF:  "CNPJ/CPF"
       xNome: "NOME/RAZÃO SOCIAL"
       xLgr: "ENDEREÇO"
       nro: "NÚMERO"

data/lib/br_danfe/danfe_lib/nfe_lib/dest.rb

@@ -34,16 +34,8 @@ module BrDanfe
         end
 
         def render_cnpj_cpf
-          if @xml['dest/CNPJ'] == ''
-            @pdf.i18n_lbox LINE_HEIGHT, 4.37, 12.57, @l1, 'dest.CPF', cpf
-          else
-            @pdf.lcnpj LINE_HEIGHT, 4.37, 12.57, @l1, @xml, 'dest/CNPJ'
-          end
-        end
-
-        def cpf
-          cpf = BrDocuments::CnpjCpf::Cpf.new(@xml['dest/CPF'])
-          cpf.formatted
+          xpath = @xml['dest/CNPJ'].present? ? 'dest/CNPJ' : 'dest/CPF'
+          @pdf.lcnpj_cpf LINE_HEIGHT, 4.37, 12.57, @l1, @xml, xpath
         end
 
         def render_line2

data/lib/br_danfe/danfe_lib/nfe_lib/document.rb

@@ -64,12 +64,12 @@ module BrDanfe
           i18n_lbox(h, w, x, y, i18n, data, options)
         end
 
-        def lcnpj(h, w, x, y, xml, xpath, options = {})
+        def lcnpj_cpf(h, w, x, y, xml, xpath, options = {})
           i18n = xpath.tr('/', '.')
-
-          cnpj = BrDocuments::CnpjCpf::Cnpj.new(xml[xpath])
-          data = if cnpj.valid?
-                   cnpj.formatted
+          document_class = xpath.include?('CNPJ') ? BrDocuments::CnpjCpf::Cnpj : BrDocuments::CnpjCpf::Cpf
+          cnpj_cpf = document_class.new(xml[xpath])
+          data = if cnpj_cpf.valid?
+                   cnpj_cpf.formatted
                  else
                    ''
                  end

data/lib/br_danfe/danfe_lib/nfe_lib/emit_header.rb

@@ -108,7 +108,15 @@ module BrDanfe
 
           @pdf.lie LINE_HEIGHT, 6.36, 0.75, y_second_line, @xml, 'enderEmit/UF', 'emit/IE'
           @pdf.lie LINE_HEIGHT, 6.86, 7.11, y_second_line, @xml, 'enderDest/UF', 'emit/IEST'
-          @pdf.lcnpj LINE_HEIGHT, 6.34, 13.97, y_second_line, @xml, 'emit/CNPJ'
+          @pdf.lcnpj_cpf LINE_HEIGHT, 6.34, 13.97, y_second_line, @xml, cnpj_cpf
+        end
+
+        def cnpj_cpf
+          if @xml['emit/CNPJ'].present?
+            'emit/CNPJ'
+          else
+            'emit/CPF'
+          end
         end
       end
     end

data/lib/br_danfe/danfe_lib/nfe_lib/entrega.rb

@@ -39,16 +39,8 @@ module BrDanfe
         end
 
         def render_cnpj_cpf
-          if @xml['entrega/CNPJ'] == ''
-            @pdf.i18n_lbox LINE_HEIGHT, 4.37, 12.57, @l1, 'entrega.CPF', cpf
-          else
-            @pdf.lcnpj LINE_HEIGHT, 4.37, 12.57, @l1, @xml, 'entrega/CNPJ'
-          end
-        end
-
-        def cpf
-          cpf = BrDocuments::CnpjCpf::Cpf.new(@xml['entrega/CPF'])
-          cpf.formatted
+          xpath = @xml['entrega/CNPJ'].present? ? 'entrega/CNPJ' : 'entrega/CPF'
+          @pdf.lcnpj_cpf LINE_HEIGHT, 4.37, 12.57, @l1, @xml, xpath
         end
 
         def render_line2

data/lib/br_danfe/danfe_lib/nfe_lib/transp.rb

@@ -25,7 +25,7 @@ module BrDanfe
           @pdf.lbox LINE_HEIGHT, 1.78, 12.06, @l1, @xml, 'veicTransp/RNTC'
           @pdf.i18n_lbox LINE_HEIGHT, 2.29, 13.84, @l1, 'veicTransp.placa', plate
           @pdf.lbox LINE_HEIGHT, 0.76, 16.13, @l1, @xml, 'veicTransp/UF'
-          @pdf.lcnpj LINE_HEIGHT, 3.44, 16.89, @l1, @xml, 'transporta/CNPJ'
+          @pdf.lcnpj_cpf LINE_HEIGHT, 3.44, 16.89, @l1, @xml, 'transporta/CNPJ'
           @pdf.lbox LINE_HEIGHT, 8.52, 0.75, @l2, @xml, 'transporta/xEnder'
           @pdf.lbox LINE_HEIGHT, 6.86, 9.27, @l2, @xml, 'transporta/xMun'
           @pdf.lbox LINE_HEIGHT, 0.76, 16.13, @l2, @xml, 'transporta/UF'

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/spec/br_danfe/danfe_lib/nfe_lib/document_spec.rb

@@ -114,7 +114,7 @@ describe BrDanfe::DanfeLib::NfeLib::Document do
     end
   end
 
-  describe '#lcnpj' do
+  describe '#lcnpj_cpf' do
     before do
       subject.render
       FileUtils.rm_f(output_pdf)
@@ -138,10 +138,10 @@ describe BrDanfe::DanfeLib::NfeLib::Document do
       it 'renders a box with a formated CNPJ to the pdf' do
         expect(File.exist?(output_pdf)).to be_falsey
 
-        subject.lcnpj 0.80, 3.94, 0.75, 1.85, xml, 'transporta/CNPJ'
+        subject.lcnpj_cpf 0.80, 3.94, 0.75, 1.85, xml, 'transporta/CNPJ'
         subject.render_file output_pdf
 
-        expect("#{base_dir}document#lcnpj-valid.pdf").to have_same_content_of file: output_pdf
+        expect("#{base_dir}document#lcnpj_cpf-valid.pdf").to have_same_content_of file: output_pdf
       end
     end
 
@@ -163,10 +163,10 @@ describe BrDanfe::DanfeLib::NfeLib::Document do
       it 'renders a blank box to the pdf' do
         expect(File.exist?(output_pdf)).to be_falsey
 
-        subject.lcnpj 0.80, 3.94, 0.75, 1.85, xml, 'transporta/CNPJ'
+        subject.lcnpj_cpf 0.80, 3.94, 0.75, 1.85, xml, 'transporta/CNPJ'
         subject.render_file output_pdf
 
-        expect("#{base_dir}document#lcnpj-invalid.pdf").to have_same_content_of file: output_pdf
+        expect("#{base_dir}document#lcnpj_cpf-invalid.pdf").to have_same_content_of file: output_pdf
       end
     end
 
@@ -187,10 +187,10 @@ describe BrDanfe::DanfeLib::NfeLib::Document do
       it 'renders a blank box to the pdf' do
         expect(File.exist?(output_pdf)).to be_falsey
 
-        subject.lcnpj 0.80, 3.94, 0.75, 1.85, xml, 'transporta/CNPJ'
+        subject.lcnpj_cpf 0.80, 3.94, 0.75, 1.85, xml, 'transporta/CNPJ'
         subject.render_file output_pdf
 
-        expect("#{base_dir}document#lcnpj-blank.pdf").to have_same_content_of file: output_pdf
+        expect("#{base_dir}document#lcnpj_cpf-blank.pdf").to have_same_content_of file: output_pdf
       end
     end
   end

data/spec/br_danfe/danfe_lib/nfe_lib/emit_header_spec.rb

@@ -114,5 +114,68 @@ describe BrDanfe::DanfeLib::NfeLib::EmitHeader do
         end
       end
     end
+
+    context 'when emitter has CPF instead of CNPJ' do
+      let(:xml_as_string) do
+        <<~XML
+          <nfeProc xmlns="http://www.portalfiscal.inf.br/nfe" versao="2.00">
+            <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
+              <infNFe Id="NFe25111012345678901234550020000134151000134151" versao="2.00">
+                <ide>
+                  <tpNF>1</tpNF>
+                  <nNF>1</nNF>
+                  <serie>1</serie>
+                  <natOp>Vendas de producao do estabelecimento</natOp>
+                </ide>
+                <emit>
+                  <xNome>Nome do Remetente</xNome>
+                  <CPF>86893723008</CPF>
+                  <IE>526926313553</IE>
+                  <enderEmit>
+                    <xLgr>Rua do Remetente, Casa</xLgr>
+                    <nro>123</nro>
+                    <xBairro>Bairro do Remetente</xBairro>
+                    <xMun>SAO PAULO</xMun>
+                    <UF>SP</UF>
+                    <CEP>12345678</CEP>
+                    <fone>1112345678</fone>
+                    <email>foo@bar.com</email>
+                  </enderEmit>
+                </emit>
+                <det nItem="1">
+                  <prod>
+                    <detExport>
+                      <exportInd>
+                        <chNFe>41211285493849000105550020000027171182910239</chNFe>
+                      </exportInd>
+                    </detExport>
+                  </prod>
+                </det>
+              </infNFe>
+            </NFe>
+            <protNFe xmlns="http://www.portalfiscal.inf.br/nfe" versao="2.00">
+              <infProt Id="ID325110012866320">
+                <chNFe>25111012345678901234550020000134151000134151</chNFe>
+                <dhRecbto>2011-10-29T14:37:09</dhRecbto>
+                <nProt>325110012866320</nProt>
+              </infProt>
+            </protNFe>
+          </nfeProc>
+        XML
+      end
+
+      before do
+        subject.render 1, 3.96, 1
+        FileUtils.rm_f(output_pdf)
+      end
+
+      it 'renders xml with CPF to the pdf' do
+        expect(File.exist?(output_pdf)).to be_falsey
+
+        pdf.render_file output_pdf
+
+        expect("#{base_dir}emit_header#render-with_cpf.pdf").to have_same_content_of file: output_pdf
+      end
+    end
   end
 end

data/spec/fixtures/nfe/lib/emit_header#render-nfe_key.pdf

@@ -17,7 +17,7 @@ endobj
 >>
 endobj
 4 0 obj
-<< /Length 11058
+<< /Length 11066
 >>
 stream
 q
@@ -677,7 +677,7 @@ S
 BT
 398.0 685.49554 Td
 /F1.0 6 Tf
-<434e504a> Tj
+<434e504a2f435046> Tj
 ET
 
 
@@ -1056,24 +1056,24 @@ xref
 0000000109 00000 n 
 0000000158 00000 n 
 0000000215 00000 n 
-0000011326 00000 n 
-0000011659 00000 n 
-0000011824 00000 n 
-0000011992 00000 n 
-0000014379 00000 n 
-0000014753 00000 n 
-0000026482 00000 n 
-0000026693 00000 n 
-0000027315 00000 n 
-0000027657 00000 n 
-0000049438 00000 n 
-0000049651 00000 n 
-0000050314 00000 n 
+0000011334 00000 n 
+0000011667 00000 n 
+0000011832 00000 n 
+0000012000 00000 n 
+0000014387 00000 n 
+0000014761 00000 n 
+0000026490 00000 n 
+0000026701 00000 n 
+0000027323 00000 n 
+0000027665 00000 n 
+0000049446 00000 n 
+0000049659 00000 n 
+0000050322 00000 n 
 trailer
 << /Info 1 0 R
 /Root 2 0 R
 /Size 18
 >>
 startxref
-50866
+50874
 %%EOF

data/spec/fixtures/nfe/lib/emit_header#render-second_page.pdf

@@ -17,7 +17,7 @@ endobj
 >>
 endobj
 4 0 obj
-<< /Length 11058
+<< /Length 11066
 >>
 stream
 q
@@ -677,7 +677,7 @@ S
 BT
 398.0 685.49554 Td
 /F1.0 6 Tf
-<434e504a> Tj
+<434e504a2f435046> Tj
 ET
 
 
@@ -1056,24 +1056,24 @@ xref
 0000000109 00000 n 
 0000000158 00000 n 
 0000000215 00000 n 
-0000011326 00000 n 
-0000011659 00000 n 
-0000011824 00000 n 
-0000011992 00000 n 
-0000014379 00000 n 
-0000014753 00000 n 
-0000026482 00000 n 
-0000026693 00000 n 
-0000027315 00000 n 
-0000027657 00000 n 
-0000049438 00000 n 
-0000049651 00000 n 
-0000050314 00000 n 
+0000011334 00000 n 
+0000011667 00000 n 
+0000011832 00000 n 
+0000012000 00000 n 
+0000014387 00000 n 
+0000014761 00000 n 
+0000026490 00000 n 
+0000026701 00000 n 
+0000027323 00000 n 
+0000027665 00000 n 
+0000049446 00000 n 
+0000049659 00000 n 
+0000050322 00000 n 
 trailer
 << /Info 1 0 R
 /Root 2 0 R
 /Size 18
 >>
 startxref
-50866
+50874
 %%EOF