correios_gem 1.4.2 → 1.4.3

data/lib/pricefier/requests/calculate_price_fac.rb

@@ -1,18 +1,9 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Pricefier
-    class CalculatePriceFAC < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CalculatePriceFAC < Helper
       def initialize(data = {})
         @show_request = data[:show_request]
+
         @service_codes = data[:service_codes]
         @weight = data[:weight]
         @reference_date = data[:reference_date]
@@ -22,16 +13,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:calc_preco_fac,
-                                             soap_action: 'http://tempuri.org/CalcPrecoFAC',
-                                             xml: xml).to_hash)
+          format_response(Pricefier.client.call(
+            :calc_preco_fac,
+            soap_action: 'http://tempuri.org/CalcPrecoFAC',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -39,14 +29,12 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(Pricefier.namespaces) do
             xml['soap'].Body do
               xml['ns1'].CalcPrecoFAC do
-                xml.nCdServico HELPER.format_service_codes(@service_codes)
+                xml.nCdServico array_to_string_comma(@service_codes)
                 xml.nVlPeso @weight
-                xml.strDataCalculo HELPER.convert_date_to_string(
-                  @reference_date
-                )
+                xml.strDataCalculo date_to_string(@reference_date)
               end
             end
           end
@@ -59,14 +47,7 @@ module Correios
         services = response[:servicos][:c_servico]
         services = [services] if services.is_a?(Hash)
 
-        formatted_services = []
-        services.each do |service|
-          formatted_services << format_service(service)
-        end
-
-        {
-          services: formatted_services
-        }
+        { services: services.map { |s| format_service(s) } }
       end
 
       def format_service(service)
@@ -75,29 +56,23 @@ module Correios
             code: service[:codigo],
             prices: {
               additional_serivces: {
-                own_hands: HELPER.convert_string_to_float(
-                  service[:valor_mao_propria]
-                ),
-                receipt_notification: HELPER.convert_string_to_float(
+                own_hands: string_to_decimal(service[:valor_mao_propria]),
+                receipt_notification: string_to_decimal(
                   service[:valor_aviso_recebimento]
                 ),
-                declared_value: HELPER.convert_string_to_float(
+                declared_value: string_to_decimal(
                   service[:valor_valor_declarado]
-                ),
+                )
               },
-              only_shipping: HELPER.convert_string_to_float(
-                service[:valor_sem_adicionais]
-              ),
-              total: HELPER.convert_string_to_float(service[:valor])
+              only_shipping: string_to_decimal(service[:valor_sem_adicionais]),
+              total: string_to_decimal(service[:valor])
             }
           }
         else
           {
             code: service[:codigo],
-            error: {
-              code: service[:erro],
-              description: service[:msg_erro]
-            }
+            error: { code: service[:erro],
+                     description: service[:msg_erro] }
           }
         end
       end

data/lib/pricefier/requests/list_services.rb

@@ -1,34 +1,26 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Pricefier
-    class ListServices < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class ListServices < Helper
       def initialize(data = {})
         @show_request = data[:show_request]
         super()
       end
 
-      def request
+      def request(method)
+        @method = method
+        @method_snake = method.underscore
+
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:calc_preco,
-                                             soap_action: 'http://tempuri.org/ListaServicos',
-                                             xml: xml).to_hash)
+          format_response(Pricefier.client.call(
+            @method_snake.to_sym,
+            soap_action: "http://tempuri.org/#{@method}",
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -36,49 +28,41 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(Pricefier.namespaces) do
             xml['soap'].Body do
-              xml['ns1'].ListaServicos
+              xml['ns1'].send(@method)
             end
           end
         end.doc.root.to_xml
       end
 
       def format_response(response)
-        response = response[:lista_servicos_response][:lista_servicos_result]
+        response = response["#{@method_snake}_response".to_sym]["#{@method_snake}_result".to_sym]
 
         services = response[:servicos_calculo][:c_servicos_calculo]
         services = [services] if services.is_a?(Hash)
 
-        formatted_services = []
-        services.each do |service|
-          formatted_services << format_service(service)
-        end
-
-        {
-          services: formatted_services
-        }
+        { services: services.map { |s| format_service(s) } }
       end
 
       def format_service(service)
-        if service[:erro].to_i == 0
+        if service[:erro].to_i.zero?
           {
             code: service[:codigo],
             description: service[:descricao].strip,
-            calculate_price: HELPER.convert_string_to_bool(
-              service[:calcula_preco]
-            ),
-            calculate_deadline: HELPER.convert_string_to_bool(
-              service[:calcula_prazo]
-            )
+            calculate_price: string_to_bool(service[:calcula_preco]),
+            calculate_deadline:
+              if service[:calcula_prazo].present?
+                string_to_bool(service[:calcula_prazo])
+              else
+                false
+              end
           }
         else
           {
             code: service[:codigo],
-            error: {
-              code: service[:erro],
-              description: service[:msg_erro]
-            }
+            error: { code: service[:erro],
+                     description: service[:msg_erro] }
           }
         end
       end

data/lib/reverse_logistics/requests/calculate_ticket_number_check_digit.rb

@@ -1,16 +1,6 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module ReverseLogistics
-    class CalculateTicketNumberCheckDigit < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CalculateTicketNumberCheckDigit < Helper
       def initialize(data = {})
         @show_request = data[:show_request]
         @ticket_number = data[:ticket_number]
@@ -20,16 +10,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:calcular_digito_verificador,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(ReverseLogistics.client.call(
+            :calcular_digito_verificador,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -37,7 +26,7 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(ReverseLogistics.namespaces) do
             xml['soap'].Body do
               xml['ns1'].calcularDigitoVerificador do
                 parent_namespace = xml.parent.namespace
@@ -54,7 +43,7 @@ module Correios
 
       def format_response(response)
         response = response[:calcular_digito_verificador_response][:calcular_digito_verificador]
-        generate_exception(response[:msg_erro]) if response[:cod_erro] != '0'
+        generate_revese_logistics_exception(response)
 
         {
           digit_checker: response[:digito],

data/lib/reverse_logistics/requests/cancel_shipping.rb

@@ -1,37 +1,27 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module ReverseLogistics
-    class CancelShipping < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CancelShipping < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
+        @show_request = data[:show_request]
 
         @ticket_number = data[:ticket_number]
-        @type = data[:type]
+        @ticket_type = data[:ticket_type]
         super()
       end
 
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:cancelar_pedido,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(ReverseLogistics.client.call(
+            :cancelar_pedido,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -39,7 +29,7 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(ReverseLogistics.namespaces) do
             xml['soap'].Body do
               xml['ns1'].cancelarPedido do
                 parent_namespace = xml.parent.namespace
@@ -47,7 +37,7 @@ module Correios
 
                 xml.codAdministrativo @credentials.administrative_code
                 xml.numeroPedido @ticket_number
-                xml.tipo HELPER.shipping_type(@type)
+                xml.tipo reverse_shipping_type(@ticket_type)
 
                 xml.parent.namespace = parent_namespace
               end
@@ -58,7 +48,7 @@ module Correios
 
       def format_response(response)
         response = response[:cancelar_pedido_response][:cancelar_pedido]
-        generate_exception(response[:msg_erro]) if response[:cod_erro].to_i != 0
+        generate_revese_logistics_exception(response)
 
         {
           ticket_number: response[:objeto_postal][:numero_pedido],

data/lib/reverse_logistics/requests/create_shippings.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module ReverseLogistics
-    class CreateShippings < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CreateShippings < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @receiver = data[:receiver]
         @service_code = data[:service_code]
         @shippings = data[:shippings]
@@ -24,16 +14,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:solicitar_postagem_reversa,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(ReverseLogistics.client.call(
+            :solicitar_postagem_reversa,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -41,7 +30,7 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(ReverseLogistics.namespaces) do
             xml['soap'].Body do
               xml['ns1'].solicitarPostagemReversa do
                 parent_namespace = xml.parent.namespace
@@ -69,17 +58,19 @@ module Correios
                   goods = shipping[:goods] || []
                   objects = shipping[:objects] || [{}]
                   xml.coletas_solicitadas do
-                    xml.tipo HELPER.shipping_type(shipping[:type])
+                    xml.tipo reverse_shipping_type(shipping[:type])
                     xml.numero shipping[:ticket_number]
                     xml.id_cliente shipping[:code]
-                    xml.ag HELPER.deadline(shipping[:deadline], shipping[:type])
+                    xml.ag calculate_reverse_shipping_deadline(
+                      shipping[:deadline], shipping[:type]
+                    )
                     xml.cartao @credentials.card
                     xml.valor_declarado shipping[:_value]
-                    xml.servico_adicional HELPER.additional_services(
+                    xml.servico_adicional array_to_string_comma(
                       shipping[:additional_services]
                     )
                     xml.descricao shipping[:description]
-                    xml.ar HELPER.bool_to_int(shipping[:receipt_notification])
+                    xml.ar bool_to_int(shipping[:receipt_notification])
                     xml.cklist shipping[:check_list]
                     xml.documento shipping[:document]
                     xml.remetente do
@@ -91,7 +82,7 @@ module Correios
                       xml.ddd_celular sender[:cellphone][0, 2]
                       xml.celular sender[:cellphone][2, sender[:phone].length - 1]
                       xml.email sender[:email]
-                      xml.sms HELPER.bool_to_string(sender[:send_sms])
+                      xml.sms bool_to_string(sender[:send_sms])
                       xml.identificacao sender[:document]
                       xml.logradouro sender_address[:street]
                       xml.numero sender_address[:number]
@@ -130,32 +121,27 @@ module Correios
 
       def format_response(response)
         response = response[:solicitar_postagem_reversa_response][:solicitar_postagem_reversa]
-        generate_exception(response[:msg_erro]) if response[:cod_erro].to_i != 0
+        generate_revese_logistics_exception(response)
 
         shippings = response[:resultado_solicitacao]
         shippings = [shippings] if shippings.is_a?(Hash)
 
-        formatted_shippings = []
-        shippings.each do |shipping|
-          formatted_shippings << format_shipping(shipping)
-        end
-
-        { shippings: formatted_shippings }
+        { shippings: shippings.map {|s| format_shipping(s)} }
       end
 
       def format_shipping(shipping)
         if shipping[:codigo_erro].to_i.zero?
           {
-            type: HELPER.shipping_type_inverse(shipping[:tipo]),
+            type: inverse_reverse_shipping_type(shipping[:tipo]),
             code: shipping[:id_cliente],
             ticket_number: shipping[:numero_coleta],
             label_number: shipping[:numero_etiqueta],
             object_id: shipping[:id_obj],
-            deadline: HELPER.convert_string_to_date(shipping[:prazo])
+            deadline: string_to_date(shipping[:prazo])
           }
         else
           {
-            type: HELPER.shipping_type_inverse(shipping[:tipo]),
+            type: inverse_reverse_shipping_type(shipping[:tipo]),
             code: shipping[:id_cliente],
             error: shipping[:descricao_erro]
           }