enotas_api 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aebce3c20a825b7d6081c72b4a656634c5c5b71ba8df4b1bbcf72d2145ca8033
-  data.tar.gz: f613fdd47e28d4f8d0f210122b973cbfe6a92002705329b8b696195d59de8b9d
+  metadata.gz: f32296c352fa04f05b793c4a65c6edf503db4bf60cf216ddd1a09d6bc2529964
+  data.tar.gz: 9527f7fda48a0e52e5ece0bae5d76ea025d4d6477ef63d24a9823b341250ab80
 SHA512:
-  metadata.gz: e64f6bcca0685b09aa54e652b5de4d8b4b4a48a1bcbb17180160f90b6e5b0dabf7616db592875bb878401049da3e9ce02dd5b1403e90a4a5634d816e581e7056
-  data.tar.gz: db850da3b638d066912e421d4fe7c908f6e679dd2955ea27246ba1751f3d8c5374be87c7ddbb3b0a96130b3c9ef0dde3e49fe01dced2cc7158e691cc4e508691
+  metadata.gz: 037f7ee47f22ad756483d6fb87ba6913246acdab727ee1d4312313fc6cf3e9805f51c4f663a96ca9888a957bcfa76a2894620e87e11d0632f653604daf33cc13
+  data.tar.gz: ee90b0c194e39fb8f75dc3b244be0fbed4bad065ddbcc522c5aecfa9e0d1114af055e5d73c88210f8231d471e1364222237b46b72c92e9345e9bedb80729fec9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.0
+- [BREAK_CHANGE] Método attributes das classes entity agora renomeado para entity_attributes, porém se mantem attributes nas instancias das mesmas classes
+- Adicionando suporte completo (todos os campos) a NFS-e
 # 1.0.2
 - Ajustando bug na renderização de json, que trazia o atributo inválido @attributes no json
 # 1.0.1

data/enotas_api.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Non oficial, well supported, e-notas ruby api client'
   spec.homepage      = 'https://github.com/salaozen/enotas_api'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.6')
+  spec.required_ruby_version = Gem::Requirement.new('~> 2.6')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 

data/lib/enotas_api/common/entity.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'date'
+require 'time'
 require_relative '../support/attributable'
 
 module EnotasApi
@@ -8,10 +10,10 @@ module EnotasApi
     include EnotasApi::Attributable
 
     def as_json(_options = nil)
-      self.class.attributes.keys
-          .map { |att| [att, json_value(att)] }
-          .reject { |e| e[1].nil? && !attribute_changed?(e[0]) }
-          .to_h
+      attributes.keys
+                .map { |att| [att, json_value(att)] }
+                .reject { |e| e[1].nil? && !attribute_changed?(e[0]) }
+                .to_h
     end
 
     def to_json(options = nil)
@@ -22,7 +24,14 @@ module EnotasApi
 
     def json_value(attr)
       value = send(attr)
-      value.is_a?(EnotasApi::Entity) ? value.as_json : value
+      return nil if value.nil?
+
+      type = attribute_type(attr)
+
+      return value.as_json if type.is_a?(Class)
+      return value.to_time.utc.iso8601 if type == :datetime
+
+      value
     end
   end
 end

data/lib/enotas_api/support/attributable.rb

@@ -21,7 +21,11 @@ module EnotasApi
     end
 
     def attributes
-      self.class.attributes
+      self.class.entity_attributes
+    end
+
+    def attribute_type(attribute)
+      self.class.attribute_type(attribute)
     end
 
     def set(attributes)
@@ -51,9 +55,17 @@ module EnotasApi
         end
       end
 
-      def attributes
+      def attributes(map)
+        map.each_pair(&method(:attribute))
+      end
+
+      def entity_attributes
         (@attributes || {}).freeze
       end
+
+      def attribute_type(attribute)
+        entity_attributes[attribute.to_sym]
+      end
     end
   end
 end

data/lib/enotas_api/support/type_handler.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'bigdecimal'
+require 'date'
 
 module EnotasApi
   class TypeHandler
@@ -9,6 +10,7 @@ module EnotasApi
       decimal: ->(value, _type) { value.is_a?(Float) || value.is_a?(Integer) || value.is_a?(BigDecimal) },
       integer: ->(value, _type) { value.is_a?(Integer) },
       string: ->(value, _type) { value.is_a?(String) },
+      datetime: ->(value, _type) { value.is_a?(DateTime) || value.is_a?(Date) },
       entity: ->(value, type) { value.is_a?(type) || value.is_a?(Hash) }
     }.freeze
 

