correios_sigep 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51231597d79a613436e06506f3fef51e54f8ad1b
-  data.tar.gz: f07572647ee016687d787a6f770ece656b45e786
+  metadata.gz: 48306a5b571325269cefb86911a20ac7fc30f1c6
+  data.tar.gz: 4f500e96b3ab1429bf39fb1de6922f2a517cedd4
 SHA512:
-  metadata.gz: e0c6af4a6da09f6ec53a6bc5127e3668361cb9a71cfa99bc310f73cc19f4f5a7ae09bbc6ba30e589ccedcd992e684074dc4fd055dc09b3025b39933ae81924c8
-  data.tar.gz: f38ab6b0a6149e22032748049c7e514e053fba4681c4cb42afe9b5fc6234f8a74c8b48a0b41e5e310d3d2a2e89f6b79320279257c9918cad53572139b9d9fd03
+  metadata.gz: 9cd53cb28b9a2a3672d68dc05629326a34c706a09898d42bd4a5d74358993b02eb437139f0877cb19447f573d78b9f1827d2e2a2f31b733e1bb9d8e8f2cd97f8
+  data.tar.gz: a6e35a9ee2fff1a456c1aacb6f40e0aab1c1fc6934ab37d7fdd4273f7f72aac31ff4a0f22f34e34b1f1ca99093110cfd58e1bf5f8e303a3161203754d01a32f8

data/lib/correios_sigep.rb

@@ -38,6 +38,9 @@ require 'correios_sigep/models/errors/unknown_error'
 require 'correios_sigep/models/errors/sro_not_ready'
 require 'correios_sigep/models/errors/required_fields'
 require 'correios_sigep/models/errors/collect_number_not_found'
+require 'correios_sigep/models/errors/invalid_solicitation'
+require 'correios_sigep/logistic_reverse/collect_number_actions/process_invalid_request'
+require 'correios_sigep/logistic_reverse/collect_number_actions/process_valid_request'
 require 'correios_sigep/logistic_reverse/base_client'
 require 'correios_sigep/logistic_reverse/request_collect_number'
 require 'correios_sigep/logistic_reverse/request_sro'

data/lib/correios_sigep/logistic_reverse/collect_number_actions/process_invalid_request.rb

@@ -0,0 +1,32 @@
+module CorreiosSigep
+  module LogisticReverse
+    module CollectNumberActions
+      class ProcessInvalidRequest
+        def initialize(response)
+          @response = response
+        end
+
+        def run
+          code          = @response.search('//cod_erro').text.to_i
+          error_message = @response.search('//msg_erro').text
+          klass         = (errors[code] || Models::Errors::UnknownError)
+
+          raise klass.new(error_message)
+        end
+
+        private
+
+        def errors
+          {
+            Models::CorreiosResponseCodes::TICKET_ALREADY_USED => Models::Errors::TicketAlreadyUsed,
+            Models::CorreiosResponseCodes::UNAVAILABLE_SERVICE => Models::Errors::UnavailableService,
+            Models::CorreiosResponseCodes::INEXISTENT_ZIPCODE => Models::Errors::InexistentZipcode,
+            Models::CorreiosResponseCodes::UNAVAILABLE_HOUSE_COLLECT => Models::Errors::UnavailableHouseCollect,
+            Models::CorreiosResponseCodes::COLLECT_NOT_ANSWERED_FOR_THE_ZIPCODE => Models::Errors::CollectNotAnsweredForTheZipcode,
+            Models::CorreiosResponseCodes::NOT_CONFIGURED_CLIENT => Models::Errors::NotConfiguredClient
+          }
+        end
+      end
+    end
+  end
+end

data/lib/correios_sigep/logistic_reverse/collect_number_actions/process_valid_request.rb

@@ -0,0 +1,24 @@
+module CorreiosSigep
+  module LogisticReverse
+    module CollectNumberActions
+      class ProcessValidRequest
+        def initialize(response)
+          @response = response
+        end
+
+        def run
+          result_node = @response.search('//resultado_solicitacao')
+          code = result_node.search('//codigo_erro').text.to_i
+
+          if Models::CorreiosResponseCodes::SUCCESS != code
+            error_message = @response.search('//descricao_erro').text
+            raise Models::Errors::InvalidSolicitation.new(error_message)
+          end
+
+          result = result_node.search('//numero_coleta')
+          result.first.text
+        end
+      end
+    end
+  end
+end

