ruby_danfe 1.15.2 → 1.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45bbbc1f6ba37e78030d768952c28eae216e365697be2aadd126b6a3c8de3802
-  data.tar.gz: 0db177fe5fd1bf50b99a194bc1bc6b6415b5be4981ccbd44459b87335e965d8e
+  metadata.gz: b9c2189d353cd157495224787759f42e852858838eb42a4771bfeacbb43d4261
+  data.tar.gz: 690661efbd78af347c65714277435d863db5be3a4e02c292282c88320d02f5f1
 SHA512:
-  metadata.gz: 6cf0eaeedb0fe4b9d25cee65c9fcb03d872b33ab8e9bb2396132ceab31a8315df6f36ff2288bb47e9dd82bca025f4e23c412d46b193616a5b6b658fb82a90d43
-  data.tar.gz: 1161b86c4e04271d8ac6b51bbf86ac8b4d6a42f1f563fedd0ef6e0b357348e86ae59ac3c0ae2cd2b27ee925dd3ec218f60e8ce6a9705ba24d71f4b8d4b43e15d
+  metadata.gz: dd2acaf149116a70f61100bfb74fdb9905f9cc7d31ff8ef56c199442936f2c53be6cce904f9d850d068fc4466c9459ea2068dd8e48c1c8db88ff571fce3d416f
+  data.tar.gz: 11f3a91fa45a6e47cd51d3a8df4ebf790b62af6e71a2db74bea52e0a542b92ad6e2c705ae6a7c14cd0bad1982b8fee58fec511efa79d0dac8860d01a489c27c6

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-3.2.2

data/lib/ruby_danfe/dacte_generator.rb

@@ -433,6 +433,7 @@ module RubyDanfe
     def render_impostos
       #informações relativas ao Imposto
       @pdf.ibox 0.40, 20.49, 0.25, 17.42, '', 'INFORMAÇÕES RELATIVAS AO IMPOSTO', { :align => :left, :size => 7, :border => 0, :style => :bold }
+      complemento = ''
       if !@xml['imp/ICMS/ICMS00'].eql?("")
          cst = '00 - Tributação Normal ICMS'
          tipoIcms = 'ICMS00'
@@ -445,6 +446,7 @@ module RubyDanfe
       elsif !@xml['imp/ICMS/ICMS60'].eql?("")
          cst = '60 - ICMS cobrado anteriormente por Substituição Tributária'
          tipoIcms = 'ICMS60'
+         complemento = 'STRet'
       elsif !@xml['imp/ICMS/ICMS90'].eql?("")
          cst = '90 - ICMS outros'
          tipoIcms = 'ICMS90'
@@ -456,11 +458,11 @@ module RubyDanfe
         tipoIcms = 'ICMSOutraUF'
       end
       @pdf.ibox 0.90, 10.00, 0.25, 17.83, 'SITUAÇÃO TRIBUTÁRIA', cst, { :size => 7, :style => :bold }
-      @pdf.inumeric 0.90, 3.00, 10.25, 17.83, 'BASE DE CÁLCULO', @xml['imp/ICMS/'+ tipoIcms + '/vBC'], { :size => 7, :style => :bold }
-      @pdf.inumeric 0.90, 1.00, 13.25, 17.83, 'AL. ICMS', @xml[('imp/ICMS/' + tipoIcms + '/pICMS')], { :size => 7, :style => :bold }
+      @pdf.inumeric 0.90, 3.00, 10.25, 17.83, 'BASE DE CÁLCULO', @xml['imp/ICMS/'+ tipoIcms + '/vBC'+ complemento], { :size => 7, :style => :bold }
+      @pdf.inumeric 0.90, 1.00, 13.25, 17.83, 'AL. ICMS', @xml['imp/ICMS/' + tipoIcms + '/pICMS'+ complemento], { :size => 7, :style => :bold }
       @pdf.inumeric 0.90, 3.00, 14.25, 17.83, 'VALOR ICMS', @xml['imp/ICMS/' +  tipoIcms + '/vICMS'],{ :size => 7, :style => :bold }
       @pdf.inumeric 0.90, 2.00, 17.25, 17.83, '% RED.BC.CALC.', @xml['imp/ICMS/' + tipoIcms + '/pRedBC'], { :size => 7, :style => :bold }
-      @pdf.inumeric 0.90, 1.49, 19.25, 17.83, 'ICMS ST.', @xml['imp/ICMS/' + tipoIcms + '/pRedBC'], { :size => 7, :style => :bold }
+      @pdf.inumeric 0.90, 1.49, 19.25, 17.83, 'ICMS ST.', @xml['imp/ICMS/' + tipoIcms + '/vICMS'+ complemento], { :size => 7, :style => :bold }
     end
 
     def render_documentos_originarios

data/lib/ruby_danfe/descricao.rb

@@ -17,6 +17,17 @@ module RubyDanfe
         descricao += "FCI: #{det.css('prod/nFCI').text}"
       end
 
