br_danfe 0.14.5 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7df8dd96da6ae0ee71f0f6c56b6c2b01a312fd5afb51273b771bda2b5a26c6c
-  data.tar.gz: 72f880a77fbe1a2ecb633015a959ba9e10173079b9e3b6157e57d5c44b3757e7
+  metadata.gz: 8ddb33657303d50b425d475e7c493dde5272ed1d4e4bd7d96f9eab45a8f5c600
+  data.tar.gz: 67ba29fde1351c27b7ff6479a6bfd5d803cc843b4a756f9594bc53c82f44a3a0
 SHA512:
-  metadata.gz: 567f26f3c2caea2b097653467cb757dd9f90f784a8f8de0fe6a624010fd7595f7fe9856ec0f8e4f300d54d23ddeec086313e2316545dbad8e0a15b61195f856c
-  data.tar.gz: 731c1dedadc7edc8d9a9698c57310f8e86739b9a0864570e11bd72d24108e6c1778391a9307f623946db484adfba73cf34287fa1eef7e659076af576ee8bd601
+  metadata.gz: e99eb16d42eff7bf889afa5d697f75bdba24ebcc091b8713d55fa83e6950f5b2bc4269d7401292594dbcd5585b1698cd2fbfa3ec45fb96dadb94d0f117da4bfb
+  data.tar.gz: cf348dbad5f7117cda63a7e3d88226c35900a99cfe3ae3dca13e9fab3b093a195c0e7a5331877275b9580ade584422fcb9a63f6b120f7f279eaaf9b647b1ae79

data/.tool-versions

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

data/Gemfile.lock

@@ -1,39 +1,41 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.14.5)
-      barby (= 0.5.1)
+    br_danfe (0.17.0)
+      barby (= 0.6.8)
       br_documents (>= 0.1.3)
       i18n (>= 0.8.6)
       nokogiri (>= 1.8)
-      prawn (~> 2.0)
+      prawn (~> 2.4.0)
       prawn-table (= 0.2.2)
       rqrcode (~> 1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.1)
-      activesupport (= 6.1.3.1)
-    activesupport (6.1.3.1)
+    Ascii85 (1.1.0)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    ast (2.4.0)
-    barby (0.5.1)
-    br_documents (0.1.3)
+    afm (0.2.2)
+    ast (2.4.2)
+    barby (0.6.8)
+    br_documents (0.2.1)
       activemodel (>= 4.0.0)
       i18n (>= 0.6.5)
     byebug (11.1.3)
     chunky_png (1.4.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    docile (1.3.2)
-    ffi (1.13.1)
-    formatador (0.2.5)
+    docile (1.4.0)
+    ffi (1.15.3)
+    formatador (0.3.0)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -48,41 +50,48 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    hashery (2.1.2)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    json (2.3.0)
-    listen (3.2.1)
+    json (2.5.1)
+    listen (3.5.1)
       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.1)
     minitest (5.14.4)
     nenv (0.3.0)
-    nokogiri (1.11.3)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.11.7-x86_64-linux)
       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)
-    pdf-core (0.8.1)
-    prawn (2.3.0)
-      pdf-core (~> 0.8.1)
-      ttfunk (~> 1.6)
+    parallel (1.20.1)
+    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)
+    psych (4.0.1)
     racc (1.5.2)
     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)
@@ -93,15 +102,15 @@ GEM
       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)
+    rspec-support (3.10.2)
     rubocop (0.67.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -112,14 +121,15 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.6)
     rubocop-performance (1.1.0)
       rubocop (>= 0.67.0)
-    ruby-progressbar (1.10.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)
@@ -134,7 +144,8 @@ DEPENDENCIES
   byebug (= 11.1.3)
   guard (~> 2.16.2)
   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)

data/Guardfile

@@ -1,5 +1,5 @@
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 
   # RSpec files

data/README.md

@@ -45,6 +45,22 @@ XML version | Supported?
           end
         end
 
+#### Usage in Rails Controller with more than one xml
+        class DanfeController < ApplicationController
+          def new
+            invoices = Invoice.where(ids: params[:ids])
+            xmls_as_string = []
+            
+            invoices.each do |invoice|
+                xmls_as_string << invoice.generate_xml # your method that generates the NF-e's xml
+            end
+
+            danfe = BrDanfe::Danfe.new(xmls_as_string)
+
+            send_data danfe.render_pdf, filename: "danfe.pdf", type: "application/pdf"
+          end
+        end
+
 ### Options
 
 * `logo_path`: Path of sender's logo image.
@@ -72,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/br_danfe.gemspec

@@ -16,21 +16,22 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.5.1'
 
