bravo 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+*Bravo 0.3.0 (March 07, 2011)*
+
+* Bill#response returns the full list of parameters passed and returned by FECAESolicitar [leanucci]
+
 *Bravo 0.2.0 (March 04, 2011)*
 
 * Bill#response returns a complete hash from WSFE response [leanucci]

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bravo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bravo}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leandro Marcucci"]
-  s.date = %q{2011-03-04}
+  s.date = %q{2011-03-07}
   s.description = %q{Adaptador para el Web Service de Facturacion Electronica de AFIP}
   s.email = %q{leanucci@vurbia.com}
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/bravo/constants.rb",
     "lib/bravo/core_ext/float.rb",
     "lib/bravo/core_ext/hash.rb",
+    "lib/bravo/core_ext/string.rb",
     "lib/bravo/version.rb",
     "spec/bravo/auth_data_spec.rb",
     "spec/bravo/authorizer_spec.rb",

data/lib/bravo.rb

@@ -4,6 +4,7 @@ require "bravo/constants"
 require "savon"
 require "bravo/core_ext/float"
 require "bravo/core_ext/hash"
+require "bravo/core_ext/string"
 module Bravo
 
   class NullOrInvalidAttribute < StandardError; end

data/lib/bravo/bill.rb

@@ -2,14 +2,14 @@ module Bravo
   class Bill
     attr_reader :client, :base_imp, :total
     attr_accessor :net, :doc_num, :iva_cond, :documento, :concepto, :moneda,
-                  :due_date, :from, :to, :aliciva_id, :fch_serv_desde, :fch_serv_hasta,
+                  :due_date, :aliciva_id, :fch_serv_desde, :fch_serv_hasta,
                   :body, :response
 
     def initialize(attrs = {})
       Bravo::AuthData.fetch
-      @client = Savon::Client.new(Bravo.service_url)
-      @body = {"Auth" => Bravo.auth_hash}
-      @net  = attrs[:net] || 0
+      @client         = Savon::Client.new(Bravo.service_url)
+      @body           = {"Auth" => Bravo.auth_hash}
+      @net            = attrs[:net] || 0
       self.documento  = attrs[:documento] || Bravo.default_documento
       self.moneda     = attrs[:moneda]    || Bravo.default_moneda
       self.iva_cond   = attrs[:iva_cond]
@@ -110,20 +110,32 @@ module Bravo
     end
 
     def setup_response(response)
-      header_response = response[:fecae_solicitar_response][:fecae_solicitar_result][:fe_cab_resp].symbolize_keys
-      detail_response = response[:fecae_solicitar_response][:fecae_solicitar_result][:fe_det_resp][:fecae_det_response].symbolize_keys
+      # TODO: turn this into an all-purpose Response class
 
-      iva = self.body["FeCAEReq"]["FeDetReq"]["FECAEDetRequest"]["Iva"]["AlicIva"].underscore_keys!
+      result          = response[:fecae_solicitar_response][:fecae_solicitar_result]
 
-      detail_response.merge!(iva.symbolize_keys!)
+      response_header = result[:fe_cab_resp]
+      response_detail = result[:fe_det_resp][:fecae_det_response]
 
-      response_hash = {:header_result => header_response.delete(:resultado),
-                       :detail_result => detail_response.delete(:resultado),
-                       :cae_due_date  => detail_response.delete(:cae_fch_vto),
-                       :authorized_on => header_response.delete(:fch_proceso),
-                       :iva_id        => detail_response.delete(:id),
-                       :iva_importe   => detail_response.delete(:importe)
-                       }.merge!(header_response).merge!(detail_response)
+      request_header  = body["FeCAEReq"]["FeCabReq"].underscore_keys.symbolize_keys
+      request_detail  = body["FeCAEReq"]["FeDetReq"]["FECAEDetRequest"].underscore_keys.symbolize_keys
+
+      iva             = request_detail.delete(:iva)["AlicIva"].underscore_keys.symbolize_keys
+
+      request_detail.merge!(iva)
+
+      response_hash = {:header_result => response_header.delete(:resultado),
+                       :authorized_on => response_header.delete(:fch_proceso),
+                       :detail_result => response_detail.delete(:resultado),
+                       :cae_due_date  => response_detail.delete(:cae_fch_vto),
+                       :cae           => response_detail.delete(:cae),
+                       :iva_id        => request_detail.delete(:id),
+                       :iva_importe   => request_detail.delete(:importe),
+                       :moneda        => request_detail.delete(:mon_id),
+                       :cotizacion    => request_detail.delete(:mon_cotiz),
+                       :iva_base_imp  => request_detail.delete(:base_imp),
+                       :doc_num       => request_detail.delete(:doc_nro)
+                       }.merge!(request_header).merge!(request_detail)
 
       keys, values  = response_hash.to_a.transpose
       self.response = Struct.new("Response", *keys).new(*values)

data/lib/bravo/core_ext/hash.rb

@@ -12,7 +12,7 @@ class Hash
 
   def underscore_keys!
     keys.each do |key|
-      self[(key.downcase rescue key) || key] = delete(key)
+      self[(key.underscore rescue key) || key] = delete(key)
     end
     self
   end

data/lib/bravo/core_ext/string.rb

@@ -0,0 +1,12 @@
+# Stolen from activesupport/lib/active_support/inflector/methods.rb, line 48
+class String
+  def underscore
+    word = self.to_s.dup
+    word.gsub!(/::/, '/')
+    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+end

data/lib/bravo/version.rb

@@ -1,3 +1,3 @@
 module Bravo
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/bravo/bill_spec.rb

@@ -91,20 +91,14 @@ describe "Bill" do
       @bill.iva_cond = :responsable_inscripto
       @bill.concepto = "Servicios"
 
-      @bill.authorized?.should == false
-
-      @bill.authorize.should == true
-
-      @bill.authorized?.should == true
+      @bill.authorized?.should  == false
+      @bill.authorize.should    == true
+      @bill.authorized?.should  == true
 
       response = @bill.response
 
+      response.length.should     == 28
       response.cae.length.should == 14
-
-      pp response
-
-      response.length.should == 19
-
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bravo
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Leandro Marcucci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -03:00
+date: 2011-03-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,7 @@ files:
 - lib/bravo/constants.rb
 - lib/bravo/core_ext/float.rb
 - lib/bravo/core_ext/hash.rb
+- lib/bravo/core_ext/string.rb
 - lib/bravo/version.rb
 - spec/bravo/auth_data_spec.rb
 - spec/bravo/authorizer_spec.rb