afipws 0.1.4 → 0.1.6

data/.gitignore

@@ -2,4 +2,5 @@ pkg/*
 *.gem
 .bundle
 spec/manual/*.key
-spec/manual/*.crt
+spec/manual/*.crt
+.DS_Store

data/Gemfile.lock

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

data/lib/afipws/core_ext/hash.rb

@@ -0,0 +1,29 @@
+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
+  
+      def has_entries? entries
+        entries.each_pair.all? { |k, v| self[k] == v }
+      end
+    end
+  end
+end
+
+class Hash
+  include Afipws::CoreExt::Hash
+end

data/lib/afipws/version.rb

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

data/lib/afipws/wsfe.rb

@@ -71,10 +71,9 @@ module Afipws
     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] })
+      nro = comprobante.delete :cbte_nro
+      iva = comprobante.delete :imp_iva
+      comprobante.merge :cbte_desde => nro, :cbte_hasta => nro, 'ImpIVA' => iva
     end
     
     def solicitar_caea
@@ -96,7 +95,7 @@ module Afipws
       request = { 'FeCAEARegInfReq' => {
         'FeCabReq' => opciones.select_keys(:cbte_tipo, :pto_vta).merge(:cant_reg => comprobantes.size),
         'FeDetReq' => { 'FECAEADetRequest' => comprobantes.map do |comprobante|
-            comprobante_to_request(comprobante).merge('CAEA' => comprobante[:caea])
+            comprobante_to_request comprobante.merge('CAEA' => comprobante.delete(:caea))
           end
       }}}
       r = @client.fecaea_reg_informativo auth.merge r2x(request, :cbte_fch => :date)
@@ -116,7 +115,7 @@ module Afipws
     end
 
     def consultar_comprobante opciones
-      @client.fe_comp_consultar(auth.merge(opciones))[:result_get]
+      @client.fe_comp_consultar(auth.merge(:fe_comp_cons_req => opciones))[:result_get]
     end
     
     def cant_max_registros_x_lote

data/lib/afipws.rb

@@ -8,7 +8,7 @@ require 'base64'
 require 'savon'
 require 'nokogiri'
 require 'active_support/core_ext'
-require 'core_ext/hash'
+require 'afipws/core_ext/hash'
 require 'afipws/excepciones'
 require 'afipws/type_conversions'
 require 'afipws/client'

data/spec/{core_ext → afipws/core_ext}/hash_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Hash do
   context "fetch_path" do

data/spec/afipws/wsfe_spec.rb

@@ -215,7 +215,8 @@ describe Afipws::WSFE do
     end
     
     it "consultar_comprobante" do
-      savon.expects('FECompConsultar').with(has_entries 'wsdl:PtoVta' => 1, 'wsdl:CbteTipo' => 2, 'wsdl:CbteNro' => 3).returns(:success)
+      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)
       rta[:cod_autorizacion].should == '61023008595705'
       rta[:emision_tipo].should == 'CAE'

metadata

@@ -2,7 +2,7 @@
 name: afipws
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors: 
 - Emmanuel Nicolau
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -03:00
+date: 2011-02-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,18 +134,18 @@ files:
 - autotest/discover.rb
 - lib/afipws.rb
 - lib/afipws/client.rb
+- lib/afipws/core_ext/hash.rb
 - lib/afipws/excepciones.rb
 - lib/afipws/type_conversions.rb
 - lib/afipws/version.rb
 - lib/afipws/wsaa.rb
 - lib/afipws/wsfe.rb
-- lib/core_ext/hash.rb
+- spec/afipws/core_ext/hash_spec.rb
 - spec/afipws/test.crt
 - spec/afipws/test.key
 - spec/afipws/type_conversions_spec.rb
 - spec/afipws/wsaa_spec.rb
 - spec/afipws/wsfe_spec.rb
-- spec/core_ext/hash_spec.rb
 - spec/fixtures/fe_comp_consultar/success.xml
 - spec/fixtures/fe_comp_tot_x_request/success.xml
 - spec/fixtures/fe_comp_ultimo_autorizado/success.xml
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1641972703349920218
+      hash: -1452844401751397239
       segments: 
       - 0
       version: "0"
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1641972703349920218
+      hash: -1452844401751397239
       segments: 
       - 0
       version: "0"
@@ -214,12 +214,12 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper para los servicios web de la AFIP
 test_files: 
+- spec/afipws/core_ext/hash_spec.rb
 - spec/afipws/test.crt
 - spec/afipws/test.key
 - spec/afipws/type_conversions_spec.rb
 - spec/afipws/wsaa_spec.rb
 - spec/afipws/wsfe_spec.rb
-- spec/core_ext/hash_spec.rb
 - spec/fixtures/fe_comp_consultar/success.xml
 - spec/fixtures/fe_comp_tot_x_request/success.xml
 - spec/fixtures/fe_comp_ultimo_autorizado/success.xml

data/lib/core_ext/hash.rb

@@ -1,21 +0,0 @@
-class 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
-  
-  def has_entries? entries
-    entries.each_pair.all? { |k, v| self[k] == v }
-  end
-end