br_danfe 0.16.0 → 0.17.3

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

@@ -14,19 +14,54 @@ module BrDanfe
 
         private
 
+        def render_headers(headers)
+          2.times { @pdf.render_blank_line }
+          cursor = @pdf.cursor
+          headers.each_with_index do |header, index|
+            cursor -= 10 if index == 1
+            @pdf.bounding_box [columns[index][:position], cursor], width: columns[index][:width], height: 0.3.cm do
+              @pdf.text header[:content], header[:options]
+            end
+          end
+        end
+
         def headers
           [
-            header_column('Código', :left),
-            header_column('Descrição', :left),
-            header_column('Qtde', :right),
+            header_column('CÓDIGO - DESCRIÇÃO', :left),
+            header_column('QTD', :left),
             header_column('UN', :right),
-            header_column('Vl Unit', :right),
-            header_column('Vl Total', :right)
+            header_column('VL UNIT', :right),
+            header_column('TOTAL', :right)
           ]
         end
 
         def header_column(title, align)
-          { content: title, options: { align: align, size: 6, style: :bold } }
+          { content: title, options: { align: align, size: 9, style: :bold } }
+        end
+
+        def columns
+          [
+            { width: 6.7.cm, position: 0 },
+            { width: 1.7.cm, position: 0.cm },
+            { width: 1.cm, position: 1.7.cm },
+            { width: 1.7.cm, position: 2.7.cm },
+            { width: 2.3.cm, position: 4.4.cm }
+          ]
+        end
+
+        def render_products
+          @pdf.render_blank_line
+          products.each do |product|
+            cursor = @pdf.cursor
+
+            product.each_with_index do |cell, index|
+              cursor -= 10 if index == 1
+              @pdf.bounding_box [columns[index][:position], cursor], width: columns[index][:width], height: 0.3.cm do
+                options = cell[:options].merge(overflow: :truncate)
+                @pdf.text_box cell[:content], options
+              end
+            end
+          end
         end
 
         def products