data/lib/enotas_api/v1/entities/empresa.rb

@@ -7,25 +7,25 @@ require_relative 'empresa_configuracoes'
 module EnotasApi
   module V1
     class Empresa < EnotasApi::Entity
-      attribute :id, :string
-      attribute :cnpj, :string
-      attribute :inscricaoMunicipal, :string
-      attribute :inscricaoEstadual, :string
-      attribute :razaoSocial, :string
-      attribute :nomeFantasia, :string
-      attribute :optanteSimplesNacional, :boolean
-      attribute :email, :string
-      attribute :telefoneComercial, :string
-      attribute :incentivadorCultural, :boolean
-      attribute :regimeEspecialTributacao, :string
-      attribute :codigoServicoMunicipal, :string
-      attribute :cnae, :string
-      attribute :aliquotaIss, :decimal
-      attribute :descricaoServico, :string
-      attribute :itemListaServicoLC116, :string
-      attribute :endereco, EnotasApi::V1::EmpresaEndereco
-      attribute :configuracoesNFSeHomologacao, EnotasApi::V1::EmpresaConfiguracoes
-      attribute :configuracoesNFSeProducao, EnotasApi::V1::EmpresaConfiguracoes
+      attributes id: :string,
+                 cnpj: :string,
+                 inscricaoMunicipal: :string,
+                 inscricaoEstadual: :string,
+                 razaoSocial: :string,
+                 nomeFantasia: :string,
+                 optanteSimplesNacional: :boolean,
+                 email: :string,
+                 telefoneComercial: :string,
+                 incentivadorCultural: :boolean,
+                 regimeEspecialTributacao: :string,
+                 codigoServicoMunicipal: :string,
+                 cnae: :string,
+                 aliquotaIss: :decimal,
+                 descricaoServico: :string,
+                 itemListaServicoLC116: :string,
+                 endereco: EmpresaEndereco,
+                 configuracoesNFSeHomologacao: EmpresaConfiguracoes,
+                 configuracoesNFSeProducao: EmpresaConfiguracoes
     end
   end
 end

data/lib/enotas_api/v1/entities/empresa_configuracoes.rb

@@ -5,12 +5,12 @@ require_relative '../../common/entity'
 module EnotasApi
   module V1
     class EmpresaConfiguracoes < EnotasApi::Entity
-      attribute :sequencialNFe, :integer
-      attribute :serieNFe, :string
-      attribute :sequencialLoteNFe, :integer
-      attribute :usuarioAcessoProvedor, :string
-      attribute :senhaAcessoProvedor, :string
-      attribute :tokenAcessoProvedor, :string
+      attributes sequencialNFe: :integer,
+                 serieNFe: :string,
+                 sequencialLoteNFe: :integer,
+                 usuarioAcessoProvedor: :string,
+                 senhaAcessoProvedor: :string,
+                 tokenAcessoProvedor: :string
     end
   end
 end

data/lib/enotas_api/v1/entities/empresa_endereco.rb

@@ -5,16 +5,16 @@ require_relative '../../common/entity'
 module EnotasApi
   module V1
     class EmpresaEndereco < EnotasApi::Entity
-      attribute :codigoIbgeUf, :integer
-      attribute :codigoIbgeCidade, :integer
-      attribute :pais, :string
-      attribute :uf, :string
-      attribute :cidade, :string
-      attribute :logradouro, :string
-      attribute :numero, :string
-      attribute :complemento, :string
-      attribute :bairro, :string
-      attribute :cep, :string
+      attributes codigoIbgeUf: :integer,
+                 codigoIbgeCidade: :integer,
+                 pais: :string,
+                 uf: :string,
+                 cidade: :string,
+                 logradouro: :string,
+                 numero: :string,
+                 complemento: :string,
+                 bairro: :string,
+                 cep: :string
     end
   end
 end

data/lib/enotas_api/v1/entities/nfs.rb

@@ -3,17 +3,26 @@
 require_relative '../../common/entity'
 require_relative 'nfs_cliente'
 require_relative 'nfs_servico'
+require_relative 'nfs_dados_adicionais_email'
 
 module EnotasApi
   module V1
     class Nfs < EnotasApi::Entity
-      attribute :idExterno, :string
-      attribute :ambienteEmissao, :string
-      attribute :enviarPorEmail, :boolean
-      attribute :cliente, EnotasApi::V1::NfsCliente
-      attribute :servico, EnotasApi::V1::NfsServico
-      attribute :valorTotal, :decimal
-      attribute :observacoes, :string
+      attributes idExterno: :string,
+                 ambienteEmissao: :string,
+                 numeroRps: :integer,
+                 serieRps: :string,
+                 tipo: :string,
+                 dataCompetencia: :datetime,
+                 enviarPorEmail: :boolean,
+                 dadosAdicionaisEmail: NfsDadosAdicionaisEmail,
+                 cliente: NfsCliente,
+                 servico: NfsServico,
+                 naturezaOperacao: :string,
+                 deducoes: :decimal,
+                 descontos: :decimal,
+                 valorTotal: :decimal,
+                 observacoes: :string
     end
   end
 end

data/lib/enotas_api/v1/entities/nfs_cliente.rb

@@ -6,11 +6,14 @@ require_relative 'nfs_cliente_endereco'
 module EnotasApi
   module V1
     class NfsCliente < EnotasApi::Entity
-      attribute :tipoPessoa, :string
-      attribute :nome, :string
-      attribute :email, :string
-      attribute :cpfCnpj, :string
-      attribute :endereco, EnotasApi::V1::NfsClienteEndereco
+      attributes tipoPessoa: :string,
+                 nome: :string,
+                 email: :string,
+                 cpfCnpj: :string,
+                 inscricaoMunicipal: :string,
+                 inscricaoEstadual: :string,
+                 telefone: :string,
+                 endereco: NfsClienteEndereco
     end
   end
 end

data/lib/enotas_api/v1/entities/nfs_cliente_endereco.rb

@@ -5,13 +5,13 @@ require_relative '../../common/entity'
 module EnotasApi
   module V1
     class NfsClienteEndereco < EnotasApi::Entity
-      attribute :logradouro, :string
-      attribute :numero, :string
-      attribute :complemento, :string
-      attribute :bairro, :string
-      attribute :cep, :string
-      attribute :uf, :string
-      attribute :cidade, :string
+      attributes logradouro: :string,
+                 numero: :string,
+                 complemento: :string,
+                 bairro: :string,
+                 cep: :string,
+                 uf: :string,
+                 cidade: :string
     end
   end
 end

data/lib/enotas_api/v1/entities/nfs_dados_adicionais_email.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative '../../common/entity'
+require_relative 'nfs_cliente'
+require_relative 'nfs_servico'
+
+module EnotasApi
+  module V1
+    class NfsDadosAdicionaisEmail < EnotasApi::Entity
+      attributes outrosDestinatarios: :string
+    end
+  end
+end

data/lib/enotas_api/v1/entities/nfs_servico.rb

@@ -5,17 +5,21 @@ require_relative '../../common/entity'
 module EnotasApi
   module V1
     class NfsServico < EnotasApi::Entity
-      attribute :descricao, :string
-      attribute :aliquotaIss, :decimal
-      attribute :issRetidoFonte, :boolean
-      attribute :cnae, :string
-      attribute :codigoServicoMunicipio, :string
-      attribute :valorPis, :decimal
-      attribute :valorCofins, :decimal
-      attribute :valorCsll, :decimal
-      attribute :valorInss, :decimal
-      attribute :valorIr, :decimal
-      attribute :codigoInternoServicoMunicipal, :string
+      attributes ufPrestacaoServico: :string,
+                 municipioPrestacaoServico: :string,
+                 descricao: :string,
+                 aliquotaIss: :decimal,
+                 issRetidoFonte: :boolean,
+                 cnae: :string,
+                 codigoServicoMunicipio: :string,
+                 descricaoServicoMunicipio: :string,
+                 itemListaServicoLC116: :string,
+                 valorPis: :decimal,
+                 valorCofins: :decimal,
+                 valorCsll: :decimal,
+                 valorInss: :decimal,
+                 valorIr: :decimal,
+                 codigoInternoServicoMunicipal: :string
     end
   end
 end

data/lib/enotas_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EnotasApi
-  VERSION = '1.0.2'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enotas_api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Eduardo Bohrer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -137,6 +137,7 @@ files:
 - lib/enotas_api/v1/entities/nfs.rb
 - lib/enotas_api/v1/entities/nfs_cliente.rb
 - lib/enotas_api/v1/entities/nfs_cliente_endereco.rb
+- lib/enotas_api/v1/entities/nfs_dados_adicionais_email.rb
 - lib/enotas_api/v1/entities/nfs_servico.rb
 - lib/enotas_api/v1/habilitar_empresa.rb
 - lib/enotas_api/v1/incluir_atualizar_empresa.rb
@@ -159,9 +160,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.6.6
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="