correios_sigep 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjFiOTcyYTk2ZDY4ZTljOGZlMzBmZDM0ODllZTMwNjg0NjBmZDAwOA==
+    ZTkyNGM5YWJjODE5MmQwZjZjZGFmMzkwMWZhZDY4NzVjYzI3OWQ0OQ==
   data.tar.gz: !binary |-
-    NmIyMWNhNzQzNzNjMmI5MzIxZGViOWI1MjVhMDg1OWVkYzgyOTk3MA==
+    Yjc4YjIzN2U4MTIxZTBjMDIwZTUwNWY0M2YwY2QwY2NmYmVhOGJjNA==
 SHA512:
   metadata.gz: !binary |-
-    MzBmZGYzNjI1ZTgyZjkwZDZjNmUzMmNkN2UyODFiMTRlZmIyM2E2ODkzMjhl
-    ZTRiMTNlZjlkMmY3NjUzYjQ2ZDU3M2FhNGUyNTA2MjhhYjdkZTQxMDBkOGFj
-    ODc1NGExM2I0NjcyOTAwMGJkYzE0ZGM2Y2VmOTNiZGQ0NjExODU=
+    YmIzOTYzYzljYjBhZWUxMmY2YTczNGY4OTJmOTMzNmY1YmRlZWRjZjdhNTQ0
+    YjZkZmExYjZlY2QyZDQ3ZThjMzU2M2Q3M2ZjZmYxYjVmMTdhNmIzNTRiY2Uz
+    NDhiMWI5MzhjZjc1NzYxMWIzYzU0NDI4M2M5MDU0ZDEwODNkY2Y=
   data.tar.gz: !binary |-
-    ZjI0ZmEzM2FiZjk2ZjRhMmI3MTM4MmRjNGJlODMyM2YxOWMwZDA5NzVmNTBi
-    ZmExOWNiMWE0NTMyZDJhOTIwMGY4ODdjOWMxYmY5MzUyMGM3MTc4Y2JiOWFk
-    ZWUzMmVmM2YxODdhNmY2MGZlNmM4ZWI4NWViMjY5MTY5YzExYzQ=
+    ZmYwOTM1MGY2ZTE4YTYyZGFmZjBiODE5NTBjYWRkMGM5ZGNkZDQyMzZlODlj
+    NzU4MDBkMzI0MTlkOGJiNmUxMmNhMGJjOGFjMmY2ZmE3YTViYjI0MjcyMjE2
+    MzFjM2M4ZDBiMzliYjhmZDI3MmM1NTdkOTIzYTBiNTg0YjQ5ZWQ=

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
 - 2.0.0
 - 2.1.1
 - 2.2.2
+- 2.3.0
 - jruby-19mode
 bundler_args: --without debug
 deploy:

data/README.md

