ruby_danfe 1.11.5 → 1.13.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f371621258cdb5a61f30f3a2f8a2380872585c35
+  data.tar.gz: 7e9f02f772f2baf428af82696ba0e7cdfc980752
+SHA512:
+  metadata.gz: efb679811efa892d3ab45d513e68408fd61d2a69e88cd89c63389bafc75d80fb65902cd53d4d810d90ab5bf11fec822b44b175a6e6a30cf07db0458ddc2b44d8
+  data.tar.gz: 4c22ac1d6ba1167505670b176d2cea8e7bf4d90c74dde1b6b81dd4f2cfe6d93a81c98e59047e2d40c753c869c52945f0d318b27bd88a46c34129d9216dadb1fb

data/.ruby-gemset

@@ -0,0 +1 @@
+ruby-danfe

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.3.1

data/lib/ruby_danfe/dacte_generator.rb

@@ -35,7 +35,7 @@ module RubyDanfe
     private
     def render_emitente
       @pdf.ibox 2.27, 7.67, 0.25, 0.54
-      @pdf.ibox 2.27, 7.67, 0.25, 0.84, '',
+      @pdf.ibox 2.27, 7.67, 0.25, 0.74, '',
         @xml['emit/xNome'],
         { :align => :center, :size => 9, :border => 0, :style => :bold }
 
@@ -47,11 +47,15 @@ module RubyDanfe
           fone = @xml['enderEmit/fone'][0,4] + '-' + @xml['enderEmit/fone'][4,4]
         end
       end
-      @pdf.ibox 2.27, 7.67, 0.25, 1.30, '',
+      @pdf.ibox 2.27, 7.67, 0.25, 1.20, '',
         @xml['enderEmit/xLgr'] + ", " + @xml['enderEmit/nro'] + " " + @xml['enderEmit/xCpl'] + "\n" +
         @xml['enderEmit/xMun'] + " - " + @xml['enderEmit/UF'] + " " + @xml['enderEmit/xPais'] + "\n" +
         "Fone/Fax: " + fone,
         { :align => :center, :size => 8, :border => 0, :style => :bold }
+
+      @pdf.ibox 2.27, 7.67, 0.25, 2.30, '',
+        "CNPJ: " + Helper.format_cnpj(@xml['emit/CNPJ']) + "     " + "IE: " + @xml['emit/IE'],
+        { :align => :center, :size => 7, :border => 0, :style => :bold }
     end
 
     def render_tipo_cte
@@ -164,7 +168,7 @@ module RubyDanfe
       @pdf.ibox 0.90, 3.00, 6.50, 8.02, '', 'CEP: ', { :size => 7, :border => 0, :style => :italic }
       @pdf.ibox 0.90, 3.00, 7.20, 8.02, '', @xml['enderReme/CEP'][0,2] + '.' + @xml['enderReme/CEP'][3,3] + '-' + @xml['enderReme/CEP'][5,3], { :size => 7, :border => 0, :style => :bold } if @xml['enderReme/CEP'] != ''
       @pdf.ibox 0.90, 10.00, 0.28, 8.41, '', 'CNPJ/CPF: ', { :size => 7, :border => 0, :style => :italic }
-      @pdf.ibox 0.90, 10.00, 1.88, 8.41, '', @xml['rem/CNPJ'][0,2] + '.' + @xml['rem/CNPJ'][2,3] + '.' + @xml['rem/CNPJ'][5,3] + '/' + @xml['rem/CNPJ'][8,4] + '-' + @xml['rem/CNPJ'][12,2], { :size => 7, :border => 0, :style => :bold } if @xml['rem/CNPJ'] != ''
+      @pdf.ibox 0.90, 10.00, 1.88, 8.41, '', Helper.format_cnpj(@xml['rem/CNPJ']), { :size => 7, :border => 0, :style => :bold } if @xml['rem/CNPJ'] != ''
       @pdf.ibox 0.90, 10.00, 1.88, 8.41, '', @xml['rem/CPF'][0,3] + '.' + @xml['rem/CPF'][3,3] + '.' + @xml['rem/CPF'][6,3] + '-' + @xml['rem/CPF'][9,2], { :size => 7, :border => 0, :style => :bold } if @xml['rem/CPF'] != ''
       @pdf.ibox 0.90, 3.50, 6.50, 8.41, '', 'Inscr. Est.: ', { :size => 7, :border => 0, :style => :italic }
       @pdf.ibox 0.90, 3.50, 7.85, 8.41, '', @xml['rem/IE'], { :size => 7, :border => 0, :style => :bold }
