br_danfe 0.15.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 210c7c1c3a0ea98ed48753e1432c91ae8f4795400d5df40d7d9c2e0a91d4c502
-  data.tar.gz: 611c666027eca9cac90640753446085f58b4b9deacc43c8d0df5f7150d623a1f
+  metadata.gz: 7d7ff47128c1eb8696ae40615a70cda26ce2a79e78e9e08ca4b87022a05e80a0
+  data.tar.gz: a69988df12809c67c14fd780c9f9863511113f954c4e1e18743eefd6c92e1bd7
 SHA512:
-  metadata.gz: 4c04ab16fdac8a9285024a018b2c23cdd5d65c6e2748b8cafa9e97ec67cf10f49cc0e0766a475e060f2c65793a6400795988e299d6931bd4cacb2ed01d18092f
-  data.tar.gz: b894f40fba2376bd795beadfbf47dabe2db2c9d7a40e69c728d29550397c6df2baf14acb39ff73cface9df9ffd2de7832b2762647ccf2ab6715134fcfb740c82
+  metadata.gz: 2b7bb8b7db6a30564905827ee2c89e427db7d9ad6b771740f9c90f36140ef8705266f42dacc2dcf60981d828846f60ad2cf7064364f7688955b7fa8871218589
+  data.tar.gz: f473cd9b67ad5c62e21a1d0f152e8c951f4158c4a13ac17bb4f7f0df87734c924171d56f2504f81a48038fd76355b0e22d0c3931491855f110d5adf0fc24d277

data/.circleci/config.yml

@@ -2,28 +2,37 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.5.1
+      - image: circleci/ruby:2.7.4
     steps:
       - checkout
       - restore_cache:
-          key: brdanfe-cache-v1-{{ checksum "Gemfile.lock" }}
+          key: brdanfe-cache-v2-{{ checksum "Gemfile.lock" }}
       - run: bundle check || bundle install
       - save_cache:
-          key: brdanfe-cache-v1-{{ .Environment.CIRCLE_SHA1 }}
+          key: brdanfe-cache-v2-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - .
       - save_cache:
-          key: brdanfe-cache-v1-{{ checksum "Gemfile.lock" }}
+          key: brdanfe-cache-v2-{{ checksum "Gemfile.lock" }}
           paths:
             - ./vendor/bundle
+  linter:
+    docker:
+      - image: circleci/ruby:2.7.4
+    steps:
+      - restore_cache:
+          key: brdanfe-cache-v2-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          key: brdanfe-cache-v2-{{ checksum "Gemfile.lock" }}
+      - run: bundle exec rubocop --display-cop-names --parallel
   rspec:
     docker:
-      - image: circleci/ruby:2.5.1
+      - image: circleci/ruby:2.7.4
     steps:
       - restore_cache:
-          key: brdanfe-cache-v1-{{ .Environment.CIRCLE_SHA1 }}
+          key: brdanfe-cache-v2-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
-          key: brdanfe-cache-v1-{{ checksum "Gemfile.lock" }}
+          key: brdanfe-cache-v2-{{ checksum "Gemfile.lock" }}
       - run:
           name: Install Test Coverage for CodeClimate
           command: |
@@ -37,6 +46,9 @@ workflows:
   main:
     jobs:
       - build
-      - rspec:
+      - linter:
           requires:
             - build
+      - rspec:
+          requires:
+            - linter

data/.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+      time: "09:00"
+      timezone: "America/Sao_Paulo"
+    open-pull-requests-limit: 10
+    allow:
+      - dependency-type: "direct"
+    pull-request-branch-name:
+      separator: "-"

data/.rubocop.yml

@@ -1,29 +1,36 @@
-require: rubocop-performance
+require:
+  - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.5.1
+  TargetRubyVersion: 2.6
   Exclude:
