afipws 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    afipws (0.1.3)
+    afipws (0.1.4)
       activesupport
       builder
       httpclient

data/lib/afipws/version.rb

@@ -1,3 +1,3 @@
 module Afipws
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/afipws/wsfe.rb

@@ -60,13 +60,7 @@ module Afipws
       comprobantes = opciones[:comprobantes]
       request = { 'FeCAEReq' => {
         'FeCabReq' => opciones.select_keys(:cbte_tipo, :pto_vta).merge(:cant_reg => comprobantes.size),
-        'FeDetReq' => { 
-          'FECAEDetRequest' => comprobantes.map do |comprobante|
-            comprobante.merge(:cbte_desde => comprobante[:cbte_nro], :cbte_hasta => comprobante[:cbte_nro]).
-              select_keys(:concepto, :doc_tipo, :doc_nro, :cbte_desde, 
-              :cbte_hasta, :cbte_fch, :imp_total, :imp_tot_conc, :imp_neto, :imp_op_ex, :imp_trib, 
-              :mon_id, :mon_cotiz, :iva).merge({ 'ImpIVA' => comprobante[:imp_iva] })
-          end
+        'FeDetReq' => { 'FECAEDetRequest' => comprobantes.map { |comprobante|  comprobante_to_request comprobante }
       }}}
       r = @client.fecae_solicitar auth.merge r2x(request, :cbte_fch => :date)
       r = Array.wrap(r[:fe_det_resp][:fecae_det_response]).map do |h| 
@@ -76,6 +70,13 @@ module Afipws
       x2r r, :cae_fch_vto => :date, :cbte_nro => :integer, :code => :integer
     end
     
+    def comprobante_to_request comprobante
+      comprobante.merge(:cbte_desde => comprobante[:cbte_nro], :cbte_hasta => comprobante[:cbte_nro]).
+        select_keys(:concepto, :doc_tipo, :doc_nro, :cbte_desde, 
+        :cbte_hasta, :cbte_fch, :imp_total, :imp_tot_conc, :imp_neto, :imp_op_ex, :imp_trib, 
+        :mon_id, :mon_cotiz, :iva, :tributos).merge({ 'ImpIVA' => comprobante[:imp_iva] })
+    end
+    
     def solicitar_caea
       convertir_rta_caea @client.fecaea_solicitar auth.merge(periodo_para_solicitud_caea)
     rescue Afipws::WSError => e
@@ -94,12 +95,8 @@ module Afipws
       comprobantes = opciones[:comprobantes]
       request = { 'FeCAEARegInfReq' => {
         'FeCabReq' => opciones.select_keys(:cbte_tipo, :pto_vta).merge(:cant_reg => comprobantes.size),
-        'FeDetReq' => { 
-          'FECAEADetRequest' => comprobantes.map do |comprobante|
-            comprobante.merge(:cbte_desde => comprobante[:cbte_nro], :cbte_hasta => comprobante[:cbte_nro]).
-              select_keys(:concepto, :doc_tipo, :doc_nro, :cbte_desde, 
-              :cbte_hasta, :cbte_fch, :imp_total, :imp_tot_conc, :imp_neto, :imp_op_ex, :imp_trib, 
-              :mon_id, :mon_cotiz, :iva).merge({ 'ImpIVA' => comprobante[:imp_iva], 'CAEA' => comprobante[:caea] })
+        'FeDetReq' => { 'FECAEADetRequest' => comprobantes.map do |comprobante|
+            comprobante_to_request(comprobante).merge('CAEA' => comprobante[:caea])
           end
       }}}
       r = @client.fecaea_reg_informativo auth.merge r2x(request, :cbte_fch => :date)

data/spec/afipws/wsfe_spec.rb

@@ -80,12 +80,17 @@ describe Afipws::WSFE do
           '/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]/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 }]}
+          :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 => []

data/spec/manual/test.rb

@@ -1,11 +1,8 @@
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
-require 'afipws'
+$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(File.dirname(__FILE__) + '/test.crt'), 
-  :key => File.read(File.dirname(__FILE__) + '/test.key') 
+ws = Afipws::WSFE.new :env => :development, :cuit => '20300032673', :cert => File.read('spec/manual/test.crt'), :key => File.read('spec/manual/test.key') 
 
 def obtener_ta ws
   ws.cotizacion 'DOL'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: afipws
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors: 
 - Emmanuel Nicolau
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -03:00
+date: 2011-02-04 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -37,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -50,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -63,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -76,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -89,8 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -102,8 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -115,8 +97,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -128,8 +108,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -215,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2410002717626230803
+      hash: 1641972703349920218
       segments: 
       - 0
       version: "0"
@@ -224,14 +202,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2410002717626230803
+      hash: 1641972703349920218
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: afipws
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper para los servicios web de la AFIP