@@ -194,7 +198,7 @@ module RubyDanfe
       @pdf.ibox 0.90, 3.00, 16.75, 8.02, '', 'CEP: ' , { :size => 7, :border => 0, :style => :italic }
       @pdf.ibox 0.90, 3.00, 17.40, 8.02, '', @xml['enderDest/CEP'][0,2] + '.' + @xml['enderDest/CEP'][3,3] + '-' + @xml['enderDest/CEP'][5,3], { :size => 7, :border => 0, :style => :bold } if @xml['enderDest/CEP'] != ''
       @pdf.ibox 0.90, 10.00, 10.53, 8.41, '', 'CNPJ/CPF: ', { :size => 7, :border => 0, :style => :italic }
-      @pdf.ibox 0.90, 10.00, 12.10, 8.41, '', @xml['dest/CNPJ'][0,2] + '.' + @xml['dest/CNPJ'][2,3] + '.' + @xml['dest/CNPJ'][5,3] + '/' + @xml['dest/CNPJ'][8,4] + '-' + @xml['dest/CNPJ'][12,2], { :size => 7, :border => 0, :style => :bold } if @xml['dest/CNPJ'] != ''
+      @pdf.ibox 0.90, 10.00, 12.10, 8.41, '', Helper.format_cnpj(@xml['dest/CNPJ']), { :size => 7, :border => 0, :style => :bold } if @xml['dest/CNPJ'] != ''
       @pdf.ibox 0.90, 10.00, 12.10, 8.41, '', @xml['dest/CPF'][0,3] + '.' + @xml['dest/CPF'][3,3] + '.' + @xml['dest/CPF'][6,3] + '-' + @xml['dest/CPF'][9,2], { :size => 7, :border => 0, :style => :bold } if @xml['dest/CPF'] != ''
       @pdf.ibox 0.90, 3.50, 16.75, 8.41, '', 'Inscr. Est.: ', { :size => 7, :border => 0, :style => :italic }
       @pdf.ibox 0.90, 3.50, 18.05, 8.41, '', @xml['dest/IE'], { :size => 7, :border => 0, :style => :bold }
@@ -224,7 +228,7 @@ module RubyDanfe
       @pdf.ibox 0.90, 3.00, 6.50, 10.78, '', 'CEP: ', { :size => 7, :border => 0, :style => :italic }
       @pdf.ibox 0.90, 3.00, 7.20, 10.78, '', @xml['enderExped/CEP'][0,2] + '.' + @xml['enderExped/CEP'][3,3] + '-' + @xml['enderExped/CEP'][5,3], { :size => 7, :border => 0, :style => :bold } if @xml['enderExped/CEP'] != ''
       @pdf.ibox 0.90, 10.00, 0.28, 11.17, '', 'CNPJ/CPF: ', { :size => 7, :border => 0, :style => :italic }
-      @pdf.ibox 0.90, 10.00, 1.88, 11.17, '', @xml['exped/CNPJ'][0,2] + '.' + @xml['exped/CNPJ'][2,3] + '.' + @xml['exped/CNPJ'][5,3] + '/' + @xml['exped/CNPJ'][8,4] + '-' + @xml['exped/CNPJ'][12,2], { :size => 7, :border => 0, :style => :bold } if @xml['exped/CNPJ'] != ''
+      @pdf.ibox 0.90, 10.00, 1.88, 11.17, '', Helper.format_cnpj(@xml['exped/CNPJ']), { :size => 7, :border => 0, :style => :bold } if @xml['exped/CNPJ'] != ''
       @pdf.ibox 0.90, 10.00, 1.88, 11.17, '', @xml['exped/CPF'][0,3] + '.' + @xml['exped/CPF'][3,3] + '.' + @xml['exped/CPF'][6,3] + '-' + @xml['exped/CPF'][9,2], { :size => 7, :border => 0, :style => :bold } if @xml['exped/CPF'] != ''
       @pdf.ibox 0.90, 3.50, 6.50, 11.17, '', 'Inscr. Est.:' , { :size => 7, :border => 0, :style => :italic }
       @pdf.ibox 0.90, 3.50, 7.85, 11.17, '', @xml['exped/IE'], { :size => 7, :border => 0, :style => :bold }
@@ -254,7 +258,7 @@ module RubyDanfe
       @pdf.ibox 0.90, 3.00, 16.75, 10.78, '', 'CEP: ', { :size => 7, :border => 0, :style => :italic }
       @pdf.ibox 0.90, 3.00, 17.40, 10.78, '', @xml['enderReceb/CEP'][0,2] + '.' + @xml['enderReceb/CEP'][3,3] + '-' + @xml['enderReceb/CEP'][5,3], { :size => 7, :border => 0, :style => :bold } if @xml['enderReceb/CEP'] != ''
       @pdf.ibox 0.90, 10.00, 10.53, 11.17, '', 'CNPJ/CPF: ', { :size => 7, :border => 0, :style => :italic }
