afipws 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0aba9e6eb57dd5305a4c8836a1a589b7001f89
-  data.tar.gz: 9a0f95b8ef6c03b321652802791a83cdcb0fc1ab
+  metadata.gz: f0430f1994cf2d6f6afe098bda447441df15f7bb
+  data.tar.gz: 519d1e3e5ea15497d131905c9b1e37e2959b26b0
 SHA512:
-  metadata.gz: c1d1f1441ad8d505028b3c3908583381627952ba538913b38d5c5ac80bc562f501dfc903a2bd7976ee85857c6bf1780f2c2c28759ea1577c08c8c688bf108ce5
-  data.tar.gz: 18cb3316c1d763e0172a676c78e2e960f09114953ec3b50fe30482f97aa630eadc74ccf665a322f96146a9c40f2edc5986c1958a6e40928cbfc2e3e6c495aa16
+  metadata.gz: 3fa823ccd4f74a535dce9893b9df3277a82f944789e8c75be937c4fc277afc32fdc6e9136359b13fab08c839b063a0bc71b34a89053eb448c3bc654babc5f756
+  data.tar.gz: 9a40c8d4855d4b0d5eb3ea0112c38f282213ecf727f1a3963026670fcd3f76f2fd433a535140eb7ae0a9d53b7011e20fad172e812e83095195c630608d3969f4

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    afipws (0.2.0)
+    afipws (1.0.0)
       activesupport
       builder
       httpclient
-      httpi (>= 2.4.2)
       i18n
       nokogiri
-      savon
+      savon (~> 2.11.0)
 
 GEM
   remote: http://rubygems.org/
@@ -18,57 +17,108 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    builder (3.0.0)
+    akami (1.3.1)
+      gyoku (>= 0.4.0)
+      nokogiri
+    builder (3.2.2)
+    byebug (1.1.1)
+      columnize (~> 0.3.6)
+      debugger-linecache (~> 1.2.0)
+    coderay (1.1.1)
+    columnize (0.3.6)
     concurrent-ruby (1.0.2)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    gyoku (0.2.0)
