correios_sigep 0.5.0 → 1.0.0

data/.travis.yml

@@ -2,10 +2,10 @@ language: ruby
 before_install:
 - gem install bundler -v '~> 1.5'
 rvm:
-- 2.0.0
-- 2.1.1
-- 2.2.2
-- 2.3.0
+- 2.1.10
+- 2.2.6
+- 2.3.3
+- 2.4.0
 bundler_args: --without debug
 deploy:
   provider: rubygems

data/README.md

@@ -34,11 +34,10 @@ Para utilizar a gem, é necessário configurar os campos necessários com base n
 
 ```ruby
 CorreiosSigep.configure do |config|
-  config.user                   = '60618043'
-  config.password               = '8o8otn'
+  config.user                   = 'empresacws'
+  config.password               = '123456'
   config.administrative_code    = '08082650'
   config.card                   = '0057018901'
-  config.contract               = '9912208555'
   config.service_code           = '41076'
 end
 ```

data/correios_sigep.gemspec

@@ -20,12 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'net-http-persistent', '~> 2.9.4'
   spec.add_dependency 'rack', '~> 1.6', '>= 1.6.4'
-  spec.add_dependency 'savon', '~> 2.0'
+  spec.add_dependency 'savon', '~> 2.11'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov', '~> 0.9'
-  spec.add_development_dependency 'webmock', '~> 1.0'
+  spec.add_development_dependency 'webmock', '~> 2.3'
 end

data/lib/correios_sigep.rb

@@ -15,7 +15,6 @@ 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/authentication'
 require 'correios_sigep/builders/xml/request'
 require 'correios_sigep/builders/xml/request_collect_number'
 require 'correios_sigep/builders/xml/request_sro'

data/lib/correios_sigep/builders/xml/collect_objects.rb

@@ -17,11 +17,11 @@ module CorreiosSigep
 
         private
         def build_item(object)
-          @builder.item  object.item
-          @builder.id    object.id
-          @builder.desc  object.description
+          @builder.item     object.item
+          @builder.id       object.id
+          @builder.desc     object.description
           @builder.entrega  object.ship
-          @builder.num   object.num
+          @builder.num      object.num
         end
       end
     end

data/lib/correios_sigep/builders/xml/request.rb

@@ -3,18 +3,41 @@ module CorreiosSigep
     module XML
       class Request
 
-        def self.build_xml(request, overrides={})
-          config = CorreiosSigep.configuration
-          document = Nokogiri::XML(request.to_xml)
-          administrative_fields =
-            overrides[:administrative] || config.administrative_fields
-          XML::Authentication.new(document, administrative_fields).build_xml!
+        def initialize(document, overrides={})
+          @document = Nokogiri::XML(document.to_xml)
+          config    = CorreiosSigep.configuration
+
+          administrative_fields!( overrides[:administrative] ||
+                                  config.administrative_fields )
+        end
 
-          document
+        def administrative_fields!(administrative_fields)
+          add_node 'codAdministrativo', administrative_fields.administrative_code
+        end
+
+        def to_xml
+          @document
             .to_xml(save_with: Nokogiri::XML::Node::SaveOptions::NO_DECLARATION)
             .gsub(/<(\/)?root>/, '')
         end
 
+        def self.build_xml(request, overrides={})
+          new(request, overrides).to_xml
+        end
+
+        private
+
+        def add_node(node_name, node_content)
+          @document.root.children.first.add_previous_sibling(
+            create_node(node_name, node_content)
+          )
+        end
+
+        def create_node(node_name, node_content)
+          node = Nokogiri::XML::Node.new(node_name, @document)
+          node.content = node_content
+          node
+        end
       end
     end
   end

data/lib/correios_sigep/builders/xml/request_collect_number.rb

@@ -2,6 +2,11 @@ module CorreiosSigep
   module Builders
     module XML
       class RequestCollectNumber < Request
+        def administrative_fields!(administrative_fields)
+          add_node 'codAdministrativo', administrative_fields.administrative_code
+          add_node 'codigo_servico', administrative_fields.service_code
+          add_node 'cartao', administrative_fields.card
+        end
       end
     end
   end

data/lib/correios_sigep/configuration.rb

@@ -1,12 +1,12 @@
 module CorreiosSigep
   class Configuration
-    attr_accessor :administrative_code, :card, :contract, :password,
-                  :service_code, :user, :wsdl_base_url, :proxy, :timeout
+    attr_accessor :administrative_code, :card, :service_code, :wsdl_base_url,
+                  :proxy, :timeout, :user, :password
 
     def administrative_fields
       @administrative_fields ||=
         Models::AdministrativeFields.new(administrative_code: administrative_code,
-                                         card: card, contract: contract,
+                                         card: card,
                                          service_code: service_code)
 
     end