-      @pdf.ibox 0.90, 10.00, 12.10, 11.17, '', @xml['receb/CNPJ'][0,2] + '.' + @xml['receb/CNPJ'][2,3] + '.' + @xml['receb/CNPJ'][5,3] + '/' + @xml['receb/CNPJ'][8,4] + '-' + @xml['receb/CNPJ'][12,2], { :size => 7, :border => 0, :style => :bold } if @xml['receb/CNPJ'] != ''
+      @pdf.ibox 0.90, 10.00, 12.10, 11.17, '', Helper.format_cnpj(@xml['receb/CNPJ']), { :size => 7, :border => 0, :style => :bold } if @xml['receb/CNPJ'] != ''
       @pdf.ibox 0.90, 10.00, 12.10, 11.17, '', @xml['receb/CPF'][0,3] + '.' + @xml['receb/CPF'][3,3] + '.' + @xml['receb/CPF'][6,3] + '-' + @xml['receb/CPF'][9,2], { :size => 7, :border => 0, :style => :bold } if @xml['receb/CPF'] != ''
       @pdf.ibox 0.90, 3.50, 16.75, 11.17, '', 'Inscr. Est.: ', { :size => 7, :border => 0, :style => :italic }
       @pdf.ibox 0.90, 3.50, 18.05, 11.17, '', @xml['receb/IE'], { :size => 7, :border => 0, :style => :bold }
@@ -310,7 +314,7 @@ module RubyDanfe
         @pdf.ibox 0.90, 5.00, 16.50, 12.81, '', 'País: ' , { :size => 7, :border => 0, :style => :italic }
         @pdf.ibox 0.90, 5.00, 17.50, 12.81, '', @xml['enderToma/xPais'], { :size => 7, :border => 0, :style => :bold }
         @pdf.ibox 0.90, 5.00, 0.28, 13.17, '', 'CNPJ/CPF: ' , { :size => 7, :border => 0, :style => :italic }
-        @pdf.ibox 0.90, 5.00, 1.88, 13.17, '', @xml['toma4/CNPJ'][0,2] + '.' + @xml['toma4/CNPJ'][2,3] + '.' + @xml['toma4/CNPJ'][5,3] + '/' + @xml['toma4/CNPJ'][8,4] + '-' + @xml['toma4/CNPJ'][12,2], { :size => 7, :border => 0, :style => :bold } if @xml['toma4/CNPJ'] != ''
+        @pdf.ibox 0.90, 5.00, 1.88, 13.17, '', Helper.format_cnpj(@xml['toma4/CNPJ']), { :size => 7, :border => 0, :style => :bold } if @xml['toma4/CNPJ'] != ''
         @pdf.ibox 0.90, 5.00, 1.88, 13.17, '', @xml['toma4/CPF'][0,3] + '.' + @xml['toma4/CPF'][3,3] + '.' + @xml['toma4/CPF'][6,3] + '-' + @xml['toma4/CPF'][9,2], { :size => 7, :border => 0, :style => :bold } if @xml['toma4/CPF'] != ''
         @pdf.ibox 0.90, 5.00, 5.60, 13.17, '', 'Inscr. Est.: ', { :size => 7, :border => 0, :style => :italic }
         @pdf.ibox 0.90, 5.00, 7.20, 13.17, '', @xml['toma4/IE'], { :size => 7, :border => 0, :style => :bold }
@@ -337,7 +341,7 @@ module RubyDanfe
         @pdf.ibox 0.90, 5.00, 16.50, 12.81, '', 'País: ' , { :size => 7, :border => 0, :style => :italic }
         @pdf.ibox 0.90, 5.00, 17.50, 12.81, '', @xml[endereco + '/xPais'], { :size => 7, :border => 0, :style => :bold }
         @pdf.ibox 0.90, 5.00, 0.28, 13.17, '', 'CNPJ/CPF: ' , { :size => 7, :border => 0, :style => :italic }
