correios-sro-xml 0.0.3 → 0.0.4

data/CHANGELOG.rdoc

@@ -1,5 +1,8 @@
+== Versão 0.0.4
+- Correção: Lugar de encode é no Parser e não no WebService.
+
 == Versão 0.0.3
-- Melhoria: {Issue #2: Problema de encoding}[https://github.com/prodis/correios-sro-xml/pull/2].
+- Correção: {Issue #2: Problema de encoding}[https://github.com/prodis/correios-sro-xml/pull/2].
 
 == Versão 0.0.2
 - Melhoria: {Issue #1: Incluindo campo hora}[https://github.com/prodis/correios-sro-xml/pull/1].

data/correios-sro-xml.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "correios-sro-xml"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Prodis a.k.a. Fernando Hamasaki"]

data/lib/correios/sro/parser.rb

@@ -6,6 +6,7 @@ module Correios
     class Parser
       def objetos(xml)
         objetos = {}
+        xml = xml.backward_encode("UTF-8", "ISO-8859-1")
 
         doc = Nokogiri::XML(xml)
         doc.xpath("//objeto").each do |element|

data/lib/correios/sro/version.rb

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

data/lib/correios/sro/web_service.rb

@@ -15,7 +15,7 @@ module Correios
 
       def request(sro)
         response = Net::HTTP.post_form(@uri, params_for(sro))
-        response.body.backward_encode("UTF-8", "ISO-8859-1")
+        response.body
       end
 
       private

data/spec/correios/sro/parser_spec.rb

@@ -3,19 +3,24 @@ require 'spec_helper'
 
 describe Correios::SRO::Parser do
   describe "#objetos" do
-    before :each do
-      xml = body_for :success_response_many_objects
-      parser = Correios::SRO::Parser.new
-      @objetos = parser.objetos(xml)
+    let(:xml) { body_for :success_response_many_objects }
+    let(:parser) { Correios::SRO::Parser.new }
+
+    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.objetos(xml)
     end
 
     ["SI047624825BR", "SX104110463BR"].each do |number|
       it "returns object number" do
-        @objetos[number].numero.should == number
+        objetos = parser.objetos(xml)
+        objetos[number].numero.should == number
       end
     end
 
     context "returns event" do
+      before(:each) { @objetos = parser.objetos(xml) }
+
       { "SI047624825BR" => {
           :tipo => "BDI",
           :status => "01",
@@ -57,6 +62,8 @@ describe Correios::SRO::Parser do
     end
 
     context "returns destination" do
+      before(:each) { @objetos = parser.objetos(xml) }
+
       { "SI047624825BR" => {
           :local => "CTE VILA MARIA",
           :codigo => "02170975",

data/spec/correios/sro/web_service_spec.rb

@@ -6,13 +6,6 @@ describe Correios::SRO::WebService do
     let(:sro) { Correios::SRO::Rastreador.new }
     let(:web_service) { Correios::SRO::WebService.new }
 
-    it "encodes from ISO-8859-1 to UTF-8" do
-      response = double("response", :body => "<xml><fake></fake>")
-      response.body.should_receive(:backward_encode).with("UTF-8", "ISO-8859-1")
-      Net::HTTP.stub(:post_form).and_return(response)
-      web_service.request(sro)
-    end
-
     it "returns XML response" do
       fake_request_for("<xml><fake></fake>")
       web_service.request(sro).should == "<xml><fake></fake>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: correios-sro-xml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log-me
-  requirement: &11300850 !ruby/object:Gem::Requirement
+  requirement: &11301360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *11300850
+  version_requirements: *11301360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &11300240 !ruby/object:Gem::Requirement
+  requirement: &11300280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *11300240
+  version_requirements: *11300280
 - !ruby/object:Gem::Dependency
   name: sax-machine
-  requirement: &11299850 !ruby/object:Gem::Requirement
+  requirement: &11299360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *11299850
+  version_requirements: *11299360
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &11299430 !ruby/object:Gem::Requirement
+  requirement: &11298680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *11299430
+  version_requirements: *11298680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11298700 !ruby/object:Gem::Requirement
+  requirement: &11297320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *11298700
+  version_requirements: *11297320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11298340 !ruby/object:Gem::Requirement
+  requirement: &11296780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *11298340
+  version_requirements: *11296780
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &11298100 !ruby/object:Gem::Requirement
+  requirement: &11312530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11298100
+  version_requirements: *11312530
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &11297770 !ruby/object:Gem::Requirement
+  requirement: &11311710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11297770
+  version_requirements: *11311710
 description: Sistema de Rastreamento de Objetos dos Correios (SRO) utilizando o Web
   Service SRO XML, que permite a consulta de ate 50 encomendas simultaneamente.
 email: prodis@gmail.com