pombo 1.0.0.beta → 1.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e35c41bc810a96a4517c2a1bd0cf2dfaafb47ad5
-  data.tar.gz: 6b15a04c6ce1c138e5572bdc11d6a556d9eca58a
+  metadata.gz: cd144d6e1e25eb82dd55c488cd80f16a1c2f874b
+  data.tar.gz: 57544b7c52580cfed848aaeed9c8875f4139b8ad
 SHA512:
-  metadata.gz: 4e1bb9beb588c8bf1e31e8bcab2f4dfb124df2131f1f0d7ffcc7820260dae14badfaefb144db649c41ff9cea2908a545a6adebf7f40624d657871133497e6946
-  data.tar.gz: 6a2de9baa6b927b97180a6e6a8e8a3f9f5e70470681be718a3872e2d247f3e0e79e007eec0a388b97b58cb8c153dc7d931bb4b53747d3430b5b58f76b8db2627
+  metadata.gz: 864dcbc1efce094de63fef6e5c89e3db5f428bcb4232cd525ec9cc603ba14878ca7ec9872bc7ec916fcda8204ac06738447bb088738b79cf93c457dcd9c13fa0
+  data.tar.gz: 3cb3a7a1dc2092e82664c2fbaad5b6bc613f18c4b42a15ee405c0dd4e3baf51dbf5704c53a2e95e848ab1d5c3037bcfcd995be3a2e41b6d8241a86c1fe37729b

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
   - 2.3.0
-  - 2.1.2
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -1,5 +1,5 @@
 > ***
-> Attention! if you are looking for documentation in English, [click here!](readmes/README-EN.md)
+> Attention! It is strongly advised not to use this version in production
 > ***
 
 # Pombo