@@ -35,9 +70,8 @@ module BrDanfe
 
         def product(det)
           [
-            cell_text(det.css('prod/cProd').text),
-            cell_text(det.css('prod/xProd').text),
-            cell_number(BrDanfe::Helper.numerify(det.css('prod/qCom').text)),
+            cell_text("#{det.css('prod/cProd').text} - #{det.css('prod/xProd').text}"),
+            cell_text(BrDanfe::Helper.numerify(det.css('prod/qCom').text), align: :left),
             cell_text(det.css('prod/uCom').text, align: :right),
             cell_number(BrDanfe::Helper.numerify(det.css('prod/vUnCom').text)),
             cell_number(BrDanfe::Helper.numerify(det.css('prod/vProd').text))
@@ -45,7 +79,7 @@ module BrDanfe
         end
 
         def cell_text(text, options = {})
-          cell = { content: text, options: { border_width: 0, size: 6 } }
+          cell = { content: text, options: { border_width: 0, size: 9 } }
           cell[:options].merge!(options)
           cell
         end
@@ -53,49 +87,6 @@ module BrDanfe
         def cell_number(text)
           cell_text(text, align: :right)
         end
-
-        def columns
-          [
-            { width: 0.9.cm, position: 0 },
-            { width: 2.6.cm, position: 0.9.cm },
-            { width: 1.1.cm, position: 3.5.cm },
-            { width: 0.4.cm, position: 4.6.cm },
-            { width: 1.2.cm, position: 5.cm },
-            { width: 1.2.cm, position: 6.2.cm }
-          ]
-        end
-
-        def render_headers(headers)
-          2.times { @pdf.render_blank_line }
-          cursor = @pdf.cursor
-          headers.each_with_index do |header, index|
-            @pdf.bounding_box [columns[index][:position], cursor], width: columns[index][:width], height: 0.2.cm do
-              @pdf.text header[:content], header[:options]
-            end
-          end
-        end
-
-        def render_products
-          @pdf.render_blank_line
-          index_of_product_name = 1
-          products.each do |product|
-            box_height = box_height(product[index_of_product_name][:content])
-            cursor = @pdf.cursor
-
-            product.each_with_index do |cell, index|
-              @pdf.bounding_box [columns[index][:position], cursor], width: columns[index][:width], height: box_height do
-                @pdf.text cell[:content], cell[:options]
-              end
-            end
-          end
-        end
-
-        def box_height(content)
-          line_height_base = 0.23.cm
-
-          lines = content.scan(/[\s\S]{1,20}( |$)/).length
-          line_height_base * lines
-        end
       end
     end
   end

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

@@ -23,7 +23,7 @@ module BrDanfe
         private
 
         def options
-          { size: 7, align: :center }
+          { size: 9, align: :center }
         end
 
         def identified_recipient?

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

@@ -18,12 +18,13 @@ module BrDanfe
         private
 
         def subtotal
+          @pdf.render_blank_line
           cursor = @pdf.cursor
-          @pdf.bounding_box [4.8.cm, cursor], width: 1.4.cm, height: 0.2.cm do
-            @pdf.text 'Subtotal R$', size: 6, align: :left
+          @pdf.bounding_box [3.5.cm, cursor], width: 1.6.cm, height: 0.4.cm do
+            @pdf.text 'Subtotal R$', size: 9, align: :left
           end
-          @pdf.bounding_box [6.2.cm, cursor], width: 1.2.cm, height: 0.2.cm do
-            @pdf.text BrDanfe::Helper.numerify(@xml['ICMSTot > vProd'].to_f), size: 6, align: :right
+          @pdf.bounding_box [5.1.cm, cursor], width: 1.6.cm, height: 0.4.cm do
+            @pdf.text BrDanfe::Helper.numerify(@xml['ICMSTot > vProd'].to_f), size: 9, align: :right
           end
         end
 
@@ -31,16 +32,16 @@ module BrDanfe
           @pdf.render_blank_line
 
           cursor = @pdf.cursor
-          print_text('Qtde. total de itens', cursor, size: 7, align: :left)
-          print_text(@xml.css('det').count.to_s, cursor, size: 7, align: :right)
+          print_text('QTD. TOTAL DE ITENS', cursor, size: 10, align: :left)
+          print_text(@xml.css('det').count.to_s, cursor, size: 10, align: :right)
 
           cursor = @pdf.cursor
-          print_text('Desconto R$', cursor, size: 7, align: :left)
-          print_text(BrDanfe::Helper.numerify(@xml['ICMSTot > vDesc'].to_f), cursor, size: 7, align: :right)
+          print_text('DESCONTO R$', cursor, size: 10, align: :left)
+          print_text(BrDanfe::Helper.numerify(@xml['ICMSTot > vDesc'].to_f), cursor, size: 10, align: :right)
 
           cursor = @pdf.cursor
-          print_text('Valor Total R$', cursor, size: 7, align: :left, style: :bold)
-          print_text(BrDanfe::Helper.numerify(@xml['ICMSTot > vNF'].to_f), cursor, size: 7, align: :right, style: :bold)
+          print_text('VALOR TOTAL R$', cursor, size: 10, align: :left, style: :bold)
+          print_text(BrDanfe::Helper.numerify(@xml['ICMSTot > vNF'].to_f), cursor, size: 10, align: :right, style: :bold)
         end
 
         def payment_methods
@@ -59,19 +60,19 @@ module BrDanfe
             @pdf.render_blank_line
 
             cursor = @pdf.cursor
-            print_text('Forma de pagamento', cursor, size: 7, align: :left, style: :bold)
-            print_text('Valor pago R$', cursor, size: 7, align: :right, style: :bold)
+            print_text('FORMA PAGTO.', cursor, size: 9, align: :left, style: :bold)
+            print_text('VLR PAGO R$', cursor, size: 9, align: :right, style: :bold)
 
             payments.each do |key, value|
               cursor = @pdf.cursor
-              print_text(I18n.t("nfce.payment_methods.#{key}"), cursor, size: 7, align: :left)
-              print_text(BrDanfe::Helper.numerify(value.to_f), cursor, size: 7, align: :right)
+              print_text(I18n.t("nfce.payment_methods.#{key}"), cursor, size: 9, align: :left)
+              print_text(BrDanfe::Helper.numerify(value.to_f), cursor, size: 9, align: :right)
             end
           end
         end
 
         def print_text(text, cursor, options)
-          @pdf.bounding_box [0, cursor], width: 7.4.cm, height: 0.25.cm do
+          @pdf.bounding_box [0, cursor], width: 6.7.cm, height: 0.35.cm do
             @pdf.text text, options
           end
         end

data/lib/br_danfe/danfe_lib/nfe.rb

@@ -10,15 +10,17 @@ module BrDanfe
       def create_watermark
         @document.create_stamp('has_no_fiscal_value') do
           @document.fill_color '7d7d7d'
-          @document.text_box I18n.t('danfe.others.has_no_fiscal_value'),
-                        size: 2.2.cm,
-                        width: @document.bounds.width,
-                        height: @document.bounds.height,
-                        align: :center,
-                        valign: :center,
-                        at: [0, @document.bounds.height],
-                        rotate: 45,
-                        rotate_around: :center
+          @document.text_box(
+            I18n.t('danfe.others.has_no_fiscal_value'),
+            size: 2.2.cm,
+            width: @document.bounds.width,
+            height: @document.bounds.height,
+            align: :center,
+            valign: :center,
+            at: [0, @document.bounds.height],
+            rotate: 45,
+            rotate_around: :center
+          )
         end
       end
 

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

@@ -38,8 +38,7 @@ module BrDanfe
 
         def dtduplicata(det)
           dtduplicata = det.css('dVenc').text
-          dtduplicata = dtduplicata[8, 2] + '/' + dtduplicata[5, 2] + '/' + dtduplicata[0, 4]
-          dtduplicata
+          "#{dtduplicata[8, 2]}/#{dtduplicata[5, 2]}/#{dtduplicata[0, 4]}"
         end
 
         def normal

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

@@ -38,11 +38,10 @@ module BrDanfe
         end
 
         def address
-          formatted = @xml['enderEmit/xLgr'] + ', ' + @xml['enderEmit/nro'] + "\n"
-          formatted += @xml['enderEmit/xBairro'] + ' - ' + cep + "\n"
-          formatted += @xml['enderEmit/xMun'] + '/' + @xml['enderEmit/UF'] + "\n"
-          formatted += phone + ' ' + @xml['enderEmit/email']
-          formatted
+          "#{@xml['enderEmit/xLgr']}, #{@xml['enderEmit/nro']}\n" \
+            "#{@xml['enderEmit/xBairro']} - #{cep}\n" \
+            "#{@xml['enderEmit/xMun']}/#{@xml['enderEmit/UF']}\n" \
+            "#{phone} #{@xml['enderEmit/email']}"
         end
 
         def phone
@@ -89,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/danfe_lib/nfe_lib/infadic.rb

@@ -93,7 +93,8 @@ module BrDanfe
         end
 
         def difal?
-          @xml['ICMSTot/vICMSUFDest'].to_f != 0
+          value = @xml['ICMSTot/vICMSUFDest'].presence || '0.0'
+          BigDecimal(value).positive?
         end
 
         def fisco_content

data/lib/br_danfe/helper.rb

@@ -20,7 +20,7 @@ module BrDanfe
       decimal_part = separated_number[1] || '00'
       decimal_part += '0' if decimal_part.size < 2
 
-      integer_part + ',' + decimal_part
+      "#{integer_part},#{decimal_part}"
     end
 
     def self.format_datetime(xml_datetime, with_time_zone: false)

data/lib/br_danfe/mdfe.rb

@@ -7,7 +7,7 @@ module BrDanfe
     attr_reader :logo_options
 
     def initialize(xml)
-      @xml = xml
+      @xml = BrDanfe::XML.new(xml)
       @pdf = MdfeLib::Document.new
       @logo_options = BrDanfe::Logo::Config.new
     end

data/lib/br_danfe/mdfe_lib/authorization_protocol.rb

@@ -14,7 +14,7 @@ module BrDanfe
 
       def authorization
         title = 'Protocolo de autorização'
-        protocol = @xml['infProt/nProt'] + ' - ' + Helper.format_datetime(@xml['infProt/dhRecbto'], with_time_zone: true)
+        protocol = "#{@xml['infProt/nProt']} - #{Helper.format_datetime(@xml['infProt/dhRecbto'], with_time_zone: true)}"
 
         @pdf.text_box(title, size: 9, align: :left, style: :bold, at: [0, 510])
         @pdf.text_box(protocol, size: 11, align: :left, at: [0, 500])

data/lib/br_danfe/mdfe_lib/fisco_control.rb

@@ -3,37 +3,18 @@ module BrDanfe
     class FiscoControl
       def initialize(pdf, xml)
         @pdf = pdf
-        @xml = xml
+        @nfe_key = xml['mdfeProc > protMDFe > infProt > chMDFe']
       end
 
       def generate
-        title
-        barcode
-        generate_nfe_key
-      end
-
-      private
-
-      def title
-        title = 'CONTROLE DO FISCO'
-
-        @pdf.text_box(title, size: 9, align: :left, at: [250, 600])
-      end
-
-      def barcode
-        barcode = Barby::Code128C.new(nfe_key)
-        barcode.annotate_pdf(@pdf, x: 250, y: 530, height: 50)
-      end
+        @pdf.text_box('CONTROLE DO FISCO', size: 9, align: :left, at: [250, 600])
 
-      def nfe_key
-        @xml['mdfeProc > protMDFe > infProt > chMDFe']
-      end
+        return if @nfe_key.blank?
 
-      def generate_nfe_key
-        title = 'Chave de Acesso'
+        Barby::Code128C.new(@nfe_key).annotate_pdf(@pdf, x: 250, y: 530, height: 50)
 
-        @pdf.text_box(title, size: 9, align: :left, style: :bold, at: [250, 510])
-        @pdf.text_box(nfe_key, size: 11, align: :left, at: [250, 500])
+        @pdf.text_box('Chave de Acesso', size: 9, align: :left, style: :bold, at: [250, 510])
+        @pdf.text_box(@nfe_key, size: 11, align: :left, at: [250, 500])
       end
     end
   end

data/lib/br_danfe/mdfe_lib/header.rb

@@ -11,7 +11,7 @@ module BrDanfe
       def generate
         generate_emit
         generate_title
-        qr_code
+        generate_qr_code if @xml['qrCodMDFe'].present?
       end
 
       private
@@ -34,9 +34,8 @@ module BrDanfe
       end
 
       def address
-        formatted = @xml['enderEmit/xLgr'] + ', nº ' + @xml['enderEmit/nro'] + "\n"
-        formatted += @xml['enderEmit/xMun'] + ' - ' + @xml['enderEmit/UF'] + '   ' + 'CEP ' + cep + "\n"
-        formatted
+        "#{@xml['enderEmit/xLgr']}, nº #{@xml['enderEmit/nro']}\n" \
+          "#{@xml['enderEmit/xMun']} - #{@xml['enderEmit/UF']}   CEP #{cep}\n"
       end
 
       def cep
@@ -44,7 +43,7 @@ module BrDanfe
       end
 
       def company_informations
-        '<b>CNPJ: </b>' + @xml['emit/CNPJ'] + '   ' + '<b>IE: </b>' + @xml['emit/IE']
+        "<b>CNPJ: </b>#{@xml['emit/CNPJ']}   <b>IE: </b>#{@xml['emit/IE']}"
       end
 
       def logo
@@ -65,12 +64,12 @@ module BrDanfe
         end
       end
 
-      def qr_code
+      def generate_qr_code
         box_size = 40.mm
-        security_margin = box_size + box_size / 10.0
+        security_margin = box_size + (box_size / 10.0)
 
         @pdf.bounding_box([414, 780], width: security_margin, height: security_margin) do
-          BrDanfe::QrCode.new(pdf: @pdf, xml: @xml, qr_code_tag: @xml['qrCodMDFe'], box_size: box_size).render
+          BrDanfe::QrCode.new(pdf: @pdf, qr_code_tag: @xml['qrCodMDFe'], box_size: box_size).render
         end
       end
     end

data/lib/br_danfe/mdfe_lib/mdfe_identification.rb

@@ -48,7 +48,7 @@ module BrDanfe
       end
 
       def number_of_pages(page)
-        text = page.to_s + '/' + @pdf.page_count.to_s
+        text = "#{page}/#{@pdf.page_count}"
         generate_box('FL', text, 125)
       end
 

data/lib/br_danfe/mdfe_lib/notes.rb

@@ -74,7 +74,7 @@ module BrDanfe
 
           total_height += 10 if total_chars >= MAX_CHARS_ON_LINE
 
-          total_height <= height_on_first_page ? first_page += word + ' ' : next_page += word + ' '
+          total_height <= height_on_first_page ? first_page += "#{word} " : next_page += "#{word} "
         end
 
         { first_page: first_page, next_page: next_page }

data/lib/br_danfe/qr_code.rb

@@ -4,9 +4,8 @@ module BrDanfe
     require 'chunky_png'
     require 'tempfile'
 
-    def initialize(pdf:, xml:, qr_code_tag:, box_size:)
+    def initialize(pdf:, qr_code_tag:, box_size:)
       @pdf = pdf
-      @xml = xml
       @qr_code_tag = qr_code_tag
       @box_size = box_size
     end

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.17.3'.freeze
 end

data/lib/br_danfe.rb

@@ -10,12 +10,12 @@ require 'ostruct'
 require 'i18n'
 require 'br_documents'
 
-Dir[File.dirname(__FILE__) + '/**/*.rb'].sort.each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/**/*.rb"].sort.each { |f| require f }
 I18n.load_path << File.expand_path('../config/locales/pt-BR.yml', __dir__)
 Prawn::Font::AFM.hide_m17n_warning = true
 
 module BrDanfe
   def self.root_path
-    File.expand_path('../..', __FILE__)
+    File.expand_path('..', __dir__)
   end
 end

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

@@ -7,7 +7,7 @@ describe BrDanfe::DanfeLib::NfceLib::Footer do
   let(:pdf) { BrDanfe::DanfeLib::NfceLib::Document.new(8.cm, 5.cm) }
 
   let(:xml_footer) do
-    xml = <<-eos
+    xml = <<~XML
       <nfeProc>
         <NFe>
           <infNFe>
@@ -19,7 +19,7 @@ describe BrDanfe::DanfeLib::NfceLib::Footer do
           </infNFe>
         </NFe>
       </nfeProc>
-    eos
+    XML
 
     BrDanfe::XML.new(xml)
   end
@@ -28,6 +28,7 @@ describe BrDanfe::DanfeLib::NfceLib::Footer do
 
   describe '#render' do
     before { File.delete(output_pdf) if File.exist?(output_pdf) }
+
     it 'renders footer to the pdf' do
       subject.render
       expect(File.exist?(output_pdf)).to be_falsey

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

@@ -8,7 +8,7 @@ describe BrDanfe::DanfeLib::NfceLib::Header do
   let(:environment) { 1 }
 
   let(:xml) do
-    xml = <<-eos
+    xml = <<~XML
       <nfeProc>
         <NFe>
           <infNFe>
@@ -37,12 +37,12 @@ describe BrDanfe::DanfeLib::NfceLib::Header do
           </infNFe>
         </NFe>
       </nfeProc>
-    eos
+    XML
 
     BrDanfe::XML.new(xml)
   end
 
-  let(:pdf) { BrDanfe::DanfeLib::NfceLib::Document.new(8.cm, 5.cm) }
+  let(:pdf) { BrDanfe::DanfeLib::NfceLib::Document.new(8.cm, 6.cm) }
 
   subject { described_class.new pdf, xml, logo, logo_options }
 
@@ -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_lib/helper_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe BrDanfe::DanfeLib::NfceLib::Helper do
   let(:xml) do
-    xml = <<-eos
+    xml = <<~XML
       <enderDest>
         <xLgr>Rua Tijucas</xLgr>
         <nro>99</nro>
@@ -15,7 +15,7 @@ describe BrDanfe::DanfeLib::NfceLib::Helper do
         <cPais>1058</cPais>
         <xPais>Brasil</xPais>
       </enderDest>
-    eos
+    XML
 
     BrDanfe::XML.new(xml)
   end

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

@@ -5,7 +5,7 @@ describe BrDanfe::DanfeLib::NfceLib::Key do
   let(:output_pdf) { "#{base_dir}output.pdf" }
 
   let(:xml_key) do
-    xml = <<-eos
+    xml = <<~XML
       <nfeProc>
         <NFe>
           <infNFeSupl>
@@ -19,7 +19,7 @@ describe BrDanfe::DanfeLib::NfceLib::Key do
           </infProt>
         </protNFe>
       </nfeProc>
-    eos
+    XML
 
     BrDanfe::XML.new(xml)
   end

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

@@ -7,7 +7,7 @@ describe BrDanfe::DanfeLib::NfceLib::NfceIdentification do
   let(:pdf) { BrDanfe::DanfeLib::NfceLib::Document.new(8.cm, 5.cm) }
 
   let(:xml) do
-    xml = <<-eos
+    xml = <<~XML
       <nfeProc>
         <NFe>
           <infNFe>
@@ -25,7 +25,7 @@ describe BrDanfe::DanfeLib::NfceLib::NfceIdentification do
           </infNFe>
         </NFe>
       </nfeProc>
-    eos
+    XML
 
     BrDanfe::XML.new(xml)
   end