br_danfe 0.11.1 → 0.11.2

data/lib/br_danfe/danfe_lib/vol.rb

@@ -13,24 +13,25 @@ module BrDanfe
       def render
         nVol = 0
 
-        @xml.collect("xmlns", "vol") do |det|
+        @xml.collect('xmlns', 'vol') do |det|
           nVol += 1
           render_vol(det) if nVol < 2
         end
 
-        render_blank_boxes if nVol == 0
+        render_blank_boxes if nVol.zero?
 
         nVol
       end
 
       private
+
       def render_vol(det)
-        @pdf.ibox 0.85, 2.42, 0.75, @l1, I18n.t("danfe.vol.qVol"), det.css("qVol").text
-        @pdf.ibox 0.85, 3.05, 3.17, @l1, I18n.t("danfe.vol.esp"), det.css("esp").text
-        @pdf.ibox 0.85, 3.05, 6.22, @l1, I18n.t("danfe.vol.marca"), det.css("marca").text
-        @pdf.ibox 0.85, 4.83, 9.27, @l1, I18n.t("danfe.vol.nVol")
-        @pdf.inumeric 0.85, 3.43, 14.10, @l1, "vol.pesoB", det.css("pesoB").text, { decimals: 3 }
-        @pdf.inumeric 0.85, 2.80, 17.53, @l1, "vol.pesoL", det.css("pesoL").text, { decimals: 3 }
+        @pdf.ibox 0.85, 2.42, 0.75, @l1, I18n.t('danfe.vol.qVol'), det.css('qVol').text
+        @pdf.ibox 0.85, 3.05, 3.17, @l1, I18n.t('danfe.vol.esp'), det.css('esp').text
+        @pdf.ibox 0.85, 3.05, 6.22, @l1, I18n.t('danfe.vol.marca'), det.css('marca').text
+        @pdf.ibox 0.85, 4.83, 9.27, @l1, I18n.t('danfe.vol.nVol')
+        @pdf.inumeric 0.85, 3.43, 14.10, @l1, 'vol.pesoB', det.css('pesoB').text, { decimals: 3 }
+        @pdf.inumeric 0.85, 2.80, 17.53, @l1, 'vol.pesoL', det.css('pesoL').text, { decimals: 3 }
       end
 
       def render_blank_boxes

data/lib/br_danfe/danfe_lib/xml.rb

@@ -11,18 +11,18 @@ module BrDanfe
 
       def [](xpath)
         node = @xml.css(xpath)
-        return node ? node.text : ""
+        node ? node.text : ''
       end
 
-      def collect(ns, tag, &block)
+      def collect(ns, tag)
         result = []
-        # Tenta primeiro com uso de namespace
+        # With namespace
         begin
           @xml.xpath("//#{ns}:#{tag}").each do |det|
             result << yield(det)
           end
-        rescue
-          # Caso dê erro, tenta sem
+        rescue StandardError
+          # Without namespace
           @xml.xpath("//#{tag}").each do |det|
             result << yield(det)
           end
@@ -31,7 +31,7 @@ module BrDanfe
       end
 
       def version_is_310_or_newer?
-        @xml.css("infNFe").attr("versao").to_s.to_f >= 3.10
+        @xml.css('infNFe').attr('versao').to_s.to_f >= 3.10
       end
     end
   end

data/lib/br_danfe/danfe_lib/xprod.rb

@@ -6,9 +6,9 @@ module BrDanfe
       end
 
       def render
-        xprod = "#{@det.css('prod/xProd').text}"
+        xprod = @det.css('prod/xProd').text.to_s
 
-        xprod += infAdProd if has_infAdProd?
+        xprod += infAdProd if infAdProd?
         xprod += fci if fci?
         xprod += icms_st if icms_st?
         xprod += fcp if fcp?
@@ -24,13 +24,13 @@ module BrDanfe
         "\n#{@det.css('infAdProd').text}"
       end
 