-    - 'config/**/*'
-    - 'spec/spec_helper.rb'
+    - bin/**/*
+    - vendor/bundle/**/*
+    - config/**/*
+    - spec/spec_helper.rb
     - !ruby/regexp /old_and_unused\.rb$/
   DisplayCopNames: true
   DisplayStyleGuide: true
+  NewCops: enable
 
 Bundler/OrderedGems:
   Enabled: false
 
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Enabled: false
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 Layout/SpaceBeforeBlockBraces:
   EnforcedStyleForEmptyBraces: space
 
+Layout/LineLength:
+  Max: 200
+
 Metrics/ClassLength:
   Max: 230
 
@@ -57,8 +64,14 @@ Style/IfUnlessModifier:
 Style/SymbolArray:
   EnforcedStyle: brackets
 
-Metrics/LineLength:
-  Max: 200
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
 
 Lint/AmbiguousBlockAssociation:
   Exclude:
@@ -87,7 +100,7 @@ Naming/HeredocDelimiterNaming:
 Naming/HeredocDelimiterCase:
   Enabled: false
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 
 Naming/MethodName:
@@ -99,5 +112,5 @@ Naming/VariableName:
 Metrics/ParameterLists:
   Enabled: false
 
-Naming/UncommunicativeBlockParamName:
+Naming/BlockParameterName:
   Enabled: false

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.4

data/Gemfile.lock

@@ -1,29 +1,31 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.15.1)
+    br_danfe (0.17.2)
       barby (= 0.6.8)
       br_documents (>= 0.1.3)
       i18n (>= 0.8.6)
       nokogiri (>= 1.8)
       prawn (~> 2.4.0)
       prawn-table (= 0.2.2)
-      rqrcode (~> 1.1.1)
+      rqrcode (~> 2.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activesupport (6.1.3.2)
+    Ascii85 (1.1.0)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    ast (2.4.0)
+    afm (0.2.2)
+    ast (2.4.2)
     barby (0.6.8)
-    br_documents (0.2.0)
+    br_documents (0.2.1)
       activemodel (>= 4.0.0)
       i18n (>= 0.6.5)
     byebug (11.1.3)
@@ -31,16 +33,16 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    docile (1.3.2)
-    ffi (1.13.1)
-    formatador (0.2.5)
-    guard (2.16.2)
+    docile (1.4.0)
+    ffi (1.15.3)
+    formatador (0.3.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -48,83 +50,98 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.10)
+    hashery (2.1.2)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.3.0)
-    listen (3.2.1)
+    json (2.5.1)
+    listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    mini_portile2 (2.5.3)
     minitest (5.14.4)
     nenv (0.3.0)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.1)