data/lib/correios_sigep/logistic_reverse/base_client.rb

@@ -4,14 +4,17 @@ module CorreiosSigep
       DEFAULT_TIMEOUT = 30
 
       def initialize
-        timeout = CorreiosSigep.configuration.timeout || DEFAULT_TIMEOUT
+        timeout     = CorreiosSigep.configuration.timeout || DEFAULT_TIMEOUT
+        user        = CorreiosSigep.configuration.user
+        password    = CorreiosSigep.configuration.password  
 
         options = {
           adapter: :net_http_persistent,
           proxy: CorreiosSigep.configuration.proxy,
           wsdl: wsdl,
           open_timeout: timeout,
-          read_timeout: timeout
+          read_timeout: timeout,
+          basic_auth: [user, password]
         }
         options.delete(:proxy) unless options[:proxy]
 
@@ -22,9 +25,9 @@ module CorreiosSigep
 
       def wsdl
         @wsdl ||= if ENV['GEM_ENV'] == 'test'
-                    'http://webservicescolhomologacao.correios.com.br/ScolWeb/WebServiceScol?wsdl'
+                    'https://apphom.correios.com.br/logisticaReversaWS/logisticaReversaService/logisticaReversaWS?wsdl'
                   else
-                    'http://webservicescol.correios.com.br/ScolWeb/WebServiceScol?wsdl'
+                    'https://cws.correios.com.br/logisticaReversaWS/logisticaReversaService/logisticaReversaWS?wsdl'
                   end
       end
 

data/lib/correios_sigep/logistic_reverse/request_sro.rb

@@ -14,7 +14,7 @@ module CorreiosSigep
 
       private
       def process_response response
-        correios_hash = response.body[:acompanhar_pedido_response][:return]
+        correios_hash = response.body[:acompanhar_pedido_response][:acompanhar_pedido]
         check_sro_errors(correios_hash)
         correios_response(correios_hash[:coleta][:objeto])[:numero_etiqueta] || begin raise Models::Errors::SRONotReady; end
       end

data/lib/correios_sigep/models/administrative_fields.rb

@@ -1,12 +1,11 @@
 module CorreiosSigep
   module Models
     class AdministrativeFields
-      attr_accessor :administrative_code, :card, :contract, :service_code
+      attr_accessor :administrative_code, :card, :service_code
 
       def initialize(options={})
         self.administrative_code  = options[:administrative_code]
         self.card                 = options[:card]
-        self.contract             = options[:contract]
         self.service_code         = options[:service_code]
       end
     end

data/lib/correios_sigep/models/sro.rb

@@ -10,11 +10,11 @@ module CorreiosSigep
 
       def to_xml
         builder = Nokogiri::XML::Builder.new do |xml|
-          xml.root {
+          xml.root do
             xml.tipoBusca('H')
             xml.tipoSolicitacao(@type)
             xml.numeroPedido(@collect_number)
-          }
+          end
         end
         builder.to_xml
       end

data/lib/correios_sigep/version.rb

@@ -1,3 +1,3 @@
 module CorreiosSigep
-  VERSION = '0.5.0'
+  VERSION = '1.0.0'.freeze
 end

data/spec/correios_sigep/builders/xml/request_collect_number_spec.rb

@@ -5,7 +5,7 @@ module CorreiosSigep
     module XML
       describe RequestCollectNumber do
         describe '.build_xml' do
-          subject { described_class.build_xml(logistic_reverse) }
+          subject { described_class.build_xml(logistic_reverse).chop }
 
           let(:logistic_reverse) { CorreiosSigep::Models::LogisticReverse.new }
           let(:expected_xml)     { builders_fixture('request_collect_number.xml') }

data/spec/correios_sigep/builders/xml/request_spec.rb

@@ -9,12 +9,7 @@ module CorreiosSigep
           context 'when do not override anything' do
             it 'builds a Authentication XML with Configuration parameters' do
               expected_response = [
-                '<cartao>0057018901</cartao>',
-                '<codigo_servico>41076</codigo_servico>',
-                '<contrato>9912208555</contrato>',
-                '<codAdministrativo>08082650</codAdministrativo>',
-                '<senha>8o8otn</senha>',
-                '<usuario>60618043</usuario><test/>'
+                '<codAdministrativo>08082650</codAdministrativo><test/>'
               ].join + "\n"
               expect(described_class.build_xml request).to eq expected_response
             end
