afipws 0.1.0 → 0.1.1

data/Gemfile.lock

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

data/lib/afipws/version.rb

@@ -1,3 +1,3 @@
 module Afipws
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/afipws/wsaa.rb

@@ -4,17 +4,18 @@ module Afipws
 
     WSDL = {
       :development => "https://wsaahomo.afip.gov.ar/ws/services/LoginCms?wsdl",
-      :production => 'https://wsaa.afip.gov.ar/ws/services/LoginCms?wsdl',
-      :test => Root + '/spec/fixtures/wsaa.wsdl'
+      :production => "https://wsaa.afip.gov.ar/ws/services/LoginCms?wsdl",
+      :test => Root + "/spec/fixtures/wsaa.wsdl"
     }
     
     def initialize options = {}
+      @env = options[:env] || :test
       @key = options[:key]
       @cert = options[:cert]
       @service = options[:service] || 'wsfe'
       @ttl = options[:ttl] || 2400
       @cuit = options[:cuit]
-      @client = Client.new WSDL[options[:env] || :test]
+      @client = Client.new WSDL[@env.to_sym]
     end
     
     def generar_tra service, ttl

data/lib/afipws/wsfe.rb

@@ -2,18 +2,19 @@ module Afipws
   class WSFE
     extend Forwardable
     include TypeConversions
-    attr_reader :wsaa, :client
+    attr_reader :wsaa, :client, :env
     def_delegators :wsaa, :ta, :auth, :cuit
 
     WSDL = {
       :development => "https://wswhomo.afip.gov.ar/wsfev1/service.asmx?WSDL",
       :production => "https://servicios1.afip.gov.ar/wsfev1/service.asmx?WSDL",
-      :test => Root + '/spec/fixtures/wsfe.wsdl'
+      :test => Root + "/spec/fixtures/wsfe.wsdl"
     }
     
     def initialize options = {}
+      @env = options[:env] || :test
       @wsaa = options[:wsaa] || WSAA.new(options.merge(:service => 'wsfe'))
-      @client = Client.new WSDL[options[:env] || :test]
+      @client = Client.new WSDL[@env.to_sym]
     end
     
     def dummy
@@ -77,6 +78,12 @@ module Afipws
     
     def solicitar_caea
       convertir_rta_caea @client.fecaea_solicitar auth.merge(periodo_para_solicitud_caea)
+    rescue Afipws::WSError => e
+      if e.errors.any? { |e| e[:code] == '15008' }
+        consultar_caea fecha_inicio_quincena_siguiente
+      else
+        raise
+      end
     end
     
     def consultar_caea fecha
@@ -116,11 +123,7 @@ module Afipws
     end
     
     def periodo_para_solicitud_caea
-      if Date.today.day <= 15
-        { :orden => 2, :periodo => Date.today.strftime('%Y%m') }
-      else
-        { :orden => 1, :periodo => Date.today.next_month.strftime('%Y%m') }
-      end
+      periodo_para_consulta_caea fecha_inicio_quincena_siguiente
     end
     
     def periodo_para_consulta_caea fecha
@@ -128,6 +131,11 @@ module Afipws
       { :orden => orden, :periodo => fecha.strftime('%Y%m') }
     end
     
+    def fecha_inicio_quincena_siguiente
+      hoy = Date.today
+      hoy.day <= 15 ? hoy.change(:day => 16) : hoy.next_month.change(:day => 1)      
+    end
+    
     private
     def get_array response, array_element
       Array.wrap response[:result_get][array_element]

data/spec/afipws/wsfe_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Afipws::WSFE do
   let :ws do 
     wsaa = Afipws::WSAA.new 
-    wsaa.stubs :login => { :token => 't', :sign => 's' }
+    wsaa.stubs :login => { :token => 't', :sign => 's', :expiration_time => 12.hours.from_now }
     Afipws::WSFE.new :cuit => '1', :wsaa => wsaa
   end
   
