correios_gem 1.4.2 → 1.4.3

data/lib/correios_gem.rb

@@ -1,15 +1,16 @@
+require 'nokogiri'
+require 'savon'
+
+require_relative 'auxiliars/environments'
+require_relative 'auxiliars/helper'
+require_relative 'auxiliars/credentials'
+
 # Pricefier
 require_relative 'pricefier/requests/calculate_deadline'
-require_relative 'pricefier/requests/calculate_deadline_with_date'
-require_relative 'pricefier/requests/calculate_deadline_with_restrictions'
 require_relative 'pricefier/requests/calculate_price'
 require_relative 'pricefier/requests/calculate_price_deadline'
-require_relative 'pricefier/requests/calculate_price_deadline_with_date'
-require_relative 'pricefier/requests/calculate_price_deadline_with_restrictions'
 require_relative 'pricefier/requests/calculate_price_fac'
-require_relative 'pricefier/requests/calculate_price_with_date'
 require_relative 'pricefier/requests/list_services'
-require_relative 'pricefier/requests/list_services_star'
 
 # Reverse Logistics
 require_relative 'reverse_logistics/requests/calculate_ticket_number_check_digit'
@@ -35,9 +36,6 @@ require_relative 'sigep/requests/track_shippings'
 
 # SRO
 require_relative 'SRO/requests/track_shippings'
-require_relative 'SRO/requests/track_shippings_list'
-
-require_relative 'credentials'
 
 module Correios
   def self.test
@@ -54,31 +52,31 @@ module Correios
 
   module Pricefier
     def self.calculate_deadline(data = {})
-      CalculateDeadline.new(data).request
+      CalculateDeadline.new(data).request('CalcPrazo')
     end
 
     def self.calculate_deadline_with_date(data = {})
-      CalculateDeadlineWithDate.new(data).request
+      CalculateDeadline.new(data).request('CalcPrazoData')
     end
 
     def self.calculate_deadline_with_restrictions(data = {})
-      CalculateDeadlineWithRestrictions.new(data).request
-    end
-
-    def self.calculate_price(data = {})
-      CalculatePrice.new(data).request
+      CalculateDeadline.new(data).request('CalcPrazoRestricao')
     end
 
     def self.calculate_price_deadline(data = {})
-      CalculatePriceDeadline.new(data).request
+      CalculatePriceDeadline.new(data).request('CalcPrecoPrazo')
     end
 
     def self.calculate_price_deadline_with_date(data = {})
-      CalculatePriceDeadlineWithDate.new(data).request
+      CalculatePriceDeadline.new(data).request('CalcPrecoPrazoData')
     end
 
     def self.calculate_price_deadline_with_restrictions(data = {})
-      CalculatePriceDeadlineWithRestrictions.new(data).request
+      CalculatePriceDeadline.new(data).request('CalcPrecoPrazoRestricao')
+    end
+
+    def self.calculate_price(data = {})
+      CalculatePrice.new(data).request('CalcPreco')
     end
 
     def self.calculate_price_fac(data = {})
@@ -86,15 +84,15 @@ module Correios
     end
 
     def self.calculate_price_with_date(data = {})
-      CalculatePriceWithDate.new(data).request
+      CalculatePriceWithDate.new(data).request('CalcPrecoData')
     end
 
     def self.list_services(data = {})
-      ListServices.new(data).request
+      ListServices.new(data).request('ListaServicos')
     end
 
     def self.list_services_star(data = {})
-      ListServicesSTAR.new(data).request
+      ListServices.new(data).request('ListaServicosSTAR')
     end
   end
 
@@ -176,11 +174,11 @@ module Correios
 
   module SRO
     def self.track_shippings(data = {})
-      TrackShippings.new(data).request
+      TrackShippings.new(data).request('buscaEventos')
     end
 
     def self.track_shippings_list(data = {})
-      TrackShippingsList.new(data).request
+      TrackShippings.new(data).request('buscaEventosLista')
     end
   end
 end

data/lib/pricefier/requests/calculate_deadline.rb

@@ -1,37 +1,31 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Pricefier
-    class CalculateDeadline < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CalculateDeadline < Helper
       def initialize(data = {})
         @show_request = data[:show_request]