-  spec.add_dependency 'barby', '0.5.1'
+  spec.add_dependency 'barby', '0.6.8'
   spec.add_dependency 'br_documents', '>= 0.1.3'
   spec.add_dependency 'i18n', '>= 0.8.6'
   spec.add_dependency 'nokogiri', '>= 1.8'
-  spec.add_dependency 'prawn', '~> 2.0'
+  spec.add_dependency 'prawn', '~> 2.4.0'
   spec.add_dependency 'prawn-table', '0.2.2'
   spec.add_dependency 'rqrcode', '~> 1.1.1'
 
   spec.add_development_dependency 'byebug', '11.1.3'
-  spec.add_development_dependency 'rake', '13.0.1'
+  spec.add_development_dependency 'guard', '~> 2.16.2'
+  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 '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.rb

@@ -1,12 +1,15 @@
 module BrDanfe
   class Danfe
-    def self.new(xml)
-      create_danfe BrDanfe::XML.new(xml)
+    def self.new(xmls)
+      xmls = [xmls] unless xmls.is_a?(Array)
+
+      parsed_xmls = xmls.map { |xml| BrDanfe::XML.new(xml) }
+
+      create_danfe(parsed_xmls)
     end
 
-    def self.create_danfe(xml)
-      nfe_code = '55'
-      xml['ide > mod'] == nfe_code ? DanfeLib::Nfe.new(xml) : DanfeLib::Nfce.new(xml)
+    def self.create_danfe(xmls)
+      BrDanfe::Helper.nfe?(xmls.first) ? DanfeLib::Nfe.new(xmls) : DanfeLib::Nfce.new(xmls)
     end
     private_class_method :create_danfe
   end

data/lib/br_danfe/danfe_lib/base.rb

@@ -3,8 +3,8 @@ module BrDanfe
     class Base
       attr_reader :options
 
-      def initialize(xml)
-        @xml = xml
+      def initialize(xmls)
+        @xmls = xmls
         @document = document
         @options = BrDanfe::Logo::Config.new
 

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
@@ -24,21 +24,23 @@ module BrDanfe
       end
 
       def generate(footer_info)
-        NfceLib::Header.new(@document, @xml, @options.logo, @options.logo_dimensions).render
-        NfceLib::ProductList.new(@document, @xml).render
-        NfceLib::TotalList.new(@document, @xml).render
-        NfceLib::Key.new(@document, @xml).render
-        NfceLib::Recipient.new(@document, @xml).render
-        NfceLib::NfceIdentification.new(@document, @xml).render
-        NfceLib::QrCode.new(@document, @xml).render
-        NfceLib::Footer.new(@document, @xml).render(footer_info)
+        @xmls.each do |xml|
+          NfceLib::Header.new(@document, xml, @options.logo, @options.logo_dimensions).render
+          NfceLib::ProductList.new(@document, xml).render
+          NfceLib::TotalList.new(@document, xml).render
+          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
+          NfceLib::Footer.new(@document, xml).render(footer_info)
 
-        render_no_fiscal_value
-        resize_page_height
+          render_no_fiscal_value(xml)
+          resize_page_height
+        end
       end
 
-      def render_no_fiscal_value
-        @document.stamp('has_no_fiscal_value') if BrDanfe::Helper.unauthorized?(@xml)
+      def render_no_fiscal_value(xml)
+        @document.stamp('has_no_fiscal_value') if BrDanfe::Helper.unauthorized?(xml)
       end
 
       def resize_page_height

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

@@ -14,6 +14,7 @@ module BrDanfe
 
           render_company_info(cursor)
           render_logo(cursor) if @logo.present?
+          render_doc
 
           render_homologation if BrDanfe::Helper.homologation?(@xml)
         end
@@ -23,21 +24,20 @@ module BrDanfe
         def render_company_info(cursor)
           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.bounding_box([x_position, cursor], width: width_box, height: 65) do
+            @pdf.text (@xml['emit/xNome']).to_s, size: 10, align: :left, style: :bold
+            @pdf.text cnpj(@xml['emit/CNPJ']), size: 9, align: :left
+            @pdf.text BrDanfe::DanfeLib::NfceLib::Helper.address(@xml.css('enderEmit')), size: 9, align: :left
             @pdf.render_blank_line if count_name_lines(@xml['emit/xNome']) == one_line
-            @pdf.text 'Documento Auxiliar da Nota Fiscal de Consumidor Eletrônica', size: 6, align: :left
           end
         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)
@@ -51,7 +51,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 +59,23 @@ 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
+          cursor = @pdf.cursor
+
+          @pdf.bounding_box([0, 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 }
+
+          cursor = @pdf.cursor
+          @pdf.bounding_box([0, 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