-    parser (2.7.0.4)
-      ast (~> 2.4.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
     pdf-core (0.9.0)
+    pdf-inspector (1.3.0)
+      pdf-reader (>= 1.0, < 3.0.a)
+    pdf-reader (2.5.0)
+      Ascii85 (~> 1.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
     prawn (2.4.0)
       pdf-core (~> 0.9.0)
       ttfunk (~> 1.7)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (3.1.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rqrcode (1.1.2)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rqrcode (2.1.0)
       chunky_png (~> 1.0)
-      rqrcode_core (~> 0.1)
-    rqrcode_core (0.2.0)
+      rqrcode_core (~> 1.0)
+    rqrcode_core (1.2.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (0.67.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.10.2)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.1.0)
-      rubocop (>= 0.67.0)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.13.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.10.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.11.0)
+    ruby-rc4 (0.1.5)
     shellany (0.0.1)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thor (1.0.1)
+    thor (1.1.0)
     ttfunk (1.7.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.5.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (1.8.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -132,14 +149,16 @@ PLATFORMS
 DEPENDENCIES
   br_danfe!
   byebug (= 11.1.3)
-  guard (~> 2.16.2)
+  guard (~> 2.18.0)
   guard-rspec
-  rake (= 13.0.1)
+  pdf-inspector (~> 1.3.0)
+  rake (= 13.0.6)
   rspec (= 3.10.0)
-  rubocop (= 0.67.0)
-  rubocop-performance (~> 1.1.0)
+  rubocop (~> 0.93.1)
+  rubocop-performance (~> 1.10.2)
+  rubocop-rspec (~> 1.44.1)
   simplecov (= 0.17.1)
   simplecov-html (= 0.10.2)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/Guardfile

@@ -1,5 +1,7 @@
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
+directories %w[lib spec]
+
+guard :rspec, cmd: 'NO_COVERAGE=true bundle exec rspec' do
+  require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 
   # RSpec files

data/README.md

@@ -88,6 +88,29 @@ XML version | Supported?
           end
         end
 
+### DAMDFE - _Documento Auxiliar do Manifesto Eletrônico de Documentos Fiscais_
+
+#### Usage in Ruby
+
+        xml = File.read("mdfe.xml")
+
+        mdfe = BrDanfe::Mdfe.new(xml)
+        mdfe.save_pdf("mdfe.pdf")
+
+#### Usage in Rails Controller
+
+        class MdfeController < ApplicationController
+          def new
+            mdfe = Mdfe.find(params[:id])
+            xml_as_string = mdfe.generate_xml # your method that generates the MDF-e's xml
+
+            mdfe = BrDanfe::Mdfe.new(xml_as_string)
+
+            send_data mdfe.render_pdf, filename: "mdfe.pdf", type: "application/pdf"
+          end
+        end
+
+
 ## I18n
 
 By default, your rails application must be configured to `pt-Br`.

data/bin/_guard-core

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application '_guard-core' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "_guard-core")

data/bin/guard

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'guard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "guard")

data/br_danfe.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- { test,spec,features }/*`.split("\n")
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.5.1'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency 'barby', '0.6.8'
   spec.add_dependency 'br_documents', '>= 0.1.3'
@@ -22,15 +22,17 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'nokogiri', '>= 1.8'
   spec.add_dependency 'prawn', '~> 2.4.0'
   spec.add_dependency 'prawn-table', '0.2.2'
-  spec.add_dependency 'rqrcode', '~> 1.1.1'
+  spec.add_dependency 'rqrcode', '~> 2.1.0'
 
   spec.add_development_dependency 'byebug', '11.1.3'
-  spec.add_development_dependency 'rake', '13.0.1'
+  spec.add_development_dependency 'guard', '~> 2.18.0'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'pdf-inspector', '~> 1.3.0'
+  spec.add_development_dependency 'rake', '13.0.6'
   spec.add_development_dependency 'rspec', '3.10.0'
-  spec.add_development_dependency 'rubocop', '0.67.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.1.0'
+  spec.add_development_dependency 'rubocop', '~> 0.93.1'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.10.2'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.44.1'
   spec.add_development_dependency 'simplecov', '0.17.1'
   spec.add_development_dependency 'simplecov-html', '0.10.2'
-  spec.add_development_dependency 'guard', '~> 2.16.2'
-  spec.add_development_dependency 'guard-rspec'
 end

data/lib/br_danfe/danfe_lib/nfce.rb

@@ -1,7 +1,7 @@
 module BrDanfe
   module DanfeLib
     class Nfce < Base
-      PAGE_WIDTH = 8.cm
+      PAGE_WIDTH = 7.cm
       PAGE_HEIGHT = 100.cm
 
       private
@@ -13,13 +13,15 @@ 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: 0.8.cm,
-                    width: 10.cm,
-                    height: 1.2.cm,
-                    at: [0, PAGE_HEIGHT - 3.8.cm],
-                    rotate: 45,
-                    rotate_around: :center
+          @document.text_box(
+            I18n.t('danfe.others.has_no_fiscal_value'),
+            size: 0.8.cm,
+            width: 10.cm,
+            height: 1.2.cm,
+            at: [0, PAGE_HEIGHT - 3.8.cm],
+            rotate: 45,
+            rotate_around: :center
+          )
         end
       end
 
@@ -31,7 +33,7 @@ module BrDanfe
           NfceLib::Key.new(@document, xml).render
           NfceLib::Recipient.new(@document, xml).render
           NfceLib::NfceIdentification.new(@document, xml).render
-          NfceLib::QrCode.new(@document, xml).render
+          BrDanfe::QrCode.new(pdf: @document, qr_code_tag: xml['qrCode'], box_size: 4.5.cm).render
           NfceLib::Footer.new(@document, xml).render(footer_info)
 
           render_no_fiscal_value(xml)

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

@@ -12,7 +12,7 @@ module BrDanfe
             botton_margin: 0
           )
 
-          @document.font 'Courier'
+          @document.font 'tinos'
           @document.line_width = 0.3
         end
 

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

@@ -9,11 +9,11 @@ module BrDanfe
 
         def render(info = '')
           tot_trib = @xml['ICMSTot/vTotTrib'].present? ? BrDanfe::Helper.numerify(@xml['ICMSTot/vTotTrib']) : '0,00'
-          @pdf.text "Tributos Totais Incidentes (Lei Federal 12.741/2012): R$ #{tot_trib}", size: 5, align: :center
+          @pdf.text "Tributos Totais Incidentes (Lei Federal 12.741/2012): R$ #{tot_trib}", size: 8, align: :center
 
           if info.present?
             @pdf.render_blank_line
-            @pdf.text info, size: 5, align: :center
+            @pdf.text info, size: 8, align: :center
           end
         end
       end

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

@@ -12,38 +12,40 @@ module BrDanfe
         def render
           cursor = @pdf.cursor
 
-          render_company_info(cursor)
+          render_company_info
           render_logo(cursor) if @logo.present?
+          render_doc
 
           render_homologation if BrDanfe::Helper.homologation?(@xml)
         end
 
         private
 
-        def render_company_info(cursor)
+        def render_company_info
           one_line = 1
 
-          @pdf.bounding_box([x_position, cursor], width: width_box, height: 45) do
-            @pdf.text (@xml['emit/xNome']).to_s, size: 7, align: :left, style: :bold
-            @pdf.text cnpj(@xml['emit/CNPJ']), size: 6, align: :left
-            @pdf.text BrDanfe::DanfeLib::NfceLib::Helper.address(@xml.css('enderEmit')), size: 6, align: :left
-            @pdf.render_blank_line if count_name_lines(@xml['emit/xNome']) == one_line
-            @pdf.text 'Documento Auxiliar da Nota Fiscal de Consumidor Eletrônica', size: 6, align: :left
-          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
-          @logo.present? ? 1.7.cm : 0
+          @logo.present? ? 2.2.cm : 0
         end
 
         def width_box
-          @logo.present? ? 5.7.cm : 7.4.cm
+          @logo.present? ? 4.5.cm : 6.7.cm
         end
 
         def cnpj(info)
           cnpj = BrDocuments::CnpjCpf::Cnpj.new info
-          data = "CNPJ: #{cnpj.valid? ? cnpj.formatted : ''}"
-          data
+          "CNPJ: #{cnpj.valid? ? cnpj.formatted : ''}"
         end
 
         def count_name_lines(company_name)
@@ -51,7 +53,7 @@ module BrDanfe
         end
 
         def render_logo(cursor)
-          box_size = 45
+          box_size = 60
           logo_options = BrDanfe::Logo::Options.new(box_size, @logo_dimensions).options
 
           @pdf.bounding_box([0, cursor], width: box_size, height: box_size) do
@@ -59,9 +61,21 @@ module BrDanfe
           end
         end
 
-        def render_homologation
+        def render_doc
           @pdf.render_blank_line
-          @pdf.text 'EMITIDA EM AMBIENTE DE HOMOLOGAÇÃO – SEM VALOR FISCAL', size: 7, align: :center, style: :bold
+
+          @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
+
+        def render_homologation
+          2.times { @pdf.render_blank_line }
+
+          @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
         end
       end
     end