pombo 1.0.0.beta → 1.0.0.pre.alpha

data/lib/pombo/support.rb

@@ -1,26 +1,13 @@
 module Pombo
-  # Generic methods
   module Support
     TRUE_VALUES  = [true, 1, '1', 't', 'T', 'true', 'TRUE']
     FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE']
 
-    # Convert the string of Brazilian currency to float
-    # @return [String] the converted string pattern R$ (unit brazilian) to pattern Float.
-    # @raise [TypeError] if the value is not a String
-    # @example
-    #   Pombo::Support.str_real_to_float('2,00')
-    #   # => '2.00'
     def self.str_real_to_float(value)
       raise TypeError, "no implicit conversion of #{ value.class.name } into String" unless value.kind_of? String
-      value.tr(',','.').to_f
+      value.gsub(',','.').to_f
     end
 
-    # Used to convert Boolean values to String
-    # @param [Boolean] the value to be converted
-    # @return [String] the string representation of a boolean. 'S' to +true+ and 'N' to +false+
-    # @example
-    #   Pombo::Support.boolean_to_string(true)
-    #   # => 'S'
     def self.boolean_to_string(value)
       value ? 'S' : 'N'
     end

data/lib/pombo/version.rb

@@ -1,3 +1,3 @@
 module Pombo
-  VERSION = "1.0.0.beta"
+  VERSION = "1.0.0.pre.alpha"
 end

data/lib/pombo/webservice/base.rb

@@ -3,12 +3,9 @@ require 'net/http'
 
 module Pombo
   module Webservice
-    # Class contains the base to make requests
-    # @abstract
     class Base
 
       def self.get(url, request = nil)
-        Pombo.logger.info('start_request.webservice') { "GET - #{ url }" }
         uri = URI.parse url
         uri.query = request.to_param unless request.nil?
         http_request = Net::HTTP::Get.new uri
@@ -25,9 +22,7 @@ module Pombo
         http = Net::HTTP.new host, port
         #http.set_debug_output($stdout)
         http.open_timeout = Pombo.configurations.request_timeout
-        response = http.request(http_request)
-        Pombo.logger.info('end_request.webservice') { response.inspect }
-        response
+        http.request(http_request)
       end
     end
   end

data/lib/pombo/webservice/cpp/base_request.rb

@@ -3,15 +3,12 @@ require 'uri'
 module Pombo
   module Webservice
     class CPP
-      # Class to create the requests for services
-      # @abstract
       class BaseRequest
 
         def initialize(package)
           @package = package
         end
 
-        # Encodes the request for http format
         def to_param
           URI.encode_www_form to_hash
         end

data/lib/pombo/webservice/cpp/delivery_time_request.rb

@@ -3,9 +3,8 @@ require 'uri'
 module Pombo
   module Webservice
     class CPP
-      # Request for delivery time service
       class DeliveryTimeRequest < BaseRequest