+    debugger-linecache (1.2.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.14)
+    formatador (0.2.5)
+    guard (2.14.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    gyoku (1.3.1)
       builder (>= 2.1.2)
     httpclient (2.8.2.4)
     httpi (2.4.2)
       rack
       socksify
     i18n (0.7.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.10)
+    method_source (0.8.2)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
     mocha (0.9.10)
       rake
+    nenv (0.3.0)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
+    nori (2.6.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     pkg-config (1.1.7)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (1.0.1)
+      byebug (~> 1.1.1)
+      pry (>= 0.9.10)
     rack (2.0.1)
     rake (10.4.2)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    savon (0.8.3)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    ruby_dep (1.4.0)
+    savon (2.11.1)
+      akami (~> 1.2)
       builder (>= 2.1.2)
-      crack (~> 0.1.8)
-      gyoku (>= 0.2.0)
-      httpi (>= 0.7.8)
-    savon_spec (0.1.2)
-      mocha (>= 0.9.8)
-      rspec (>= 2.0.0)
-      savon (~> 0.8.0)
+      gyoku (~> 1.2)
+      httpi (~> 2.3)
+      nokogiri (>= 1.4.0)
+      nori (~> 2.4)
+      wasabi (~> 3.4)
+    shellany (0.0.1)
+    slop (3.6.0)
     socksify (1.7.0)
+    thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    wasabi (3.5.0)
+      httpi (~> 2.0)
+      nokogiri (>= 1.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   afipws!
+  guard-rspec (~> 4.3.1)
+  mocha (~> 0.9.10)
+  pry-byebug
   rake (~> 10.4.2)
-  rspec
-  savon_spec
+  rspec (~> 2.14.1)
 
 BUNDLED WITH
    1.12.3

data/Guardfile

@@ -1,19 +1,3 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
-
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), then you will want to move
-## the Guardfile to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
 guard :rspec, cmd: 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }

data/afipws.gemspec

@@ -18,14 +18,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "savon_spec"
-  s.add_development_dependency "rake", '~> 10.4.2'
+  s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rake', '~> 10.4.2'
+  s.add_development_dependency 'mocha', '~> 0.9.10'
+  s.add_development_dependency 'guard-rspec', '~> 4.3.1'
+  s.add_development_dependency 'pry-byebug'
   s.add_dependency "builder"
-  s.add_dependency "savon"
+  s.add_dependency "savon", '~> 2.11.0'
   s.add_dependency "nokogiri"
   s.add_dependency "activesupport"
   s.add_dependency "i18n"
   s.add_dependency "httpclient"
-  s.add_dependency "httpi", '>= 2.4.2'
 end

data/lib/afipws.rb

@@ -15,8 +15,3 @@ require 'afipws/type_conversions'
 require 'afipws/client'
 require 'afipws/wsaa'
 require 'afipws/wsfe'
-
-Savon.configure do |config|
-  config.soap_version = 2
-  config.log = false
-end

data/lib/afipws/client.rb

@@ -1,11 +1,7 @@
 module Afipws
   class Client
-    def initialize wsdl_url, env
-      @client = Savon::Client.new do
-        wsdl.document = wsdl_url
-        http.auth.ssl.verify_mode = :none if env == :development # Esto está porque el certificado del WSAA había vencido durante las pruebas
-        http.auth.ssl.ssl_version = :SSLv3 if env == :development || Date.today >= Date.new(2016,11,1) # Esto es porque la afip cambió el algoritmo de cifrado de los certificados y sin esto no conectaba al WSFE. En el entorno de homologación ya está realizado el cambio pero en production recién el 1/11/2016.
-      end
+    def initialize savon_options
+      @client = Savon.client savon_options.reverse_merge(soap_version: 2)
     end
     
     def request action, body = nil
@@ -18,36 +14,15 @@ module Afipws
     end
     
     def raw_request action, body = nil
-      @client.request(namespace, action) { soap.body = add_ns_to_keys(body) }
+      @client.call action, message: body
     end
     
-    def soap_actions
-      @client.wsdl.soap_actions
+    def operations
+      @client.operations
     end
     
     def method_missing method_sym, *args
       request method_sym, *args
     end
-    
-    private
-    
-    def add_ns_to_keys body
-      case body
-      when Hash
-        Hash[body.map { |k, v| ["#{namespace}:#{camelize(k)}", add_ns_to_keys(v)] }]
-      when Array
-        body.map { |x| add_ns_to_keys x }
-      else 
-        body
-      end
-    end
-    
-    def namespace
-      :wsdl
-    end
-    
-    def camelize k
-      k.is_a?(String) ? k : k.to_s.camelize
-    end
   end
 end

data/lib/afipws/core_ext/hash.rb

@@ -1,18 +1,6 @@
 module Afipws
   module CoreExt
     module Hash
-      def fetch_path path
-        path.split('/').drop(1).inject(self) do |hash, key| 
-          if scan = key.scan(/\[[\d+]\]/).first
-            key.sub! scan, ''
-            idx = scan.scan(/\d+/).first.to_i
-            hash.respond_to?(:has_key?) && hash.has_key?(key) ? hash[key][idx] : break
-          else
-            hash.respond_to?(:has_key?) && hash.has_key?(key) ? hash[key] : break
-          end
-        end
-      end
-  
       def select_keys *keys
         select { |k, _| keys.include? k }
       end

data/lib/afipws/version.rb

@@ -1,3 +1,3 @@
 module Afipws
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/lib/afipws/wsaa.rb

@@ -15,7 +15,7 @@ module Afipws
       @service = options[:service] || 'wsfe'
       @ttl = options[:ttl] || 2400
       @cuit = options[:cuit]
-      @client = Client.new WSDL[@env], @env
+      @client = Client.new Hash(options[:savon]).reverse_merge(wsdl: WSDL[@env])
     end
     
     def generar_tra service, ttl
@@ -47,12 +47,12 @@ module Afipws
     end
     
     def login
-      response = @client.raw_request :login_cms, 'in0' => tra(@key, @cert, @service, @ttl)
+      response = @client.raw_request :login_cms, in0: tra(@key, @cert, @service, @ttl)
       ta = Nokogiri::XML(Nokogiri::XML(response.to_xml).text)
       { token: ta.css('token').text, sign: ta.css('sign').text, 
         generation_time: from_xsd_datetime(ta.css('generationTime').text),
         expiration_time: from_xsd_datetime(ta.css('expirationTime').text) }
-    rescue Savon::SOAP::Fault => f
+    rescue Savon::SOAPFault => f
       raise WSError, f.message
     end
     

data/lib/afipws/wsfe.rb

@@ -15,7 +15,8 @@ module Afipws
     def initialize options = {}
       @env = (options[:env] || :test).to_sym
       @wsaa = options[:wsaa] || WSAA.new(options.merge(service: 'wsfe'))
-      @client = Client.new WSDL[@env], @env
+      ssl_version = env == :development || Date.today >= Date.new(2016,11,1) ? :SSLv3 : :TLSv1
+      @client = Client.new Hash(options[:savon]).reverse_merge(wsdl: WSDL[@env], ssl_version: ssl_version, convert_request_keys_to: :camelcase)
     end
     
     def dummy

data/spec/afipws/core_ext/hash_spec.rb

@@ -1,27 +1,6 @@
-# coding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe Hash do
-  context "fetch_path" do
-    it "deberia aceptar un path como /../.. y retornar el value" do
-      hash = { '1' => 2, '3' => { '4' => '5', '6' => { '7' => '8' } } }
-      hash.fetch_path('/1').should == 2
-      hash.fetch_path('/1/2').should == nil
-      hash.fetch_path('/2').should == nil
-      hash.fetch_path('/3/4').should == '5'
-      hash.fetch_path('/3/6').should == { '7' => '8' }
-      hash.fetch_path('/3/6/7').should == '8'
-    end
-    
-    it "debería permitir acceder a values tipo array con subindice" do
-      hash = { '1' => [{ '2' => 3 }, { '4' => 5 }] }
-      hash.fetch_path('/1[0]/2').should == 3
-      hash.fetch_path('/1[1]/4').should == 5
-      hash.fetch_path('/1[0]').should == { '2' => 3 }
-      hash.fetch_path('/1[2]').should == nil
-    end
-  end
-  
   context "select_keys" do
     it "debería tomar los values de las keys indicadas" do
       hash = Hash[1, 2, 3, 4]

data/spec/afipws/type_conversions_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Afipws::TypeConversions do
   include Afipws::TypeConversions

data/spec/afipws/wsaa_spec.rb

@@ -1,5 +1,4 @@
-# coding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Afipws::WSAA do
   context "generación documento tra" do
@@ -30,9 +29,9 @@ describe Afipws::WSAA do
   
   context "login" do
     it "debería mandar el TRA al WS y obtener el TA" do
-      ws = Afipws::WSAA.new :key => 'key', :cert => 'cert'
+      ws = Afipws::WSAA.new key: 'key', cert: 'cert'
       ws.expects(:tra).with('key', 'cert', 'wsfe', 2400).returns('tra')
-      savon.expects('loginCms').with('wsdl:in0' => 'tra').returns(:success)
+      savon.expects(:login_cms).with(message: {in0: 'tra'}).returns(fixture('login_cms/success'))
       ta = ws.login
       ta[:token].should == 'PD94='
       ta[:sign].should == 'i9xDN='
@@ -42,8 +41,8 @@ describe Afipws::WSAA do
     
     it "debería encapsular SOAP Faults" do
       subject.stubs(:tra).returns('')
-      savon.stubs('loginCms').returns(:fault)
-      expect { subject.login }.to raise_error Afipws::WSError, /CMS no es valido/
+      savon.expects(:login_cms).with(message: :any).returns(fixture('login_cms/fault'))
+      lambda { subject.login }.should raise_error Afipws::WSError, /CMS no es valido/
     end
   end
   

data/spec/afipws/wsfe_spec.rb

@@ -1,223 +1,222 @@
-# coding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Afipws::WSFE do
-  let :ws do 
-    wsaa = Afipws::WSAA.new 
-    wsaa.stubs :login => { :token => 't', :sign => 's', :expiration_time => 12.hours.from_now }
-    Afipws::WSFE.new :cuit => '1', :wsaa => wsaa
-  end
+  let(:auth) { {auth: {token: 't', sign: 's', expiration_time: 12.hours.from_now}} }
+  let(:ws) { Afipws::WSFE.new cuit: '1', wsaa: Afipws::WSAA.new.tap { |wsaa| wsaa.stubs auth: auth } }
   
   context "Métodos de negocio" do
     it "dummy" do
-      savon.expects('FEDummy').returns(:success)
-      ws.dummy.should == { :app_server => "OK", :db_server => "OK", :auth_server => "OK" }
+      savon.expects(:fe_dummy).returns(fixture('fe_dummy/success'))
+      ws.dummy.should == { app_server: "OK", db_server: "OK", auth_server: "OK" }
     end
 
     it "tipos_comprobantes" do
-      savon.expects('FEParamGetTiposCbte').returns(:success)
+      savon.expects(:fe_param_get_tipos_cbte).with(message: auth).returns(fixture('fe_param_get_tipos_cbte/success'))
       ws.tipos_comprobantes.should == [
-        { :id => 1, :desc => "Factura A", :fch_desde => Date.new(2010,9,17), :fch_hasta => nil }, 
-        { :id => 2, :desc => "Nota de Débito A", :fch_desde => Date.new(2010,9,18), :fch_hasta => Date.new(2011,9,18) }]
+        { id: 1, desc: "Factura A", fch_desde: Date.new(2010,9,17), fch_hasta: nil }, 
+        { id: 2, desc: "Nota de Débito A", fch_desde: Date.new(2010,9,18), fch_hasta: Date.new(2011,9,18) }]
     end
     
     it "tipos_documentos" do