-      def has_infAdProd?
-        !@det.css("infAdProd").text.empty?
+      def infAdProd?
+        !@det.css('infAdProd').text.empty?
       end
 
       def fci
         "\n#{I18n.t('danfe.det.prod.xProdFCI',
-          nFCI: @det.css('prod/nFCI').text)}"
+                    nFCI: @det.css('prod/nFCI').text)}"
       end
 
       def fci?
@@ -39,18 +39,18 @@ module BrDanfe
 
       def icms_st
         "\n#{I18n.t('danfe.det.prod.xProdST',
-          pMVAST: Helper.numerify(@det.css('ICMS/*/pMVAST').text),
-          pICMSST: Helper.numerify(@det.css('ICMS/*/pICMSST').text),
-          vBCST: Helper.numerify(@det.css('ICMS/*/vBCST').text),
-          vICMSST: Helper.numerify(@det.css('ICMS/*/vICMSST').text))}"
+                    pMVAST: Helper.numerify(@det.css('ICMS/*/pMVAST').text),
+                    pICMSST: Helper.numerify(@det.css('ICMS/*/pICMSST').text),
+                    vBCST: Helper.numerify(@det.css('ICMS/*/vBCST').text),
+                    vICMSST: Helper.numerify(@det.css('ICMS/*/vICMSST').text))}"
       end
 
       def icms_st?
-        @det.css('ICMS/*/vBCST').text.to_i > 0
+        @det.css('ICMS/*/vBCST').text.to_i.positive?
       end
 
       def fcp?
-        @det.css('ICMS/*/vFCP').text.to_i > 0
+        @det.css('ICMS/*/vFCP').text.to_i.positive?
       end
 
       def fcp
@@ -63,26 +63,26 @@ module BrDanfe
 
       def fcp_for_icms00
         "\n#{I18n.t('danfe.det.prod.xProdFCPICMS00',
-          vFCP: Helper.numerify(@det.css('ICMS00/vFCP').text),
-          pFCP: Helper.numerify(@det.css('ICMS00/pFCP').text))}"
+                    vFCP: Helper.numerify(@det.css('ICMS00/vFCP').text),
+                    pFCP: Helper.numerify(@det.css('ICMS00/pFCP').text))}"
       end
 
       def fcp_complete
         "\n#{I18n.t('danfe.det.prod.xProdFCP',
-          vBCFCP: Helper.numerify(@det.css('ICMS/*/vBCFCP').text),
-          vFCP: Helper.numerify(@det.css('ICMS/*/vFCP').text),
-          pFCP: Helper.numerify(@det.css('ICMS/*/pFCP').text))}"
+                    vBCFCP: Helper.numerify(@det.css('ICMS/*/vBCFCP').text),
+                    vFCP: Helper.numerify(@det.css('ICMS/*/vFCP').text),
+                    pFCP: Helper.numerify(@det.css('ICMS/*/pFCP').text))}"
       end
 
       def fcp_st?
-        @det.css('ICMS/*/vFCPST').text.to_i > 0
+        @det.css('ICMS/*/vFCPST').text.to_i.positive?
       end
 
       def fcp_st
         "\n#{I18n.t('danfe.det.prod.xProdFCPST',
-          vBCFCPST: Helper.numerify(@det.css('ICMS/*/vBCFCPST').text),
-          pFCPST: Helper.numerify(@det.css('ICMS/*/pFCPST').text),
-          vFCPST: Helper.numerify(@det.css('ICMS/*/vFCPST').text))}"
+                    vBCFCPST: Helper.numerify(@det.css('ICMS/*/vBCFCPST').text),
+                    pFCPST: Helper.numerify(@det.css('ICMS/*/pFCPST').text),
+                    vFCPST: Helper.numerify(@det.css('ICMS/*/vFCPST').text))}"
       end
 
       def add_icms_st_ret_to_product