-        # Convert the object to the format accepted in webservice Correios
+
         def to_hash
           {
             nCdServico: @package.services.join(','),

data/lib/pombo/webservice/cpp/response.rb

@@ -2,22 +2,18 @@ require 'sax-machine'
 
 module Pombo
   module Webservice
-    # Class representing the webservice for consulting services
     class CPP
-      # Performs the parse of the server response
       class ParseService
         include SAXMachine
-        elements :cServico, as: :services, class: Pombo::Webservice::CPP::ServiceResponse
+        elements :cServico, as: :services, class: Pombo::Webservice::CPP::Service
       end
 
-      # Comes the response from the server
       class Response
+
         def initialize(http_response)
           @http_response = http_response
         end
 
-        # Contains services found
-        # @return [Array<Pombo::Webservice::CPP::ServiceResponse>] the services found
         def body
           response = Pombo::Webservice::CPP::ParseService.parse @http_response.body
           response.services

data/lib/pombo/webservice/cpp/{service_response.rb → service.rb}

@@ -3,8 +3,7 @@ require 'sax-machine'
 module Pombo
   module Webservice
     class CPP
-      # Response standard for service delivery
-      class ServiceResponse
+      class Service
         include SAXMachine
 
         element :Codigo, as: :code
@@ -30,10 +29,8 @@ module Pombo
         element :EntregaSabado, as: :delivery_sartuday do |value|
           value == 'S'
         end
-        element :Erro, as: :error_code, default: '0'
-        element :MsgErro, as: :error_message do
-          Pombo.t "webservices.cpp.errors.#{ error_code }"
-        end
+        element :Erro, as: :error_code
+        element :MsgErro, as: :error_message
         element :obsFim, as: :comments
       end
     end

data/lib/pombo/webservice/cpp/shipping_request.rb

@@ -3,10 +3,8 @@ require 'uri'
 module Pombo
   module Webservice
     class CPP
-      # Request for shipping service
       class ShippingRequest < BaseRequest
 
-        # Convert the object to the format accepted in webservice Correios
         def to_hash
           {
             nCdEmpresa: Pombo.configurations.contract_code.to_s,

data/lib/pombo/webservice/cpp/shipping_value_request.rb

@@ -1,8 +1,29 @@
+require 'uri'
+
 module Pombo
   module Webservice
     class CPP
-      # Request for shipping value service
-      class ShippingValueRequest < ShippingRequest
+      class ShippingValueRequest < BaseRequest
+
+        def to_hash
+          {
+            nCdEmpresa: Pombo.configurations.contract_code.to_s,
+            sDsSenha: Pombo.configurations.password.to_s,
+            nCdServico: @package.services.join(','),
+            sCepOrigem: @package.origin_zip_code,
+            sCepDestino: @package.destination_zip_code,
+            nVlPeso: @package.weight,
+            nCdFormato: @package.format,
+            nVlComprimento: @package.length,
+            nVlAltura: @package.height,
+            nVlLargura: @package.width,
+            nVlDiametro: @package.diameter,
+            sCdMaoPropria: Pombo::Support.boolean_to_string(@package.in_hand?),
+            nVlValorDeclarado: @package.declared_value,
+            sCdAvisoRecebimento: Pombo::Support.boolean_to_string(@package.delivery_notice?)
+          }
+        end
+
       end
     end
   end

data/lib/pombo/webservice/cpp.rb

@@ -7,21 +7,20 @@ module Pombo
       URL      = "#{ PROTOCOL }://#{ HOST }/calculador/CalcPrecoPrazo.asmx"
 
       def self.shipping(package)
-        resource "#{ URL }/CalcPrecoPrazo", ShippingRequest.new(package)
+        url = "#{ URL }/CalcPrecoPrazo"
+        response = Response.new get(url, ShippingRequest.new(package))
+        response.body
       end
 
       def self.delivery_time(package)
-        resource "#{ URL }/CalcPrazo", DeliveryTimeRequest.new(package)
+        url = "#{ URL }/CalcPrazo"
+        response = Response.new get(url, DeliveryTimeRequest.new(package))
+        response.body
       end
 
       def self.shipping_value(package)
-        resource "#{ URL }/CalcPreco", ShippingValueRequest.new(package)
-      end
-
-      private
-
-      def self.resource(url, request)
-        response = Response.new get(url, request)
+        url = "#{ URL }/CalcPreco"
+        response = Response.new get(url, ShippingValueRequest.new(package))
         response.body
       end
     end

data/lib/pombo/webservice.rb

@@ -1,5 +1,4 @@
 module Pombo
-  # Namespace for webservices
   module Webservice
   end
 end

data/lib/pombo.rb

@@ -1,8 +1,4 @@
-require 'i18n'
-I18n.load_path += Dir[File.expand_path('../../locales/*.yml', __FILE__)]
-
 require 'pombo/version'
-require 'pombo/logger'
 require 'pombo/configuration'
 require 'pombo/exception'
 require 'pombo/support'
@@ -12,26 +8,39 @@ require 'pombo/package/item'
 require 'pombo/package/format'
 require 'pombo/webservice/base'
 require 'pombo/webservice/cpp'
-require 'pombo/webservice/cpp/service_response'
+require 'pombo/webservice/cpp/service'
 require 'pombo/webservice/cpp/response'
 require 'pombo/webservice/cpp/base_request'
 require 'pombo/webservice/cpp/shipping_request'
 require 'pombo/webservice/cpp/shipping_value_request'
 require 'pombo/webservice/cpp/delivery_time_request'
 
-# It allows you to configure and perform consulting delivery services
-#
-# For more information read the file {file:/readmes/README-EN.md}
 module Pombo
   # Inform settings for persisting with default
-  # @yield [config] with the configuration data.
-  # @return [Pombo::Configuration] with default settings
+  # @yield [config] with the configuration data
+  # @option config [String]  :contract_code Its administrative code by the ECT
+  # @option config [String]  :password Password to access the service, associated with its contract code
+  # @option config [Integer] :extends_delivery Days late on a package
+  # @option config [Integer] :request_timeout Second delay when accessing the webservice
+  # @option config [Symbol]  :log_level Log Level, `:info`, `:debug` or `warn`
+  # @option config [Symbol]  :logger object to trigger messages (defaults to `:logger`)
+  #
+  # @example
+  #   Pombo.setup do |config|
+  #     config.contract_code = 'AA99BB'
+  #     config.password = '999999'
+  #     config.extends_delivery = 0
+  #     config.request_timeout = 5
+  #     config.log_level = :info
+  #     config.logger = :logger
+  #   end
   def self.setup(&block)
     Configuration.setup(&block)
   end
 
   # Tells the settings that will be used at this time
   # @note Does not modify the default settings
+  # @options (see .setup)
   # @return [Pombo::Configuration] current settings
   def self.set(**args)
     @@configurations = Configuration.new args
@@ -42,37 +51,15 @@ module Pombo
     @@configurations ||= Configuration.new
   end
 
-  # Perform the quotation of delivery of consulting services value and delivery time
-  # @param package [Pombo::Package] the package to be consulted
-  # @return [Array<Pombo::Webservice::CPP::ServiceResponse>]
   def self.shipping(package)
     Webservice::CPP.shipping(package)
   end
 
-  # Perform the quotation of delivery of consulting delivery time
-  # @param package [Pombo::Package] the package to be consulted
-  # @return [Array<Pombo::Webservice::CPP::ServiceResponse>]
   def self.delivery_time(package)
     Webservice::CPP.delivery_time(package)
   end
 
-  # Perform the quotation of delivery of consulting services value
-  # @param package [Pombo::Package] the package to be consulted
-  # @return [Array<Pombo::Webservice::CPP::ServiceResponse>]
   def self.shipping_value(package)
     Webservice::CPP.shipping_value(package)
   end
-
-  # Performs internationalization for informed locale in settings
-  # @return [String] internationalized text
-  def self.t(*args)
-    I18n.with_locale configurations.locale do
-      I18n.translate args
-    end.first
-  end
-
-  # @return [Pombo::Logger] the default log object Pombo
-  def self.logger
-    configurations.logger
-  end
 end

data/pombo.gemspec

@@ -4,31 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pombo/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'pombo'
+  spec.name          = "pombo"
   spec.version       = Pombo::VERSION
-  spec.authors       = ['Leandro Nunes']
-  spec.email         = ['leandronunes.dev@gmail.com']
+  spec.authors       = ["Leandro Nunes"]
+  spec.email         = ["leandronunes.dev@gmail.com"]
 
   spec.summary       = %q{Gem to manage the shipping packages using the webservice of the Correios}
-  spec.description   = %q{Pombo is a gem that allows the use of webservices the Brazilian service of sending packets to check price, delivery time and progress of service}
-  spec.homepage      = 'https://github.com/adenaecommerce/pombo'
+  spec.description   = spec.summary
+  spec.homepage      = "https://github.com/adenaecommerce/pombo"
   spec.license       = 'MIT'
   spec.platform      = Gem::Platform::RUBY
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '~> 2.3'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'i18n', '~> 0.7.0'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
-  spec.add_runtime_dependency 'sax-machine', '~> 1.3'
+  spec.add_runtime_dependency "nokogiri", "~> 1.6"
+  spec.add_runtime_dependency "sax-machine", "~> 1.3"
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 11.1'
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'pry', '~> 0.10.3'
-  spec.add_development_dependency 'webmock', '~> 2.0'
-  spec.add_development_dependency 'yard', '~> 0.8.7.6'
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 11.1"
+  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency "pry", "~> 0.10.3"
+  spec.add_development_dependency "webmock", "~> 1.24"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pombo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.pre.alpha
 platform: ruby
 authors:
 - Leandro Nunes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -114,30 +100,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.7.6
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
-description: Pombo is a gem that allows the use of webservices the Brazilian service
-  of sending packets to check price, delivery time and progress of service
+        version: '1.24'
+description: Gem to manage the shipping packages using the webservice of the Correios
 email:
 - leandronunes.dev@gmail.com
 executables: []
@@ -148,7 +119,6 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
-- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -159,7 +129,6 @@ files:
 - lib/pombo.rb
 - lib/pombo/configuration.rb
 - lib/pombo/exception.rb
-- lib/pombo/logger.rb
 - lib/pombo/package.rb
 - lib/pombo/package/format.rb
 - lib/pombo/package/item.rb
@@ -172,14 +141,11 @@ files:
 - lib/pombo/webservice/cpp/base_request.rb
 - lib/pombo/webservice/cpp/delivery_time_request.rb
 - lib/pombo/webservice/cpp/response.rb
-- lib/pombo/webservice/cpp/service_response.rb
+- lib/pombo/webservice/cpp/service.rb
 - lib/pombo/webservice/cpp/shipping_request.rb
 - lib/pombo/webservice/cpp/shipping_value_request.rb
 - lib/pombo/webservice/sro.rb
-- locales/en.yml
-- locales/pt-br.yml
 - pombo.gemspec
-- readmes/README-EN.md
 homepage: https://github.com/adenaecommerce/pombo
 licenses:
 - MIT
@@ -192,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -205,4 +171,3 @@ signing_key:
 specification_version: 4
 summary: Gem to manage the shipping packages using the webservice of the Correios
 test_files: []
-has_rdoc: 

data/CHANGELOG.md

@@ -1,12 +0,0 @@
-## v1.0.0
-
-#### New features
-
-* It allows you to change the default settings
-* It allows you to change the runtime settings
-* Allows the creation of packages with items
-* Allows the service value of consultation
-* Allows consultation of service delivery time
-* It allows you to see the value and service delivery time
-* It supports internationalization
-* Accepts a logger compatible with the interface [Log4r](http://log4r.rubyforge.org/index.html)

data/lib/pombo/logger.rb

@@ -1,17 +0,0 @@
-require 'logger'
-
-module Pombo
-  # Used to extend the Logger class and customize the message
-  # @exemple
-  #   Pombo.logger.info('event.namespace'){ 'Any error message' }
-  #   # => 2016-05-13 15:15:49 -0300 | POMBO | event.namespace | INFO: Any error message
-  class Logger < ::Logger
-
-    private
-
-    def format_message(severity, datetime, progname, msg)
-      "#{ datetime } | POMBO | #{ progname } | #{ severity }: #{ msg }\n"
-    end
-
-  end
-end

data/locales/en.yml

@@ -1,87 +0,0 @@
----
-en:
-  services:
-    pac:
-      '41106': PAC (without contract)
-      '41068': PAC (with contract)
-      '41300': PAC (large format)
-    sedex:
-      '40010': SEDEX (without contract)
-      '40045': SEDEX to charge (without contract)
-      '40126': SEDEX to charge (with contract)
-      '40215': SEDEX 10 (without contract)
-      '40290': SEDEX today (without contract)
-      '40096': SEDEX (with contract)
-      '40436': SEDEX (with contract)
-      '40444': SEDEX (with contract)
-      '40568': SEDEX (with contract)
-      '40606': SEDEX (with contract)
-    e_sedex:
-      '81019': E-SEDEX (with contract)
-      '81027': E-SEDEX Priority (with contract)
-      '81035': E-SEDEX Express (with contract)
-      '81868': E-SEDEX (with contract, group 1)
-      '81833': E-SEDEX (with contract, group 2)
-      '81850': E-SEDEX (with contract, group 3)
-
-  formats:
-    '1': Box/Package
-    '2': Roll/Prism
-    '3': Envelope
-
-  webservices:
-    cpp:
-      error:
-        '0': Successfully processing
-        '-1': Invalid service code
-        '-2': invalid origin zip code
-        '-3': Invalid destination zip code
-        '-4': Exceeded weight
-        '-5': The declared value must not exceed R$ 10,000.00
-        '-6': Service unavailable to the informed section
-        '-7': The declared Value is required for this service
-        '-8': This service does not accept hand own
-        '-9': This service does not accept return receipt requested
-        '-10': Pricing unavailable for informed stretch
-        '-11': For price setting should be informed also the length, width and height of the object in centimeters (cm)
-        '-12': Invalid length
-        '-13': Invalid width
-        '-14': Invalid height
-        '-15': The length may not exceed 105 cm
-        '-16': The width can not be larger than 105 cm
-        '-17': The height can not be greater than 105 cm
-        '-18': The height can not be less than 2 cm
-        '-20': The width can not be less than 11 cm
-        '-22': Length can not be less than 16 cm
-        '-23': The resulting sum of the length + width + height must not exceed 200 cm
-        '-24': Invalid length
-        '-25': Invalid diameter
-        '-26': Enter the length
-        '-27': Enter the diameter
-        '-28': The length may not exceed 105 cm
-        '-29': The diameter can not be greater than 91 cm
-        '-30': The length can not be less than 18 cm
-        '-31': The diameter can not be less than 5 cm
-        '-32': The resulting sum of the length + two times the diameter should not exceed 200 cm
-        '-33': System temporarily unavailable. Please try later
-        '-34': Administrative Code or invalid password
-        '-35': Incorrect password
-        '-36': Customer does not have current contract with the Post Office
-        '-37': Customer does not have active service in his contract
-        '-38': Service unavailable for this administrative code
-        '-39': Exceeded weight for the envelope format
-        '-40': For definition of price should be informed, as well, the length and the width and height of the object in centimeters (cm)
-        '-41': The length can not be more than 60 cm
-        '-42': Length can not be less than 16 cm
-        '-43': The resulting sum of the length + width must not exceed 120 cm
-        '-44': The width can not be less than 11 cm
-        '-45': The width may be not greater than 60 cm
-        '-888': Error when calculating the rate
-        '006': City of origin does not cover the given service
-        '007': Destination location does not cover the given service
-        '008': Service unavailable to the informed section
-        '009': Initial zip code belonging to risk area
-        '010': Area delivery temporarily subject to different term
-        '011': initial and final zip code belonging to risk area
-        '7': Service unavailable, try again later
-        '99': An error occurred while processing