-        @pdf.ibox 0.90, 5.00, 1.88, 13.17, '', @xml[toma + '/CNPJ'][0,2] + '.' + @xml[toma + '/CNPJ'][2,3] + '.' + @xml[toma + '/CNPJ'][5,3] + '/' + @xml[toma + '/CNPJ'][8,4] + '-' + @xml[toma + '/CNPJ'][12,2], { :size => 7, :border => 0, :style => :bold } if @xml[toma + '/CNPJ'] != ''
+        @pdf.ibox 0.90, 5.00, 1.88, 13.17, '', Helper.format_cnpj(@xml[toma + '/CNPJ']), { :size => 7, :border => 0, :style => :bold } if @xml[toma + '/CNPJ'] != ''
         @pdf.ibox 0.90, 5.00, 1.88, 13.17, '', @xml[toma + '/CPF'][0,3] + '.' + @xml[toma + '/CPF'][3,3] + '.' + @xml[toma + '/CPF'][6,3] + '-' + @xml[toma + '/CPF'][9,2], { :size => 7, :border => 0, :style => :bold } if @xml[toma + '/CPF'] != ''
         @pdf.ibox 0.90, 5.00, 5.60, 13.17, '', 'Inscr. Est.: ', { :size => 7, :border => 0, :style => :italic }
         @pdf.ibox 0.90, 5.00, 7.20, 13.17, '', @xml[toma + '/IE'], { :size => 7, :border => 0, :style => :bold }
@@ -358,7 +362,7 @@ module RubyDanfe
       #@pdf.ibox 0.92, 20.49, 0.25, 13.82
       @pdf.ibox 0.90, 6.83, 0.25, 13.82, 'PRODUTO PREDOMINANTE', @xml['infCarga/proPred'], {:size => 7, :style => :bold }
       @pdf.ibox 0.90, 6.83, 7.09, 13.82, 'OUTRAS CARACTERÍSTICAS DA CARGA', @xml['infCarga/xOutCat'], {:size => 7, :style => :bold }
-      @pdf.ibox 0.90, 6.82, 13.92, 13.82, 'VALOR TOTAL DA MERCADORIA', '0,00', {:size => 7, :style => :bold }
+      @pdf.ibox 0.90, 6.82, 13.92, 13.82, 'VALOR TOTAL DA MERCADORIA', @xml['infCarga/vCarga'].empty? ? '0,00' : @xml['infCarga/vCarga'], {:size => 7, :style => :bold }
     end
 
     def render_quantidade
@@ -461,25 +465,39 @@ module RubyDanfe
     def render_documentos_originarios
       #documentos originários
       @pdf.ibox 0.40, 20.49, 0.25, 18.73, '', 'DOCUMENTOS ORIGINÁRIOS', { :align => :left, :size => 7, :style => :bold, :border => 0 }
