correios_gem 1.4.2 → 1.4.3

data/lib/sigep/requests/calculate_label_number_check_digit.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Sigep
-    class CalculateLabelNumberCheckDigit < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CalculateLabelNumberCheckDigit < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @label_numbers = data[:label_numbers]
         super()
       end
@@ -22,11 +12,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:gera_digito_verificador_etiquetas,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :gera_digito_verificador_etiquetas,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
+        rescue Savon::HTTPError => error
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -34,7 +28,7 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(Sigep.namespaces) do
             xml['soap'].Body do
               xml['ns1'].geraDigitoVerificadorEtiquetas do
                 parent_namespace = xml.parent.namespace
@@ -55,17 +49,9 @@ module Correios
 
       def format_response(response)
         response = response[:gera_digito_verificador_etiquetas_response][:return]
-        response = [response] if response.is_a?(Hash)
-
-        { digit_checkers: format_digit_checkers(response) }
-      end
+        response = [response] if response.is_a?(String)
 
-      def format_digit_checkers(digit_checkers)
-        formatted_digit_checkers = []
-        digit_checkers.each do |digit_check|
-          formatted_digit_checkers << digit_check.to_i
-        end
-        formatted_digit_checkers
+        { digit_checkers: response.map(&:to_i) }
       end
     end
   end

data/lib/sigep/requests/cancel_shipping.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Sigep
-    class CancelShipping < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CancelShipping < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @label_number = data[:label_number]
         @request_id = data[:request_id]
         super()
@@ -23,11 +13,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:bloquear_objeto,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :bloquear_objeto,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
+        rescue Savon::HTTPError => error
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -35,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(Sigep.namespaces) do
             xml['soap'].Body do
               xml['ns1'].bloquearObjeto do
                 parent_namespace = xml.parent.namespace
@@ -58,14 +52,7 @@ module Correios
       def format_response(response)
         response = response[:bloquear_objeto_response][:return]
 
-        { status: convert_status_to_symbol(response) }
-      end
-
-      def convert_status_to_symbol(status)
-        case status
-        when 'Registro gravado'
-          :ok
-        end
+        { status: inverse_shipping_cancellation(response) }
       end
     end
   end

data/lib/sigep/requests/check_card_status.rb

@@ -1,19 +1,8 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Sigep
-    class CheckCardStatus < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CheckCardStatus < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
         super()
       end
@@ -21,11 +10,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:get_status_cartao_postagem,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :get_status_cartao_postagem,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
+        rescue Savon::HTTPError => error
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -33,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(Sigep.namespaces) do
             xml['soap'].Body do
               xml['ns1'].getStatusCartaoPostagem do
                 parent_namespace = xml.parent.namespace
@@ -53,16 +46,7 @@ module Correios
       def format_response(response)
         response = response[:get_status_cartao_postagem_response][:return]
 
-        { status: convert_status_to_symbol(response) }
-      end
-
-      def convert_status_to_symbol(status)
-        case status
-        when 'Normal'
-          :ok
-        when 'Cancelado'
-          :canceled
-        end
+        { status: inverse_card_status(response) }
       end
     end
   end

data/lib/sigep/requests/check_service_availability.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Sigep
-    class CheckServiceAvailability < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CheckServiceAvailability < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @service_code = data[:service_code]
         @source_zip_code = data[:source_zip_code]
         @target_zip_code = data[:target_zip_code]
@@ -24,11 +14,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:verifica_disponibilidade_servico,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :verifica_disponibilidade_servico,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
+        rescue Savon::HTTPError => error
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -36,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(Sigep.namespaces) do
             xml['soap'].Body do
               xml['ns1'].verificaDisponibilidadeServico do
                 parent_namespace = xml.parent.namespace
@@ -61,31 +55,10 @@ module Correios
         response = response.split('#')
 
         { 
-          status: convert_availability_to_symbol(response[0]),
+          status: inverse_service_availability(response[0]),
           message: response[1]
         }
       end
-
-      def convert_availability_to_symbol(availability)
-        case availability.to_i
-        when 0, 11
-          :available
-        when -2, -3
-          :invalid_zip_code
-        when -33
-          :system_down
-        when -34, -35, 1
-          :incorrect_data
-        when -36, -37, -38
-          :unauthorized
-        when -888, 6, 7, 8, 9, 12
-          :unavailable
-        when 10
-          :partially_available
-        when 99
-          :error
-        end
-      end
     end
   end
 end

data/lib/sigep/requests/create_shippings.rb

@@ -1,20 +1,12 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
+require_relative '../auxiliars/shipping_xml'
 
 module Correios
   module Sigep
