correios_sigep 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48306a5b571325269cefb86911a20ac7fc30f1c6
-  data.tar.gz: 4f500e96b3ab1429bf39fb1de6922f2a517cedd4
+  metadata.gz: 85b92be1bc69bfaf584b2189929f7bcdb9b9eea2
+  data.tar.gz: 45ec9534a9adebaef05490913cb1528231edeb41
 SHA512:
-  metadata.gz: 9cd53cb28b9a2a3672d68dc05629326a34c706a09898d42bd4a5d74358993b02eb437139f0877cb19447f573d78b9f1827d2e2a2f31b733e1bb9d8e8f2cd97f8
-  data.tar.gz: a6e35a9ee2fff1a456c1aacb6f40e0aab1c1fc6934ab37d7fdd4273f7f72aac31ff4a0f22f34e34b1f1ca99093110cfd58e1bf5f8e303a3161203754d01a32f8
+  metadata.gz: b6133289b2d5fa2d63474603a93919544c397ec7671d63077453f80c4850d7bc53e87abf140d7d0ff3545d02882ebc80ec060f48c22c8198ad527aa8bfb28641
+  data.tar.gz: cd19948cd68d1b77e4513f4f2132368850a1dd5b04afca72f6373cc4e1f28d6c4bafa0d95b98124e69073abfe544b67ed5af8a077801432887772c6276fcddb9

data/lib/correios_sigep.rb

@@ -1,54 +1,17 @@
-require 'correios_sigep/version'
-require 'correios_sigep/models/administrative_fields'
-require 'correios_sigep/configuration'
-require 'correios_sigep/dsl/logistic_reverse'
-require 'correios_sigep/dsl/person'
-require 'correios_sigep/dsl/object'
-require 'correios_sigep/dsl/product'
-require 'correios_sigep/dsl/collect'
-require 'correios_sigep/builders/person'
-require 'correios_sigep/builders/object'
-require 'correios_sigep/builders/product'
-require 'correios_sigep/builders/collect'
-require 'correios_sigep/builders/xml/recipient'
-require 'correios_sigep/builders/xml/sender'
-require 'correios_sigep/builders/xml/product'
-require 'correios_sigep/builders/xml/collect_objects'
-require 'correios_sigep/builders/xml/collect'
-require 'correios_sigep/builders/xml/request'
-require 'correios_sigep/builders/xml/request_collect_number'
-require 'correios_sigep/builders/xml/request_sro'
-require 'correios_sigep/models/recipient'
-require 'correios_sigep/models/product'
-require 'correios_sigep/models/recipient'
-require 'correios_sigep/models/sender'
-require 'correios_sigep/models/object'
-require 'correios_sigep/models/sender'
-require 'correios_sigep/models/collect'
-require 'correios_sigep/models/logistic_reverse'
-require 'correios_sigep/models/sro'
-require 'correios_sigep/models/correios_response_codes'
-require 'correios_sigep/models/errors/ticket_already_used'
-require 'correios_sigep/models/errors/unavailable_service'
-require 'correios_sigep/models/errors/inexistent_zipcode'
-require 'correios_sigep/models/errors/unavailable_house_collect'
-require 'correios_sigep/models/errors/collect_not_answered_for_the_zipcode'
-require 'correios_sigep/models/errors/not_configured_client'
-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'
 require 'net/http/persistent'
 require 'nokogiri'
 require 'savon'
 
+require 'correios_sigep/version'
+
+require 'correios_sigep/builders'
+require 'correios_sigep/dsl'
+require 'correios_sigep/logistic_reverse'
+require 'correios_sigep/models'
+
 module CorreiosSigep
+  autoload :Configuration, 'correios_sigep/configuration'
+
   def self.configuration
     @configuration ||= Configuration.new
   end

data/lib/correios_sigep/builders.rb

