br_danfe 0.17.1 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c9447a1d0a80c9293026b9e0c746231a9e5763bfb7712d1c1c659f259aa0e9
-  data.tar.gz: edb0a29145a0b5b5b08f0904e4fbf234901b98f250ad72ac8dd5134698badfe3
+  metadata.gz: c3d3b2150c3a402b60290cec03c5cf876a8c220c42abf91a6e9728950478e06e
+  data.tar.gz: 135046af062cb860b844b526425d8e18a6282bd7be87bb4a9cf3180dc05f0ddb
 SHA512:
-  metadata.gz: 142c384cef5410d88dfe2241cb6ceddaab6fbf36db23341e9ab584cb7f626ea9839618c0860f275e7b0d9512e2cc23ebc6e1ac19a38c71971a56f82d99892aa0
-  data.tar.gz: 73bd5e390fcf3e8433aab1148f593db6361122379588195bbcae3aba0b82791657de02855a5b4724c05e8220e2a5287499e225ac150eb5f25958284f1a6d145c
+  metadata.gz: 2da619a08cfd3f2af12021a2affc67c0672e82d8c371b8b6ec624dac17dfd3b42809aa353f5672185f92484a9c0fd1bff3b05c1fd6abf23f92441fb376450172
+  data.tar.gz: 232a65f8b1ec56f9639d185dc785ffae0160c5ccbd20ab77727a43b012d3cd58c8ad89b0861f20884b83ecf892ad1d112a17b9c1d308efea1c82acceed209d64

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.17.1)
+    br_danfe (0.17.4)
       barby (= 0.6.8)
       br_documents (>= 0.1.3)
       i18n (>= 0.8.6)
@@ -25,13 +25,13 @@ GEM
     afm (0.2.2)
     ast (2.4.2)
     barby (0.6.8)
-    br_documents (0.2.1)
+    br_documents (0.2.2)
       activemodel (>= 4.0.0)
       i18n (>= 0.6.5)
     byebug (11.1.3)
     chunky_png (1.4.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
     docile (1.4.0)
     ffi (1.15.3)
@@ -51,7 +51,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashery (2.1.2)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     listen (3.6.0)
@@ -59,9 +59,11 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
+    mini_portile2 (2.7.1)
     minitest (5.14.4)
     nenv (0.3.0)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -138,7 +140,7 @@ GEM
     simplecov-html (0.10.2)
     thor (1.1.0)
     ttfunk (1.7.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
     zeitwerk (2.5.1)

data/lib/br_danfe/danfe_lib/nfce_lib/header.rb

@@ -12,7 +12,7 @@ module BrDanfe
         def render
           cursor = @pdf.cursor
 
-          render_company_info(cursor)
+          render_company_info
           render_logo(cursor) if @logo.present?
           render_doc
 
@@ -21,15 +21,18 @@ module BrDanfe
 
         private
 
-        def render_company_info(cursor)
+        def render_company_info
           one_line = 1
 
-          @pdf.bounding_box([x_position, cursor], width: width_box, height: 65) do
-            @pdf.text (@xml['emit/xNome']).to_s, size: 10, align: :left, style: :bold
-            @pdf.text cnpj(@xml['emit/CNPJ']), size: 9, align: :left
-            @pdf.text BrDanfe::DanfeLib::NfceLib::Helper.address(@xml.css('enderEmit')), size: 9, align: :left
-            @pdf.render_blank_line if count_name_lines(@xml['emit/xNome']) == one_line
-          end
+          @pdf.text_box (@xml['emit/xNome']).to_s, at: [x_position, @pdf.cursor], height: 36, size: 9, align: :left, style: :bold, overflow: :shrink_to_fit
+          @pdf.move_down 36
+
+          @pdf.text_box cnpj(@xml['emit/CNPJ']), at: [x_position, @pdf.cursor], height: 9, size: 9, align: :left, overflow: :shrink_to_fit
+          @pdf.move_down 9
+
+          @pdf.text_box BrDanfe::DanfeLib::NfceLib::Helper.address(@xml.css('enderEmit')), at: [x_position, @pdf.cursor], height: 20, size: 9, align: :left, overflow: :shrink_to_fit
+          @pdf.move_down 20
+          @pdf.render_blank_line if count_name_lines(@xml['emit/xNome']) == one_line
         end
 
         def x_position
@@ -60,9 +63,8 @@ module BrDanfe
 
         def render_doc
           @pdf.render_blank_line
-          cursor = @pdf.cursor
 
-          @pdf.bounding_box([0, cursor], width: 6.7.cm, height: 20) do
+          @pdf.bounding_box([0, @pdf.cursor], width: 6.7.cm, height: 20) do
             @pdf.text 'Documento Auxiliar da Nota Fiscal de Consumidor Eletrônica', size: 9, align: :center
           end
         end
@@ -70,8 +72,7 @@ module BrDanfe
         def render_homologation
           2.times { @pdf.render_blank_line }
 
-          cursor = @pdf.cursor
-          @pdf.bounding_box([0, cursor], width: 6.7.cm, height: 20) do
+          @pdf.bounding_box([0, @pdf.cursor], width: 6.7.cm, height: 20) do
             @pdf.text 'EMITIDA EM AMBIENTE DE HOMOLOGAÇÃO', size: 8, align: :center, style: :bold
             @pdf.text 'SEM VALOR FISCAL', size: 8, align: :center, style: :bold
           end

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

@@ -88,9 +88,9 @@ module BrDanfe
 
         def access_key_box
           @pdf.ibox 2.22, 10.02, 10.29, @y_position
-          @pdf.ibarcode 1.50, 8.00, 10.4010, @y_position + 1.90, @xml['chNFe']
+          @pdf.ibarcode 1.50, 8.00, 10.4010, @y_position + 1.90, @xml['infProt > chNFe']
           @pdf.ibox 0.85, 10.02, 10.29, @y_position + 2.22, I18n.t('danfe.chNFe'),
-                    @xml['chNFe'].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, '\\1 '), style: :bold, align: :center
+                    @xml['infProt > chNFe'].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, '\\1 '), style: :bold, align: :center
         end
 
         def sefaz_box

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '0.17.1'.freeze
+  VERSION = '0.17.4'.freeze
 end