+
         @service_codes = data[:service_codes]
         @source_zip_code = data[:source_zip_code]
         @target_zip_code = data[:target_zip_code]
+        @reference_date = data[:reference_date]
         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_prazo,
-                                             soap_action: 'http://tempuri.org/CalcPrazo',
-                                             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
 
@@ -39,12 +33,15 @@ 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'].CalcPrazo do
-                xml.nCdServico HELPER.format_service_codes(@service_codes)
+              xml['ns1'].send(@method) do
+                xml.nCdServico array_to_string_comma(@service_codes)
                 xml.sCepOrigem @source_zip_code
                 xml.sCepDestino @target_zip_code
+                if @method != 'CalcPrazo'
+                  xml.sDtCalculo date_to_string(@reference_date)
+                end
               end
             end
           end
@@ -52,46 +49,31 @@ module Correios
       end
 
       def format_response(response)
-        response = response[:calc_prazo_response][:calc_prazo_result]
+        response = response["#{@method_snake}_response".to_sym]["#{@method_snake}_result".to_sym]
 
         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)
         if [0, 10, 11].include?(service[:erro].to_i)
           {
             code: service[:codigo],
-            delivery_at_home: HELPER.convert_string_to_bool(
-              service[:entrega_domiciliar]
-            ),
-            delivery_on_saturdays: HELPER.convert_string_to_bool(
-              service[:entrega_sabado]
-            ),
+            delivery_at_home: string_to_bool(service[:entrega_domiciliar]),
+            delivery_on_saturdays: string_to_bool(service[:entrega_sabado]),
             note: service[:obs_fim],
             deadline: {
               days: service[:prazo_entrega].to_i,
-              date: HELPER.convert_string_to_date(
-                service[:data_max_entrega]
-              ),
+              date: string_to_date(service[:data_max_entrega])
             }
           }
         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/calculate_price.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Pricefier
-    class CalculatePrice < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CalculatePrice < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @service_codes = data[:service_codes]
         @source_zip_code = data[:source_zip_code]
         @target_zip_code = data[:target_zip_code]
@@ -22,22 +12,25 @@ module Correios
         @own_hands = data[:own_hands]
         @receipt_notification = data[:receipt_notification]
         @declared_value = data[:declared_value]
+        @reference_date = data[:reference_date]
         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/CalcPreco',
-                                             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
 
@@ -45,25 +38,26 @@ 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'].CalcPreco do
+              xml['ns1'].send(@method) do
                 xml.nCdEmpresa @credentials.administrative_code
                 xml.sDsSenha @credentials.sigep_password
-                xml.nCdServico HELPER.format_service_codes(@service_codes)
+                xml.nCdServico array_to_string_comma(@service_codes)
                 xml.sCepOrigem @source_zip_code
                 xml.sCepDestino @target_zip_code
-                xml.nCdFormato HELPER.object_type(@object[:type])
-                xml.nVlPeso @object[:weight].to_f/1000
+                xml.nCdFormato pricefier_object_type(@object[:type])
+                xml.nVlPeso @object[:weight].to_f / 1000
                 xml.nVlComprimento @object[:length] || 0
                 xml.nVlAltura @object[:height] || 0
                 xml.nVlLargura @object[:width] || 0
                 xml.nVlDiametro @object[:diameter] || 0
-                xml.sCdMaoPropria HELPER.convert_bool_to_string(@own_hands)
-                xml.sCdAvisoRecebimento HELPER.convert_bool_to_string(
-                  @receipt_notification
-                )
+                xml.sCdMaoPropria bool_to_string(@own_hands)
+                xml.sCdAvisoRecebimento bool_to_string(@receipt_notification)
                 xml.nVlValorDeclarado @declared_value || 0
+                if @method == 'CalcPrecoData'
+                  xml.sDtCalculo date_to_string(@reference_date)
+                end
               end
             end
           end
@@ -71,19 +65,12 @@ module Correios
       end
 
       def format_response(response)
-        response = response[:calc_preco_response][:calc_preco_result]
+        response = response["#{@method_snake}_response".to_sym]["#{@method_snake}_result".to_sym]
 
         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)