+      if need_veicProd(det)
+        veicProd = det.css('veicProd')
+
+        descricao += LINEBREAK
+        descricao += "Chassi: #{veicProd.css('chassi').text} "
+        descricao += "Motor: #{veicProd.css('nMotor').text} "
+        descricao += "AnoFab: #{veicProd.css('anoFab').text} "
+        descricao += "AnoMod: #{veicProd.css('anoMod').text} "
+        descricao += "Cor: #{veicProd.css('xCor').text}"
+      end
+
       if need_st(det)
         descricao += LINEBREAK
         descricao += "ST: MVA: #{det.css('ICMS/*/pMVAST').text}% "
@@ -37,6 +48,10 @@ module RubyDanfe
       !det.css('prod/nFCI').text.empty?
     end
 
+    def self.need_veicProd(det)
+      !det.css('prod/veicProd').text.empty?
+    end
+
     def self.need_st(det)
       det.css('ICMS/*/vBCST').text.to_i > 0
     end

data/lib/ruby_danfe/options.rb

@@ -13,7 +13,7 @@ module RubyDanfe
 
     private
       def file
-        File.exists?("config/ruby_danfe.yml") ? File.open("config/ruby_danfe.yml").read : ""
+        File.exist?("config/ruby_danfe.yml") ? File.open("config/ruby_danfe.yml").read : ""
       end
 
       def config_yaml_load

data/lib/ruby_danfe/version.rb

@@ -1,3 +1,3 @@
 module RubyDanfe
-  VERSION = "1.15.2"
+  VERSION = "1.15.4"
 end

data/ruby_danfe.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "DANFE and DACTE pdf generator for Brazilian invoices and transportation docs."
   spec.author        = "Eduardo Reboucas"
   spec.email         = "eduardo.reboucas@gmail.com"
-  spec.homepage      = "http://github.com/taxweb/ruby_danfe"
+  spec.homepage      = "http://github.com/mcfox/ruby_danfe"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split("\n")
@@ -17,14 +17,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_dependency "nokogiri", "~> 1.10.4"
+  spec.add_dependency "nokogiri", "> 1.8.5"
   spec.add_dependency "prawn", "~> 1.2"
-  spec.add_dependency "prawn-table", "~> 0.2"
-  spec.add_dependency "barby", "~> 0.5"
-  spec.add_dependency "rqrcode", "~> 0.10"
+  spec.add_dependency "prawn-table", "> 0.2"
+  spec.add_dependency "barby", "> 0.5"
+  spec.add_dependency "rqrcode", "> 0.10"
   spec.add_dependency "rake"
 
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec", "> 3.0"
   spec.add_development_dependency "simplecov"
 end

data/spec/lib/descricao_spec.rb

@@ -54,6 +54,25 @@ describe RubyDanfe::Descricao do
     Nokogiri::XML(xml)
   end
 
+  let(:xml_veicProd) do
+    xml = <<-eos
+    <det nItem="1">
+      <prod>
+        <xProd>MOTOCICLETA</xProd>
+        <veicProd>
+          <chassi>32A1SF354S6FASD213ASD5</chassi>
+          <xCor>PRETA</xCor>
+          <nMotor>DSA5DA-321503</nMotor>
+          <anoMod>2018</anoMod>
+          <anoFab>2018</anoFab>
+        </veicProd>
+      </prod>
+    </det>
+    eos
+
+    Nokogiri::XML(xml)
+  end
+
   let(:xml_IFC_ST_infAdProd) do
     xml = <<-eos
     <det nItem="1">
@@ -110,6 +129,19 @@ describe RubyDanfe::Descricao do
       end
     end
 
+    context "when have veicProd" do
+      it "returns product + veicProd" do
+        string = "MOTOCICLETA"
+        string += LINEBREAK
+        string += "Chassi: 32A1SF354S6FASD213ASD5 "
+        string += "Motor: DSA5DA-321503 "
+        string += "AnoFab: 2018 "
+        string += "AnoMod: 2018 "
+        string += "Cor: PRETA"
+        expect(RubyDanfe::Descricao.generate(xml_veicProd)).to eq string        
+      end
+    end
+
     context "when have FCI + ST + infAdProd" do
       it "returns product + FCI + ST + infAdProd" do
         string = "MONITOR DE ARCO ELETRICO"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby_danfe
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.15.4
 platform: ruby
 authors:
 - Eduardo Reboucas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
@@ -42,42 +42,42 @@ dependencies:
   name: prawn-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: barby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
@@ -112,14 +112,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: eduardo.reboucas@gmail.com
 executables: []
 extensions: []
@@ -191,11 +191,11 @@ files:
 - test/nfe_with_fci.xml
 - test/nfe_with_ns.xml
 - test/nfe_without_ns.xml
-homepage: http://github.com/taxweb/ruby_danfe
+homepage: http://github.com/mcfox/ruby_danfe
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,9 +210,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.4.22
+signing_key:
 specification_version: 4
 summary: DANFE and DACTE pdf generator for Brazilian invoices and transportation docs.
 test_files: