afipws 1.3.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010fac0fb543b010564f089fc4625d0b45d7c7d5f81b713832e0765bc7620cdf
-  data.tar.gz: acaa441393cd79fcbaac477d1c806e97988a93e3aef64fa9018693bff172b5c7
+  metadata.gz: a50ec977b4eb2da94edd06703a11d9ee46b6cfd847de01160a1527871712158e
+  data.tar.gz: 3c0aa5ab031957e66b2afea67af73ea1cd91026f67cfea9353877c1b43186dc2
 SHA512:
-  metadata.gz: 71cc61d3c240a9832897bc0ee397679cd4c9b0d0867e83c2a7c7e9832c88a144dff0170b9ba7b17a3825e2a7233fec72f93e6badfee6a6ca69269326877448da
-  data.tar.gz: fc5af32704571cfca4fda6ec345e4fc9d9237f7a00ac65a568f6116a1f09b15482f6af0c7fc5a6b845cf0eeb960c5eef60f92f836334cb49e79b0744e2191ca6
+  metadata.gz: 471e56e9c6ceab26acc42b4c2997c2ab9f611ad89bee70400ce5a5d68bc83dc3e89e348af5ce98e727bc6c2363af8936fbcd238f8d1f00942cae3a8a754dae02
+  data.tar.gz: d503f3f2df71fc503ddb10bf80985014da6cb03cabc77c5a8a98b4203269e5225c011f66fb125d248e785cb5c3b5b133b32ae8bd2b8c471b1946c8fc1f7dc1ad

data/.rubocop.yml

@@ -46,6 +46,9 @@ Style/Next:
 Style/NumericPredicate:
   Enabled: false
 
+Style/NumericLiterals:
+  Enabled: false
+
 Style/SymbolArray:
   Enabled: false
 

data/Gemfile.lock

@@ -1,21 +1,24 @@
 PATH
   remote: .
   specs:
-    afipws (1.3.2)
+    afipws (2.0.0)
       activesupport
       builder
+      httpclient
       nokogiri
       savon (~> 2.11.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
@@ -23,7 +26,7 @@ GEM
     builder (3.2.4)
     byebug (11.0.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     ffi (1.9.25)
     formatador (0.2.5)
@@ -43,10 +46,11 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    httpi (2.4.4)
+    httpclient (2.8.3)
+    httpi (2.4.5)
       rack
       socksify
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     listen (3.1.5)
@@ -56,11 +60,11 @@ GEM
     lumberjack (1.0.13)
     method_source (0.9.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     mocha (0.9.10)
       rake
     nenv (0.3.0)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nori (2.6.0)
     notiffany (0.1.1)
@@ -76,6 +80,7 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
+    public_suffix (4.0.5)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.1)
@@ -120,10 +125,11 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.4.0)
-    wasabi (3.5.0)
+    wasabi (3.6.1)
+      addressable
       httpi (~> 2.0)
       nokogiri (>= 1.4.2)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/afipws.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry-byebug'
   s.add_dependency "builder"
   s.add_dependency "savon", '~> 2.11.0'
+  s.add_dependency "httpclient"
   s.add_dependency "nokogiri"
   s.add_dependency "activesupport"
 end

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'afipws'
+
+require 'pry'
+Pry.start

data/lib/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.0.0] - 2020-10-28
+
+### Added
+
+- Long overdue CHANGELOG file.
+- Include `httpclient` dependency so we can wrap network errors.
+
+### Changed
+
+- Rename Afipws::WSError to Afipws::Error, and create subclasses to distinguish between different types of errors.

data/lib/afipws.rb

@@ -5,12 +5,16 @@ end
 require 'forwardable'
 require 'builder'
 require 'base64'
+require 'httpclient'
 require 'savon'
 require 'nokogiri'
 require 'active_support'
 require 'active_support/core_ext'
 require 'afipws/core_ext/hash'
-require 'afipws/wserror'
+require 'afipws/errors/error'
+require 'afipws/errors/response_error'
+require 'afipws/errors/server_error'
+require 'afipws/errors/network_error'
 require 'afipws/type_conversions'
 require 'afipws/client'
 require 'afipws/wsaa'

data/lib/afipws/client.rb

@@ -1,15 +1,19 @@
 module Afipws
   class Client
     def initialize savon_options
-      @client = Savon.client savon_options.reverse_merge(soap_version: 2, ssl_version: :TLSv1_2)
+      @savon = Savon.client savon_options.reverse_merge(soap_version: 2, ssl_version: :TLSv1_2)
     end
 
     def request action, body = nil
-      @client.call action, message: body
+      @savon.call action, message: body
+    rescue Savon::SOAPFault => e
+      raise ServerError, e
+    rescue HTTPClient::TimeoutError => e
+      raise NetworkError, e
     end
 
     def operations
-      @client.operations
+      @savon.operations
     end
   end
 end

data/lib/afipws/core_ext/hash.rb

@@ -4,10 +4,6 @@ module Afipws
       def select_keys *keys
         select { |k, _| keys.include? k }
       end
-
-      def has_entries? entries
-        entries.each_pair.all? { |k, v| self[k] == v }
-      end
     end
   end
 end

data/lib/afipws/errors/error.rb

@@ -0,0 +1,7 @@
+module Afipws
+  class Error < StandardError
+    def code? _code
+      false
+    end
+  end
+end

data/lib/afipws/errors/network_error.rb

@@ -0,0 +1,4 @@
+module Afipws
+  class NetworkError < Error
+  end
+end

data/lib/afipws/errors/response_error.rb

@@ -0,0 +1,16 @@
+module Afipws
+  class ResponseError < Error
+    attr_reader :errors
+
+    def initialize errors
+      raise ArgumentError, '`errors` must be an array of maps, each with :code and :msg keys' unless errors.is_a? Array
+
+      super errors.map { |e| "#{e[:code]}: #{e[:msg]}" }.join '; '
+      @errors = errors
+    end
+
+    def code? code
+      @errors.any? { |e| e[:code].to_s == code.to_s }
+    end
+  end
+end

data/lib/afipws/errors/server_error.rb

@@ -0,0 +1,4 @@
+module Afipws
+  class ServerError < Error
+  end
+end

data/lib/afipws/persona_service_a100.rb

@@ -44,8 +44,6 @@ module Afipws
 
     def request action, body = nil
       @client.request(action, body).to_hash[:"#{action}_response"]
-    rescue Savon::SOAPFault => f
-      raise WSError, f.message
     end
   end
 end

data/lib/afipws/persona_service_a4.rb

@@ -27,8 +27,6 @@ module Afipws
 
     def request action, body = nil
       @client.request(action, body).to_hash[:"#{action}_response"]
-    rescue Savon::SOAPFault => f
-      raise WSError, f.message
     end
   end
 end

data/lib/afipws/persona_service_a5.rb

@@ -28,8 +28,6 @@ module Afipws
 
     def request action, body = nil
       @client.request(action, body).to_hash[:"#{action}_response"]
-    rescue Savon::SOAPFault => f
-      raise WSError, f.message
     end
   end
 end

data/lib/afipws/version.rb

@@ -1,3 +1,3 @@
 module Afipws
-  VERSION = '1.3.2'
+  VERSION = '2.0.0'
 end

data/lib/afipws/w_cons_declaracion.rb

@@ -40,12 +40,10 @@ module Afipws
     def request action, body = nil
       response = @client.request(action, body).to_hash[:"#{action}_response"][:"#{action}_result"]
       if response[:lista_errores] && response[:lista_errores][:detalle_error][:codigo] != '0'
-        raise WSError, Array.wrap(response[:lista_errores][:detalle_error]).map { |e| {code: e[:codigo], msg: e[:descripcion]} }
+        raise ResponseError, Array.wrap(response[:lista_errores][:detalle_error]).map { |e| {code: e[:codigo], msg: e[:descripcion]} }
       else
         response
       end
-    rescue Savon::SOAPFault => f
-      raise WSError, f.message
     end
 
     def auth

data/lib/afipws/ws_constancia_inscripcion.rb

@@ -27,8 +27,6 @@ module Afipws
 
     def request action, body = nil
       @client.request(action, body).to_hash[:"#{action}_response"]
-    rescue Savon::SOAPFault => f
-      raise WSError, f.message
     end
   end
 end

data/lib/afipws/wsaa.rb

@@ -55,8 +55,6 @@ module Afipws
         generation_time: from_xsd_datetime(ta.css('generationTime').text),
         expiration_time: from_xsd_datetime(ta.css('expirationTime').text)
       }
-    rescue Savon::SOAPFault => f
-      raise WSError, f.message
     end
 
     def auth

data/lib/afipws/wsfe.rb

@@ -92,8 +92,8 @@ module Afipws
 
     def solicitar_caea
       convertir_rta_caea request(:fecaea_solicitar, auth.merge(periodo_para_solicitud_caea))
-    rescue Afipws::WSError => e
-      if e.errors.any? { |e| e[:code] == '15008' }
+    rescue Afipws::ResponseError => e
+      if e.code? 15008
         consultar_caea fecha_inicio_quincena_siguiente
       else
         raise
@@ -163,7 +163,7 @@ module Afipws
     def request action, body = nil
       response = @client.request(action, body).to_hash[:"#{action}_response"][:"#{action}_result"]
       if response[:errors]
-        raise WSError, Array.wrap(response[:errors][:err])
+        raise ResponseError, Array.wrap(response[:errors][:err])
       else
         response
       end

data/spec/afipws/client_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+module Afipws
+  describe Client do
+    context 'manejo de errores' do
+      subject { Client.new(wsdl: Afipws::WSFE::WSDL[:test]) }
+
+      it 'Savon::SOAPFault se encapsulan en ServerError' do
+        savon.expects(:fe_dummy).returns(fixture('wsaa/login_cms/fault'))
+        -> { subject.request :fe_dummy }.should raise_error ServerError, /CMS no es valido/
+      end
+
+      it 'HTTPClient::TimeoutError se encapsulan en NetworkError' do
+        # Hack to mock exceptions on Savon
+        subject.instance_eval('@savon').expects(:call).raises(HTTPClient::ReceiveTimeoutError, 'execution expired')
+        -> { subject.request :fe_dummy }.should raise_error NetworkError, /execution expired/
+      end
+    end
+  end
+end

data/spec/afipws/core_ext/hash_spec.rb

@@ -10,14 +10,4 @@ describe Hash do
       hash.select_keys(5, 3).should == {3 => 4}
     end
   end
-
-  context 'has_entries?' do
-    subject { Hash[1, 2, 3, 4] }
-
-    it 'debería devolver true cuando self incluye todas las entries del hash parametro' do
-      should include 1 => 2
-      should include 3 => 4, 1 => 2
-      should_not include 1 => 3
-    end
-  end
 end

data/spec/afipws/w_cons_declaracion_spec.rb

@@ -55,7 +55,7 @@ module Afipws
           savon.expects(:detallada_lista_declaraciones).with(message: :any)
             .returns(fixture('wconsdeclaracion/detallada_lista_declaraciones/por_id_inexistente'))
           -> { ws.detallada_lista_declaraciones identificador_declaracion: '...' }
-            .should raise_error WSError, '21248: Declaracion 19093SIMI000434. inexistente o invalida'
+            .should raise_error ResponseError, '21248: Declaracion 19093SIMI000434. inexistente o invalida'
         end
       end
 

data/spec/afipws/ws_constancia_inscripcion_spec.rb

@@ -51,7 +51,7 @@ module Afipws
         savon.expects(:get_persona)
           .with(message: message.merge(id_persona: '123'))
           .returns(fixture('ws_sr_constancia_inscripcion/get_persona/fault'))
-        -> { ws.get_persona '123' }.should raise_error WSError, /No existe persona con ese Id/
+        -> { ws.get_persona '123' }.should raise_error ServerError, /No existe persona con ese Id/
       end
     end
 

data/spec/afipws/wsaa_spec.rb

@@ -39,12 +39,6 @@ module Afipws
         ta[:generation_time].should == Time.new(2011, 1, 12, 18, 57, 4, '-03:00')
         ta[:expiration_time].should == Time.new(2011, 1, 13, 6, 57, 4, '-03:00')
       end
-
-      it 'debería encapsular SOAP Faults' do
-        subject.stubs(:tra).returns('')
-        savon.expects(:login_cms).with(message: :any).returns(fixture('wsaa/login_cms/fault'))
-        -> { subject.login }.should raise_error WSError, /CMS no es valido/
-      end
     end
 
     context 'auth' do

data/spec/afipws/wsfe_spec.rb

@@ -70,7 +70,7 @@ module Afipws
         it 'cuando la moneda no existe' do
           savon.expects(:fe_param_get_cotizacion).with(message: auth.merge(mon_id: 'PES')).returns(fixture('wsfe/fe_param_get_cotizacion/inexistente'))
           -> { ws.cotizacion('PES') }.should raise_error { |error|
-            error.should be_a WSError
+            error.should be_a ResponseError
             error.message.should match /602: Sin Resultados/
             error.code?(602).should be true
             error.code?(603).should be false
@@ -195,9 +195,9 @@ module Afipws
           ws.solicitar_caea.should include caea: '21043476341977', fch_vig_desde: Date.new(2011, 0o2, 0o1)
         end
 
-        it 'cuando hay otro error debería burbujearlo' do
+        it 'cuando encapsular errores' do
           savon.expects(:fecaea_solicitar).with(message: :any).returns(fixture('wsfe/fecaea_solicitar/error_distinto'))
-          -> { ws.solicitar_caea }.should raise_error WSError, /15007/
+          -> { ws.solicitar_caea }.should raise_error ResponseError, /15007/
         end
       end
 
@@ -287,7 +287,7 @@ module Afipws
       it 'cuando hay un error' do
         savon.expects(:fe_param_get_tipos_cbte).with(message: :any).returns(fixture('wsfe/fe_param_get_tipos_cbte/failure_1_error'))
         -> { ws.tipos_comprobantes }.should raise_error { |e|
-          e.should be_a WSError
+          e.should be_a ResponseError
           e.errors.should == [{ code: '600', msg: 'No se corresponden token con firma' }]
           e.message.should == '600: No se corresponden token con firma'
         }
@@ -296,8 +296,11 @@ module Afipws
       it 'cuando hay varios errores' do
         savon.expects(:fe_param_get_tipos_cbte).with(message: :any).returns(fixture('wsfe/fe_param_get_tipos_cbte/failure_2_errors'))
         -> { ws.tipos_comprobantes }.should raise_error { |e|
-          e.should be_a WSError
-          e.errors.should == [{ code: '600', msg: 'No se corresponden token con firma' }, { code: '601', msg: 'CUIT representada no incluida en token' }]
+          e.should be_a ResponseError
+          e.errors.should == [
+            { code: '600', msg: 'No se corresponden token con firma' },
+            { code: '601', msg: 'CUIT representada no incluida en token' }
+          ]
           e.message.should == '600: No se corresponden token con firma; 601: CUIT representada no incluida en token'
         }
       end

data/spec/support/savon_extensions.rb

@@ -24,14 +24,14 @@ end
 
 class HasXPath
   include RSpec::Matchers
-  
+
   def initialize(paths)
     @paths = paths
   end
-  
+
   def verify! xml
     @actual_xml = xml
-    @paths.each do |(path, value)| 
+    @paths.each do |(path, value)|
       @expected_xpath, @expected_value = path, value
       @actual_xml.should match_xpath @expected_xpath, @expected_value
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afipws
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Emmanuel Nicolau
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +167,8 @@ dependencies:
 description: ''
 email:
 - emmanicolau@gmail.com
-executables: []
+executables:
+- console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -169,9 +184,15 @@ files:
 - README.md
 - Rakefile
 - afipws.gemspec
+- bin/console
+- lib/CHANGELOG.md
 - lib/afipws.rb
 - lib/afipws/client.rb
 - lib/afipws/core_ext/hash.rb
+- lib/afipws/errors/error.rb
+- lib/afipws/errors/network_error.rb
+- lib/afipws/errors/response_error.rb
+- lib/afipws/errors/server_error.rb
 - lib/afipws/persona_service_a100.rb
 - lib/afipws/persona_service_a4.rb
 - lib/afipws/persona_service_a5.rb
@@ -180,8 +201,8 @@ files:
 - lib/afipws/w_cons_declaracion.rb
 - lib/afipws/ws_constancia_inscripcion.rb
 - lib/afipws/wsaa.rb
-- lib/afipws/wserror.rb
 - lib/afipws/wsfe.rb
+- spec/afipws/client_spec.rb
 - spec/afipws/core_ext/hash_spec.rb
 - spec/afipws/persona_service_a100_spec.rb
 - spec/afipws/persona_service_a4_spec.rb
@@ -255,7 +276,7 @@ files:
 homepage: https://github.com/eeng/afipws
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,10 +293,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: afipws
 rubygems_version: 2.7.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby client para los web services de la AFIP
 test_files:
+- spec/afipws/client_spec.rb
 - spec/afipws/core_ext/hash_spec.rb
 - spec/afipws/persona_service_a100_spec.rb
 - spec/afipws/persona_service_a4_spec.rb

data/lib/afipws/wserror.rb

@@ -1,19 +0,0 @@
-module Afipws
-  class WSError < StandardError
-    attr_reader :errors
-
-    def initialize errors
-      if errors.is_a? Array
-        super errors.map { |e| "#{e[:code]}: #{e[:msg]}" }.join '; '
-        @errors = errors
-      else
-        super
-        @errors = []
-      end
-    end
-
-    def code? code
-      @errors.any? { |e| e[:code].to_s == code.to_s }
-    end
-  end
-end