-      savon.expects('FEParamGetTiposDoc').returns(:success)
-      ws.tipos_documentos.should == [{ :id => 80, :desc => "CUIT", :fch_desde => Date.new(2008,7,25), :fch_hasta => nil }]
+      savon.expects(:fe_param_get_tipos_doc).with(message: auth).returns(fixture('fe_param_get_tipos_doc/success'))
+      ws.tipos_documentos.should == [{ id: 80, desc: "CUIT", fch_desde: Date.new(2008,7,25), fch_hasta: nil }]
     end
     
     it "tipos_monedas" do
-      savon.expects('FEParamGetTiposMonedas').returns(:success)
+      savon.expects(:fe_param_get_tipos_monedas).with(message: auth).returns(fixture('fe_param_get_tipos_monedas/success'))
       ws.tipos_monedas.should == [
-        { :id => 'PES', :desc => "Pesos Argentinos", :fch_desde => Date.new(2009,4,3), :fch_hasta => nil }, 
-        { :id => '002', :desc => "Dólar Libre EEUU", :fch_desde => Date.new(2009,4,16), :fch_hasta => nil }]
+        { id: 'PES', desc: "Pesos Argentinos", fch_desde: Date.new(2009,4,3), fch_hasta: nil }, 
+        { id: '002', desc: "Dólar Libre EEUU", fch_desde: Date.new(2009,4,16), fch_hasta: nil }]
     end
     
     it "tipos_iva" do
-      savon.expects('FEParamGetTiposIva').returns(:success)
-      ws.tipos_iva.should == [{ :id => 5, :desc => "21%", :fch_desde => Date.new(2009,2,20), :fch_hasta => nil }] 
+      savon.expects(:fe_param_get_tipos_iva).with(message: auth).returns(fixture('fe_param_get_tipos_iva/success'))
+      ws.tipos_iva.should == [{ id: 5, desc: "21%", fch_desde: Date.new(2009,2,20), fch_hasta: nil }] 
     end
     
     it "tipos_tributos" do
-      savon.expects('FEParamGetTiposTributos').returns(:success)
-      ws.tipos_tributos.should == [{ :id => 2, :desc => "Impuestos provinciales", :fch_desde => Date.new(2010,9,17), :fch_hasta => nil }]
+      savon.expects(:fe_param_get_tipos_tributos).with(message: auth).returns(fixture('fe_param_get_tipos_tributos/success'))
+      ws.tipos_tributos.should == [{ id: 2, desc: "Impuestos provinciales", fch_desde: Date.new(2010,9,17), fch_hasta: nil }]
     end
     
     it "puntos_venta" do
-      savon.expects('FEParamGetPtosVenta').returns(:success)
+      savon.expects(:fe_param_get_ptos_venta).with(message: auth).returns(fixture('fe_param_get_ptos_venta/success'))
       ws.puntos_venta.should == [
-        { :nro => 1, :emision_tipo => "CAE", :bloqueado => false, :fch_baja => nil },
-        { :nro => 2, :emision_tipo => "CAEA", :bloqueado => true, :fch_baja => Date.new(2011,1,31) }
-      ]
+        { nro: 1, emision_tipo: "CAE", bloqueado: false, fch_baja: nil },
+        { nro: 2, emision_tipo: "CAEA", bloqueado: true, fch_baja: Date.new(2011,1,31) }]
     end
     
     context "cotizacion" do
       it "cuando la moneda solicitada existe" do
-        savon.expects('FEParamGetCotizacion').with(has_path '/MonId' => 'DOL').returns(:dolar)
+        savon.expects(:fe_param_get_cotizacion).with(message: auth.merge(mon_id: 'DOL')).returns(fixture('fe_param_get_cotizacion/dolar'))
         ws.cotizacion('DOL').should == 3.976
       end
       
       it "cuando la moneda no existe" do
-        savon.expects('FEParamGetCotizacion').with(has_path '/Auth/Token' => 't', '/MonId' => 'PES').returns(:inexistente)
-        expect { ws.cotizacion('PES') }.to raise_error Afipws::WSError, /602: Sin Resultados/
+        savon.expects(:fe_param_get_cotizacion).with(message: auth.merge(mon_id: 'PES')).returns(fixture('fe_param_get_cotizacion/inexistente'))
+        lambda { ws.cotizacion('PES') }.should raise_error Afipws::WSError, /602: Sin Resultados/
       end
     end
     
     it "cant_max_registros_x_lote" do
-      savon.expects('FECompTotXRequest').with(has_path '/Auth/Token' => 't').returns(:success)
+      savon.expects(:fe_comp_tot_x_request).with(message: auth).returns(fixture('fe_comp_tot_x_request/success'))
       ws.cant_max_registros_x_lote.should == 250
     end
     
     context "autorizar_comprobante" do
       it "debería devolver un hash con el CAE y su fecha de vencimiento" do