-      @pdf.ibox 5.52, 2.25, 0.25, 19.13, 'TP DOC.', '', { :size => 7}
-      @pdf.ibox 5.52, 4.00, 2.50, 19.13, 'CNPJ/CPF EMITENTE', '', { :size => 7}
-      @pdf.ibox 5.52, 1.50, 6.50, 19.13, 'SÉRIE', '', { :size => 7}
-      @pdf.ibox 5.52, 2.50, 8.00, 19.13, 'Nº DOCUMENTO', '', { :size => 7}
-      @pdf.ibox 5.52, 2.25, 10.50, 19.13, 'TP DOC.', '', { :size => 7}
-      @pdf.ibox 5.52, 4.00, 12.75, 19.13, 'CNPJ/CPF EMITENTE', '', { :size => 7}
-      @pdf.ibox 5.52, 1.50, 16.75, 19.13, 'SÉRIE', '', { :size => 7}
-      @pdf.ibox 5.52, 2.50, 18.24, 19.13, 'Nº DOCUMENTO', '', { :size => 7}
+      @pdf.ibox 5.52, 1.75, 0.25, 19.13, 'TP DOC.', '', { :size => 7}
+      @pdf.ibox 5.52, 5.50, 2.00, 19.13, 'CNPJ/CPF EMITENTE/CHAVE', '', { :size => 7}
+      @pdf.ibox 5.52, 1.00, 7.50, 19.13, 'SÉRIE', '', { :size => 7}
+      @pdf.ibox 5.52, 2.00, 8.50, 19.13, 'Nº DOCUMENTO', '', { :size => 7}
+      @pdf.ibox 5.52, 1.75, 10.50, 19.13, 'TP DOC.', '', { :size => 7}
+      @pdf.ibox 5.52, 5.50, 12.25, 19.13, 'CNPJ/CPF EMITENTE/CHAVE', '', { :size => 7}
+      @pdf.ibox 5.52, 1.00, 17.75, 19.13, 'SÉRIE', '', { :size => 7}
+      @pdf.ibox 5.52, 2.00, 18.74, 19.13, 'Nº DOCUMENTO', '', { :size => 7}
       x = 0.25
       @xml.collect('xmlns', 'infNF') { |det|
-        @pdf.ibox 5.52, 2.25, x, 19.43, '', det.css('mod').text, { :size => 7, :border => 0, :style => :bold }
-        x = x + 2.25
-        @pdf.ibox 5.52, 2.25, x, 19.43, '', @xml['rem/CNPJ'][0,2] + '.' + @xml['rem/CNPJ'][2,3] + '.' +@xml['rem/CNPJ'][5,3] + '/' + @xml['rem/CNPJ'][8,4] + '-' + @xml['rem/CNPJ'][12,2], { :size => 7, :border => 0, :style => :bold } if @xml['rem/CNPJ'] != ''
-        @pdf.ibox 5.52, 2.25, x, 19.43, '', @xml['rem/CPF'][0,3] + '.' + @xml['rem/CPF'][3,3] + '.' +@xml['rem/CPF'][6,3] + '-' + @xml['rem/CPF'][9,2], { :size => 7, :border => 0, :style => :bold } if @xml['rem/CPF'] != ''
-        x = x + 4.00
-        @pdf.ibox 5.52, 2.25, x, 19.43, '', det.css('serie').text, { :size => 7, :border => 0, :style => :bold }
-        x = x + 1.50
-        @pdf.ibox 5.52, 2.25, x, 19.43, '', det.css('nDoc').text, { :size => 7, :border => 0, :style => :bold }
-        x = x + 2.50
+        @pdf.ibox 5.52, 1.50, x, 19.43, '', det.css('mod').text, { :size => 7, :border => 0, :style => :bold }
+        x = x + 1.75
+        @pdf.ibox 5.52, 2.25, x, 19.43, '', Helper.format_cnpj(@xml['rem/CNPJ']), { :size => 7, :border => 0, :style => :bold } if @xml['rem/CNPJ'] != ''
+        @pdf.ibox 5.52, 5.25, x, 19.43, '', @xml['rem/CPF'][0,3] + '.' + @xml['rem/CPF'][3,3] + '.' +@xml['rem/CPF'][6,3] + '-' + @xml['rem/CPF'][9,2], { :size => 7, :border => 0, :style => :bold } if @xml['rem/CPF'] != ''
+        x = x + 5.50
+        @pdf.ibox 5.52, 0.75, x, 19.43, '', det.css('serie').text, { :size => 7, :border => 0, :style => :bold }
+        x = x + 1.00
+        @pdf.ibox 5.52, 1.75, x, 19.43, '', det.css('nDoc').text, { :size => 7, :border => 0, :style => :bold }
+        x = x + 2.00
+      }
+      # NFe
+      @xml.collect('xmlns', 'infNFe') { |det|
+        chave = det.css('chave').text
+        unless chave.empty?
+          @pdf.ibox 5.52, 1.50, x, 19.43, '', 'NFe', { :size => 7, :border => 0, :style => :bold }
+          x = x + 1.75
+          @pdf.ibox 5.52, 5.25, x, 19.43, '', chave, { :size => 6, :border => 0, :style => :bold }
+          x = x + 5.50
+          @pdf.ibox 5.52, 0.75, x, 19.43, '', chave[22, 3], { :size => 7, :border => 0, :style => :bold }
+          x = x + 1.00
+          @pdf.ibox 5.52, 1.75, x, 19.43, '', chave[25, 9].gsub(/^[0]+/, ''), { :size => 7, :border => 0, :style => :bold }
+          x = x + 2.00
+        end
       }
     end
 

data/lib/ruby_danfe/danfe_generator.rb

@@ -24,7 +24,7 @@ module RubyDanfe
 
       @pdf.page_count.times do |i|
         @pdf.go_to_page(i + 1)
-        @pdf.ibox 1.00, 3.08, 7.71, 5.54, '',
+        @pdf.ibox 1.00, 3.08, 6.71, 5.54, '',
         "FOLHA #{i + 1} de #{@pdf.page_count}", {:size => 8, :align => :center, :valign => :center, :border => 0, :style => :bold}
       end
 
@@ -44,31 +44,31 @@ module RubyDanfe
     end
 
     def render_emitente
-      @pdf.ibox 3.92, 7.46, 0.25, 2.54, '',
+      @pdf.ibox 3.92, 6.46, 0.25, 2.54, '',
         @xml['emit/xNome'] + "\n" +
         @xml['enderEmit/xLgr'] + ", " + @xml['enderEmit/nro'] + "\n" +
         @xml['enderEmit/xBairro'] + " - " + @xml['enderEmit/CEP'] + "\n" +
         @xml['enderEmit/xMun'] + "/" + @xml['enderEmit/UF'] + "\n" +
         @xml['enderEmit/fone'] + " " + @xml['enderEmit/email'], {:align => :center, :valign => :center}
 
-      @pdf.ibox 3.92, 3.08, 7.71, 2.54
+      @pdf.ibox 3.92, 3.08, 6.71, 2.54
 