@@ -0,0 +1,19 @@
+module CorreiosSigep
+  module Builders
+    autoload :Collect, 'correios_sigep/builders/collect'
+    autoload :Object, 'correios_sigep/builders/object'
+    autoload :Person, 'correios_sigep/builders/person'
+    autoload :Product, 'correios_sigep/builders/product'
+
+    module XML
+      autoload :Collect, 'correios_sigep/builders/xml/collect'
+      autoload :CollectObjects, 'correios_sigep/builders/xml/collect_objects'
+      autoload :Product, 'correios_sigep/builders/xml/product'
+      autoload :Recipient, 'correios_sigep/builders/xml/recipient'
+      autoload :Request, 'correios_sigep/builders/xml/request'
+      autoload :RequestCollectNumber, 'correios_sigep/builders/xml/request_collect_number'
+      autoload :RequestSRO, 'correios_sigep/builders/xml/request_sro'
+      autoload :Sender,  'correios_sigep/builders/xml/sender'
+    end
+  end
+end

data/lib/correios_sigep/dsl.rb

@@ -0,0 +1,9 @@
+module CorreiosSigep
+  module DSL
+    autoload :Collect, 'correios_sigep/dsl/collect'
+    autoload :LogisticReverse, 'correios_sigep/dsl/logistic_reverse'
+    autoload :Object, 'correios_sigep/dsl/object'
+    autoload :Person, 'correios_sigep/dsl/person'
+    autoload :Product, 'correios_sigep/dsl/product'
+  end
+end

data/lib/correios_sigep/logistic_reverse.rb

@@ -0,0 +1,12 @@
+module CorreiosSigep
+  module LogisticReverse
+    autoload :BaseClient, 'correios_sigep/logistic_reverse/base_client'
+    autoload :RequestCollectNumber, 'correios_sigep/logistic_reverse/request_collect_number'
+    autoload :RequestSRO, 'correios_sigep/logistic_reverse/request_sro'
+
+    module CollectNumberActions
+      autoload :ProcessInvalidRequest, 'correios_sigep/logistic_reverse/collect_number_actions/process_invalid_request'
+      autoload :ProcessValidRequest, 'correios_sigep/logistic_reverse/collect_number_actions/process_valid_request'
+    end
+  end
+end

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

@@ -7,10 +7,7 @@ module CorreiosSigep
         end
 
         def run
-          code          = @response.search('//cod_erro').text.to_i
-          error_message = @response.search('//msg_erro').text
-          klass         = (errors[code] || Models::Errors::UnknownError)
-
+          klass = (errors[error_code] || errors[new_error_code] || Models::Errors::UnknownError)
           raise klass.new(error_message)
         end
 
@@ -23,9 +20,25 @@ module CorreiosSigep
             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
+            Models::CorreiosResponseCodes::NOT_CONFIGURED_CLIENT => Models::Errors::NotConfiguredClient,
+            Models::CorreiosResponseCodes::INVALID_CONTRACT => Models::Errors::InvalidContract,
+            Models::CorreiosResponseCodes::INVALID_DECLARED_VALUE => Models::Errors::InvalidDeclaredValue
           }
         end
+
+        def error_code
+          return nil if @response.search('//cod_erro').empty?
+          @response.search('//cod_erro').text.to_i
+        end
+
+        def new_error_code
+          return nil if @response.search('//codigo_erro').empty?
+          @response.search('//codigo_erro').text.to_i
+        end
+
+        def error_message
+          "#{@response.search('//msg_erro').text} #{@response.search('//descricao_erro').text}".strip
+        end
       end
     end
   end

data/lib/correios_sigep/logistic_reverse/request_collect_number.rb

@@ -1,3 +1,5 @@
+# encoding UTF-8
+
 module CorreiosSigep
   module LogisticReverse
     class RequestCollectNumber < BaseClient
@@ -16,15 +18,19 @@ module CorreiosSigep
       private
 
       def process_response(response)
-        response_xml = response.to_xml.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+        response_xml = response.to_xml.force_encoding('UTF-8')
         response_doc = Nokogiri::XML.parse(response_xml)
-        code = response_doc.search('//cod_erro').text.to_i
+        code         = response_doc.search('//cod_erro').text.to_i
+
+        unless response_doc.search('//codigo_erro').empty?
+          new_code = response_doc.search('//codigo_erro').text.to_i
+        end
 
-        action(code).new(response_doc).run
+        action([code, new_code || nil].compact).new(response_doc).run
       end
 
-      def action(code)
-        if Models::CorreiosResponseCodes::SUCCESS == code
+      def action(response_codes)
+        if response_codes.all?{|response_code| response_code == Models::CorreiosResponseCodes::SUCCESS}
           CollectNumberActions::ProcessValidRequest
         else
           CollectNumberActions::ProcessInvalidRequest

data/lib/correios_sigep/models.rb

@@ -0,0 +1,30 @@
+
+module CorreiosSigep
+  module Models
+    autoload :AdministrativeFields, 'correios_sigep/models/administrative_fields'
+    autoload :Collect, 'correios_sigep/models/collect'
+    autoload :CorreiosResponseCodes, 'correios_sigep/models/correios_response_codes'
+    autoload :LogisticReverse, 'correios_sigep/models/logistic_reverse'
+    autoload :Object, 'correios_sigep/models/object'
+    autoload :Product, 'correios_sigep/models/product'
+    autoload :Recipient, 'correios_sigep/models/recipient'
+    autoload :Sender, 'correios_sigep/models/sender'
+    autoload :SRO, 'correios_sigep/models/sro'
+
+    module Errors
+      autoload :CollectNotAnsweredForTheZipcode, 'correios_sigep/models/errors/collect_not_answered_for_the_zipcode'
+      autoload :CollectNumberNotFound, 'correios_sigep/models/errors/collect_number_not_found'
+      autoload :InexistentZipcode, 'correios_sigep/models/errors/inexistent_zipcode'
+      autoload :InvalidSolicitation, 'correios_sigep/models/errors/invalid_solicitation'
+      autoload :NotConfiguredClient, 'correios_sigep/models/errors/not_configured_client'
+      autoload :RequiredFields, 'correios_sigep/models/errors/required_fields'
+      autoload :SRONotReady, 'correios_sigep/models/errors/sro_not_ready'
+      autoload :TicketAlreadyUsed, 'correios_sigep/models/errors/ticket_already_used'
+      autoload :UnavailableHouseCollect, 'correios_sigep/models/errors/unavailable_house_collect'
+      autoload :UnavailableService, 'correios_sigep/models/errors/unavailable_service'
+      autoload :InvalidContract, 'correios_sigep/models/errors/invalid_contract'
+      autoload :InvalidDeclaredValue, 'correios_sigep/models/errors/invalid_declared_value'
+      autoload :UnknownError, 'correios_sigep/models/errors/unknown_error'
+    end
+  end
+end

data/lib/correios_sigep/models/correios_response_codes.rb

@@ -8,6 +8,8 @@ module CorreiosSigep
       UNAVAILABLE_HOUSE_COLLECT             = 111
       COLLECT_NOT_ANSWERED_FOR_THE_ZIPCODE  = 117
       NOT_CONFIGURED_CLIENT                 = 105
+      INVALID_CONTRACT                      = 109
+      INVALID_DECLARED_VALUE                = 205
     end
   end
 end

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

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

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

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

data/lib/correios_sigep/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: correios_sigep
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Carlos Ribeiro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -170,6 +170,7 @@ files:
 - README.md
 - correios_sigep.gemspec
 - lib/correios_sigep.rb
+- lib/correios_sigep/builders.rb
 - lib/correios_sigep/builders/collect.rb
 - lib/correios_sigep/builders/object.rb
 - lib/correios_sigep/builders/person.rb
@@ -183,22 +184,27 @@ files:
 - lib/correios_sigep/builders/xml/request_sro.rb
 - lib/correios_sigep/builders/xml/sender.rb
 - lib/correios_sigep/configuration.rb
+- lib/correios_sigep/dsl.rb
 - lib/correios_sigep/dsl/collect.rb
 - lib/correios_sigep/dsl/logistic_reverse.rb
 - lib/correios_sigep/dsl/object.rb
 - lib/correios_sigep/dsl/person.rb
 - lib/correios_sigep/dsl/product.rb
+- lib/correios_sigep/logistic_reverse.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.rb
 - lib/correios_sigep/models/administrative_fields.rb
 - lib/correios_sigep/models/collect.rb
 - lib/correios_sigep/models/correios_response_codes.rb
 - 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_contract.rb
+- lib/correios_sigep/models/errors/invalid_declared_value.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