br_danfe 0.14.4 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8da84a67d90f50f225fec5e94551d20645078771493cc7ab409ba5b5c9ad1520
-  data.tar.gz: 388ea2d3244d90339dc310c53a538f21773fc99b268948c0a890924bcdda9bd5
+  metadata.gz: 447b593d2df30cc919fbc59e6453d794c1a60319a256357f650023e51bc6f369
+  data.tar.gz: a1d696214eeb03ef958c001870427cada4d826fabeb09cb24b1174a3ff19107e
 SHA512:
-  metadata.gz: a4235e4eba637692a822496f4872f8589f12d16d93ffaa9ec38a25cded168fef9244b4cc0bb79cfc6e99b8fa5dc975e3bfb977bf7ce069769387742f496e6f89
-  data.tar.gz: 389bb382836e781d5d72e3892dd2e051e6b2349de0757eaa09c0aa47ec7da3243478198425ded15bcc3631a198ac34364ae0e62992fa068adfb34c9d57296121
+  metadata.gz: b7ca6b73178f85c69d8e40334cfdffe2a1840de6c4910c1a40d09f97df05624226a1c5e8e285b5774fcceac78646e32194ce372456a038a66f52f67cb6202f83
+  data.tar.gz: 480fbe9dedac710566471b56a87ec05598bde90232b49fce063462739f249be6084944f397b8424661a2201ce086c77b8ae76c0ceb3315c2b7bf12c0757dfd30

data/.tool-versions

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

data/Gemfile.lock

@@ -1,39 +1,41 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.14.4)
-      barby (= 0.5.1)
+    br_danfe (0.16.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.0)
-      activesupport (= 6.1.0)
-    activesupport (6.1.0)
+    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.0)
       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,39 +50,50 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.9)
+    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.3)
     minitest (5.14.4)
     nenv (0.3.0)
-    nokogiri (1.11.2-x86_64-linux)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
       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)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rqrcode (1.1.2)
@@ -91,15 +104,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)
@@ -110,14 +123,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)
@@ -132,6 +146,7 @@ DEPENDENCIES
   byebug (= 11.1.3)
   guard (~> 2.16.2)
   guard-rspec
+  pdf-inspector (~> 1.3.0)
   rake (= 13.0.1)
   rspec (= 3.10.0)
   rubocop (= 0.67.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 '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.1'
   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/config/locales/pt-BR.yml

@@ -151,4 +151,5 @@ pt-BR:
       '03': "Cartão de Crédito"
       '04': "Cartão de Débito"
       '05': "Crédito Loja"
+      '15': "Boleto"
       '99': "Outros"

data/lib/br_danfe.rb

@@ -16,6 +16,6 @@ Prawn::Font::AFM.hide_m17n_warning = true
 
 module BrDanfe
   def self.root_path
-    File.expand_path('../..',__FILE__)
+    File.expand_path('../..', __FILE__)
   end
 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

@@ -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: 3.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/nfe.rb

@@ -23,45 +23,57 @@ module BrDanfe
       end
 
       def generate(footer_info)
-        render_on_first_page
-        render_on_each_page footer_info
+        last_index = @xmls.size - 1
+
+        @xmls.each_with_index do |xml, index|
+          break unless BrDanfe::Helper.nfe?(xml)
+
+          initial_number_of_pages = @document.page_count
+          render_on_first_page(xml)
+          render_on_each_page(footer_info, xml, initial_number_of_pages)
+          @document.start_new_page unless index == last_index
+        end
+
         @document
       end
 
-      def render_on_first_page
-        NfeLib::Ticket.new(@document, @xml).render
-        NfeLib::Dest.new(@document, @xml).render
-        NfeLib::Dup.new(@document, @xml).render
-        NfeLib::Icmstot.new(@document, @xml).render
-        NfeLib::Transp.new(@document, @xml).render
-        n_vol = NfeLib::Vol.new(@document, @xml).render
-        has_issqn = NfeLib::Issqn.new(@document, @xml).render
-        NfeLib::Infadic.new(@document, @xml).render(n_vol)
-
-        render_products has_issqn
+      def render_on_first_page(xml)
+        NfeLib::Ticket.new(@document, xml).render
+        NfeLib::Dest.new(@document, xml).render
+        NfeLib::Dup.new(@document, xml).render
+        NfeLib::Icmstot.new(@document, xml).render
+        NfeLib::Transp.new(@document, xml).render
+        n_vol = NfeLib::Vol.new(@document, xml).render
+        has_issqn = NfeLib::Issqn.new(@document, xml).render
+        NfeLib::Infadic.new(@document, xml).render(n_vol)
+
+        render_products(has_issqn, xml)
       end
 
-      def render_products(has_issqn)
-        NfeLib::DetBody.new(@document, @xml).render(has_issqn)
+      def render_products(has_issqn, xml)
+        NfeLib::DetBody.new(@document, xml).render(has_issqn)
       end
 
-      def render_on_each_page(footer_info)
-        emitter = NfeLib::EmitHeader.new(@document, @xml, @options.logo, @options.logo_dimensions)
+      def render_on_each_page(footer_info, xml, initial_number_of_pages)
+        total_pages = @document.page_count + 1 - initial_number_of_pages
+
+        emitter = NfeLib::EmitHeader.new(@document, xml, @options.logo, @options.logo_dimensions)
+
+        total_pages.times do |page_index|
+          page = page_index + initial_number_of_pages
 
-        @document.page_count.times do |i|
-          page = i + 1
-          position = page == 1 ? 3.96 : 1.85
-          repeated_information page, position, emitter, footer_info
+          position = page_index + 1 == 1 ? 3.96 : 1.85
+          repeated_information(page, position, emitter, footer_info, xml, total_pages, page_index + 1)
         end
       end
 
-      def repeated_information(page, y_position, emitter, footer_info)
+      def repeated_information(page, y_position, emitter, footer_info, xml, total_pages, initial_page_of_pdf)
         @document.go_to_page(page)
 
-        emitter.render page, y_position
-        render_product_table_title page
+        emitter.render(initial_page_of_pdf, y_position, total_pages)
+        render_product_table_title initial_page_of_pdf
         render_footer_information footer_info
-        render_no_fiscal_value
+        render_no_fiscal_value(xml)
       end
 
       def render_product_table_title(page)
@@ -75,8 +87,8 @@ module BrDanfe
         end
       end
 
-      def render_no_fiscal_value
-        @document.stamp('has_no_fiscal_value') if BrDanfe::Helper.no_fiscal_value?(@xml)
+      def render_no_fiscal_value(xml)
+        @document.stamp('has_no_fiscal_value') if BrDanfe::Helper.no_fiscal_value?(xml)
       end
     end
   end