correios_gem 1.4.2 → 1.4.3

data/lib/sigep/requests/search_available_additional_services.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 SearchAvailableAdditionalServices < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class SearchAvailableAdditionalServices < Helper
       def initialize(data = {})
         @show_request = data[:show_request]
         super()
@@ -19,11 +9,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:busca_servicos_adicionais_ativos,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :busca_servicos_adicionais_ativos,
+            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
 
@@ -31,7 +25,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'].buscaServicosAdicionaisAtivos
             end
@@ -47,15 +41,13 @@ module Correios
       end
 
       def format_additional_services(additional_services)
-        formatted_additional_services = []
-        additional_services.each do |additional_service|
-          formatted_additional_services << {
+        additional_services.map do |additional_service|
+          {
             code: additional_service[:codigo],
             description: additional_service[:descricao].encode(Encoding::UTF_8),
             initials: additional_service[:sigla]
           }
         end
-        formatted_additional_services
       end
     end
   end

data/lib/sigep/requests/search_customer.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 SearchCustomer < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class SearchCustomer < 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(:busca_cliente,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :busca_cliente,
+            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'].buscaCliente do
                 parent_namespace = xml.parent.namespace
@@ -57,15 +50,10 @@ module Correios
         contracts = response[:contratos]
         contracts = [contracts] if contracts.is_a?(Hash)
 
-        formatted_contracts = []
-        contracts.each do |contract|
-          formatted_contracts << format_contract(contract)
-        end
-
         {
           status_code: response[:status_codigo].strip,
           status_description: response[:descricao_status_cliente].strip,
-          contracts: formatted_contracts
+          contracts: contracts.map {|c| format_contract(c)}
         }
       end
 
@@ -73,17 +61,12 @@ module Correios
         cards = contract[:cartoes_postagem]
         cards = [cards] if cards.is_a?(Hash)
 
-        formatted_cards = []
-        cards.each do |card|
-          formatted_cards << format_card(card)
-        end
-
         {
           board_id: contract[:codigo_diretoria].strip,
           board_description: contract[:descricao_diretoria_regional].strip,
           validity_begin: contract[:data_vigencia_inicio],
           validity_end: contract[:data_vigencia_fim],
-          cards: formatted_cards
+          cards: cards.map {|c| format_card(c)}
         }
       end
 
@@ -91,15 +74,10 @@ module Correios
         services = card[:servicos]
         services = [services] if services.is_a?(Hash)
 
-        formatted_services = []
-        services.each do |service|
-          formatted_services << format_service(service)
-        end
-
         {
           validity_begin: card[:data_vigencia_inicio],
           validity_end: card[:data_vigencia_fim],
-          services: formatted_services
+          services: services.map {|s| format_service(s)}
         }
       end
 
@@ -115,10 +93,10 @@ module Correios
           conditions: {
             dimensions_required: sigep_service[:exige_dimensoes],
             addtional_price_required: sigep_service[:exige_valor_cobrar],
-            payment_on_delivery: HELPER.convert_string_to_bool(
+            payment_on_delivery: string_to_bool(
               sigep_service[:pagamento_entrega]
             ),
-            grouped_shipment: HELPER.convert_string_to_bool(
+            grouped_shipment: string_to_bool(
               sigep_service[:remessa_agrupada]
             )
           }

data/lib/sigep/requests/search_zip_code.rb

@@ -1,18 +1,9 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Sigep
-    class SearchZipCode < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class SearchZipCode < Helper
       def initialize(data = {})
         @show_request = data[:show_request]
+
         @zip_code = data[:zip_code]
         super()
       end
@@ -20,11 +11,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:consulta_cep,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :consulta_cep,
+            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
 
@@ -32,7 +27,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'].consultaCEP do
                 parent_namespace = xml.parent.namespace

data/lib/sigep/requests/track_shippings.rb

@@ -1,20 +1,12 @@
-require 'nokogiri'
 require 'active_support/core_ext/hash'
 
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module Sigep
-    class TrackShippings < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class TrackShippings < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @label_numbers = data[:label_numbers]
         @query_type = data[:query_type]
         @result_type = data[:result_type]
@@ -24,11 +16,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:consulta_sro,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(Sigep.client.call(
+            :consulta_sro,
+            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 +32,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'].consultaSRO do
                 parent_namespace = xml.parent.namespace
@@ -45,8 +41,8 @@ module Correios
                 @label_numbers.each do |label_number|
                   xml.listaObjetos label_number
                 end
-                xml.tipoConsulta query_type(@query_type)
-                xml.tipoResultado result_type(@result_type)
+                xml.tipoConsulta tracking_query_type(@query_type)
+                xml.tipoResultado tracking_result_type(@result_type)
                 xml.usuarioSro @credentials.sro_user
                 xml.senhaSro @credentials.sro_password
 
@@ -64,23 +60,13 @@ module Correios
         objects = response['rastro']['objeto']
         objects = [objects] if objects.is_a?(Hash)
 
-        formatted_objects = []
-        objects.each do |object|
-          formatted_objects << format_object(object)
-        end
-
-        { tracking: formatted_objects }
+        { tracking: objects.map {|o| format_object(o)} }
       end
 
       def format_object(object)
         events = object['evento']
         events = [events] if events.is_a?(Hash)
 
-        formatted_events = []
-        events.each do |event|
-          formatted_events << format_event(event)
-        end
-
         {
           label: {
             number: object['numero'],
@@ -88,16 +74,16 @@ module Correios
             name: object['nome'],
             category: object['categoria']
           },
-          events: formatted_events
+          events: events.map {|e| format_event(e)}
         }
       end
 
       def format_event(event)
         {
-          movement: HELPER.tracking_event_status(event),
+          movement: inverse_tracking_event_status(event),
           type: event['tipo'],
           status: event['status'],
-          time: HELPER.convert_string_to_date(event['data'], event['hora']),
+          time: string_to_time_no_second(event['data'], event['hora']),
           description: event['descricao'],
           detail: event['detalhe'],
           city: event['cidade'],
@@ -105,7 +91,7 @@ module Correios
           destination: format_destination(event['destino']),
           site: {
             description: event['local'],
-            code: event['codigo']
+            zip_code: event['codigo']
           }
         }
       end
@@ -118,28 +104,10 @@ module Correios
           state: destination['uf'],
           site: {
             description: destination['local'],
-            code: destination['codigo']
+            zip_code: destination['codigo']
           }
         }
       end
-
-      def query_type(type)
-        case type
-        when :list
-          'L'
-        when :range
-          'F'
-        end
-      end
-
-      def result_type(type)
-        case type
-        when :last_event
-          'U'
-        when :all_events
-          'T'
-        end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: correios_gem
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Arthur Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,6 +70,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: |-
   Integracao com as APIs Sigep, Logistica Reversa,
                        Precificador (frete) e SRO, utilizando objetos Ruby para
@@ -80,28 +94,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/SRO/client.rb
-- lib/SRO/helper.rb
+- correios_gem.gemspec
 - lib/SRO/requests/track_shippings.rb
-- lib/SRO/requests/track_shippings_list.rb
-- lib/correios_exception.rb
+- lib/auxiliars/credentials.rb
+- lib/auxiliars/environments.rb
+- lib/auxiliars/exception.rb
+- lib/auxiliars/helper.rb
 - lib/correios_gem.rb
-- lib/credentials.rb
-- lib/pricefier/client.rb
-- lib/pricefier/helper.rb
 - lib/pricefier/requests/calculate_deadline.rb
-- lib/pricefier/requests/calculate_deadline_with_date.rb
-- lib/pricefier/requests/calculate_deadline_with_restrictions.rb
 - lib/pricefier/requests/calculate_price.rb
 - lib/pricefier/requests/calculate_price_deadline.rb
-- lib/pricefier/requests/calculate_price_deadline_with_date.rb
-- lib/pricefier/requests/calculate_price_deadline_with_restrictions.rb
 - lib/pricefier/requests/calculate_price_fac.rb
-- lib/pricefier/requests/calculate_price_with_date.rb
 - lib/pricefier/requests/list_services.rb
-- lib/pricefier/requests/list_services_star.rb
-- lib/reverse_logistics/client.rb
-- lib/reverse_logistics/helper.rb
 - lib/reverse_logistics/requests/calculate_ticket_number_check_digit.rb
 - lib/reverse_logistics/requests/cancel_shipping.rb
 - lib/reverse_logistics/requests/create_shippings.rb
@@ -109,8 +113,7 @@ files:
 - lib/reverse_logistics/requests/request_ticket_numbers.rb
 - lib/reverse_logistics/requests/track_shipping.rb
 - lib/reverse_logistics/requests/track_shippings_by_date.rb
-- lib/sigep/client.rb
-- lib/sigep/helper.rb
+- lib/sigep/auxiliars/shipping_xml.rb
 - lib/sigep/requests/calculate_label_number_check_digit.rb
 - lib/sigep/requests/cancel_shipping.rb
 - lib/sigep/requests/check_card_status.rb