@@ -2,6 +2,7 @@ CorreiosSigep
 =============
 
 [![Build Status](https://travis-ci.org/duduribeiro/correios_sigep.svg?branch=master)](https://travis-ci.org/duduribeiro/correios_sigep)
+[![Coverage Status](https://coveralls.io/repos/duduribeiro/correios_sigep/badge.svg?branch=master&service=github)](https://coveralls.io/github/duduribeiro/correios_sigep?branch=master)
 
 - Integrador responsável pela comunicação com o SigepWeb - http://goo.gl/z8VJjJ.
 - Excelente documentação do SigepWeb providenciada pelos Correios: http://goo.gl/6TWp2f :trollface:
@@ -83,18 +84,18 @@ Se for necessário, é possível adicionar também um proxy.
     state: 'Estado'
   })
   objects   = [
-    {
+    CorreiosSigep::Models::Object.new({
       item: 'Item',
       id: '1',
       description: 'Descricao',
       num: '',
-    },
-    {
+    }),
+    CorreiosSigep::Models::Object.new({
       item: 'Item',
       id: '2',
       description: 'Descricao',
       num: '',
-    }
+    })
   ]
 
   # Produto: pag 67 da documentação oficial dos correios

data/correios_sigep.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'savon', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
+  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'

data/lib/correios_sigep.rb

@@ -1,6 +1,15 @@
 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'

data/lib/correios_sigep/builders/collect.rb

@@ -0,0 +1,15 @@
+module CorreiosSigep
+  module Builders
+    class Collect
+      include DSL::Collect
+
+      def initialize
+        @instance = Models::Collect.new
+      end
+
+      def build
+        @instance
+      end
+    end
+  end
+end

data/lib/correios_sigep/builders/object.rb

@@ -0,0 +1,15 @@
+module CorreiosSigep
+  module Builders
+    class Object
+      include DSL::Object
+
+      def initialize
+        @instance = Models::Object.new
+      end
+
+      def build
+        @instance
+      end
+    end
+  end
+end

data/lib/correios_sigep/builders/person.rb

@@ -0,0 +1,15 @@
+module CorreiosSigep
+  module Builders
+    class Person
+      include DSL::Person
+
+      def initialize(klass)
+        @instance = klass.new
+      end
+
+      def build
+        @instance
+      end
+    end
+  end
+end

data/lib/correios_sigep/builders/product.rb

@@ -0,0 +1,15 @@
+module CorreiosSigep
+  module Builders
+    class Product
+      include DSL::Product
+
+      def initialize
+        @instance = Models::Product.new
+      end
+
+      def build
+        @instance
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module CorreiosSigep
           @builder.item  object.item
           @builder.id    object.id
           @builder.desc  object.description
-          @builder.ship  object.ship
+          @builder.entrega  object.ship
           @builder.num   object.num
         end
       end

data/lib/correios_sigep/dsl/collect.rb

@@ -0,0 +1,39 @@
+module CorreiosSigep
+  module DSL
+    module Collect
+      def self.included(_base)
+        %w(aditional_service ag ar card checklist declared_value description
+             number objects product_params type sender_params client_id).each do |property|
+          define_method(property) do |param|
+            @instance.send("#{property}=", param)
+          end
+        end
+      end
+
+      def add_object(object = nil, &block)
+        @instance.objects << if block_given?
+                               Models::Object.build(&block)
+                             else
+                               object
+                             end
+
+      end
+
+      def with_product(product = nil, &block)
+        @instance.product = if block_given?
+                              Models::Product.build(&block)
+                            else
+                              product
+                            end
+      end
+
+      def with_sender(sender = nil, &block)
+        @instance.sender = if block_given?
+                             Models::Sender.build(&block)
+                           else
+                             sender
+                           end
+      end
+    end
+  end
+end

data/lib/correios_sigep/dsl/logistic_reverse.rb

@@ -0,0 +1,13 @@
+module CorreiosSigep
+  module DSL
+    module LogisticReverse
+      def with_collect(&block)
+        self.collect = Models::Collect.build(&block)
+      end
+
+      def with_recipient(&block)
+        self.recipient = Models::Recipient.build(&block)
+      end
+    end
+  end
+end

data/lib/correios_sigep/dsl/object.rb

@@ -0,0 +1,13 @@
+module CorreiosSigep
+  module DSL
+    module Object
+      def self.included(_base)
+        %w(description id item num ship).each do |property|
+          define_method(property) do |param|
+            @instance.send("#{property}=", param)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/correios_sigep/dsl/person.rb

@@ -0,0 +1,14 @@
+module CorreiosSigep
+  module DSL
+    module Person
+      def self.included(_base)
+        %w(address area_code city complement email name neighborhood number
+           phone postal_code reference state).each do |property|
+          define_method(property) do |param|
+            @instance.send("#{property}=", param)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/correios_sigep/dsl/product.rb

@@ -0,0 +1,13 @@
+module CorreiosSigep
+  module DSL
+    module Product
+      def self.included(_base)
+        %w(code type quantity).each do |property|
+          define_method(property) do |param|
+            @instance.send("#{property}=", param)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/correios_sigep/logistic_reverse/base_client.rb

@@ -5,6 +5,8 @@ module CorreiosSigep
         options = { adapter: :net_http_persistent, proxy: CorreiosSigep.configuration.proxy, wsdl: wsdl }
         options.delete(:proxy) unless options[:proxy]
 
+        options.merge!({ headers: { 'SOAPAction' => '' }}) if ENV['GEM_ENV'] == 'test'
+
         @client = Savon.client(options)
       end
 

data/lib/correios_sigep/models/collect.rb

@@ -5,7 +5,13 @@ module CorreiosSigep
                     :declared_value, :description, :number, :objects, :product,
                     :product_params, :type, :sender, :sender_params, :client_id
 
-      def initialize(options={})
+      def self.build(&block)
+        builder = Builders::Collect.new
+        builder.instance_eval(&block)
+        builder.build
+      end
+
+      def initialize(options = {})
         @aditional_service  = options[:aditional_service]
         @ag                 = options[:ag]
         @ar                 = options[:ar]

data/lib/correios_sigep/models/logistic_reverse.rb

@@ -1,9 +1,17 @@
 module CorreiosSigep
   module Models
     class LogisticReverse
+      include DSL::LogisticReverse
+
       attr_accessor :collect, :recipient
 
-      def initialize(options={})
+      def self.build(&block)
+        instance = new
+        instance.instance_eval(&block)
+        instance
+      end
+
+      def initialize(options = {})
         @collect    = options[:collect] || Models::Collect.new
         @recipient  = options[:recipient] || Models::Recipient.new
       end
@@ -16,7 +24,6 @@ module CorreiosSigep
           end
         end
         builder.to_xml
-
       end
     end
   end

data/lib/correios_sigep/models/object.rb

@@ -3,6 +3,12 @@ module CorreiosSigep
     class Object
       attr_accessor :description, :id, :item, :num, :ship
 
+      def self.build(&block)
+        builder = Builders::Object.new
+        builder.instance_eval(&block)
+        builder.build
+      end
+
       def initialize(options={})
         @description  = options[:description]
         @id           = options[:id]

data/lib/correios_sigep/models/product.rb

@@ -3,6 +3,12 @@ module CorreiosSigep
     class Product
       attr_accessor :code, :type, :quantity
 
+      def self.build(&block)
+        builder = Builders::Product.new
+        builder.instance_eval(&block)
+        builder.build
+      end
+
       def initialize(options={})
         @code     = options[:code]
         @type     = options[:type]

data/lib/correios_sigep/models/recipient.rb

@@ -5,7 +5,13 @@ module CorreiosSigep
                     :neighborhood, :number, :phone, :postal_code, :reference,
                     :state
 
-      def initialize(options={})
+      def self.build(&block)
+        builder = Builders::Person.new(self)
+        builder.instance_eval(&block)
+        builder.build
+      end
+
+      def initialize(options = {})
         @address      = options[:address]
         @area_code    = options[:area_code]
         @city         = options[:city]
@@ -19,7 +25,6 @@ module CorreiosSigep
         @reference    = options[:reference]
         @state        = options[:state]
       end
-
     end
   end
 end

data/lib/correios_sigep/models/sender.rb

@@ -6,6 +6,12 @@ module CorreiosSigep
                     :neighborhood, :number, :phone, :postal_code, :reference,
                     :sms, :state
 
+      def self.build(&block)
+        builder = Builders::Person.new(self)
+        builder.instance_eval(&block)
+        builder.build
+      end
+
       def initialize(options={})
         @area_code        = options[:area_code]
         @address          = options[:address]

data/lib/correios_sigep/version.rb

@@ -1,3 +1,3 @@
 module CorreiosSigep
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/correios_sigep/logistic_reverse/base_client_spec.rb

@@ -12,7 +12,8 @@ module CorreiosSigep
             {
               adapter: :net_http_persistent,
               proxy: CorreiosSigep.configuration.proxy,
-              wsdl:  described_class.new.wsdl
+              wsdl:  described_class.new.wsdl,
+              headers: { 'SOAPAction' => '' }
             }
           end
 
@@ -24,7 +25,13 @@ module CorreiosSigep
 
         context 'without a proxy' do
           before { CorreiosSigep.configuration.proxy = nil }
-          let(:params) { { adapter: :net_http_persistent, wsdl: described_class.new.wsdl } }
+          let(:params) do
+            {
+              adapter: :net_http_persistent,
+              wsdl: described_class.new.wsdl,
+              headers: { 'SOAPAction' => '' }
+            }
+          end
 
           it 'initializes @client without proxy' do
             expect(Savon).to receive(:client).with(params) { true }

data/spec/correios_sigep/logistic_reverse/request_collect_number_spec.rb

@@ -13,14 +13,14 @@ module CorreiosSigep
         # 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.xml'), :headers => {})
+          to_return(:status => 200, :body => correios_fixture('wsdl_test.xml'), :headers => {})
 
         # REQUEST
         stub_request(:post, "http://webservicescolhomologacao.correios.com.br/ScolWeb/WebServiceScol").
          with(:body => body, :headers => { 'Accept'=>'*/*',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'Content-Length'=>'2267', 'Content-Type'=>'text/xml;charset=UTF-8',
-            'Soapaction'=>'"solicitarPostagemReversa"', 'User-Agent'=>'Ruby' }).
+            '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 => {})
       end
 

data/spec/correios_sigep/logistic_reverse/request_sro_spec.rb

@@ -18,7 +18,7 @@ module CorreiosSigep
          with(:body => body, :headers => { 'Accept'=>'*/*',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
             'Content-Length'=>'633', 'Content-Type'=>'text/xml;charset=UTF-8',
-            'Soapaction'=>'"acompanharPedido"', 'User-Agent'=>'Ruby' }).
+            'Soapaction'=>'', 'User-Agent'=>'Ruby' }).
          to_return(:status => 200, :body => correios_fixture("request_sro/#{response_body}"), :headers => {})
       end
 

