br_danfe 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ddb33657303d50b425d475e7c493dde5272ed1d4e4bd7d96f9eab45a8f5c600
-  data.tar.gz: 67ba29fde1351c27b7ff6479a6bfd5d803cc843b4a756f9594bc53c82f44a3a0
+  metadata.gz: 75c9447a1d0a80c9293026b9e0c746231a9e5763bfb7712d1c1c659f259aa0e9
+  data.tar.gz: edb0a29145a0b5b5b08f0904e4fbf234901b98f250ad72ac8dd5134698badfe3
 SHA512:
-  metadata.gz: e99eb16d42eff7bf889afa5d697f75bdba24ebcc091b8713d55fa83e6950f5b2bc4269d7401292594dbcd5585b1698cd2fbfa3ec45fb96dadb94d0f117da4bfb
-  data.tar.gz: cf348dbad5f7117cda63a7e3d88226c35900a99cfe3ae3dca13e9fab3b093a195c0e7a5331877275b9580ade584422fcb9a63f6b120f7f279eaaf9b647b1ae79
+  metadata.gz: 142c384cef5410d88dfe2241cb6ceddaab6fbf36db23341e9ab584cb7f626ea9839618c0860f275e7b0d9512e2cc23ebc6e1ac19a38c71971a56f82d99892aa0
+  data.tar.gz: 73bd5e390fcf3e8433aab1148f593db6361122379588195bbcae3aba0b82791657de02855a5b4724c05e8220e2a5287499e225ac150eb5f25958284f1a6d145c

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/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.17.0)
+    br_danfe (0.17.1)
       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:
     Ascii85 (1.1.0)
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activesupport (6.1.4)
+    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)
@@ -36,13 +36,13 @@ GEM
     docile (1.4.0)
     ffi (1.15.3)
     formatador (0.3.0)
-    guard (2.16.2)
+    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)
@@ -51,23 +51,22 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashery (2.1.2)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     json (2.5.1)
-    listen (3.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)
     minitest (5.14.4)
     nenv (0.3.0)
-    nokogiri (1.11.7-x86_64-linux)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     pdf-core (0.9.0)
@@ -87,17 +86,18 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (4.0.1)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
     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)
@@ -111,16 +111,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (0.67.0)
-      jaro_winkler (~> 1.5.1)
+    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)
+      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)
@@ -133,8 +140,8 @@ GEM
     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
@@ -142,15 +149,16 @@ PLATFORMS
 DEPENDENCIES
   br_danfe!
   byebug (= 11.1.3)
-  guard (~> 2.16.2)
+  guard (~> 2.18.0)
   guard-rspec
   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,4 +1,6 @@
-guard :rspec, cmd: 'bundle exec rspec' do
+directories %w[lib spec]
+
+guard :rspec, cmd: 'NO_COVERAGE=true bundle exec rspec' do
   require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 

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,16 +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 'guard', '~> 2.16.2'
+  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'
 end

data/lib/br_danfe/danfe_lib/nfce.rb

@@ -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
-          BrDanfe::QrCode.new(pdf: @document, xml: xml, qr_code_tag: xml['qrCode'], box_size: 4.5.cm).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/header.rb

@@ -42,8 +42,7 @@ module BrDanfe
 
         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)

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

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