correios-frete 1.5.2 → 1.6.0

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== Versão 1.6.0
+- Correção: Encoding de ISO-8859-1 para UTF-8 na mensagem de erro dos serviços, pois o parser não estava rolando para mensagens com acentos e/ou cedilhas.
+
 == Versão 1.5.2
 - Correção: {Issue #9: Bundler as dependency}[https://github.com/prodis/correios-frete/pull/9] - Remoção da gem bundler das dependências de ambiente de desenvolvimento.
 - Atualização: Refatorações de testes.

data/Gemfile

@@ -1,13 +1,13 @@
 source "http://rubygems.org"
 
 gem "log-me", "~> 0.0.2"
-gem "nokogiri", "~> 1.5.0"
-gem "sax-machine", "~> 0.1.0"
+gem "nokogiri", "~> 1.5"
+gem "sax-machine", "~> 0.1"
 
 group :development do
-  gem "fakeweb", "~> 1.3.0"
-  gem "jeweler", "~> 1.8.3"
-  gem "rspec", "~> 2.8"
+  gem "fakeweb", "~> 1.3"
+  gem "jeweler", "~> 1.8"
+  gem "rspec", "~> 2.9"
   gem "ruby-debug", :platforms => :ruby_18
   gem "ruby-debug19", :require => "ruby-debug", :platforms => :ruby_19
 end

data/Gemfile.lock

@@ -17,19 +17,19 @@ GEM
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     log-me (0.0.2)
-    nokogiri (1.5.0)
+    nokogiri (1.5.2)
     rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
+    rbx-require-relative (0.0.9)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -52,11 +52,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fakeweb (~> 1.3.0)
-  jeweler (~> 1.8.3)
+  fakeweb (~> 1.3)
+  jeweler (~> 1.8)
   log-me (~> 0.0.2)
-  nokogiri (~> 1.5.0)
-  rspec (~> 2.8)
+  nokogiri (~> 1.5)
+  rspec (~> 2.9)
   ruby-debug
   ruby-debug19
-  sax-machine (~> 0.1.0)
+  sax-machine (~> 0.1)

data/correios-frete.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "correios-frete"
-  s.version = "1.5.2"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Prodis a.k.a. Fernando Hamasaki"]
-  s.date = "2012-02-07"
+  s.date = "2012-03-26"
   s.description = "Calculo de frete utilizando o Web Service dos Correios (http://www.correios.com.br/webservices).\nOs servicos de frete suportados sao PAC, SEDEX, SEDEX a Cobrar, SEDEX 10, SEDEX Hoje e e-SEDEX."
   s.email = "prodis@gmail.com"
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/correios-frete.rb",
     "lib/correios/frete.rb",
     "lib/correios/frete/calculador.rb",
+    "lib/correios/frete/encoding_converter.rb",
     "lib/correios/frete/pacote.rb",
     "lib/correios/frete/pacote_item.rb",
     "lib/correios/frete/parser.rb",
@@ -49,7 +50,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.17"
   s.summary = "Calculo de frete dos Correios."
 
   if s.respond_to? :specification_version then
@@ -57,30 +58,30 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<log-me>, ["~> 0.0.2"])
-      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_runtime_dependency(%q<sax-machine>, ["~> 0.1.0"])
-      s.add_development_dependency(%q<fakeweb>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8"])
+      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5"])
+      s.add_runtime_dependency(%q<sax-machine>, ["~> 0.1"])
+      s.add_development_dependency(%q<fakeweb>, ["~> 1.3"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.9"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
     else
       s.add_dependency(%q<log-me>, ["~> 0.0.2"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_dependency(%q<sax-machine>, ["~> 0.1.0"])
-      s.add_dependency(%q<fakeweb>, ["~> 1.3.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<rspec>, ["~> 2.8"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.5"])
+      s.add_dependency(%q<sax-machine>, ["~> 0.1"])
+      s.add_dependency(%q<fakeweb>, ["~> 1.3"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_dependency(%q<rspec>, ["~> 2.9"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
     end
   else
     s.add_dependency(%q<log-me>, ["~> 0.0.2"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-    s.add_dependency(%q<sax-machine>, ["~> 0.1.0"])
-    s.add_dependency(%q<fakeweb>, ["~> 1.3.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<rspec>, ["~> 2.8"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.5"])
+    s.add_dependency(%q<sax-machine>, ["~> 0.1"])
+    s.add_dependency(%q<fakeweb>, ["~> 1.3"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8"])
+    s.add_dependency(%q<rspec>, ["~> 2.9"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
   end

data/lib/correios-frete.rb

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'correios/frete'
 require 'correios/frete/calculador'
+require 'correios/frete/encoding_converter'
 require 'correios/frete/pacote'
 require 'correios/frete/pacote_item'
 require 'correios/frete/parser'

data/lib/correios/frete/encoding_converter.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+require 'iconv'
+
+module Correios
+  module Frete
+    class EncodingConverter
+      def self.from_iso_to_utf8(text)
+        converter = Iconv.new "UTF-8", "ISO-8859-1"
+        converter.iconv(text)
+      end
+    end
+  end
+end

data/lib/correios/frete/parser.rb

@@ -8,12 +8,20 @@ module Correios
         servicos = {}
 
         Nokogiri::XML(xml).root.elements.each do |element|
+          encode_msg_erro!(element)
           servico = Correios::Frete::Servico.new.parse(element.to_xml)
           servicos[servico.tipo] = servico
         end
 
         servicos
       end
+
+      private
+
+      def encode_msg_erro!(element)
+        msg_erro_element = element.search("MsgErro").first.children.first
+        msg_erro_element.content = Correios::Frete::EncodingConverter.from_iso_to_utf8(msg_erro_element.text) if msg_erro_element
+      end
     end
   end
 end

data/lib/correios/frete/version.rb

@@ -3,8 +3,8 @@ module Correios
   module Frete
     module Version
       MAJOR = 1
-      MINOR = 5
-      PATCH = 2
+      MINOR = 6
+      PATCH = 0
       VERSION = [MAJOR, MINOR, PATCH].join(".")
     end
   end

data/spec/correios/frete/parser_spec.rb

@@ -6,6 +6,11 @@ describe Correios::Frete::Parser do
     let(:xml) { body_for :success_response_many_services }
     let(:parser) { Correios::Frete::Parser.new }
 
+    it "converts error message to UTF-8" do
+      Correios::Frete::EncodingConverter.should_receive(:from_iso_to_utf8).with("Somente para teste").and_return("Somente para teste")
+      parser.servicos(xml)
+    end
+
     { :pac => { :tipo => :pac,
                 :codigo => "41106",
                 :valor => 15.70,

metadata

@@ -1,116 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: correios-frete
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.6.0
   prerelease: 
-  version: 1.5.2
 platform: ruby
-authors: 
+authors:
 - Prodis a.k.a. Fernando Hamasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: log-me
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70094024066360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70094024066360
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70094024065560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70094024065560
+- !ruby/object:Gem::Dependency
   name: sax-machine
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70094024064700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70094024064700
+- !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70094024063680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70094024063680
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70094024062520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.8.3
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70094024062520
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70094024061800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.8"
+      - !ruby/object:Gem::Version
+        version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70094024061800
+- !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70094024058180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70094024058180
+- !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70094024057280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-description: |-
-  Calculo de frete utilizando o Web Service dos Correios (http://www.correios.com.br/webservices).
-  Os servicos de frete suportados sao PAC, SEDEX, SEDEX a Cobrar, SEDEX 10, SEDEX Hoje e e-SEDEX.
+  version_requirements: *70094024057280
+description: ! 'Calculo de frete utilizando o Web Service dos Correios (http://www.correios.com.br/webservices).
+
+  Os servicos de frete suportados sao PAC, SEDEX, SEDEX a Cobrar, SEDEX 10, SEDEX
+  Hoje e e-SEDEX.'
 email: prodis@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - CHANGELOG.rdoc
@@ -122,6 +120,7 @@ files:
 - lib/correios-frete.rb
 - lib/correios/frete.rb
 - lib/correios/frete/calculador.rb
+- lib/correios/frete/encoding_converter.rb
 - lib/correios/frete/pacote.rb
 - lib/correios/frete/pacote_item.rb
 - lib/correios/frete/parser.rb
@@ -140,31 +139,28 @@ files:
 - spec/support/responses/success-response-many-services.xml
 - spec/support/responses/success-response-one-service.xml
 homepage: http://prodis.blog.br/correios-frete-gem-para-calculo-de-frete-dos-correios
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Calculo de frete dos Correios.
 test_files: []
-