@@ -92,29 +79,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/calculate_price_deadline.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Pricefier
-    class CalculatePriceDeadline < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CalculatePriceDeadline < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @service_codes = data[:service_codes]
         @source_zip_code = data[:source_zip_code]
         @target_zip_code = data[:target_zip_code]
@@ -22,22 +12,25 @@ module Correios
         @own_hands = data[:own_hands]
         @receipt_notification = data[:receipt_notification]
         @declared_value = data[:declared_value]
+        @reference_date = data[:reference_date]
         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/CalcPrecoPrazo',
-                                             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
 
@@ -45,25 +38,26 @@ 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'].CalcPrecoPrazo do
+              xml['ns1'].send(@method) do
                 xml.nCdEmpresa @credentials.administrative_code
                 xml.sDsSenha @credentials.sigep_password
-                xml.nCdServico HELPER.format_service_codes(@service_codes)
+                xml.nCdServico array_to_string_comma(@service_codes)
                 xml.sCepOrigem @source_zip_code
                 xml.sCepDestino @target_zip_code
-                xml.nCdFormato HELPER.object_type(@object[:type])
-                xml.nVlPeso @object[:weight].to_f/1000
+                xml.nCdFormato pricefier_object_type(@object[:type])
+                xml.nVlPeso @object[:weight].to_f / 1000
                 xml.nVlComprimento @object[:length] || 0
                 xml.nVlAltura @object[:height] || 0
                 xml.nVlLargura @object[:width] || 0
                 xml.nVlDiametro @object[:diameter] || 0
-                xml.sCdMaoPropria HELPER.convert_bool_to_string(@own_hands)
-                xml.sCdAvisoRecebimento HELPER.convert_bool_to_string(
-                  @receipt_notification
-                )
+                xml.sCdMaoPropria bool_to_string(@own_hands)
+                xml.sCdAvisoRecebimento bool_to_string(@receipt_notification)
                 xml.nVlValorDeclarado @declared_value || 0
+                if @method != 'CalcPrecoPrazo'
+                  xml.sDtCalculo date_to_string(@reference_date)
+                end
               end
             end
           end
@@ -71,65 +65,57 @@ module Correios
       end
 
       def format_response(response)
-        response = response[:calc_preco_prazo_response][:calc_preco_prazo_result]
+        response = response["#{@method_snake}_response".to_sym]["#{@method_snake}_result".to_sym]
 
         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)
         if [0, 10, 11].include?(service[:erro].to_i)
-          delivery_on_saturdays = HELPER.convert_string_to_bool(
-            service[:entrega_sabado]
-          )
-
+          delivery_on_saturdays = string_to_bool(service[:entrega_sabado])
           {
             code: service[:codigo],
             prices: {
-              additional_serivces: {
-                own_hands: HELPER.convert_string_to_float(
-                  service[:valor_mao_propria]
-                ),
-                receipt_notification: HELPER.convert_string_to_float(
+              additional_services: {
+                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])
             },
-            delivery_at_home: HELPER.convert_string_to_bool(
-              service[:entrega_domiciliar]
-            ),
+            delivery_at_home: string_to_bool(service[:entrega_domiciliar]),
             delivery_on_saturdays: delivery_on_saturdays,
             deadline: {
               days: service[:prazo_entrega].to_i,
-              date: HELPER.calculate_deadline_date(
-                service[:prazo_entrega].to_i, delivery_on_saturdays
-              )
+              date:
+              if @method == 'CalcPrecoPrazo'
+                calculate_shipping_deadline(
+                  service[:prazo_entrega].to_i,
+                  delivery_on_saturdays
+                )
+              else
+                calculate_shipping_deadline(
+                  service[:prazo_entrega].to_i,
+                  delivery_on_saturdays,
+                  @reference_date
+                )
+              end
             },
             note: service[:obs_fim]
           }
         else
           {
             code: service[:codigo],
-            error: {
-              code: service[:erro],
-              description: service[:msg_erro]
-            }
+            error: { code: service[:erro],
+                     description: service[:msg_erro] }
           }
         end
       end