@@ -24,15 +19,9 @@ module CorreiosSigep
             it 'builds a Authentication XML with the override parameter' do
               administrative_fields = Models::AdministrativeFields.new(administrative_code: 'adm123',
                                                                        card: 'card123',
-                                                                       contract: 'cont123',
                                                                        service_code: 'ser123')
               expected_response = [
-                '<cartao>card123</cartao>',
-                '<codigo_servico>ser123</codigo_servico>',
-                '<contrato>cont123</contrato>',
-                '<codAdministrativo>adm123</codAdministrativo>',
-                '<senha>8o8otn</senha>',
-                '<usuario>60618043</usuario><test/>'
+                '<codAdministrativo>adm123</codAdministrativo><test/>'
               ].join + "\n"
               expect(described_class.build_xml request, administrative: administrative_fields).to eq expected_response
             end

data/spec/correios_sigep/builders/xml/request_sro_spec.rb

@@ -3,13 +3,13 @@ module CorreiosSigep
     module XML
       describe RequestSRO do
         describe '.build_xml' do
-          subject { described_class.build_xml(sro) }
+          subject { described_class.build_xml(sro).chop }
 
           let(:sro_params)   { { collect_number: '1234', type: 'A' } }
           let(:sro)          { CorreiosSigep::Models::SRO.new(sro_params) }
           let(:expected_xml) { builders_fixture('request_sro.xml') }
 
-          it {  should eq expected_xml }
+          it { should eq expected_xml }
         end
       end
     end

data/spec/correios_sigep/configuration_spec.rb

@@ -28,43 +28,29 @@ module CorreiosSigep
       end
     end
 
-    describe '#contract' do
-      it 'returns nil when unset' do
-        expect(subject.contract).to be_nil
-      end
-    end
-
-    describe '#contract=' do
-      it 'sets the contract in configuration' do
-        subject.contract = 'contract'
-        expect(subject.contract).to eq 'contract'
-      end
-    end
-
-    describe '#password' do
+    describe '#service_code' do
       it 'returns nil when unset' do
-        expect(subject.password).to be_nil
+        expect(subject.service_code).to be_nil
       end
     end
 
-    describe '#password=' do
+    describe '#service_code=' do
       it 'sets the password in configuration' do
-        subject.password = 'password'
-        expect(subject.password).to eq 'password'
+        subject.service_code = 'service_code'
+        expect(subject.service_code).to eq 'service_code'
       end
     end
 
-
-    describe '#service_code' do
+    describe '#timeout' do
       it 'returns nil when unset' do
-        expect(subject.service_code).to be_nil
+        expect(subject.timeout).to be_nil
       end
     end
 
-    describe '#service_code=' do
-      it 'sets the password in configuration' do
-        subject.service_code = 'service_code'
-        expect(subject.service_code).to eq 'service_code'
+    describe '#timeout=' do
+      it 'sets the timeout in configuration' do
+        subject.timeout = 15
+        expect(subject.timeout).to eq 15
       end
     end
 
@@ -75,22 +61,26 @@ module CorreiosSigep
     end
 
     describe '#user=' do
+      let(:user) { 'user' }
+
       it 'sets the user in configuration' do
-        subject.user = 'user'
-        expect(subject.user).to eq 'user'
+        subject.user = user
+        expect(subject.user).to eq user
       end
     end
 
-    describe '#timeout' do
+    describe '#password' do
       it 'returns nil when unset' do
-        expect(subject.timeout).to be_nil
+        expect(subject.password).to be_nil
       end
     end
 
-    describe '#timeout=' do
-      it 'sets the timeout in configuration' do
-        subject.timeout = 15
-        expect(subject.timeout).to eq 15
+    describe '#password=' do
+      let(:pass) { 'pass' }
+
+      it 'sets the password in configuration' do
+        subject.password = pass
+        expect(subject.password).to eq pass
       end
     end
   end

data/spec/correios_sigep/logistic_reverse/base_client_spec.rb

@@ -3,6 +3,9 @@ require 'spec_helper'
 module CorreiosSigep
   module LogisticReverse
     describe BaseClient do
+      let(:user) { CorreiosSigep.configuration.user }
+      let(:pass) { CorreiosSigep.configuration.password }
+
       context 'setting up a proxy' do
         subject { described_class.new }
 
@@ -15,6 +18,7 @@ module CorreiosSigep
               wsdl:  described_class.new.wsdl,
               open_timeout: CorreiosSigep::LogisticReverse::BaseClient::DEFAULT_TIMEOUT,
               read_timeout: CorreiosSigep::LogisticReverse::BaseClient::DEFAULT_TIMEOUT,