@@ -8,226 +8,38 @@
 [![Inline docs](http://inch-ci.org/github/adenaecommerce/pombo.svg?branch=master)](http://inch-ci.org/github/adenaecommerce/pombo)
 [![Hex.pm](https://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/adenaecommerce/pombo/master)
 [![Gem Version](https://badge.fury.io/rb/pombo.svg)](https://badge.fury.io/rb/pombo)
-[![Code Climate](https://codeclimate.com/github/adenaecommerce/pombo/badges/gpa.svg)](https://codeclimate.com/github/adenaecommerce/pombo)
 
-Pombo é uma gem que permite a utilização do webervice dos [Correios](http://correios.com.br/para-voce) para consulta de informacões
-de envio de encomendas
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/pombo`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-## Funcionalidades
+TODO: Delete this and the text above, and describe your gem
 
-* Permite montar um pacote com vários itens
-* Permite consultar o valor do transporte de um pacote
-* Permite consultar o prazo de envio de um pacote
-* Permite consultar o valor e o prazo de envio de um pacote
-* Suporta Internacionalização
-* Aceita um logger compatível com a interface do [Log4r](http://log4r.rubyforge.org/index.html)
+## Installation
 
-## Instalação
-
-    $ gem install pombo
-
-ou adiciona essa linha no seu Gemfile
-
-```ruby
-gem 'pombo', '~> 1.0.0.beta'
-```
-
-e
-
-    $ bundle install
-
-
-## Configuração
-
-> Os dados retornados ao realizar uma consulta são os mesmos fornecidos em uma agência dos Correios. As empresas
-> podem contratar um serviço diferenciado e usar o código do seu contrato ao utilizar o Pombo.
-
-Para alterar as configurações padrão, utilize o `#setup`
-
-```ruby
-Pombo.setup do |config|
-  config.contract_code = 'AA99BB'
-  config.password = '999999'
-  config.extends_delivery = 0
-  config.request_timeout = 5
-  config.log_level = Pombo::Logger::INFO
-  config.logger = Pombo::Logger.new(STDOUT)
-  config.locale = 'pt-BR'
-end
-```
-
-Se você precisar modificar qualquer configuração em um determinado momento, use o `#set`
-
-```ruby
-Pombo.set request_timeout: 10, locale: 'en'
-```
-
-> O `#set` não modifica as configurações default
-
-## Formatos
-
-Os formatos são objetos pré-definidos com informações fornecidas pelos Correios
-Os Correios trabalha com os seguintes formatos: caixa, envelope e rolo. Todo item deve possuir um formato.
-
-O formato do pacote é informado conforme os itens adicionado. Para mais de dois itens prevalece o formato caixa.
-
-Listar todos os formatos suportados pelos serviços de entrega
-
-```ruby
-Pombo::Package::Format.all
-
-# => [
-# =>    #<OpenStruct code=3, name="Envelope", max_length=60, min_length=16, max_width=60, min_width=11, max_weight=1>
-# =>    ....
-# => ]
-```
-
-Encontrar um formato específico pelo código ou pelo nome
-
-```ruby
-Pombo::Package::Format.find '3'
-# => #<OpenStruct code=3, name="Envelope", max_length=60, min_length=16, max_width=60, min_width=11, max_weight=1>
-
-# ou
-
-Pombo::Package::Format.find 'envelope'
-# => #<OpenStruct code=3, name="Envelope", max_length=60, min_length=16, max_width=60, min_width=11, max_weight=1>
-```
-
-## Serviços
-
-Os serviços são objetos pré-definidos com informações fornecidas pelos Correios. Para saber mais [clique aqui](http://www.correios.com.br/para-voce/envio/encomendas/encomendas)
-
-Listar todos os serviços de entrega suportados pelos Correios.
-
-```ruby
-Pombo::Services.all
-
-# => [
-# =>    #<OpenStruct code="41106", max_weight=30, name="PAC", description="PAC (sem contrato)">,
-# =>    ....
-# => ]
-```
-
-Listar todos os serviços de um grupo.
-
-```ruby
-Pombo::Services.all :pac
-# => [
-# =>    #<OpenStruct code="41106", max_weight=30, name="PAC", description="PAC (sem contrato)">,
-# =>    ....
-# => ]
-```
-
-Encontrar um serviço pelo seu código.
-
-```ruby
-Pombo::Services.find "41106"
-# => #<OpenStruct code="41106", max_weight=30, name="PAC", description="PAC (sem contrato)">
-```
-
-## Pacotes
-
-Os pacotes são os objetos enviados ao webservice para que seja realizada a consulta. Ele é composto por vários
-items, o CEP de origem e o CEP de destino e alguns serviços opcionais, [veja aqui](https://www.correios.com.br/para-voce/envio/encomendas/servicos-opcionais)
-
-Criando um pacote:
+Add this line to your application's Gemfile:
 
 ```ruby
-package = Pombo::Package.new ({
-  destination_zip_code: '29160565',
-  origin_zip_code: '29108046',
-  services: "40010",
-  in_hand: false,
-  delivery_notice: false
-})
-# => <Pombo::Package:0x007fcfd32080f0 @items=[], @length=0, @height=0, @width=0, @declared_value=0, @destination_zip_code="29160565", @origin_zip_code="29108046">
+gem 'pombo'
 ```
 
-> Pode ser informador um array de serviços para realizar a consulta em vários serviços.
-> `Pombo::Package.new services: ["40010", "41068", "40568"]`
+And then execute:
 
-Adicionando items:
+    $ bundle
 
-```ruby
-item = Pombo::Package::Item.new weight: 10, length: 17, height: 22, width: 22
-package.add_item item
-```
-
-ou pode ser informado um hash
-
-```ruby
-package.add_item weight: 10, length: 15, height: 5, width: 10
-```
-
-Agora podemos obter várias informações
-
-```ruby
-package.in_hand? # => false
-package.delivery_notice? # => false
-package.weight # => 10
-package.diameter # => 0
-package.format # => 1
-package.volume # => 8228.0
-package.single_item? # => true
-```
+Or install it yourself as:
 
-## Utilizando o Pombo
-
-Para realizar uma consulta para saber o valor e o prazo de entrega
-
-```ruby
-Pombo.shipping package
-# =>  [
-# =>    [0] #<Pombo::Webservice::CPP::Service:0x007fae1cd9d1a0 @code="40010", @value=31.3, @delivery_time="1", @value_in_hand=0.0, @value_delivery_notice=0.0, @value_declared_value=0.0, @error_code="0", @value_without_additions=31.3, @delivery_home=true, @delivery_sartuday=true>
-# =>  ]
-```
-
-Para realizar uma consulta para saber o prazo de entrega
-
-```ruby
-Pombo.delivery_time package
-# =>  [
-# =>    [0] #<Pombo::Webservice::CPP::Service:0x007fae1da0b040 @code="40010", @delivery_time="1", @delivery_home=true, @delivery_sartuday=true>
-# =>  ]
-```
-
-Para realizar uma consulta para saber o valor da entrega
-
-```ruby
-Pombo.shipping_value package
-# =>  [
-# =>    [0] #<Pombo::Webservice::CPP::Service:0x007fae1d1cb740 @code="40010", @value=31.3, @value_in_hand=0.0, @value_delivery_notice=0.0, @value_declared_value=0.0, @value_without_additions=31.3>
-# =>  ]
-```
-
-## Log
-
-Pombo aceita qualquer sistema de logger compatível com a interface do [Log4r](http://log4r.rubyforge.org/index.html).
-
-Temos nosso próprio objeto de logger, `Pombo::Logger`, que por padrão envia as mensagens para a `STDOUT` do sistema e o nível é INFO.
+    $ gem install pombo
 
-```ruby
-Pombo.logger.info('event.namespace'){ 'Any error message' }
-# => 2016-05-13 15:15:49 -0300 | POMBO | event.namespace | INFO: Any error message
-```
+## Usage
 
-Para gravar em arquivo, você pode fazer algo parecido com isso:
+TODO: Write usage instructions here
 
-```ruby
-Pombo.setup do |config|
-  config.log_level = Pombo::Logger::INFO
-  config.logger = Pombo::Logger.new('caminho do arquivo')
-end
-```
+## Development
 
-## Como contribuir
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-Pombo é mantido pela time de desenvolvimento da [Adena E-commerce Platform](http://www.adena.com.br/).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-Relatórios de Bugs e pull requests são bem vindos no GitHub em https://github.com/adenaecommerce/pombo.
-Você pode nos enviar a sua colaboração, mas deve aderir ao código de conduta [Contributor Covenant](http://contributor-covenant.org).
+## Contributing
 
-## Licença
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pombo. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-MIT License. Veja o arquivo MIT-LICENSE.

data/lib/pombo/configuration.rb

@@ -1,59 +1,36 @@
 module Pombo
-  # It allows you to modify the settings of Pombo
-  # @!attribute [rw] contract_code
-  #   Its administrative code by the ECT
-  # @!attribute [rw] password
-  #   Password to access the service, associated with its contract code
-  # @!attribute [rw] extends_delivery
-  #   Days late on a package
-  # @!attribute [rw] request_timeout
-  #   Second delay when accessing the webservice
-  # @!attribute [rw] log_level
-  #   Level compatible with Ruby Logger
-  # @!attribute [rw] logger
-  #   Object to trigger messages (defaults to +Pombo::Logger+)
-  # @!attribute [rw] locale
-  #   Tells you what language will be used (defaults to `pt-BR`)
   class Configuration
     @@default = {
       contract_code: nil,
       password: nil,
       extends_delivery: 0,
-      log_level: Pombo::Logger::INFO,
-      logger: Pombo::Logger.new(STDOUT),
-      request_timeout: 5,
-      locale: 'pt-BR'
+      log_level: :info,
+      logger: :logger,
+      request_timeout: 5
     }
 
-    attr_accessor :contract_code, :password, :extends_delivery, :log_level, :logger, :request_timeout, :locale
+    attr_accessor :contract_code, :password, :extends_delivery, :log_level, :logger, :request_timeout
 
     def initialize(**args)
       args = @@default.merge(args)
       args.each { |key, value| __send__("#{ key }=", value) }
-
-      logger.level = log_level
     end
 
     # Saves the current state of the standard as an object
-    # @return [Pombo::Configuration] with default settings
+    # @return [Hash] The new default settings
     def set_default
       attributes = {}
       instance_variables.each{ |v| attributes[v.to_s.delete('@').to_sym] = instance_variable_get(v) }
       @@default.merge!(attributes)
-      Pombo.logger.info('update.configuration'){ 'Update the default settings' }
-      self
     end
 
     # Inform settings for persisting with default
-    # @param [Proc] with the configuration data.
-    # @return [Pombo::Configuration] the updated settings
-    # @raise [Pombo::ConfigurationError] if not passed a block
+    # @see Pombo.setup
     def self.setup(&block)
       if block_given?
         config = new
         block.call config
         config.set_default
-        self
       else
         raise Pombo::ConfigurationError, 'expected block the .setup'
       end

data/lib/pombo/exception.rb

@@ -1,16 +1,7 @@
 module Pombo
-  # Generic exception
-  class Error < StandardError
-    def initializer(msg = nil)
-      super
+  class Error < StandardError; end
 
-      Pombo.logger.error('exception.pombo') { msg }
-    end
-  end
-
-  # Exception triggered to manage settings
   class ConfigurationError < Pombo::Error; end
 
-  # Exception triggered when managing the webservice
   class WebserviceError < Pombo::Error; end
 end

data/lib/pombo/package/format.rb

@@ -1,44 +1,24 @@
 module Pombo
   class Package
-    # The formats are pre-defined objects with the information provided by the Correios
     module Format
-      # List all formats supported by delivery services
-      # @return [Array<OpenStruct>] with the data structure representing a format
-      #
-      # @example
-      #     Pombo::Package::Format.all
-      #     # => [
-      #     # =>    #<OpenStruct code=3, name="Envelope", max_length=60, min_length=16, max_width=60, min_width=11, max_weight=1>
-      #     # =>    ....
-      #     # => ]
-      #
+      @@all_formats = {
+        '1' => OpenStruct.new(code: 1, name: 'Caixa/Pacote', max_length: 105, min_length: 16, max_height: 105, min_height: 2, max_width: 105, min_width: 11, max_dimension: 200),
+        '2' => OpenStruct.new(code: 2, name: 'Rolo/Prisma', max_length: 105, min_length: 18, max_diameter: 91, min_diameter: 5, max_dimension: 200),
+        '3' => OpenStruct.new(code: 3, name: 'Envelope', max_length: 60, min_length: 16, max_width: 60, min_width: 11, max_weight: 1),
+      }
+
       def self.all
-        [
-          OpenStruct.new(code: 1, name: Pombo.t('formats.1'), max_length: 105, min_length: 16, max_height: 105, min_height: 2, max_width: 105, min_width: 11, max_dimension: 200),
-          OpenStruct.new(code: 2, name: Pombo.t('formats.2'), max_length: 105, min_length: 18, max_diameter: 91, min_diameter: 5, max_dimension: 200),
-          OpenStruct.new(code: 3, name: Pombo.t('formats.3'), max_length: 60, min_length: 16, max_width: 60, min_width: 11, max_weight: 1),
-        ]
+        @@all_formats.values
       end
 
-      # Find a specific format by code or by name
-      # @return [OpenStruct] the data structure representing a format
-      # @param code [String] code or the format name, to box `1, box or package`, to roll `2, roll or prism` and to envelope `3 or envelope`
-      # @example
-      #     Pombo::Package::Format.find '3'
-      #     # => #<OpenStruct code=3, name="Envelope", max_length=60, min_length=16, max_width=60, min_width=11, max_weight=1>
-      #
-      #     # => Or
-      #
-      #     Pombo::Package::Format.find 'envelope'
-      #     # => #<OpenStruct code=3, name="Envelope", max_length=60, min_length=16, max_width=60, min_width=11, max_weight=1>
       def self.find(code)
         case code.to_s
         when '1', 'box', 'package'
-          all[0]
+          @@all_formats.values_at('1').first
         when '2', 'roll', 'prism'
-          all[1]
+          @@all_formats.values_at('2').first
         when '3', 'envelope'
-          all[2]
+          @@all_formats.values_at('3').first
         end
       end
     end

data/lib/pombo/package/item.rb

@@ -1,7 +1,4 @@
 module Pombo
-  # Item is the object that will be sent in the package through the Brazilian Post Service
-  #
-  # By default the quantity is 1 and the format is +Pombo::Package::Format.find(:box).code+
   class Package::Item
     attr_accessor :weight, :length, :height, :width, :diameter, :quantity, :format
 
@@ -10,8 +7,6 @@ module Pombo
       args.each { |key, value| __send__("#{ key }=", value) }
     end
 
-    # Calculates the volume item in accordance with the format
-    # @return [Float] the volume value
     def volume
       case format
       when Pombo::Package::Format.find(:box).code

data/lib/pombo/package.rb

@@ -1,25 +1,4 @@
 module Pombo
-  # This is the composite package of items that will be sent
-  #
-  # @example
-  #   package = Pombo::Package.new ({
-  #     destination_zip_code: '29999000',
-  #     origin_zip_code: '28888000',
-  #     services: "40010",
-  #     in_hand: false,
-  #     delivery_notice: false
-  #   })
-  #   # => <Pombo::Package:0x007fcfd32080f0 @items=[], @length=0, @height=0, @width=0, @declared_value=0, @destination_zip_code="29999000", @origin_zip_code="28888000">
-  #
-  #   package.add_item weight: 5, length: 4, height: 3, width: 5, diameter: 0
-  #   package.add_item weight: 4, length: 10, height: 5, width: 5, diameter: 5, format: Pombo::Package::Format.find(:roll).code
-  #   package.in_hand? # => false
-  #   package.delivery_notice? # => false
-  #   package.weight # => 9
-  #   package.diameter # => 0
-  #   package.format # => 1
-  #   package.volume # => 158.17000000000002
-  #   package.single_item? # => false
   class Package
     attr_accessor :destination_zip_code, :origin_zip_code, :declared_value
     attr_reader :items, :length, :height, :width, :services
@@ -30,10 +9,6 @@ module Pombo
       args.each { |key, value| __send__("#{ key }=", value) }
     end
 
-    # @!method in_hand?
-    #   Informs you are contracted delivery in hand service
-    # @!method delivery_notice?
-    #   Informs you are contracted delivery notice service
     %i[in_hand delivery_notice].each do |method|
       define_method("#{ method }?"){ instance_variable_get "@#{ method }" }
     end
@@ -50,58 +25,40 @@ module Pombo
       end
     end
 
-    # The services used to send the package
-    # @return [Array<String>] codes services
     def services=(services)
       @services = services.kind_of?(Array) ? services : [services]
     end
 
-    # It allows you to add an item to the package
-    # @return [Pombo::Package::Item] the added item
-    #
-    # @example
-    #   item = Pombo::Package::Item.new weight: 5, length: 4, height: 3, width: 5, diameter: 0
-    #   package.add_item item
-    #
-    #   # => or
-    #
-    #   package.add_item weight: 5, length: 4, height: 3, width: 5, diameter: 0
     def add_item(item = nil, **args)
       item = if item.kind_of?(Pombo::Package::Item)
-               item
-             else
-               Pombo::Package::Item.new(args)
-             end
+                  item
+                else
+                  Pombo::Package::Item.new(args)
+                end
 
       @items << item
       update_measures
       item
     end
 
-    # @return [Float] the total weight of the items
     def weight
       @items.inject(0) { |sum, item| sum += item.weight }
     end
 
-    # @return [Float] the total diameter of the items
     def diameter
       return @items.first.diameter if single_item? && format == Pombo::Package::Format.find(:roll).code
       0
     end
 
-    # @return [Fixnum] the code of the packet format
-    #   For packages with more than one item format will be 1 (:box)
     def format
       return @items.first.format if single_item?
       Pombo::Package::Format.find(:box).code
     end
 
-    # @return [Float] the total volume of the items
     def volume
       @items.inject(0) { |sum, item| sum += item.volume }
     end
 
-    # @return [Boolean] tells if the package contains only one item
     def single_item?
       @items.size == 1 && @items.first.quantity == 1
     end
@@ -109,12 +66,7 @@ module Pombo
     private
 
     def update_measures
-      if single_item?
-        item = @items.first
-        @length, @height, @width = item.length, item.height, item.width
-      else
-        @length = @height = @width = Math.cbrt volume
-      end
+      @length = @height = @width = Math.cbrt volume
     end
   end
 end

data/lib/pombo/services.rb

@@ -1,88 +1,52 @@
 require 'ostruct'
 
 module Pombo
-  # Contains delivery services
   module Services
-    # List all services supported
-    # @param service [Symbol] group services, `:pac`, `sedex` or `e_sedex`
-    # @return [Array<OpenStruct>] with the data structure representing a service
-    #
-    # @example
-    #     Pombo::Services.all
-    #     # => [
-    #     # =>    #<OpenStruct code="41106", max_weight=30, name="PAC", description="PAC (without contract)">,
-    #     # =>    ....
-    #     # => ]
-    #
-    # Listing all the services of a group
-    #
-    # @example
-    #     Pombo::Services.all :pac
-    #     # => [
-    #     # =>    #<OpenStruct code="41106", max_weight=30, name="PAC", description="PAC (without contract)">,
-    #     # =>    ....
-    #     # => ]
-    #
+    @@all_pac = {
+      "41106" => OpenStruct.new(code: "41106", max_weight: 30, name: 'PAC', description: 'PAC (sem contrato)'),
+      "41068" => OpenStruct.new(code: "41068", max_weight: 50, name: 'PAC', description: 'PAC (com contrato)'),
+      "41300" => OpenStruct.new(code: "41300", max_weight: 600, name: 'PAC GF', description: 'PAC (grandes formatos)')
+    }
+
+    @@all_sedex = {
+      "40010" => OpenStruct.new(code: "40010", max_weight: 30, name: 'SEDEX', description: 'SEDEX (sem contrato)'),
+      "40045" => OpenStruct.new(code: "40045", max_weight: 30, name: 'SEDEX a cobrar', description: 'SEDEX a cobrar (sem contrato)'),
+      "40126" => OpenStruct.new(code: "40126", max_weight: 30, name: 'SEDEX a cobrar', description: 'SEDEX a cobrar (com contrato)'),
+      "40215" => OpenStruct.new(code: "40215", max_weight: 10, name: 'SEDEX 10', description: 'SEDEX 10 (sem contrato)'),
+      "40290" => OpenStruct.new(code: "40290", max_weight: 10, name: 'SEDEX hoje', description: 'SEDEX hoje (sem contrato)'),
+      "40096" => OpenStruct.new(code: "40096", max_weight: 30, name: 'SEDEX', description: 'SEDEX (com contrato)'),
+      "40436" => OpenStruct.new(code: "40436", max_weight: 30, name: 'SEDEX', description: 'SEDEX (com contrato)'),
+      "40444" => OpenStruct.new(code: "40444", max_weight: 30, name: 'SEDEX', description: 'SEDEX (com contrato)'),
+      "40568" => OpenStruct.new(code: "40568", max_weight: 30, name: 'SEDEX', description: 'SEDEX (com contrato)'),
+      "40606" => OpenStruct.new(code: "40606", max_weight: 30, name: 'SEDEX', description: 'SEDEX (com contrato)')
+    }
+
+    @@all_e_sedex = {
+      "81019" => OpenStruct.new(code: "81019", max_weight: 15, name: 'E-SEDEX', description: 'E-SEDEX (com contrato)'),
+      "81027" => OpenStruct.new(code: "81027", max_weight: 15, name: 'E-SEDEX', description: 'E-SEDEX Prioritário (com contrato)'),
+      "81035" => OpenStruct.new(code: "81035", max_weight: 15, name: 'E-SEDEX', description: 'E-SEDEX Express (com contrato)'),
+      "81868" => OpenStruct.new(code: "81868", max_weight: 15, name: 'E-SEDEX', description: 'E-SEDEX (com contrato, grupo 1)'),
+      "81833" => OpenStruct.new(code: "81833", max_weight: 15, name: 'E-SEDEX', description: 'E-SEDEX (com contrato, grupo 2)'),
+      "81850" => OpenStruct.new(code: "81850", max_weight: 15, name: 'E-SEDEX', description: 'E-SEDEX (com contrato, grupo 3)')
+    }
+
+    @@all_services = @@all_pac.merge(@@all_sedex).merge(@@all_e_sedex)
+
     def self.all(service = nil)
       case service
       when :pac
-        all_pac.values
+        @@all_pac.values
       when :sedex
-        all_sedex.values
+        @@all_sedex.values
       when :e_sedex
-        all_e_sedex.values
+        @@all_e_sedex.values
       else
-        all_pac.values + all_sedex.values + all_e_sedex.values
+        @@all_pac.values + @@all_sedex.values + @@all_e_sedex.values
       end
     end
 
-    # Search for a service code
-    # @return [OpenStruct] the data structure representing a service
-    # @example
-    #     Pombo::Services.find "41106"
-    #     # => #<OpenStruct code="41106", max_weight=30, name="PAC", description="PAC (without contract)">
     def self.find(code)
-      all_services.values_at(code).first
-    end
-
-    private
-
-    def self.all_pac
-      {
-        "41106" => OpenStruct.new(code: "41106", max_weight: 30, name: 'PAC', description: Pombo.t('services.pac.41106')),
-        "41068" => OpenStruct.new(code: "41068", max_weight: 50, name: 'PAC', description: Pombo.t('services.pac.41068')),
-        "41300" => OpenStruct.new(code: "41300", max_weight: 600, name: 'PAC GF', description: Pombo.t('services.pac.41300'))
-      }
-    end
-
-    def self.all_sedex
-      {
-        "40010" => OpenStruct.new(code: "40010", max_weight: 30, name: 'SEDEX', description: Pombo.t('services.sedex.40010')),
-        "40045" => OpenStruct.new(code: "40045", max_weight: 30, name: 'SEDEX a cobrar', description: Pombo.t('services.sedex.40045')),
-        "40126" => OpenStruct.new(code: "40126", max_weight: 30, name: 'SEDEX a cobrar', description: Pombo.t('services.sedex.40126')),
-        "40215" => OpenStruct.new(code: "40215", max_weight: 10, name: 'SEDEX 10', description: Pombo.t('services.sedex.40215')),
-        "40290" => OpenStruct.new(code: "40290", max_weight: 10, name: 'SEDEX hoje', description: Pombo.t('services.sedex.40290')),
-        "40096" => OpenStruct.new(code: "40096", max_weight: 30, name: 'SEDEX', description: Pombo.t('services.sedex.40096')),
-        "40436" => OpenStruct.new(code: "40436", max_weight: 30, name: 'SEDEX', description: Pombo.t('services.sedex.40436')),
-        "40444" => OpenStruct.new(code: "40444", max_weight: 30, name: 'SEDEX', description: Pombo.t('services.sedex.40444')),
-        "40568" => OpenStruct.new(code: "40568", max_weight: 30, name: 'SEDEX', description: Pombo.t('services.sedex.40568')),
-        "40606" => OpenStruct.new(code: "40606", max_weight: 30, name: 'SEDEX', description: Pombo.t('services.sedex.40606'))
-      }
-    end
-
-    def self.all_e_sedex
-      {
-        "81019" => OpenStruct.new(code: "81019", max_weight: 15, name: 'E-SEDEX', description: Pombo.t('services.e_sedex.81019')),
-        "81027" => OpenStruct.new(code: "81027", max_weight: 15, name: 'E-SEDEX', description: Pombo.t('services.e_sedex.81027')),
-        "81035" => OpenStruct.new(code: "81035", max_weight: 15, name: 'E-SEDEX', description: Pombo.t('services.e_sedex.81035')),
-        "81868" => OpenStruct.new(code: "81868", max_weight: 15, name: 'E-SEDEX', description: Pombo.t('services.e_sedex.81868')),
-        "81833" => OpenStruct.new(code: "81833", max_weight: 15, name: 'E-SEDEX', description: Pombo.t('services.e_sedex.81833')),
-        "81850" => OpenStruct.new(code: "81850", max_weight: 15, name: 'E-SEDEX', description: Pombo.t('services.e_sedex.81850'))
-      }
-    end
-
-    def self.all_services
-      all_pac.merge(all_sedex).merge(all_e_sedex)
+     @@all_services.values_at(code).first
     end
   end
 end