data/lib/correios_sigep/logistic_reverse/request_collect_number.rb

@@ -10,51 +10,24 @@ module CorreiosSigep
       def process
         xml = Builders::XML::RequestCollectNumber.build_xml(@logistic_reverse, @overrides)
         response = invoke(:solicitar_postagem_reversa, xml)
-        process_response response
+        process_response(response)
       end
 
       private
 
-      def process_response response
+      def process_response(response)
         response_xml = response.to_xml.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
         response_doc = Nokogiri::XML.parse(response_xml)
-        code = response_doc.search('//cod-erro | //cod_erro').text.to_i rescue nil
-        handle_errors code, response_doc
-      end
-
-      def handle_errors code, response_doc
-        result_string = '//resultado-solicitacao | //resultado_solicitacao'
-        result_node = response_doc.search(result_string)
-        error_message = response_doc.search('//msg-erro | //msg_erro').text rescue ''
-
-        case code
-        when Models::CorreiosResponseCodes::SUCCESS
-          result = result_node.search('//numero-coleta | //numero_coleta')
-          result.first.text rescue nil
-
-        when Models::CorreiosResponseCodes::TICKET_ALREADY_USED
-          raise Models::Errors::TicketAlreadyUsed.new error_message
-
-        when Models::CorreiosResponseCodes::UNAVAILABLE_SERVICE
-          raise Models::Errors::UnavailableService
+        code = response_doc.search('//cod_erro').text.to_i
 
-        when Models::CorreiosResponseCodes::INEXISTENT_ZIPCODE
-          raise Models::Errors::InexistentZipcode
-
-        when Models::CorreiosResponseCodes::UNAVAILABLE_HOUSE_COLLECT
-          raise Models::Errors::UnavailableHouseCollect
-
-        when Models::CorreiosResponseCodes::COLLECT_NOT_ANSWERED_FOR_THE_ZIPCODE
-          raise Models::Errors::CollectNotAnsweredForTheZipcode
-
-        when Models::CorreiosResponseCodes::NOT_CONFIGURED_CLIENT
-          raise Models::Errors::NotConfiguredClient.new error_message
+        action(code).new(response_doc).run
+      end
 
+      def action(code)
+        if Models::CorreiosResponseCodes::SUCCESS == code
+          CollectNumberActions::ProcessValidRequest
         else
-          error_message = result_node.search('//msg-erro | //msg_erro').text rescue ''
-          invalid_xml_message = response_doc.search("//return").text rescue ''
-
-          raise Models::Errors::UnknownError.new [error_message, invalid_xml_message].join(', ')
+          CollectNumberActions::ProcessInvalidRequest
         end
       end
     end

data/lib/correios_sigep/models/errors/invalid_solicitation.rb

@@ -0,0 +1,8 @@
+module CorreiosSigep
+  module Models
+    module Errors
+      class InvalidSolicitation < StandardError
+      end
+    end
+  end
+end

data/lib/correios_sigep/version.rb

@@ -1,3 +1,3 @@
 module CorreiosSigep
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: correios_sigep
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Carlos Ribeiro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -189,6 +189,8 @@ files:
 - lib/correios_sigep/dsl/person.rb
 - lib/correios_sigep/dsl/product.rb
 - lib/correios_sigep/logistic_reverse/base_client.rb
+- lib/correios_sigep/logistic_reverse/collect_number_actions/process_invalid_request.rb
+- lib/correios_sigep/logistic_reverse/collect_number_actions/process_valid_request.rb
 - lib/correios_sigep/logistic_reverse/request_collect_number.rb
 - lib/correios_sigep/logistic_reverse/request_sro.rb
 - lib/correios_sigep/models/administrative_fields.rb
@@ -197,6 +199,7 @@ files:
 - lib/correios_sigep/models/errors/collect_not_answered_for_the_zipcode.rb
 - lib/correios_sigep/models/errors/collect_number_not_found.rb
 - lib/correios_sigep/models/errors/inexistent_zipcode.rb
+- lib/correios_sigep/models/errors/invalid_solicitation.rb
 - lib/correios_sigep/models/errors/not_configured_client.rb
 - lib/correios_sigep/models/errors/required_fields.rb
 - lib/correios_sigep/models/errors/sro_not_ready.rb