data/spec/correios_sigep/models/logistic_reverse_spec.rb

@@ -4,6 +4,167 @@ module CorreiosSigep
       it { should respond_to :collect }
       it { should respond_to :recipient }
 
+      describe ".build" do
+        let(:recipient) do
+          CorreiosSigep::Models::Recipient.new({
+            address: 'Endereco',
+            area_code: 'DDD',
+            city: 'Cidade',
+            complement: 'Complemento',
+            email: 'Email',
+            name: 'Nome',
+            neighborhood: 'Bairro',
+            number: 'Numero',
+            phone: 'Telefone',
+            postal_code: 'CEP',
+            reference: 'Referencia',
+            state: 'Estado'
+          })
+        end
+
+        let(:sender) do
+          CorreiosSigep::Models::Sender.new({
+            address: 'Endereco',
+            area_code: 'DDD',
+            city: 'Cidade',
+            complement: 'Complemento',
+            email: 'Email',
+            name: 'Nome',
+            neighborhood: 'Bairro',
+            number: 'Numero',
+            phone: 'Telefone',
+            postal_code: 'CEP',
+            reference: 'Referencia',
+            state: 'Estado'
+          })
+        end
+
+        let(:collect) do
+          CorreiosSigep::Models::Collect.new({
+            aditional_service: '10.00',
+            ag: '5',
+            ar: '1',
+            card: '',
+            checklist: '2',
+            client_id: '102030',
+            declared_value: '1000.00',
+            description: 'Descricao',
+            number: '',
+            type: 'A'
+          })
+        end
+
+        let(:product) do
+          CorreiosSigep::Models::Product.new({
+            code: '116600403',
+            type: '0',
+            quantity: 1
+          })
+        end
+
+        subject do
+          described_class.build do
+            with_recipient do
+              address      'Endereco'
+              area_code    'DDD'
+              city         'Cidade'
+              complement   'Complemento'
+              email        'Email'
+              name         'Nome'
+              neighborhood 'Bairro'
+              number       'Numero'
+              phone        'Telefone'
+              postal_code  'CEP'
+              reference    'Referencia'
+              state        'Estado'
+            end
+
+            with_collect do
+              aditional_service '10.00'
+              ag                '5'
+              ar                '1'
+              card              ''
+              checklist         '2'
+              client_id         '102030'
+              declared_value    '1000.00'
+              description       'Descricao'
+              number            ''
+              type              'A'
+
+              with_sender do
+                address      'Endereco'
+                area_code    'DDD'
+                city         'Cidade'
+                complement   'Complemento'
+                email        'Email'
+                name         'Nome'
+                neighborhood 'Bairro'
+                number       'Numero'
+                phone        'Telefone'
+                postal_code  'CEP'
+                reference    'Referencia'
+                state        'Estado'
+              end
+
+              with_product do
+                code     '116600403'
+                type     '0'
+                quantity 1
+              end
+
+              add_object do
+                item        'Item'
+                id          '1'
+                description 'Descricao'
+                num         ''
+              end
+
+              add_object do
+                item        'Item'
+                id          '2'
+                description 'Descricao'
+                num         ''
+              end
+            end
+          end
+        end
+
+        it 'initializes with the correct recipient' do
+          %i(address area_code city complement email name neighborhood number
+             phone postal_code reference state).each do |property|
+            expect(subject.recipient.send(property)).to eq(recipient.send(property))
+          end
+        end
+
+        it 'initializes with the correct collect' do
+          %i(aditional_service ag ar card checklist declared_value description
+             number type client_id).each do |property|
+               expect(subject.collect.send(property)).to eq(collect.send(property))
+          end
+        end
+
+        it 'initializes with the correct sender' do
+          %i(address area_code city complement email name neighborhood number
+             phone postal_code reference state).each do |property|
+            expect(subject.collect.sender.send(property)).to eq(sender.send(property))
+          end
+        end
+
+        it 'initializes with the correct product' do
+          %i(code type quantity).each do |property|
+            expect(subject.collect.product.send(property)).to eq(product.send(property))
+          end
+        end
+
+        it 'initializes with the correct objects' do
+          expect(subject.collect.objects.length).to eq(2)
+          expect(subject.collect.objects.first.id).to eq('1')
+          expect(subject.collect.objects.first.item).to eq('Item')
+          expect(subject.collect.objects.first.description).to eq('Descricao')
+          expect(subject.collect.objects.last.id).to eq('2')
+        end
+      end
+
       describe '#initialize' do
         let(:logistic_reverse) { described_class.new params }