+              basic_auth: [user, pass],
               headers: { 'SOAPAction' => '' }
             }
           end
@@ -33,6 +37,7 @@ module CorreiosSigep
               wsdl: described_class.new.wsdl,
               open_timeout: CorreiosSigep::LogisticReverse::BaseClient::DEFAULT_TIMEOUT,
               read_timeout: CorreiosSigep::LogisticReverse::BaseClient::DEFAULT_TIMEOUT,
+              basic_auth: [user, pass],
               headers: { 'SOAPAction' => '' }
             }
           end
@@ -48,16 +53,16 @@ module CorreiosSigep
         subject {  described_class.new.wsdl }
 
         context 'in a test environment' do
-          it 'return the staging url' do
+          it 'returns the staging url' do
             allow(ENV).to receive(:[]).with('GEM_ENV').and_return 'test'
-            expect(subject).to eq 'http://webservicescolhomologacao.correios.com.br/ScolWeb/WebServiceScol?wsdl'
+            expect(subject).to eq 'https://apphom.correios.com.br/logisticaReversaWS/logisticaReversaService/logisticaReversaWS?wsdl'
           end
         end
 
         context 'in other environment' do
-          it 'return the production url' do
+          it 'returns the production url' do
             allow(ENV).to receive(:[]).with('GEM_ENV').and_return 'prod'
-            expect(subject).to eq 'http://webservicescol.correios.com.br/ScolWeb/WebServiceScol?wsdl'
+            expect(subject).to eq 'https://cws.correios.com.br/logisticaReversaWS/logisticaReversaService/logisticaReversaWS?wsdl'
           end
         end
 
@@ -73,6 +78,7 @@ module CorreiosSigep
             wsdl:  described_class.new.wsdl,
             open_timeout: CorreiosSigep.configuration.timeout,
             read_timeout: CorreiosSigep.configuration.timeout,
+            basic_auth: [user, pass],
             headers: { 'SOAPAction' => '' }
           }
         end

data/spec/correios_sigep/logistic_reverse/request_collect_number_spec.rb

@@ -3,25 +3,32 @@ require 'spec_helper'
 module CorreiosSigep
   module LogisticReverse
     describe RequestCollectNumber do
-      let(:logistic_reverse) { Models::LogisticReverse.new }
-      let(:request_collect)  { described_class.new logistic_reverse }
-      let(:body)             { request_fixture('collect_number_request.xml') }
+      let(:logistic_reverse)  { Models::LogisticReverse.new }
+      let(:request_collect)   { described_class.new logistic_reverse }
+      let(:body)              { request_fixture('collect_number_request.xml').chop }
+      let(:user)              { 'user' }
+      let(:pass)              { 'pass' }
 
       before do
         seed_logistic_reverse(logistic_reverse)
 
         # WSDL
-        stub_request(:get, "http://webservicescolhomologacao.correios.com.br/ScolWeb/WebServiceScol?wsdl").
-          with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
-          to_return(:status => 200, :body => correios_fixture('wsdl_test.xml'), :headers => {})
+        stub_request(:get, 'https://apphom.correios.com.br/logisticaReversaWS/logisticaReversaService/logisticaReversaWS?wsdl').
+          with(basic_auth: [user, pass]).
+          with(:headers => {
+            'Accept'=>'*/*',
+            'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+            'User-Agent'=>'Ruby'
+          }).to_return(:status => 200, :body => correios_fixture('wsdl.xml'), :headers => {})
 
         # REQUEST
-        stub_request(:post, "http://webservicescolhomologacao.correios.com.br/ScolWeb/WebServiceScol").
-         with(:body => body, :headers => { 'Accept'=>'*/*',
+        stub_request(:post, 'https://apphom.correios.com.br/logisticaReversaWS/logisticaReversaService/logisticaReversaWS').
+          with(basic_auth: [user, pass]).
+          with(:body => body, :headers => {
+            'Accept'=>'*/*',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'Content-Length'=>'2279', 'Content-Type'=>'text/xml;charset=UTF-8',
-            'Soapaction'=>'', 'User-Agent'=>'Ruby' }).
-         to_return(:status => 200, :body => correios_fixture("request_collect_number/#{response_body}"), :headers => {})
+            'User-Agent'=>'Ruby'
+          }).to_return(:status => 200, :body => correios_fixture("request_collect_number/#{response_body}"), :headers => {})
       end
 
       describe '.process' do