-        savon.expects('FECAESolicitar').with(has_path '/Auth/Token' => 't',
-          '/FeCAEReq/FeCabReq/CantReg' => 1,
-          '/FeCAEReq/FeCabReq/PtoVta' => 2,
-          '/FeCAEReq/FeCabReq/CbteTipo' => 1,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/DocTipo' => 80,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/DocNro' => 30521189203,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/CbteFch' => '20110113',
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/ImpTotal' => 1270.48,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/ImpIVA' => 220.5,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Iva/AlicIva[0]/Id' => 5,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Iva/AlicIva[0]/Importe' => 220.5,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Tributos/Tributo[0]/Id' => 0,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Tributos/Tributo[0]/BaseImp' => 150,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Tributos/Tributo[0]/Alic' => 5.2,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Tributos/Tributo[0]/Importe' => 7.8
-        ).returns(:autorizacion_1_cbte)
-        rta = ws.autorizar_comprobantes(:cbte_tipo => 1, :pto_vta => 2, :comprobantes => [{:cbte_nro => 1, :concepto => 1, 
-          :doc_nro => 30521189203, :doc_tipo => 80, :cbte_fch => Date.new(2011,01,13), 
-          :imp_total => 1270.48, :imp_neto => 1049.98, :imp_iva => 220.50, :mon_id => 'PES', :mon_cotiz => 1,
-          :iva => { :alic_iva => [{ :id => 5, :base_imp => 1049.98, :importe => 220.50 }]},
-          :tributos => { :tributo => [{ :id => 0, :base_imp => 150, :alic => 5.2, :importe => 7.8 }] }
+        savon.expects(:fecae_solicitar).with(message: has_path(
+          '//Auth/Token' => 't',
+          '//FeCAEReq/FeCabReq/CantReg' => 1,
+          '//FeCAEReq/FeCabReq/PtoVta' => 2,
+          '//FeCAEReq/FeCabReq/CbteTipo' => 1,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/DocTipo' => 80,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/DocNro' => 30521189203,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/CbteFch' => 20110113,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/ImpTotal' => 1270.48,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/ImpIVA' => 220.5,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Iva/AlicIva[1]/Id' => 5,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Iva/AlicIva[1]/Importe' => 220.5,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Tributos/Tributo[1]/Id' => 0,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Tributos/Tributo[1]/BaseImp' => 150,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Tributos/Tributo[1]/Alic' => 5.2,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Tributos/Tributo[1]/Importe' => 7.8
+        )).returns(fixture('fecae_solicitar/autorizacion_1_cbte'))
+        rta = ws.autorizar_comprobantes(cbte_tipo: 1, pto_vta: 2, comprobantes: [{cbte_nro: 1, concepto: 1, 
+          doc_nro: 30521189203, doc_tipo: 80, cbte_fch: Date.new(2011,01,13), 
+          imp_total: 1270.48, imp_neto: 1049.98, imp_iva: 220.50, mon_id: 'PES', mon_cotiz: 1,
+          iva: { alic_iva: [{ id: 5, base_imp: 1049.98, importe: 220.50 }]},
+          tributos: { tributo: [{ id: 0, base_imp: 150, alic: 5.2, importe: 7.8 }] }
         }])
-        rta[0].should have_entries :cae => '61023008595705', :cae_fch_vto => Date.new(2011,01,23), :cbte_nro => 1, 
-          :resultado => 'A', :observaciones => []
-        rta.should have(1).item
+        rta[0].should have_entries cae: '61023008595705', cae_fch_vto: Date.new(2011,01,23), cbte_nro: 1, 
+          resultado: 'A', observaciones: []
+        rta.size.should == 1
       end
 
       it "con varias alicuotas iva" do
-        savon.expects('FECAESolicitar').with(has_path({
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Iva/AlicIva[0]/Id' => 5,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Iva/AlicIva[0]/Importe' => 21,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Iva/AlicIva[1]/Id' => 4,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/Iva/AlicIva[1]/Importe' => 5.25
-        })).returns(:autorizacion_1_cbte)
-        ws.autorizar_comprobantes(:cbte_tipo => 1, :pto_vta => 2, :comprobantes => [{:iva => {:alic_iva => [
-            { :id => 5, :base_imp => 100, :importe => 21 },
-            { :id => 4, :base_imp => 50, :importe => 5.25 }
+        savon.expects(:fecae_solicitar).with(message: has_path(
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Iva/AlicIva[1]/Id' => 5,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Iva/AlicIva[1]/Importe' => 21,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Iva/AlicIva[2]/Id' => 4,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/Iva/AlicIva[2]/Importe' => 5.25
+        )).returns(fixture('fecae_solicitar/autorizacion_1_cbte'))
+        ws.autorizar_comprobantes(cbte_tipo: 1, pto_vta: 2, comprobantes: [{iva: {alic_iva: [
+            { id: 5, base_imp: 100, importe: 21 },
+            { id: 4, base_imp: 50, importe: 5.25 }
         ]}}])
       end
       
       it "con varios comprobantes aprobados" do
-        savon.expects('FECAESolicitar').with(has_path({
-          '/FeCAEReq/FeCabReq/CantReg' => 2,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/CbteDesde' => 5,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[0]/CbteHasta' => 5,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[1]/CbteDesde' => 6,
-          '/FeCAEReq/FeDetReq/FECAEDetRequest[1]/CbteHasta' => 6,
-        })).returns(:autorizacion_2_cbtes)
-        rta = ws.autorizar_comprobantes(:cbte_tipo => 1, :pto_vta => 2, :comprobantes => [
-          { :cbte_nro => 5 }, { :cbte_nro => 6 }
-        ])
-        rta[0].should have_entries :cbte_nro => 5, :cae => '61033008894096'
-        rta[1].should have_entries :cbte_nro => 6, :cae => '61033008894101'
+        savon.expects(:fecae_solicitar).with(message: has_path(
+          '//FeCAEReq/FeCabReq/CantReg' => 2,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/CbteDesde' => 5,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[1]/CbteHasta' => 5,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[2]/CbteDesde' => 6,
+          '//FeCAEReq/FeDetReq/FECAEDetRequest[2]/CbteHasta' => 6,
+        )).returns(fixture('fecae_solicitar/autorizacion_2_cbtes'))
+        rta = ws.autorizar_comprobantes(cbte_tipo: 1, pto_vta: 2, comprobantes: [{ cbte_nro: 5 }, { cbte_nro: 6 }])
+        rta[0].should have_entries cbte_nro: 5, cae: '61033008894096'
+        rta[1].should have_entries cbte_nro: 6, cae: '61033008894101'
       end
       
       it "con 2 observaciones" do
-        savon.stubs('FECAESolicitar').returns(:dos_observaciones)
-        rta = ws.autorizar_comprobantes :comprobantes => []
-        rta[0].should have_entries :cbte_nro => 3, :cae => nil, :resultado => 'R', :observaciones => [
-          {:code => 10048, :msg => 'Msg 1'}, {:code => 10018, :msg => 'Msg 2'}]
+        savon.expects(:fecae_solicitar).with(message: :any).returns(fixture 'fecae_solicitar/dos_observaciones')
+        rta = ws.autorizar_comprobantes comprobantes: []
+        rta[0].should have_entries cbte_nro: 3, cae: nil, resultado: 'R', observaciones: [
+          {code: 10048, msg: 'Msg 1'}, {code: 10018, msg: 'Msg 2'}]
       end
 
       it "con 1 observación" do
-        savon.stubs('FECAESolicitar').returns(:una_observacion)
-        rta = ws.autorizar_comprobantes :comprobantes => []
-        rta[0].should have_entries :observaciones => [{:code => 10048, :msg => 'Msg 1'}]
+        savon.expects(:fecae_solicitar).with(message: :any).returns(fixture 'fecae_solicitar/una_observacion')
+        rta = ws.autorizar_comprobantes comprobantes: []
+        rta[0].should have_entries observaciones: [{code: 10048, msg: 'Msg 1'}]
       end
     end
     
     context "solicitar_caea" do
       it "debería mandar automáticamente el período y orden" do
-        Date.stubs :today => Date.new(2011,1,27)
-        savon.expects('FECAEASolicitar').with(has_path '/Periodo' => '201102', '/Orden' => 1).returns(:success)
-        ws.solicitar_caea.should have_entries :caea => '21043476341977', :fch_tope_inf => Date.new(2011,03,17), 
-          :fch_vig_desde => Date.new(2011,02,01), :fch_vig_hasta => Date.new(2011,02,15)
+        Date.stubs today: Date.new(2011,1,27)
+        savon.expects(:fecaea_solicitar).with(message: has_path('//Periodo' => '201102', '//Orden' => 1)).returns(fixture 'fecaea_solicitar/success')
+        ws.solicitar_caea.should have_entries caea: '21043476341977', fch_tope_inf: Date.new(2011,03,17), 
+          fch_vig_desde: Date.new(2011,02,01), fch_vig_hasta: Date.new(2011,02,15)
       end
       
       context "periodo_para_solicitud_caea" do
         it "cuando estoy en la primer quincena" do
-          Date.stubs :today => Date.new(2011,1,12)
-          ws.periodo_para_solicitud_caea.should == { :periodo => '201101', :orden => 2 }
-          Date.stubs :today => Date.new(2011,1,15)
-          ws.periodo_para_solicitud_caea.should == { :periodo => '201101', :orden => 2 }
+          Date.stubs today: Date.new(2011,1,12)
+          ws.periodo_para_solicitud_caea.should == { periodo: '201101', orden: 2 }
+          Date.stubs today: Date.new(2011,1,15)
+          ws.periodo_para_solicitud_caea.should == { periodo: '201101', orden: 2 }
         end
         
         it "cuando estoy en la segunda quincena" do
-          Date.stubs :today => Date.new(2011,1,16)
-          ws.periodo_para_solicitud_caea.should == { :periodo => '201102', :orden => 1 }
-          Date.stubs :today => Date.new(2011,1,31)
-          ws.periodo_para_solicitud_caea.should == { :periodo => '201102', :orden => 1 }
+          Date.stubs today: Date.new(2011,1,16)
+          ws.periodo_para_solicitud_caea.should == { periodo: '201102', orden: 1 }
+          Date.stubs today: Date.new(2011,1,31)
+          ws.periodo_para_solicitud_caea.should == { periodo: '201102', orden: 1 }
         end        
       end
       
       it "cuando el caea ya fue otorgado debería consultarlo y devolverlo" do
-        Date.stubs :today => Date.new(2011,1,27)
-        savon.expects('FECAEASolicitar').with(has_path '/Periodo' => '201102', '/Orden' => 1).returns(:caea_ya_otorgado)
-        savon.expects('FECAEAConsultar').with(has_path '/Periodo' => '201102', '/Orden' => 1).returns(:success)
-        ws.solicitar_caea.should have_entries :caea => '21043476341977', :fch_vig_desde => Date.new(2011,02,01)
+        Date.stubs today: Date.new(2011,1,27)
+        savon.expects(:fecaea_solicitar).with(message: has_path('//Periodo' => '201102', '//Orden' => 1)).returns(fixture 'fecaea_solicitar/caea_ya_otorgado')
+        savon.expects(:fecaea_consultar).with(message: has_path('//Periodo' => '201102', '//Orden' => 1)).returns(fixture 'fecaea_consultar/success')
+        ws.solicitar_caea.should have_entries caea: '21043476341977', fch_vig_desde: Date.new(2011,02,01)
       end    
       
       it "cuando hay otro error debería burbujearlo" do
-        savon.expects('FECAEASolicitar').returns(:error_distinto)
-        expect { ws.solicitar_caea }.to raise_error Afipws::WSError, /15007/
+        savon.expects(:fecaea_solicitar).with(message: :any).returns(fixture 'fecaea_solicitar/error_distinto')
+        lambda { ws.solicitar_caea }.should raise_error Afipws::WSError, /15007/
       end  
     end
     
     it "informar_comprobantes_caea" do
-      savon.expects('FECAEARegInformativo').with(has_path({ '/Auth/Token' => 't',
-        '/FeCAEARegInfReq/FeCabReq/CantReg' => 2,
-        '/FeCAEARegInfReq/FeCabReq/PtoVta' => 3,
-        '/FeCAEARegInfReq/FeCabReq/CbteTipo' => 1,
-        '/FeCAEARegInfReq/FeDetReq/FECAEADetRequest[0]/CbteDesde' => 1,
-        '/FeCAEARegInfReq/FeDetReq/FECAEADetRequest[0]/CbteHasta' => 1,
-        '/FeCAEARegInfReq/FeDetReq/FECAEADetRequest[0]/CAEA' => '21043476341977',
-        '/FeCAEARegInfReq/FeDetReq/FECAEADetRequest[1]/CbteDesde' => 2,
-        '/FeCAEARegInfReq/FeDetReq/FECAEADetRequest[1]/CbteHasta' => 2,
-        '/FeCAEARegInfReq/FeDetReq/FECAEADetRequest[1]/CAEA' => '21043476341977',
-      })).returns(:informe_rtdo_parcial)
-      rta = ws.informar_comprobantes_caea(:cbte_tipo => 1, :pto_vta => 3, :comprobantes => [
-        { :cbte_nro => 1, :caea => '21043476341977' }, { :cbte_nro => 2, :caea => '21043476341977' },
+      savon.expects(:fecaea_reg_informativo).with(message: has_path(
+        '//Auth/Token' => 't',
+        '//FeCAEARegInfReq/FeCabReq/CantReg' => 2,
+        '//FeCAEARegInfReq/FeCabReq/PtoVta' => 3,
+        '//FeCAEARegInfReq/FeCabReq/CbteTipo' => 1,
+        '//FeCAEARegInfReq/FeDetReq/FECAEADetRequest[1]/CbteDesde' => 1,
+        '//FeCAEARegInfReq/FeDetReq/FECAEADetRequest[1]/CbteHasta' => 1,
+        '//FeCAEARegInfReq/FeDetReq/FECAEADetRequest[1]/CAEA' => '21043476341977',
+        '//FeCAEARegInfReq/FeDetReq/FECAEADetRequest[2]/CbteDesde' => 2,
+        '//FeCAEARegInfReq/FeDetReq/FECAEADetRequest[2]/CbteHasta' => 2,
+        '//FeCAEARegInfReq/FeDetReq/FECAEADetRequest[2]/CAEA' => '21043476341977',
+      )).returns(fixture 'fecaea_reg_informativo/informe_rtdo_parcial')
+      rta = ws.informar_comprobantes_caea(cbte_tipo: 1, pto_vta: 3, comprobantes: [
+        { cbte_nro: 1, caea: '21043476341977' }, { cbte_nro: 2, caea: '21043476341977' },
       ])
-      rta[0].should have_entries :cbte_nro => 1, :caea => '21043476341977', :resultado => 'A', :observaciones => []
-      rta[1].should have_entries :cbte_nro => 2, :caea => '21043476341977', :resultado => 'R', :observaciones => [{:code => 724, :msg => 'Msg'}]
+      rta[0].should have_entries cbte_nro: 1, caea: '21043476341977', resultado: 'A', observaciones: []
+      rta[1].should have_entries cbte_nro: 2, caea: '21043476341977', resultado: 'R', observaciones: [{code: 724, msg: 'Msg'}]
     end
     
     it "informar_caea_sin_movimientos" do
-      savon.expects('FECAEASinMovimientoInformar').with(has_path('/Auth/Token' => 't',
-        '/PtoVta' => 4, '/CAEA' => '21043476341977')).returns(:success)
+      savon.expects(:fecaea_sin_movimiento_informar).with(message: has_path(
+        '//Auth/Token' => 't',
+        '//PtoVta' => 4, 
+        '//CAEA' => '21043476341977'
+      )).returns(fixture 'fecaea_sin_movimiento_informar/success')
       rta = ws.informar_caea_sin_movimientos('21043476341977', 4)
-      rta.should have_entries :caea => '21043476341977', :resultado => 'A'
+      rta.should have_entries caea: '21043476341977', resultado: 'A'
     end
     
     context "consultar_caea" do
       it "consultar_caea" do
-        savon.expects('FECAEAConsultar').with(has_path '/Periodo' => '201101', '/Orden' => 1).returns(:success)
-        ws.consultar_caea(Date.new(2011,1,1)).should have_entries :caea => '21043476341977', :fch_tope_inf => Date.new(2011,03,17)
+        savon.expects(:fecaea_consultar).with(message: has_path('//Periodo' => '201101', '//Orden' => 1)).returns(fixture 'fecaea_consultar/success')
+        ws.consultar_caea(Date.new(2011,1,1)).should have_entries caea: '21043476341977', fch_tope_inf: Date.new(2011,03,17)
       end
     end
     
     it "ultimo_comprobante_autorizado" do
-      savon.expects('FECompUltimoAutorizado').with(has_path '/PtoVta' => 1, '/CbteTipo' => 1).returns(:success)
-      ws.ultimo_comprobante_autorizado(:pto_vta => 1, :cbte_tipo => 1).should == 20
+      savon.expects(:fe_comp_ultimo_autorizado).with(message: has_path('//PtoVta' => 1, '//CbteTipo' => 1)).returns(fixture 'fe_comp_ultimo_autorizado/success')
+      ws.ultimo_comprobante_autorizado(pto_vta: 1, cbte_tipo: 1).should == 20
     end
     
     it "consultar_comprobante" do
-      savon.expects('FECompConsultar').with(has_path '/Auth/Token' => 't', 
-        '/FeCompConsReq/PtoVta' => 1, '/FeCompConsReq/CbteTipo' => 2, '/FeCompConsReq/CbteNro' => 3).returns(:success)
-      rta = ws.consultar_comprobante(:pto_vta => 1, :cbte_tipo => 2, :cbte_nro => 3)
+      savon.expects(:fe_comp_consultar).with(message: has_path(
+        '//Auth/Token' => 't', '//FeCompConsReq/PtoVta' => 1, '//FeCompConsReq/CbteTipo' => 2, '//FeCompConsReq/CbteNro' => 3
+      )).returns(fixture 'fe_comp_consultar/success')
+      rta = ws.consultar_comprobante(pto_vta: 1, cbte_tipo: 2, cbte_nro: 3)
       rta[:cod_autorizacion].should == '61023008595705'
       rta[:emision_tipo].should == 'CAE'
     end
@@ -225,48 +224,49 @@ describe Afipws::WSFE do
   
   context "autenticacion" do
     it "debería autenticarse usando el WSAA" do
-      wsfe = Afipws::WSFE.new :cuit => '1', :cert => 'cert', :key => 'key'
+      wsfe = Afipws::WSFE.new cuit: '1', cert: 'cert', key: 'key'
       wsfe.wsaa.cert.should == 'cert'
       wsfe.wsaa.key.should == 'key'
       wsfe.wsaa.service.should == 'wsfe'
-      wsfe.wsaa.expects(:login).returns({ :token => 't', :sign => 's' })
-      savon.expects('FEParamGetTiposCbte').with('wsdl:Auth' => {'wsdl:Token' => 't', 'wsdl:Sign' => 's', 'wsdl:Cuit' => '1'}).returns(:success)
+      wsfe.wsaa.expects(:login).returns({ token: 't', sign: 's' })
+      savon.expects(:fe_param_get_tipos_cbte).with(message: has_path(
+        '//Auth/Token' => 't', '//Auth/Sign' => 's', '//Auth/Cuit' => '1'
+      )).returns(fixture 'fe_param_get_tipos_cbte/success')
       wsfe.tipos_comprobantes
     end
   end
   
   context "entorno" do
     it "debería usar las url para development cuando el env es development" do
-      Afipws::Client.expects(:new).with("https://wsaahomo.afip.gov.ar/ws/services/LoginCms?wsdl", :development)
-      Afipws::Client.expects(:new).with("https://wswhomo.afip.gov.ar/wsfev1/service.asmx?WSDL", :development)
-      wsfe = Afipws::WSFE.new :env => :development
+      Afipws::Client.expects(:new).with(wsdl: 'https://wsaahomo.afip.gov.ar/ws/services/LoginCms?wsdl')
+      Afipws::Client.expects(:new).with(wsdl: 'https://wswhomo.afip.gov.ar/wsfev1/service.asmx?WSDL', ssl_version: :SSLv3, convert_request_keys_to: :camelcase)
+      wsfe = Afipws::WSFE.new env: :development
       wsfe.env.should == :development
     end
 
     it "debería usar las url para production cuando el env es production" do
-      Afipws::Client.expects(:new).with("https://wsaa.afip.gov.ar/ws/services/LoginCms?wsdl", :production)
-      # Afipws::Client.expects(:new).with("https://servicios1.afip.gov.ar/wsfev1/service.asmx?WSDL", :production)
-      Afipws::Client.expects(:new).with(File.expand_path(File.dirname(__FILE__) + '/../../') + "/lib/afipws/wsfev1.wsdl", :production)
-      wsfe = Afipws::WSFE.new :env => 'production'
+      Afipws::Client.expects(:new).with(wsdl: 'https://wsaa.afip.gov.ar/ws/services/LoginCms?wsdl')
+      Afipws::Client.expects(:new).with(has_entries wsdl: File.expand_path(File.dirname(__FILE__) + '/../../') + "/lib/afipws/wsfev1.wsdl")
+      wsfe = Afipws::WSFE.new env: 'production'
       wsfe.env.should == :production
     end
   end
   
   context "manejo de errores" do
     it "cuando hay un error" do
-      savon.expects('FEParamGetTiposCbte').returns(:failure_1_error)
-      expect { ws.tipos_comprobantes }.to raise_error { |e| 
+      savon.expects(:fe_param_get_tipos_cbte).with(message: :any).returns(fixture 'fe_param_get_tipos_cbte/failure_1_error')
+      lambda { ws.tipos_comprobantes }.should raise_error { |e| 
         e.should be_a Afipws::WSError
-        e.errors.should == [{ :code => "600", :msg => "No se corresponden token con firma" }] 
+        e.errors.should == [{ code: "600", msg: "No se corresponden token con firma" }] 
         e.message.should == "600: No se corresponden token con firma" 
       }
     end
 
     it "cuando hay varios errores" do
-      savon.expects('FEParamGetTiposCbte').returns(:failure_2_errors)
-      expect { ws.tipos_comprobantes }.to raise_error { |e| 
+      savon.expects(:fe_param_get_tipos_cbte).with(message: :any).returns(fixture 'fe_param_get_tipos_cbte/failure_2_errors')
+      lambda { ws.tipos_comprobantes }.should raise_error { |e| 
         e.should be_a Afipws::WSError
-        e.errors.should == [{ :code => "600", :msg => "No se corresponden token con firma" }, { :code => "601", :msg => "CUIT representada no incluida en token" }] 
+        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
@@ -274,11 +274,11 @@ describe Afipws::WSFE do
   
   context "cálculo de fechas y períodos" do
     it "periodo_para_consulta_caea" do
-      ws.periodo_para_consulta_caea(Date.new(2011,1,1)).should == { :periodo => '201101', :orden => 1 }
-      ws.periodo_para_consulta_caea(Date.new(2011,1,15)).should == { :periodo => '201101', :orden => 1 }
-      ws.periodo_para_consulta_caea(Date.new(2011,1,16)).should == { :periodo => '201101', :orden => 2 }
-      ws.periodo_para_consulta_caea(Date.new(2011,1,31)).should == { :periodo => '201101', :orden => 2 }
-      ws.periodo_para_consulta_caea(Date.new(2011,2,2)).should == { :periodo => '201102', :orden => 1 }
+      ws.periodo_para_consulta_caea(Date.new(2011,1,1)).should == { periodo: '201101', orden: 1 }
+      ws.periodo_para_consulta_caea(Date.new(2011,1,15)).should == { periodo: '201101', orden: 1 }
+      ws.periodo_para_consulta_caea(Date.new(2011,1,16)).should == { periodo: '201101', orden: 2 }
+      ws.periodo_para_consulta_caea(Date.new(2011,1,31)).should == { periodo: '201101', orden: 2 }
+      ws.periodo_para_consulta_caea(Date.new(2011,2,2)).should == { periodo: '201102', orden: 1 }
     end
     
     it "fecha_inicio_quincena_siguiente" do
@@ -293,7 +293,7 @@ describe Afipws::WSFE do
     end
     
     def fecha_inicio_quincena_siguiente fecha
-      Date.stubs(:today => fecha)
+      Date.stubs(today: fecha)
       subject.fecha_inicio_quincena_siguiente
     end
   end
@@ -304,7 +304,7 @@ describe Afipws::WSFE do
     end
     
     it "no debería enviar tag tributos si el impTrib es 0" do
-      c2r(:imp_trib => 0.0, :tributos => { :tributo => [] }).should_not have_key :tributos
+      c2r(imp_trib: 0.0, tributos: { tributo: [] }).should_not have_key :tributos
     end
   end
 end

data/spec/manual/test.rb

@@ -1,8 +1,6 @@
 $LOAD_PATH.unshift(File.expand_path('lib')); require 'afipws'
 
-Savon.configure { |config| config.log = true }
-
-ws = Afipws::WSFE.new :env => :development, :cuit => '20300032673', :cert => File.read('spec/manual/test.crt'), :key => File.read('spec/manual/test.key') 
+ws = Afipws::WSFE.new env: :development, cuit: '20300032673', cert: File.read('spec/manual/test.crt'), key: File.read('spec/manual/test.key'), savon: {log: true}
 
 def obtener_ta ws
   ws.cotizacion 'DOL'
@@ -16,26 +14,22 @@ def obtener_ta ws
 end
 
 def autorizar_comprobante ws
-  ultimo = ws.ultimo_comprobante_autorizado :pto_vta => 1, :cbte_tipo => 1
+  ultimo = ws.ultimo_comprobante_autorizado pto_vta: 1, cbte_tipo: 1
   # cant_informar = ws.cant_max_registros_x_lote
   cant_informar = 2
   puts "Informando #{cant_informar} comprobantes"
   comprobantes = (1..cant_informar).to_a.map do |i|
     { 
-      :cbte_nro => ultimo + i, :concepto => 1, :doc_nro => 30521189203, :doc_tipo => 80, :cbte_fch => Date.today, 
-      :imp_total => 1270.48, :imp_neto => 1049.98, :imp_iva => 220.50, :mon_id => 'PES', :mon_cotiz => 1,
-      :iva => { :alic_iva => [{ :id => 5, :base_imp => 1049.98, :importe => 220.50 }]}
+      cbte_nro: ultimo + i, concepto: 1, doc_nro: 30521189203, doc_tipo: 80, cbte_fch: Date.today, 
+      imp_total: 1270.48, imp_neto: 1049.98, imp_iva: 220.50, mon_id: 'PES', mon_cotiz: 1,
+      iva: { alic_iva: [{ id: 5, base_imp: 1049.98, importe: 220.50 }]}
     }
   end
-  puts ws.autorizar_comprobantes(:cbte_tipo => 1, :pto_vta => 1, :comprobantes => comprobantes)
+  puts ws.autorizar_comprobantes(cbte_tipo: 1, pto_vta: 1, comprobantes: comprobantes)
 end
 
 def consultar_caea ws
   ws.consultar_caea Date.new(2011,2,3)
 end
 
-def soap_actions ws
-  ws.client.soap_actions
-end
-
 obtener_ta ws

data/spec/spec_helper.rb

@@ -1,11 +1,24 @@
 require 'rspec'
 require 'afipws'
-require 'savon_spec'
+require 'savon/mock/spec_helper'
+require 'mocha'
+require 'pry-byebug'
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.include Savon::Spec::Macros
+  config.include Savon::SpecHelper
+
+  config.mock_with :mocha
+  config.expect_with(:rspec) { |c| c.syntax = :should }
+  config.alias_example_to :fit, focused: true
+  config.filter_run focused: true
+  config.run_all_when_everything_filtered = true
+
+  config.before(:all) { savon.mock!   }
+  config.after(:all)  { savon.unmock! }
 end
 
-Savon::Spec::Fixture.path = File.expand_path("../fixtures", __FILE__)
+def fixture file
+  File.read("#{Afipws::Root}/spec/fixtures/#{file}.xml")
+end

data/spec/support/matchers.rb

@@ -1,37 +1,11 @@
-RSpec::Matchers.define :match_xpath do |xpath, expected_text|
+RSpec::Matchers.define :match_xpath do |xpath, expected_value|
   match do |xml|
-    xml = Nokogiri::XML xml
-    xml.xpath(xpath).text.should == expected_text
+    @xml = Nokogiri::XML xml
+    @xml.remove_namespaces!
+    @xml.xpath(xpath).text.should == expected_value.to_s
   end
-end
 
-require 'mocha/parameter_matchers/base'
-
-module Mocha
-  module ParameterMatchers
-    def has_path(paths)
-      HasPath.new(paths)
-    end
-
-    class HasPath < Base # :nodoc:
-      def initialize(paths)
-        @paths = paths
-      end
-      
-      def matches?(available_parameters)
-        parameter = available_parameters.shift
-        return false unless parameter.is_a? Hash
-        @paths.all? do |path| 
-          path, expected_value = path
-          actual_value = parameter.fetch_path path.gsub('/', '/wsdl:')
-          @failed_path, @failed_value, @actual_value = path, expected_value, actual_value
-          expected_value == actual_value
-        end
-      end
-      
-      def mocha_inspect
-        "has_path(#{@failed_path.mocha_inspect} => #{@failed_value.mocha_inspect} | Actual: #{@actual_value.mocha_inspect})"
-      end
-    end
+  failure_message_for_should do |actual|
+    "expected xpath '#{xpath}' with value '#{expected_value}' in doc:\n#{@xml}"
   end
 end

data/spec/support/savon_extensions.rb

@@ -0,0 +1,39 @@
+# Savon 2 sólo permite verificar los params del mensaje como un hash lo cual es poco flexible. Con esto permito pasarle xpaths.
+
+module Savon
+  module MessageMatcher
+    def actual(operation_name, builder, globals, locals)
+      super.update request: builder.to_s
+    end
+
+    def verify_message!
+      if @expected[:message].respond_to? :verify!
+        @expected[:message].verify! @actual[:request]
+      else
+        super
+      end
+    end
+  end
+
+  MockExpectation.prepend MessageMatcher
+end
+
+def has_path(paths)
+  HasXPath.new(paths)
+end
+
+class HasXPath
+  include RSpec::Matchers
+  
+  def initialize(paths)
+    @paths = paths
+  end
+  
+  def verify! xml
+    @actual_xml = xml
+    @paths.each do |(path, value)| 
+      @expected_xpath, @expected_value = path, value
+      @actual_xml.should match_xpath @expected_xpath, @expected_value
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: afipws
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Emmanuel Nicolau
@@ -14,52 +14,66 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
-  name: savon_spec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 0.9.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.1
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: savon
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpi
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '0'
 description: ''
 email:
 - emmanicolau@gmail.com
@@ -216,6 +230,7 @@ files:
 - spec/manual/test.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
+- spec/support/savon_extensions.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -279,3 +294,4 @@ test_files:
 - spec/manual/test.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
+- spec/support/savon_extensions.rb