-      @pdf.ibox 0.60, 3.08, 7.71, 2.54, '', "DANFE", {:size => 12, :align => :center, :border => 0, :style => :bold}
-      @pdf.ibox 1.20, 3.08, 7.71, 3.14, '', "DOCUMENTO AUXILIAR DA NOTA FISCAL ELETRÔNICA", {:size => 8, :align => :center, :border => 0}
-      @pdf.ibox 0.60, 3.08, 7.71, 4.34, '', "#{@xml['ide/tpNF']} - " + (@xml['ide/tpNF'] == '0' ? 'ENTRADA' : 'SAÍDA'), {:size => 8, :align => :center, :border => 0}
+      @pdf.ibox 0.60, 3.08, 6.71, 2.54, '', "DANFE", {:size => 12, :align => :center, :border => 0, :style => :bold}
+      @pdf.ibox 1.20, 3.08, 6.71, 3.14, '', "DOCUMENTO AUXILIAR DA NOTA FISCAL ELETRÔNICA", {:size => 8, :align => :center, :border => 0}
+      @pdf.ibox 0.60, 3.08, 6.71, 4.34, '', "#{@xml['ide/tpNF']} - " + (@xml['ide/tpNF'] == '0' ? 'ENTRADA' : 'SAÍDA'), {:size => 8, :align => :center, :border => 0}
 
-      @pdf.ibox 1.00, 3.08, 7.71, 4.94, '',
+      @pdf.ibox 1.00, 3.08, 6.71, 4.94, '',
         "N°. " + @xml['ide/nNF'] + "\n" +
         "SÉRIE " + @xml['ide/serie'], {:size => 8, :align => :center, :valign => :center, :border => 0, :style => :bold}
 
-      @pdf.ibox 2.20, 10.02, 10.79, 2.54
-      @pdf.ibarcode 1.50, 8.00, 10.9010, 4.44, @xml['chNFe']
-      @pdf.ibox 0.85, 10.02, 10.79, 4.74, "CHAVE DE ACESSO", @xml['chNFe'].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, "\\1 "), {:style => :bold, :align => :center}
-      @pdf.ibox 0.85, 10.02, 10.79, 5.60 , '', "Consulta de autenticidade no portal nacional da NF-e www.nfe.fazenda.gov.br/portal ou no site da Sefaz Autorizadora", {:align => :center, :size => 8}
+      @pdf.ibox 2.20, 11.02, 9.79, 2.54
+      @pdf.ibarcode 1.50, 8.00, 10.4010, 4.44, @xml['chNFe']
+      @pdf.ibox 0.85, 11.02, 9.79, 4.74, "CHAVE DE ACESSO", @xml['chNFe'].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, "\\1 "), {:style => :bold, :align => :center}
+      @pdf.ibox 0.85, 11.02, 9.79, 5.60 , '', "Consulta de autenticidade no portal nacional da NF-e www.nfe.fazenda.gov.br/portal ou no site da Sefaz Autorizadora", {:align => :center, :size => 8}
       @pdf.ibox 0.85, 10.54, 0.25, 6.46, "NATUREZA DA OPERAÇÃO", @xml['ide/natOp']
       @pdf.ibox 0.85, 10.02, 10.79, 6.46, "PROTOCOLO DE AUTORIZAÇÃO DE USO", @xml['infProt/nProt'] + ' ' + Helper.format_datetime(@xml['infProt/dhRecbto']) , {:align => :center}
       @pdf.ibox 0.85, 6.86, 0.25, 7.31, "INSCRIÇÃO ESTADUAL", @xml['emit/IE']
-      @pdf.ibox 0.85, 6.86, 7.11, 7.31, "INSC.ESTADUAL DO SUBST. TRIBUTÁRIO", @xml['emit/IE_ST']
+      @pdf.ibox 0.85, 6.86, 7.11, 7.31, "INSC.ESTADUAL DO SUBST. TRIBUTÁRIO", @xml['emit/IEST']
       @pdf.ibox 0.85, 6.84, 13.97, 7.31, "CNPJ", @xml['emit/CNPJ']
     end
 
@@ -181,9 +181,9 @@ module RubyDanfe
       @pdf.ititle 0.42, 10.00, 0.25, 24.64, "CÁLCULO DO ISSQN"
 
       @pdf.ibox 0.85, 5.08, 0.25, 25.06, "INSCRIÇÃO MUNICIPAL", @xml['emit/IM']