data/spec/br_danfe/danfe_lib/nfce_lib/header_spec.rb

@@ -52,6 +52,8 @@ describe BrDanfe::DanfeLib::NfceLib::Header do
       File.delete(output_pdf) if File.exist?(output_pdf)
     end
 
+    after { File.delete(output_pdf) if File.exist?(output_pdf) }
+
     context 'when has a short name' do
       let(:company_name) { 'Test company' }
 
@@ -81,7 +83,7 @@ describe BrDanfe::DanfeLib::NfceLib::Header do
       let(:company_name) { 'Test company with some very long name to do a line break' }
 
       context 'when has a logo' do
-        it 'renders the header with company name line breaked' do
+        it 'renders the header with company name line breaked and shrinked to fit' do
           expect(File.exist?(output_pdf)).to be_falsey
           pdf.render_file output_pdf
 

data/spec/br_danfe/danfe_lib/nfce_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe BrDanfe::DanfeLib::Nfce do
-  let(:output_pdf) { "#{base_dir}output.pdf" }
   let(:base_dir) { './spec/fixtures/nfce/v4.00/' }
+  let(:output_pdf) { "#{base_dir}output.pdf" }
   let(:xml) { BrDanfe::XML.new(File.read("#{base_dir}nfce.xml")) }
 
   subject { described_class.new [xml] }
@@ -15,6 +15,7 @@ describe BrDanfe::DanfeLib::Nfce do
   describe '#render_pdf' do
     it 'renders the NFC-e pdf' do
       expected = IO.binread("#{base_dir}rendered_nfce.fixture.pdf")
+
       expect(subject.render_pdf).to eq expected
     end
   end

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

@@ -38,6 +38,15 @@ describe BrDanfe::DanfeLib::NfeLib::EmitHeader do
                   <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">
@@ -51,6 +60,15 @@ describe BrDanfe::DanfeLib::NfeLib::EmitHeader do
       XML
     end
 
+    it 'renders only the nfe key' do
+      subject.render 2, 1.85, 2
+      File.delete(output_pdf) if File.exist?(output_pdf)
+
+      pdf.render_file output_pdf
+
+      expect("#{base_dir}emit_header#render-nfe_key.pdf").to have_same_content_of file: output_pdf
+    end
+
     context 'render emitter on first page' do
       before do
         subject.render 1, 3.96, 1