correios-frete 1.6.0 → 1.6.1

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== Versão 1.6.1
+- Melhoria: Encoding de ISO-8859-1 para UTF-8 em toda resposta do Web Service.
+
 == 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.
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.5)
+    json (1.6.6)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
@@ -27,7 +27,7 @@ GEM
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     ruby-debug (0.10.4)

data/correios-frete.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "correios-frete"
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   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-03-26"
+  s.date = "2012-04-21"
   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 = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/correios/frete/pacote_item.rb",
     "lib/correios/frete/parser.rb",
     "lib/correios/frete/servico.rb",
+    "lib/correios/frete/string.rb",
     "lib/correios/frete/version.rb",
     "lib/correios/frete/web_service.rb",
     "spec/correios/frete/calculador_spec.rb",
@@ -50,7 +51,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.17"
+  s.rubygems_version = "1.8.16"
   s.summary = "Calculo de frete dos Correios."
 
   if s.respond_to? :specification_version then

data/lib/correios-frete.rb

@@ -2,9 +2,9 @@
 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'
 require 'correios/frete/servico'
+require 'correios/frete/string'
 require 'correios/frete/web_service'

data/lib/correios/frete/parser.rb

@@ -6,22 +6,15 @@ module Correios
     class Parser
       def servicos(xml)
         servicos = {}
+        xml = xml.backward_encode("UTF-8", "ISO-8859-1")
 
         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/string.rb

@@ -0,0 +1,10 @@
+class String
+  def backward_encode(to, from)
+    if self.respond_to?(:encode)
+      self.encode(to, from)
+    else
+      require 'iconv'
+      Iconv.conv(to, from, self)
+    end
+  end
+end

data/lib/correios/frete/version.rb

@@ -4,7 +4,7 @@ module Correios
     module Version
       MAJOR = 1
       MINOR = 6
-      PATCH = 0
+      PATCH = 1
       VERSION = [MAJOR, MINOR, PATCH].join(".")
     end
   end

data/spec/correios/frete/parser_spec.rb

@@ -6,8 +6,8 @@ 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")
+    it "encodes from ISO-8859-1 to UTF-8" do
+      xml.should_receive(:backward_encode).with("UTF-8", "ISO-8859-1").and_return(xml)
       parser.servicos(xml)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: correios-frete
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000Z
+date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log-me
-  requirement: &70094024066360 !ruby/object:Gem::Requirement
+  requirement: &11817300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70094024066360
+  version_requirements: *11817300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70094024065560 !ruby/object:Gem::Requirement
+  requirement: &11817060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70094024065560
+  version_requirements: *11817060
 - !ruby/object:Gem::Dependency
   name: sax-machine
-  requirement: &70094024064700 !ruby/object:Gem::Requirement
+  requirement: &11816820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70094024064700
+  version_requirements: *11816820
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70094024063680 !ruby/object:Gem::Requirement
+  requirement: &11816580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70094024063680
+  version_requirements: *11816580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70094024062520 !ruby/object:Gem::Requirement
+  requirement: &11816340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *70094024062520
+  version_requirements: *11816340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70094024061800 !ruby/object:Gem::Requirement
+  requirement: &11816100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70094024061800
+  version_requirements: *11816100
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &70094024058180 !ruby/object:Gem::Requirement
+  requirement: &11815860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70094024058180
+  version_requirements: *11815860
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70094024057280 !ruby/object:Gem::Requirement
+  requirement: &11815620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70094024057280
+  version_requirements: *11815620
 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
@@ -125,6 +125,7 @@ files:
 - lib/correios/frete/pacote_item.rb
 - lib/correios/frete/parser.rb
 - lib/correios/frete/servico.rb
+- lib/correios/frete/string.rb
 - lib/correios/frete/version.rb
 - lib/correios/frete/web_service.rb
 - spec/correios/frete/calculador_spec.rb
@@ -159,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Calculo de frete dos Correios.