@@ -90,9 +90,8 @@ module BrDanfe
       end
 
       def icms_st_ret?
-        @det.css('ICMS/*/vBCSTRet').text.to_i > 0 ||
-          @det.css('ICMS/*/vICMSSTRet').text.to_i > 0 ||
-          @det.css('ICMS/*/pST').text.to_i > 0
+        @det.css('ICMS/*/vBCSTRet').text.to_i.positive? || @det.css('ICMS/*/vICMSSTRet').text.to_i.positive? ||
+          @det.css('ICMS/*/pST').text.to_i.positive?
       end
 
       def icms_st_ret

data/lib/br_danfe/uf.rb

@@ -5,10 +5,7 @@ module BrDanfe
     end
 
     def self.all
-      %i[
-        AC AL AP AM BA CE DF ES GO MA MT MS MG PA PB PR PE PI RJ RN RS RO RR SC
-        SP SE TO
-      ]
+      [:AC, :AL, :AP, :AM, :BA, :CE, :DF, :ES, :GO, :MA, :MT, :MS, :MG, :PA, :PB, :PR, :PE, :PI, :RJ, :RN, :RS, :RO, :RR, :SC, :SP, :SE, :TO]
     end
     private_class_method :all
   end

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.11.2'.freeze
 end

data/spec/features/cce_spec.rb

@@ -1,23 +1,23 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe BrDanfe::Cce do
-  let(:base_dir) { "./spec/fixtures/cce/v1.00/"}
+  let(:base_dir) { './spec/fixtures/cce/v1.00/' }
   let(:output_pdf) { "#{base_dir}output.pdf" }
   let(:xml) { File.read("#{base_dir}cce.xml") }
   subject { described_class.new(xml) }
 
-  describe "#render_pdf" do
-    it "renders the correction letter" do
+  describe '#render_pdf' do
+    it 'renders the correction letter' do
       expected = IO.binread("#{base_dir}cce.fixture.pdf")
 
       expect(subject.render_pdf).to eq expected
     end
   end
 
-  describe "#save_pdf" do
+  describe '#save_pdf' do
     before { File.delete(output_pdf) if File.exist?(output_pdf) }
 
-    it "saves the pdf" do
+    it 'saves the pdf' do
       expect(File.exist?(output_pdf)).to be_falsey
 
       subject.save_pdf output_pdf

data/spec/features/danfe_spec.rb

@@ -1,12 +1,12 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe BrDanfe::Danfe do
   let(:output_pdf) { "#{base_dir}output.pdf" }
 
-  describe "#render_pdf" do
-    let(:base_dir) { "./spec/fixtures/nfe/v3.10/"}
+  describe '#render_pdf' do
+    let(:base_dir) { './spec/fixtures/nfe/v3.10/' }
 
-    it "renders a Simples Nacional NF-e using CSOSN" do
+    it 'renders a Simples Nacional NF-e using CSOSN' do
       danfe = BrDanfe::Danfe.new(File.read("#{base_dir}nfe_simples_nacional.xml"))
 
       expected = IO.binread("#{base_dir}nfe_simples_nacional.xml.fixture.pdf")
@@ -15,17 +15,17 @@ describe BrDanfe::Danfe do
     end
   end
 
-  describe "#save_pdf" do
-    context "when danfe has custom options" do
-      let(:base_dir) { "./spec/fixtures/nfe/v2.00/"}
+  describe '#save_pdf' do
+    context 'when danfe has custom options' do
+      let(:base_dir) { './spec/fixtures/nfe/v2.00/' }
 
       before { File.delete(output_pdf) if File.exist?(output_pdf) }
 
-      it "render a NF-e with customized options" do
+      it 'render a NF-e with customized options' do
         expect(File.exist?(output_pdf)).to be_falsey
 
         danfe = BrDanfe::Danfe.new(File.read("#{base_dir}custom_options.fixture.xml"))