-      @pdf.ibox 0.85, 5.08, 5.33, 25.06, "VALOR TOTAL DOS SERVIÇOS", @xml['total/vServ']
-      @pdf.ibox 0.85, 5.08, 10.41, 25.06, "BASE DE CÁLCULO DO ISSQN", @xml['total/vBCISS']
-      @pdf.ibox 0.85, 5.28, 15.49, 25.06, "VALOR DO ISSQN", @xml['total/ISSTot']
+      @pdf.ibox 0.85, 5.08, 5.33, 25.06, "VALOR TOTAL DOS SERVIÇOS", @xml['total/vServ'] || @xml['total/ISSQNtot/vServ']
+      @pdf.ibox 0.85, 5.08, 10.41, 25.06, "BASE DE CÁLCULO DO ISSQN", @xml['total/vBCISS'] || @xml['total/ISSQNtot/vBC']
+      @pdf.ibox 0.85, 5.28, 15.49, 25.06, "VALOR DO ISSQN", @xml['total/ISSTot'] || @xml['total/ISSQNtot/vISSQN']
     end
 
     def render_dados_adicionais

data/lib/ruby_danfe/helper.rb

@@ -25,7 +25,7 @@ module RubyDanfe
       formated_datetime = ""
 
       if not string.empty?
-        date = DateTime.strptime(string, "%Y-%m-%dT%H:%M:%S")
+        date = extract_date_time(string)
         formated_datetime = date.strftime("%d/%m/%Y %H:%M:%S")
       end
 
@@ -58,11 +58,32 @@ module RubyDanfe
       formated_time = ""
 
       if not string.empty?
-        date = DateTime.strptime(string, "%Y-%m-%dT%H:%M:%S")
+        date = extract_date_time(string)
         formated_time = date.strftime("%H:%M:%S")
       end
 
       formated_time
     end
+
+    def self.format_cnpj(string)
+      formated_cnpj = ""
+
+      if not (string.empty? || string.size != 14)
+        formated_cnpj = string[0,2] + '.' + string[2,3] + '.' + string[5,3] +
+                        '/' + string[8,4] + '-' + string[12,2]
+      end
+
+      formated_cnpj
+    end
+
+    private
+
+    def self.extract_date_time(string)
+      begin
+        DateTime.strptime(string, "%Y-%m-%dT%H:%M:%S")
+      rescue ArgumentError
+        DateTime.strptime(string, "%d/%m/%Y %H:%M:%S")
+      end
+    end
   end
 end

data/lib/ruby_danfe/version.rb

@@ -1,3 +1,3 @@
 module RubyDanfe
-  VERSION = "1.11.5"
+  VERSION = "1.13.2"
 end

data/lib/ruby_danfe/xml.rb

@@ -11,7 +11,7 @@ module RubyDanfe
 
     def regex_string(search_string, regex)
       doc = Nokogiri::HTML(search_string)
-      return doc.xpath(regex)      
+      return doc.xpath(regex)
     end
 
     def initialize(xml)

data/ruby_danfe.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "nokogiri", "~> 1.6.3.1"
   spec.add_dependency "prawn", '~> 1.0.0'
   spec.add_dependency "barby"
   spec.add_dependency "rake"
 
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "simplecov"
 end

data/spec/features/ruby_danfe_spec.rb

@@ -10,7 +10,7 @@ describe "RubyDanfe generated pdf files" do
   }
 
   it "renders a basic NF-e with namespace" do
-    expect(File.exist?(output_pdf)).to be_false
+    expect(File.exist?(output_pdf)).to be_falsey
 
     RubyDanfe.generate(output_pdf, "#{base_dir}nfe_with_ns.xml")
 
@@ -18,7 +18,7 @@ describe "RubyDanfe generated pdf files" do
   end
 
   it "renders another basic NF-e without namespace" do
-    expect(File.exist?(output_pdf)).to be_false
+    expect(File.exist?(output_pdf)).to be_falsey
 
     RubyDanfe.generate(output_pdf, "#{base_dir}nfe_without_ns.xml")
 
@@ -26,7 +26,7 @@ describe "RubyDanfe generated pdf files" do
   end
 
   it "renders a NF-e having FCI in its items" do
-    expect(File.exist?(output_pdf)).to be_false
+    expect(File.exist?(output_pdf)).to be_falsey
 
     RubyDanfe.generate(output_pdf, "#{base_dir}nfe_with_fci.xml")
 
@@ -34,7 +34,7 @@ describe "RubyDanfe generated pdf files" do
   end
 
   it "renders a NF-e of Simples Nacional using CSOSN" do
-    expect(File.exist?(output_pdf)).to be_false
+    expect(File.exist?(output_pdf)).to be_falsey
 
     RubyDanfe.generate(output_pdf, "#{base_dir}nfe_simples_nacional.xml")
 
@@ -42,7 +42,7 @@ describe "RubyDanfe generated pdf files" do
   end
 
   it "renders a basic CT-e" do
-    expect(File.exist?(output_pdf)).to be_false
+    expect(File.exist?(output_pdf)).to be_falsey
 
     RubyDanfe.generate(output_pdf, "#{base_dir}cte.xml", :dacte)
 
