br_danfe 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba0be0232ce7c32209b3efcf97e13e9ad7a8826d
-  data.tar.gz: d12d50a599043e9cc1297ffba185ab19554775b4
+  metadata.gz: bb741f1d1066620c0aa847c09fb4fa72b200c99e
+  data.tar.gz: a264f79ee360582e6ad7190fc8efebc14a630e8f
 SHA512:
-  metadata.gz: b2eb27d0c88590cb39c4124c52f874f16f52a2700e4f2ee0adfc549293c88714ad19d04d02b269afa954ba7a8d4b0d31bd49b1d6283c1e1ee28e36b9e1a987ed
-  data.tar.gz: a103bf1225b7e26d541fece0bd3c7b47a8ffbe33a1549242bca9e472a45ebec01753aea3982cce03b943cf7e49a1aab87640423a77586761b5a39663a60a431f
+  metadata.gz: b9a9e0920ff13af6e4e9b9de29cb6a8db6da16b666a038551d51df1854805813bc6793569cf12a7a7172d9d30d2830b25df9bfff69d0aa4670e273dd30222e5d
+  data.tar.gz: cf94b429c376ab34b878409c257351025a935070a16b53f0fb5901d2e7516ac1317c7062c1758a9d0a7f66c5a7da19ea3a3c625c90056f55d64395f7d01c8744

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.7.1)
+    br_danfe (0.7.2)
       barby (= 0.5.1)
       br_documents (>= 0.0.8)
       i18n
@@ -87,4 +87,4 @@ RUBY VERSION
    ruby 2.2.5p319
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/README.md

@@ -15,6 +15,7 @@ XML version | Supported?
 1.00        | no
 2.00        | yes
 3.10        | yes
+4.00        | yes
 
 ## Installing
 
@@ -49,13 +50,7 @@ XML version | Supported?
 * `logo_path`: Path of sender's logo image.
 * `logo_dimensions`: Dimensions of the logo. Ex: logo_dimensions = { width: 100, height: 90 }
 
-XML version | Supported?
------------ | ----------
-1.00        | no
-2.00        | yes
-3.10        | yes
-
-### CC-e - _Carta de Correção Eletrônica_
+### CC-e - Carta de Correção Eletrônica
 
 #### Usage in Ruby
 
@@ -103,18 +98,18 @@ You needs to install all necessaries dependencies using bunder like above:
 
 You can run all RSpec specs using:
 
-        $ rspec
+        $ bundle exec rspec
 
 
 ## About tests
 
-> If you modify something that caused general visual changes at output pdfs, so you have to rebuild the fixtures pdf files.
+> If you modify something that caused general visual changes at output pdf's, so you have to rebuild the fixtures pdf files.
 >
-> You can do this simply deleting the fixture pdf file. The `have_same_content_of` matcher will recreate the fixture in the next time you run the `rspec` command.
+> You can do this simply deleting the fixture pdf file. The `have_same_content_of` matcher will recreate the fixture in the next time you run the `bundle exec rspec` command.
 
 ### Code coverage
 
-Code coverage is available through of SimpleCov. Just run `rspec` and open the coverage report in your browser.
+Code coverage is available through of SimpleCov. Just run `bundle exec rspec` and open the coverage report in your browser.
 
 ### Fake data for generating new fixtures
 