-    class CreateShippings < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CreateShippings < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @data = data
         @shippings = data[:shippings]
         @request_number = data[:request_number]
@@ -24,35 +16,33 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:fecha_plp_varios_servicos,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :fecha_plp_varios_servicos,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
+        rescue Savon::HTTPError => error
+          generate_http_exception(error.http.code)
         end
       end
 
       private
 
-      def format_response(response)
-        response = response[:fecha_plp_varios_servicos_response][:return]
-
-        { request_id: response }
-      end
-
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(Sigep.namespaces) do
             xml['soap'].Body do
               xml['ns1'].fechaPlpVariosServicos do
                 parent_namespace = xml.parent.namespace
                 xml.parent.namespace = nil
 
-                xml.xml HELPER.shippings_xml(@data)
+                xml.xml Sigep.shipping_xml(@data)
                 xml.idPlpCliente @request_number
                 xml.cartaoPostagem @credentials.card
                 @shippings.each do |shipping|
-                  xml.listaEtiquetas HELPER.label_without_digit_checker(
+                  xml.listaEtiquetas remove_label_digit_checker(
                     shipping[:label_number].dup
                   )
                 end
@@ -65,6 +55,12 @@ module Correios
           end
         end.doc.root.to_xml
       end
+
+      def format_response(response)
+        response = response[:fecha_plp_varios_servicos_response][:return]
+
+        { request_id: response }
+      end
     end
   end
 end

data/lib/sigep/requests/request_label_numbers.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Sigep
-    class RequestLabelNumbers < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class RequestLabelNumbers < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @amount = data[:amount]
         @service_id = data[:service_id]
         super()
@@ -23,11 +13,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:solicita_etiquetas,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :solicita_etiquetas,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
+        rescue Savon::HTTPError => error
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -35,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(Sigep.namespaces) do
             xml['soap'].Body do
               xml['ns1'].solicitaEtiquetas do
                 parent_namespace = xml.parent.namespace

data/lib/sigep/requests/request_shippings_xml.rb

@@ -1,16 +1,6 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Sigep
-    class RequestShippingsXML < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class RequestShippingsXML < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
 
@@ -22,11 +12,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:solicita_xml_plp,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :solicita_xml_plp,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
+        rescue Savon::HTTPError => error
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -34,7 +28,7 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(Sigep.namespaces) do
             xml['soap'].Body do
               xml['ns1'].solicitaXmlPlp do
                 parent_namespace = xml.parent.namespace
@@ -61,16 +55,11 @@ module Correios
         shippings = response['correioslog']['objeto_postal']
         shippings = [shippings] if shippings.is_a?(Hash)
 
-        formatted_shippings = []
-        shippings.each do |shipping|
-          formatted_shippings << format_shipping(shipping)
-        end
-
         {
           request_id: request['id_plp'],
           card: request['cartao_postagem'],
           global_value: request['valor_global'].to_f,
-          payment_method: payment_method(
+          payment_method: inverse_payment_method(
             response['correioslog']['forma_pagamento']
           ),
           shipping_site: {
@@ -78,7 +67,7 @@ module Correios
             code: request['mcu_unidade_postagem']
           },
           sender: format_sender(sender),
-          shippings: formatted_shippings
+          shippings: shippings.map {|s| format_shipping(s)}
         }
       end
 
@@ -116,7 +105,7 @@ module Correios
           value: shipping['valor_cobrado'].to_f,
           proof_number: shipping['numero_comprovante_postagem'],
           cubage: shipping['cubagem'].to_f,
-          additional_value: HELPER.convert_string_to_decimal(
+          additional_value: string_to_decimal(
             shipping['nacional']['valor_a_cobrar']
           ),
           additional_services: additional_services,
@@ -167,7 +156,7 @@ module Correios
 
       def format_object(object, weight)
         {
-          type: object_type(object['tipo_objeto']),
+          type: inverse_object_type(object['tipo_objeto']),
           height: object['dimensao_altura'].to_f,
           width: object['dimensao_largura'].to_f,
           length: object['dimensao_comprimento'].to_f,
@@ -175,34 +164,6 @@ module Correios
           weight: weight.to_f
         }
       end
-
-      def payment_method(method)
-        case method
-        when '1'
-          :postal_vouncher
-        when '2'
-          :postal_refound
-        when '3'
-          :exchange_contract
-        when '4'
-          :credit_card
-        when '5'
-          :other
-        when nil
-          :to_bill
-        end
-      end
-
-      def object_type(type)
-        case type
-        when '1'
-          :letter_envelope
-        when '2'
-          :box_prism
-        when '3'
-          :cylinder
-        end
-      end
     end
   end
 end