@@ -50,7 +50,7 @@ describe "RubyDanfe generated pdf files" do
   end
 
   it "renders quantity field with 4 decimals" do
-    expect(File.exist?(output_pdf)).to be_false
+    expect(File.exist?(output_pdf)).to be_falsey
 
     RubyDanfe.generate(output_pdf, "#{base_dir}4_decimals_nfe_simples_nacional.xml", :danfe, {"quantity_decimals" => 4})
 

data/spec/lib/helper_spec.rb

@@ -2,9 +2,18 @@ require "spec_helper"
 
 describe RubyDanfe::Helper do
   describe ".format_datetime" do
-    it "returns a formated string" do
-      string = "2013-10-18T13:54:04"
-      expect(RubyDanfe::Helper.format_datetime(string)).to eq "18/10/2013 13:54:04"
+    context "when date format is %Y-%m-%d" do
+      it "returns a formated string" do
+        string = "2013-10-18T13:54:04"
+        expect(RubyDanfe::Helper.format_datetime(string)).to eq "18/10/2013 13:54:04"
+      end
+    end
+
+    context "when date format is %d/%m/%Y" do
+      it "returns a formated string" do
+        string = "25/02/2016  09:22:26"
+        expect(RubyDanfe::Helper.format_datetime(string)).to eq "25/02/2016 09:22:26"
+      end
     end
   end
 
@@ -85,4 +94,20 @@ describe RubyDanfe::Helper do
       end
     end
   end
+
+  describe ".format_cnpj" do
+    context "with a valid cnpj" do
+      it "returns a formated string" do
+        string = "15704602000105"
+        expect(RubyDanfe::Helper.format_cnpj(string)).to eq "15.704.602/0001-05"
+      end
+    end
+
+    context "with an invalid cnpj" do
+      it "returns an empty string" do
+        string = "157046020"
+        expect(RubyDanfe::Helper.format_cnpj(string)).to eq ""
+      end
+    end
+  end
 end

data/spec/lib/ruby_danfe_spec.rb

@@ -11,7 +11,7 @@ describe RubyDanfe do
 
   describe ".generate" do
     it "saves the PDF document to file based on a xml file" do
-      expect(File.exist?(output_pdf)).to be_false
+      expect(File.exist?(output_pdf)).to be_falsey
 
       RubyDanfe.generate(output_pdf, "#{base_dir}nfe_with_ns.xml")
 
@@ -25,13 +25,13 @@ describe RubyDanfe do
 
       pdf_string = RubyDanfe.render(xml_string)
 
-      expect(pdf_string).to include "%PDF-1.3\n%\xFF\xFF\xFF\xFF\n1 0 obj\n<< /Creator <"
+      expect(pdf_string).to include '%PDF-1.3'
     end
   end
 
   describe ".render_file" do
     it "renders the PDF document to file based on a xml string" do
-      expect(File.exist?(output_pdf)).to be_false
+      expect(File.exist?(output_pdf)).to be_falsey
 
       xml_string = File.new("#{base_dir}nfe_with_ns.xml")
 

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: ruby_danfe
 version: !ruby/object:Gem::Version
-  version: 1.11.5
-  prerelease: 
+  version: 1.13.2
 platform: ruby
 authors:
 - Eduardo Reboucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.3.1
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: barby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -129,8 +114,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -174,26 +161,48 @@ files:
 homepage: http://github.com/taxweb/ruby_danfe
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DANFE and DACTE pdf generator for Brazilian invoices and transportation docs.
-test_files: []
+test_files:
+- spec/features/ruby_danfe_spec.rb
+- spec/fixtures/4_decimals_nfe_simples_nacional.xml
+- spec/fixtures/cte.xml
+- spec/fixtures/nfe_date_format_infoadprod_infoadfisco_issues.xml
+- spec/fixtures/nfe_simples_nacional.xml
+- spec/fixtures/nfe_with_fci.xml
+- spec/fixtures/nfe_with_ns.xml
+- spec/fixtures/nfe_without_ns.xml
+- spec/lib/cst_spec.rb
+- spec/lib/descricao_spec.rb
+- spec/lib/helper_spec.rb
+- spec/lib/options_spec.rb
+- spec/lib/ruby_danfe_spec.rb
+- spec/spec_helper.rb
+- spec/support/be_same_file_as.rb
+- test/danfe.xml
+- test/generate.rb
+- test/generate_nfce.rb
+- test/nfce.xml
+- test/nfe_simples_nacional.xml
+- test/nfe_with_fci.xml
+- test/nfe_with_ns.xml
+- test/nfe_without_ns.xml