@@ -183,9 +178,9 @@ You can generate new data using [4devs generators](http://www.4devs.com.br).
 
 You can build using one of the above tasks
 
-        $ rake build    # Build br_danfe-X.X.X.gem into the pkg directory
-        $ rake install  # Build and install br_danfe-X.X.X.gem into system gems
-        $ rake release  # Create tag vX.X.X and build and push br_danfe-X.X.X.gem to Rubygems
+        $ bundle exec rake build    # Build br_danfe-X.X.X.gem into the pkg directory
+        $ bundle exec rake install  # Build and install br_danfe-X.X.X.gem into system gems
+        $ bundle exec rake release  # Create tag vX.X.X, build and push br_danfe-X.X.X.gem to Rubygems
 
 ## Contributing
 

data/lib/br_danfe/danfe_lib/dest.rb

@@ -7,6 +7,7 @@ module BrDanfe
       def initialize(pdf, xml)
         @pdf = pdf
         @xml = xml
+        @xml_version_is_310_or_newer = @xml.version_is_310_or_newer?
 
         @ltitle = Y - 0.42
         @l1 = Y
@@ -21,10 +22,11 @@ module BrDanfe
         render_line2
         render_line3
 
-        render_dates_block
+        @xml_version_is_310_or_newer ? render_dates_for_nfe_310_or_newer : render_dates_for_older_nfes
       end
 
       private
+
       def render_line1
         @pdf.lbox LINE_HEIGHT, 11.82, 0.75, @l1, @xml, "dest/xNome"
         render_cnpj_cpf
@@ -72,25 +74,22 @@ module BrDanfe
         @pdf.lie LINE_HEIGHT, 4.38, 12.56, @l3, @xml, "enderDest/UF", "dest/IE"
       end
 
-      def render_dates_block
+      def phone
+        Phone.format(@xml["enderDest/fone"])
+      end
 
-        if @xml.version_310?
-          dEmi = "ide/dhEmi"
-          dSaiEnt = "ide/dhSaiEnt"
-          hSaiEnt = "ide/dhSaiEnt"
-        else
-          dEmi = "ide/dEmi"
-          dSaiEnt = "ide/dSaiEnt"
-          hSaiEnt = "ide/hSaiEnt"
-        end
+      def render_dates_for_nfe_310_or_newer
+        render_dates "ide/dhEmi", "ide/dhSaiEnt", "ide/dhSaiEnt"
+      end
 
-        @pdf.ldate LINE_HEIGHT, 2.92, 17.40, @l1, "ide.dEmi", @xml[dEmi], { align: :right }
-        @pdf.ldate LINE_HEIGHT, 2.92, 17.40, @l2, "ide.dSaiEnt", @xml[dSaiEnt], { align: :right }
-        @pdf.ltime LINE_HEIGHT, 2.92, 17.40, @l3, "ide.hSaiEnt", @xml[hSaiEnt], { align: :right }
+      def render_dates(emitted_at_date_and_hour, exited_at_date, exited_at_hour)
+        @pdf.ldate LINE_HEIGHT, 2.92, 17.40, @l1, "ide.dEmi", @xml[emitted_at_date_and_hour], { align: :right }
+        @pdf.ldate LINE_HEIGHT, 2.92, 17.40, @l2, "ide.dSaiEnt", @xml[exited_at_date], { align: :right }
+        @pdf.ltime LINE_HEIGHT, 2.92, 17.40, @l3, "ide.hSaiEnt", @xml[exited_at_hour], { align: :right }
       end
 
-      def phone
-        Phone.format(@xml["enderDest/fone"])
+      def render_dates_for_older_nfes
+        render_dates "ide/dEmi", "ide/dSaiEnt", "ide/hSaiEnt"
       end
     end
   end

data/lib/br_danfe/danfe_lib/xml.rb

@@ -30,8 +30,8 @@ module BrDanfe
         result
       end
 
-      def version_310?
-        @xml.css("infNFe").attr("versao").to_s == "3.10"
+      def version_is_310_or_newer?
+        @xml.css("infNFe").attr("versao").to_s.to_f >= 3.10
       end
     end
   end

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = "0.7.1"
+  VERSION = "0.7.2".freeze
 end

data/spec/fixtures/nfe/lib/dest#render-v4.00.pdf

@@ -0,0 +1,271 @@
+%PDF-1.3
+%����
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 2451
+>>
+stream
+q
+0.3 w
+
+BT
+21.2598 596.8667 Td
+/F2.0 8 Tf
+[<44455354494e> 20 <41> 95 <54> 90 <c152494f202f2052454d4554454e5445>] TJ
+ET
+
+21.2598 571.748 335.0551 22.6772 re
+S
+
+BT
+23.2598 588.3272 Td
+/F1.0 6 Tf
+[<4e4f4d452f52415ac3> 55 <4f20534f4349414c>] TJ
+ET
+
+
+BT
+23.2598 574.5952 Td
+/F1.0 10 Tf
+[<5363686e656964657220456c6563747269632042726173696c204c746461>] TJ
+ET
+
+356.315 571.748 123.874 22.6772 re
+S
+
+BT
+358.315 588.3272 Td
+/F1.0 6 Tf
+[<434e504a2f435046>] TJ
+ET
+
+
+BT
+358.315 574.5952 Td
+/F1.0 10 Tf
+[<38322e3734332e3238372f303030382d3830>] TJ
+ET
+
+21.2598 549.0709 273.8268 22.6772 re
+S
+
+BT
+23.2598 565.65 Td
+/F1.0 6 Tf
+[<454e44455245c74f>] TJ
+ET
+
+
+BT
+23.2598 551.918 Td
+/F1.0 10 Tf
+[<41> 74 <7620646120536175646164652031313235202d2053616c612030312065203032>] TJ
+ET
+
+295.0866 549.0709 122.7402 22.6772 re
+S
+
+BT
+297.0866 565.65 Td
+/F1.0 6 Tf
+[<42> 35 <41495252> 40 <4f>] TJ
+ET
+
+
+BT
+297.0866 551.918 Td
+/F1.0 10 Tf
+[<46727574616c>] TJ
+ET
+
+417.8268 549.0709 62.3622 22.6772 re
+S
+
+BT
+419.8268 565.65 Td
+/F1.0 6 Tf
+[<434550>] TJ
+ET
+
+
+BT
+419.8268 551.918 Td
+/F1.0 10 Tf
+[<31332e3137312d333230>] TJ
+ET
+
+21.2598 526.3937 187.3701 22.6772 re
+S
+
+BT
+23.2598 542.9729 Td
+/F1.0 6 Tf
+[<4d554e4943cd50494f>] TJ
+ET
+
+
+BT
+23.2598 529.2409 Td
+/F1.0 10 Tf
+[<53554d415245>] TJ
+ET
+
+208.6299 526.3937 115.0866 22.6772 re
+S
+
+BT
+210.6299 542.9729 Td
+/F1.0 6 Tf
+[<464f4e452f46> 74 <4158>] TJ
+ET
+
+
+BT
+210.6299 529.2409 Td
+/F1.0 10 Tf
+[<2831392920323130342d36333030>] TJ
+ET
+
+323.7165 526.3937 32.315 22.6772 re
+S
+
+BT
+325.7165 542.9729 Td
+/F1.0 6 Tf
+[<5546>] TJ
+ET
+
+
+BT
+325.7165 529.2409 Td
+/F1.0 10 Tf
+[<5350>] TJ
+ET
+
+356.0315 526.3937 124.1575 22.6772 re
+S
+
+BT
+358.0315 542.9729 Td
+/F1.0 6 Tf
+[<494e53435249c7c3> 55 <4f20455354> 93 <414455> 40 <414c>] TJ
+ET
+
+
+BT
+358.0315 529.2409 Td
+/F1.0 10 Tf
+[<3637312e3030382e3337352e313130>] TJ
+ET
+
+493.2283 571.748 82.7717 22.6772 re
+S
+
+BT
+495.2283 588.3272 Td
+/F1.0 6 Tf
+[<44> 40 <41> 111 <54> 93 <412044> 40 <4120454d495353c3> 55 <4f>] TJ
+ET
+
+
+BT
+528.44 574.5952 Td
+/F1.0 10 Tf
+[<33302f30372f32303138>] TJ
+ET
+
+493.2283 549.0709 82.7717 22.6772 re
+S
+
+BT
+495.2283 565.65 Td
+/F1.0 6 Tf
+[<44> 40 <41> 111 <54> 93 <412044> 40 <4120454e54524144> 40 <412f5341cd44> 40 <41>] TJ
+ET
+
+
+BT
+528.44 551.918 Td
+/F1.0 10 Tf
+[<33302f30372f32303138>] TJ
+ET
+
+493.2283 526.3937 82.7717 22.6772 re
+S
+
+BT
+495.2283 542.9729 Td
+/F1.0 6 Tf
+[<484f524120444520454e54524144> 40 <412f5341cd44> 40 <41>] TJ
+ET
+
+
+BT
+538.44 529.2409 Td
+/F1.0 10 Tf
+[<31343a33323a3435>] TJ
+ET
+
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 6 0 R
+/F1.0 7 0 R
+>>
+>>
+>>
+endobj
+6 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Times-Bold
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<< /Type /Font
+/Subtype /Type1
+/BaseFont /Times-Roman
+/Encoding /WinAnsiEncoding
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000002718 00000 n 
+0000002910 00000 n 
+0000003008 00000 n 
+trailer
+<< /Size 8
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+3107
+%%EOF

data/spec/lib/danfe_lib/dest_spec.rb

@@ -1,8 +1,7 @@
 require "spec_helper"
 
 describe BrDanfe::DanfeLib::Dest do
-  let(:base_dir) { "./spec/fixtures/nfe/lib/" }
-  let(:output_pdf) { "#{base_dir}output.pdf" }
+  let(:path_of_expected_pdf) { "./spec/fixtures/nfe/lib/output.pdf" }
 
   let(:pdf) { BrDanfe::DanfeLib::Document.new }
   let(:xml) { BrDanfe::DanfeLib::XML.new(xml_as_string) }
@@ -11,8 +10,8 @@ describe BrDanfe::DanfeLib::Dest do
 
   describe "#render" do
     before do
+      File.delete(path_of_expected_pdf) if File.exist?(path_of_expected_pdf)
       subject.render
-      File.delete(output_pdf) if File.exist?(output_pdf)
     end
 
     context "when nf-e's version is 2.00" do
@@ -49,11 +48,11 @@ describe BrDanfe::DanfeLib::Dest do
       end
 
       it "renders xml to the pdf" do
-        expect(File.exist?(output_pdf)).to be_falsey
+        expect(File.exist?(path_of_expected_pdf)).to eql false
 
-        pdf.render_file output_pdf
+        pdf.render_file path_of_expected_pdf
 
-        expect("#{base_dir}dest#render-v2.00.pdf").to have_same_content_of file: output_pdf
+        expect("./spec/fixtures/nfe/lib/dest#render-v2.00.pdf").to have_same_content_of file: path_of_expected_pdf
       end
     end
 
@@ -90,11 +89,52 @@ describe BrDanfe::DanfeLib::Dest do
       end
 
       it "renders xml to the pdf" do
-        expect(File.exist?(output_pdf)).to be_falsey
+        expect(File.exist?(path_of_expected_pdf)).to eql false
 
-        pdf.render_file output_pdf
+        pdf.render_file path_of_expected_pdf
 
-        expect("#{base_dir}dest#render-v3.10.pdf").to have_same_content_of file: output_pdf
+        expect("./spec/fixtures/nfe/lib/dest#render-v3.10.pdf").to have_same_content_of file: path_of_expected_pdf
+      end
+    end
+
+    context "when nf-e's version is 4.00" do
+      let(:xml_as_string) do
+        <<-eos
+        <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
+          <infNFe Id="NFe25111012345678901234550020000134151000134151" versao="4.00">
+            <ide>
+              <dhEmi>2018-07-30T13:30:59+00:00</dhEmi>
+              <dhSaiEnt>2018-07-30T14:32:45-03:00</dhSaiEnt>
+            </ide>
+            <dest>
+              <CNPJ>82743287000880</CNPJ>
+              <xNome>Schneider Electric Brasil Ltda</xNome>
+              <enderDest>
+                <xLgr>Av da Saudade</xLgr>
+                <nro>1125</nro>
+                <xBairro>Frutal</xBairro>
+                <xCpl>Sala 01 e 02</xCpl>
+                <cMun>3552403</cMun>
+                <xMun>SUMARE</xMun>
+                <UF>SP</UF>
+                <CEP>13171320</CEP>
+                <cPais>1058</cPais>
+                <xPais>BRASIL</xPais>
+                <fone>1921046300</fone>
+              </enderDest>
+              <IE>671008375110</IE>
+            </dest>
+          </infNFe>
+        </NFe>
+        eos
+      end
+
+      it "renders xml to the pdf" do
+        expect(File.exist?(path_of_expected_pdf)).to eql false
+
+        pdf.render_file path_of_expected_pdf
+
+        expect("./spec/fixtures/nfe/lib/dest#render-v4.00.pdf").to have_same_content_of file: path_of_expected_pdf
       end
     end
 
@@ -112,11 +152,11 @@ describe BrDanfe::DanfeLib::Dest do
       end
 
       it "renders xml to the pdf" do
-        expect(File.exist?(output_pdf)).to be_falsey
+        expect(File.exist?(path_of_expected_pdf)).to eql false
 
-        pdf.render_file output_pdf
+        pdf.render_file path_of_expected_pdf
 
-        expect("#{base_dir}dest#render-with_cnpj.pdf").to have_same_content_of file: output_pdf
+        expect("./spec/fixtures/nfe/lib/dest#render-with_cnpj.pdf").to have_same_content_of file: path_of_expected_pdf
       end
     end
 
@@ -134,11 +174,11 @@ describe BrDanfe::DanfeLib::Dest do
       end
 
       it "renders xml to the pdf" do
-        expect(File.exist?(output_pdf)).to be_falsey
+        expect(File.exist?(path_of_expected_pdf)).to eql false
 
-        pdf.render_file output_pdf
+        pdf.render_file path_of_expected_pdf
 
-        expect("#{base_dir}dest#render-with_cpf.pdf").to have_same_content_of file: output_pdf
+        expect("./spec/fixtures/nfe/lib/dest#render-with_cpf.pdf").to have_same_content_of file: path_of_expected_pdf
       end
     end
 
@@ -159,11 +199,11 @@ describe BrDanfe::DanfeLib::Dest do
       end
 
       it "renders xml to the pdf" do
-        expect(File.exist?(output_pdf)).to be_falsey
+        expect(File.exist?(path_of_expected_pdf)).to eql false
 
-        pdf.render_file output_pdf
+        pdf.render_file path_of_expected_pdf
 
-        expect("#{base_dir}dest#render-with_ie.pdf").to have_same_content_of file: output_pdf
+        expect("./spec/fixtures/nfe/lib/dest#render-with_ie.pdf").to have_same_content_of file: path_of_expected_pdf
       end
     end
 
@@ -199,11 +239,12 @@ describe BrDanfe::DanfeLib::Dest do
       end
 
       it "renders xml to the pdf" do
-        expect(File.exist?(output_pdf)).to be_falsey
+        expect(File.exist?(path_of_expected_pdf)).to eql false
 
-        pdf.render_file output_pdf
+        pdf.render_file path_of_expected_pdf
 
-        expect("#{base_dir}dest#render-without-address-complement.pdf").to have_same_content_of file: output_pdf
+        expect("./spec/fixtures/nfe/lib/dest#render-without-address-complement.pdf")
+          .to have_same_content_of file: path_of_expected_pdf
       end
     end
 
@@ -239,12 +280,13 @@ describe BrDanfe::DanfeLib::Dest do
         eos
       end
 
-      it "it renders xml to pdf trimming the address of after 63 characters" do
-        expect(File.exist?(output_pdf)).to be_falsey
+      it "renders xml to pdf discarding the address of after 63 characters" do
+        expect(File.exist?(path_of_expected_pdf)).to eql false
 
-        pdf.render_file output_pdf
+        pdf.render_file path_of_expected_pdf
 
-        expect("#{base_dir}dest#render-with-address-bigger.pdf").to have_same_content_of file: output_pdf
+        expect("./spec/fixtures/nfe/lib/dest#render-with-address-bigger.pdf")
+          .to have_same_content_of file: path_of_expected_pdf
       end
     end
   end

data/spec/lib/danfe_lib/xml_spec.rb

@@ -3,8 +3,8 @@ require "spec_helper"
 describe BrDanfe::DanfeLib::XML do
   subject { BrDanfe::DanfeLib::XML.new(xml_as_string) }
 
-  describe "#version_310?" do
-    describe "when xml's version is 3.10" do
+  describe "#version_is_310_or_newer?" do
+    describe "when xml's version is equal 3.10" do
       let(:xml_as_string) do
         <<-eos
           <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
@@ -14,12 +14,27 @@ describe BrDanfe::DanfeLib::XML do
         eos
       end
 
-      it "is true" do
-        expect(subject.version_310?).to be_truthy
+      it "returns true" do
+        expect(subject.version_is_310_or_newer?).to eql true
       end
     end
 
-    describe "when xml's version isn't 3.10" do
+    describe "when xml's version is greather 3.10" do
+      let(:xml_as_string) do
+        <<-eos
+          <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
+            <infNFe versao="4.00" Id="NFe35150162013294000143550010000000011000000017">
+            </infNFe>
+          </NFe>
+        eos
+      end
+
+      it "returns true" do
+        expect(subject.version_is_310_or_newer?).to eql true
+      end
+    end
+
+    describe "when xml's version is minor that 3.10" do
       let(:xml_as_string) do
         <<-eos
           <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
@@ -29,8 +44,8 @@ describe BrDanfe::DanfeLib::XML do
         eos
       end
 
-      it "is false" do
-        expect(subject.version_310?).to be_falsey
+      it "returns false" do
+        expect(subject.version_is_310_or_newer?).to eql false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: br_danfe
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - ASSEINFO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -220,6 +220,7 @@ files:
 - spec/fixtures/logo.png
 - spec/fixtures/nfe/lib/dest#render-v2.00.pdf
 - spec/fixtures/nfe/lib/dest#render-v3.10.pdf
+- spec/fixtures/nfe/lib/dest#render-v4.00.pdf
 - spec/fixtures/nfe/lib/dest#render-with-address-bigger.pdf
 - spec/fixtures/nfe/lib/dest#render-with_cnpj.pdf
 - spec/fixtures/nfe/lib/dest#render-with_cpf.pdf
@@ -336,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: DANFE pdf generator for Brazilian invoices.
@@ -361,6 +362,7 @@ test_files:
 - spec/fixtures/logo.png
 - spec/fixtures/nfe/lib/dest#render-v2.00.pdf
 - spec/fixtures/nfe/lib/dest#render-v3.10.pdf
+- spec/fixtures/nfe/lib/dest#render-v4.00.pdf
 - spec/fixtures/nfe/lib/dest#render-with-address-bigger.pdf
 - spec/fixtures/nfe/lib/dest#render-with_cnpj.pdf
 - spec/fixtures/nfe/lib/dest#render-with_cpf.pdf