-        danfe.options.logo = "spec/fixtures/logo.png"
+        danfe.options.logo = 'spec/fixtures/logo.png'
         danfe.options.logo_dimensions = { width: 100, height: 100 }
 
         danfe.save_pdf output_pdf
@@ -35,11 +35,11 @@ describe BrDanfe::Danfe do
     end
 
     context "when xml's version is v2.00" do
-      let(:base_dir) { "./spec/fixtures/nfe/v2.00/"}
+      let(:base_dir) { './spec/fixtures/nfe/v2.00/' }
 
       before { File.delete(output_pdf) if File.exist?(output_pdf) }
 
-      it "renders a basic NF-e with namespace" do
+      it 'renders a basic NF-e with namespace' do
         expect(File.exist?(output_pdf)).to be_falsey
 
         danfe = BrDanfe::Danfe.new(File.read("#{base_dir}nfe_with_ns.xml"))
@@ -48,7 +48,7 @@ describe BrDanfe::Danfe do
         expect("#{base_dir}nfe_with_ns.xml.fixture.pdf").to have_same_content_of file: output_pdf
       end
 
-      it "renders another basic NF-e without namespace" do
+      it 'renders another basic NF-e without namespace' do
         expect(File.exist?(output_pdf)).to be_falsey
 
         danfe = BrDanfe::Danfe.new(File.read("#{base_dir}nfe_without_ns.xml"))
@@ -57,7 +57,7 @@ describe BrDanfe::Danfe do
         expect("#{base_dir}nfe_without_ns.xml.fixture.pdf").to have_same_content_of file: output_pdf
       end
 
-      it "renders a NF-e having FCI in its items" do
+      it 'renders a NF-e having FCI in its items' do
         expect(File.exist?(output_pdf)).to be_falsey
 
         danfe = BrDanfe::Danfe.new(File.read("#{base_dir}nfe_with_fci.xml"))
@@ -66,7 +66,7 @@ describe BrDanfe::Danfe do
         expect("#{base_dir}nfe_with_fci.xml.fixture.pdf").to have_same_content_of file: output_pdf
       end
 
-      it "renders a Simples Nacional NF-e using CSOSN" do
+      it 'renders a Simples Nacional NF-e using CSOSN' do
         expect(File.exist?(output_pdf)).to be_falsey
 
         danfe = BrDanfe::Danfe.new(File.read("#{base_dir}nfe_simples_nacional.xml"))
@@ -75,7 +75,7 @@ describe BrDanfe::Danfe do
         expect("#{base_dir}nfe_simples_nacional.xml.fixture.pdf").to have_same_content_of file: output_pdf
       end
 
-      it "renders a NF-e with extra volumes" do
+      it 'renders a NF-e with extra volumes' do
         expect(File.exist?(output_pdf)).to be_falsey
 
         danfe = BrDanfe::Danfe.new(File.read("#{base_dir}nfe_with_extra_volumes.xml"))
@@ -86,11 +86,11 @@ describe BrDanfe::Danfe do
     end
 
     context "when xml's version is v3.10" do
-      let(:base_dir) { "./spec/fixtures/nfe/v3.10/"}
+      let(:base_dir) { './spec/fixtures/nfe/v3.10/' }
 
       before { File.delete(output_pdf) if File.exist?(output_pdf) }
 
-      it "renders a Simples Nacional NF-e using CSOSN" do
+      it 'renders a Simples Nacional NF-e using CSOSN' do
         expect(File.exist?(output_pdf)).to be_falsey
 
         danfe = BrDanfe::Danfe.new(File.read("#{base_dir}nfe_simples_nacional.xml"))
@@ -99,8 +99,8 @@ describe BrDanfe::Danfe do
         expect("#{base_dir}nfe_simples_nacional.xml.fixture.pdf").to have_same_content_of file: output_pdf
       end
 