@@ -157,6 +157,18 @@ describe Afipws::WSFE do
           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)
+      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/
+      end  
     end
     
     it "informar_comprobantes_caea" do
@@ -183,14 +195,6 @@ describe Afipws::WSFE 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)
       end
-
-      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 }
-      end
     end
     
     it "ultimo_comprobante_autorizado" do
@@ -218,6 +222,22 @@ describe Afipws::WSFE do
     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")
+      Afipws::Client.expects(:new).with("https://wswhomo.afip.gov.ar/wsfev1/service.asmx?WSDL")
+      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")
+      Afipws::Client.expects(:new).with("https://servicios1.afip.gov.ar/wsfev1/service.asmx?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)
@@ -237,4 +257,30 @@ describe Afipws::WSFE do
       }
     end
   end
+  
+  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 }
+    end
+    
+    it "fecha_inicio_quincena_siguiente" do
+      fecha_inicio_quincena_siguiente(Date.new(2010,1,1)).should == Date.new(2010,1,16)
+      fecha_inicio_quincena_siguiente(Date.new(2010,1,10)).should == Date.new(2010,1,16)
+      fecha_inicio_quincena_siguiente(Date.new(2010,1,15)).should == Date.new(2010,1,16)
+      
+      fecha_inicio_quincena_siguiente(Date.new(2010,1,16)).should == Date.new(2010,2,1)
+      fecha_inicio_quincena_siguiente(Date.new(2010,1,20)).should == Date.new(2010,2,1)
+      fecha_inicio_quincena_siguiente(Date.new(2010,1,31)).should == Date.new(2010,2,1)
+      fecha_inicio_quincena_siguiente(Date.new(2010,12,31)).should == Date.new(2011,1,1)
+    end
+    
+    def fecha_inicio_quincena_siguiente fecha
+      Date.stubs(:today => fecha)
+      subject.fecha_inicio_quincena_siguiente
+    end
+  end
 end

data/spec/fixtures/fecaea_solicitar/error_distinto.xml

@@ -0,0 +1,18 @@
+<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+   <soap:Body>
+      <FECAEASolicitarResponse xmlns="http://ar.gov.afip.dif.FEV1/">
+         <FECAEASolicitarResult>
+            <ResultGet>
+               <Periodo>0</Periodo>
+               <Orden>0</Orden>
+            </ResultGet>
+            <Errors>
+               <Err>
+                  <Code>15007</Code>
+                  <Msg>Orden incorrecto.</Msg>
+               </Err>
+            </Errors>
+         </FECAEASolicitarResult>
+      </FECAEASolicitarResponse>
+   </soap:Body>
+</soap:Envelope>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Emmanuel Nicolau
@@ -189,6 +189,7 @@ files:
 - spec/fixtures/fecaea_consultar/success.xml
 - spec/fixtures/fecaea_reg_informativo/informe_rtdo_parcial.xml
 - spec/fixtures/fecaea_solicitar/caea_ya_otorgado.xml
+- spec/fixtures/fecaea_solicitar/error_distinto.xml
 - spec/fixtures/fecaea_solicitar/success.xml
 - spec/fixtures/login_cms/fault.xml
 - spec/fixtures/login_cms/success.xml
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -619404093067996403
+      hash: -4544236781708141124
       segments: 
       - 0
       version: "0"
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -619404093067996403
+      hash: -4544236781708141124
       segments: 
       - 0
       version: "0"
@@ -261,6 +262,7 @@ test_files:
 - spec/fixtures/fecaea_consultar/success.xml
 - spec/fixtures/fecaea_reg_informativo/informe_rtdo_parcial.xml
 - spec/fixtures/fecaea_solicitar/caea_ya_otorgado.xml
+- spec/fixtures/fecaea_solicitar/error_distinto.xml
 - spec/fixtures/fecaea_solicitar/success.xml
 - spec/fixtures/login_cms/fault.xml
 - spec/fixtures/login_cms/success.xml