-      context "when there are more than one page" do
-        it "renders xml to the pdf" do
+      context 'when there are more than one page' do
+        it 'renders xml to the pdf' do
           expect(File.exist?(output_pdf)).to be_falsey
 
           danfe = BrDanfe::Danfe.new(File.read("#{base_dir}with_three_pages.xml"))
@@ -110,8 +110,8 @@ describe BrDanfe::Danfe do
         end
       end
 
-      context "when there is ISSQN" do
-        it "renders xml to the pdf" do
+      context 'when there is ISSQN' do
+        it 'renders xml to the pdf' do
           expect(File.exist?(output_pdf)).to be_falsey
 
           danfe = BrDanfe::Danfe.new(File.read("#{base_dir}with_issqn.xml"))
@@ -122,7 +122,7 @@ describe BrDanfe::Danfe do
       end
 
       context "when there isn't ISSQN" do
-        it "renders xml to the pdf" do
+        it 'renders xml to the pdf' do
           expect(File.exist?(output_pdf)).to be_falsey
 
           danfe = BrDanfe::Danfe.new(File.read("#{base_dir}without_issqn.xml"))
@@ -132,11 +132,11 @@ describe BrDanfe::Danfe do
         end
       end
 
-      context "when there is footer information" do
-        it "renders xml to the pdf" do
+      context 'when there is footer information' do
+        it 'renders xml to the pdf' do
           expect(File.exist?(output_pdf)).to be_falsey
 
-          footer = "Gerado através do Teste"
+          footer = 'Gerado através do Teste'
           danfe = BrDanfe::Danfe.new(File.read("#{base_dir}with_footer.xml"))
           danfe.save_pdf output_pdf, footer
 

data/spec/fixtures/cce/lib/barcode#render.pdf

@@ -488,6 +488,10 @@ endobj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
+/CropBox [0 0 595.28 841.89]
+/BleedBox [0 0 595.28 841.89]
+/TrimBox [0 0 595.28 841.89]
+/ArtBox [0 0 595.28 841.89]
 /Contents 4 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << >>
@@ -508,5 +512,5 @@ trailer
 /Info 1 0 R
 >>
 startxref
-6246
+6362
 %%EOF

data/spec/fixtures/cce/lib/correction#render.pdf

@@ -67,6 +67,10 @@ endobj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
+/CropBox [0 0 595.28 841.89]
+/BleedBox [0 0 595.28 841.89]
+/TrimBox [0 0 595.28 841.89]
+/ArtBox [0 0 595.28 841.89]
 /Contents 4 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 6 0 R
@@ -89,12 +93,12 @@ xref
 0000000158 00000 n 
 0000000215 00000 n 
 0000001556 00000 n 
-0000001736 00000 n 
+0000001852 00000 n 
 trailer
 << /Size 7
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-1835
+1951
 %%EOF

data/spec/fixtures/cce/lib/document#box.pdf

@@ -32,6 +32,10 @@ endobj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
+/CropBox [0 0 595.28 841.89]
+/BleedBox [0 0 595.28 841.89]
+/TrimBox [0 0 595.28 841.89]
+/ArtBox [0 0 595.28 841.89]
 /Contents 4 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << >>
@@ -52,5 +56,5 @@ trailer
 /Info 1 0 R
 >>
 startxref
-472
+588
 %%EOF

data/spec/fixtures/cce/lib/document#box.with.block.pdf

@@ -39,6 +39,10 @@ endobj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
+/CropBox [0 0 595.28 841.89]
+/BleedBox [0 0 595.28 841.89]
+/TrimBox [0 0 595.28 841.89]
+/ArtBox [0 0 595.28 841.89]
 /Contents 4 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 6 0 R
@@ -61,12 +65,12 @@ xref
 0000000158 00000 n 
 0000000215 00000 n 
 0000000377 00000 n 
-0000000557 00000 n 
+0000000673 00000 n 
 trailer
 << /Size 7
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-656
+772
 %%EOF