correios-sro-xml 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5304bbd81d83f760e5828196f54a4e7bbb5e2fd5
+  data.tar.gz: 0492be9b896f68b266b72c979b80ed6dff68d238
+SHA512:
+  metadata.gz: 23cc2288024f0dd02ef64425c55b0cfcf5f0902f3befdc1b5662cb1c90e903b2c29b2d6391dfe62659d46d239db9b37138e5d90497f106f05b0ac11991712ac4
+  data.tar.gz: 1ffc569c2d430c092d616534a070584a71b7beb0256f049cd8a31288374286612f2524472706a32e95729c13ff91419d5d68f2600013dd7b18e87132efa839e8

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== Version 0.2.0
+- Warning: Minimal required Ruby version from now is 1.9.3.
+- Improvement: Update LogMe gem to version 0.0.6 with support to log request and response messages.
+- Maintenance: Refactory all classes.
+
 == Version 0.1.1
 - Maintenance: Update .gemspec info.
 

data/README.rdoc

@@ -23,7 +23,7 @@ For development environment you can use follow access data:
 
   require 'correios-sro-xml'
 
-  sro = Correios::SRO::Tracker.new(:user => "ECT", :password => "SRO")
+  sro = Correios::SRO::Tracker.new(user: "ECT", password: "SRO")
 
 Tracking a single object:
   object = sro.get("SI047624825BR")
@@ -89,7 +89,7 @@ For default, the timeout for a request to SRO XML Web Service is <b>5 seconds</b
 You can configure this timeout using <b>Correios::SRO</b> module.
 
   Correios::SRO.configure do |config|
-    config.request_timeout = 3  # It configures timeout to 3 seconds
+    config.request_timeout = 3 # It configures timeout to 3 seconds
   end
 
 === Log
@@ -97,11 +97,11 @@ You can configure this timeout using <b>Correios::SRO</b> module.
 For default, each request to SRO XML Web service is logged to STDOUT, with <b>:info</b> log level, using the gem {LogMe}[http://github.com/prodis/log-me].
 
 Log example:
-  I, [2012-08-17T00:55:10.531780 #22692]  INFO -- : Correios-SRO-XML Request:
+  I, [2012-08-17T00:55:10.531780 #22692]  INFO -- : [Correios::SRO] Request:
   POST http://websro.correios.com.br/sro_bin/sroii_xml.eventos
   Usuario=ECT&Senha=SRO&Tipo=L&Resultado=U&Objetos=PB996681660BR
 
-  I, [2012-08-17T00:55:10.750308 #22692]  INFO -- : Correios-SRO-XML Response:
+  I, [2012-08-17T00:55:10.750308 #22692]  INFO -- : [Correios::SRO] Response:
   HTTP/1.1 200 OK
   <?xml version="1.0" encoding="iso-8859-1" ?>
   <sroxml>
@@ -129,66 +129,22 @@ Log example:
        </objeto>
   </sroxml>
 
-If you configure log level to <b>:debug</b>, request and response HTTP headers will be logged too.
-  D, [2012-08-17T00:58:56.226742 #22692] DEBUG -- : Correios-SRO-XML Request:
-  POST http://websro.correios.com.br/sro_bin/sroii_xml.eventos
-  accept: */*
-  user-agent: Ruby
-  content-type: application/x-www-form-urlencoded
-  Usuario=ECT&Senha=SRO&Tipo=L&Resultado=U&Objetos=PB996681660BR
-
-  D, [2012-08-17T00:58:56.495131 #22692] DEBUG -- : Correios-SRO-XML Response:
-  HTTP/1.1 200 OK
-  date: Fri, 17 Aug 2012 03:58:56 GMT
-  server: Oracle-Application-Server-10g/10.1.2.0.2 Oracle-HTTP-Server
-  content-length: 855
-  content-type: text/html; charset=ISO-8859-1
-  x-cache: MISS from 127.0.0.1
-  connection: close
-  <?xml version="1.0" encoding="iso-8859-1" ?>
-  <sroxml>
-     <versao>1.0</versao>
-     <qtd>1</qtd>
-     <TipoPesquisa>Lista de Objetos</TipoPesquisa>
-     <TipoResultado>?ltimo evento</TipoResultado>
-       <objeto>
-         <numero>PB996681660BR</numero>
-         <evento>
-            <tipo>BDE</tipo>
-            <status>01</status>
-            <data>05/07/2012</data>
-            <hora>21:11</hora>
-            <descricao>Entregue</descricao>
-            <recebedor>                         </recebedor>
-            <documento>                         </documento>
-            <comentario>                         </comentario>
-            <local>CDD VILA ANDRADE</local>
-            <codigo>05724970</codigo>
-            <cidade>SAO PAULO</cidade>
-            <uf>SP</uf>
-            <sto>72824000</sto>
-        </evento>
-       </objeto>
-  </sroxml>
-
-To disable the log, change log level and configure other log output, use <b>Correios::SRO</b> module:
+To disable the log and configure other log output, use <b>Correios::SRO</b> module:
 
   Correios::SRO.configure do |config|
     config.log_enabled = false   # It disables the log
-    config.log_level = :debug    # It changes log level
     config.logger = Rails.logger # It uses Rails logger
   end
 
 === Configuration example
 
   Correios::SRO.configure do |config|
-    config.log_level = :debug
     config.logger = Rails.logger
     config.request_timeout = 3
   end
 
 == Author
-- {Fernando Hamasaki (prodis)}[http://prodis.blog.br]
+- {Fernando Hamasaki de Amorim (prodis)}[http://prodis.blog.br]
 
 == Collaborators
 - {Thiago Ganzarolli (tganzarolli)}[https://github.com/tganzarolli]
@@ -213,7 +169,7 @@ To disable the log, change log level and configure other log output, use <b>Corr
 
 http://prodis.net.br/images/prodis_150.gif
 
-Copyright (c) 2012 Prodis
+Copyright (c) 2012-2014 Prodis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/correios-sro-xml.gemspec

@@ -1,30 +1,33 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'correios/sro/version'
 
-Gem::Specification.new do |gem|
-  gem.name        = "correios-sro-xml"
-  gem.version     = Correios::SRO::VERSION
-  gem.authors     = ["Prodis a.k.a. Fernando Hamasaki"]
-  gem.email       = ["prodis@gmail.com"]
-  gem.summary     = "Tracking Objects System from Correios - SRO (Sistema de Rastreamento de Objetos dos Correios)."
-  gem.description = "Tracking Objects System from Correios - SRO (Sistema de Rastreamento de Objetos dos Correios), using SRO XML Web Service, that allows to query up to 50 orders simultaneously."
-  gem.homepage    = "http://github.com/prodis/correios-sro-xml"
-  gem.licenses    = ["MIT"]
+Gem::Specification.new do |spec|
+  spec.name        = "correios-sro-xml"
+  spec.version     = Correios::SRO::VERSION
+  spec.authors     = ["Prodis a.k.a. Fernando Hamasaki de Amorim"]
+  spec.email       = ["prodis@gmail.com"]
+  spec.summary     = "Tracking Objects System from Correios - SRO (Sistema de Rastreamento de Objetos dos Correios)."
+  spec.description = "Tracking Objects System from Correios - SRO (Sistema de Rastreamento de Objetos dos Correios), using SRO XML Web Service, that allows to query up to 50 orders simultaneously."
+  spec.homepage    = "http://prodis.blog.br/2012/08/17/correios-sro-xml-gem-para-rastreamento-de-objetos-dos-correios"
+  spec.licenses    = ["MIT"]
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($\)
+  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.platform              = Gem::Platform::RUBY
-  gem.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+  spec.platform              = Gem::Platform::RUBY
+  spec.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
 
-  gem.add_dependency "log-me",      "~> 0.0.4"
-  gem.add_dependency "nokogiri",    "~> 1.5"
-  gem.add_dependency "sax-machine", "~> 0.1"
+  spec.add_dependency "log-me",      "= 0.0.6"
+  spec.add_dependency "nokogiri",    "~> 1.6"
+  spec.add_dependency "sax-machine", "~> 0.2.1"
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec",   "~> 2.11"
-  gem.add_development_dependency "webmock", "~> 1.8"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec",   "~> 2.14"
+  spec.add_development_dependency "vcr",     "~> 2.8"
+  spec.add_development_dependency "webmock", "~> 1.15.2"
 end

data/lib/correios-sro-xml.rb

@@ -1,10 +1,8 @@
-# encoding: UTF-8
-require 'rubygems'
+require 'correios/sro/timeout'
 require 'correios/sro'
 require 'correios/sro/destination'
 require 'correios/sro/event'
 require 'correios/sro/object'
 require 'correios/sro/parser'
 require 'correios/sro/tracker'
-require 'correios/sro/string'
 require 'correios/sro/web_service'

data/lib/correios/sro.rb

@@ -1,19 +1,8 @@
-# encoding: UTF-8
 require 'log-me'
 
 module Correios
   module SRO
     extend LogMe
-
-    module Timeout
-      DEFAULT_REQUEST_TIMEOUT = 5 #seconds
-      attr_writer :request_timeout
-
-      def request_timeout
-        (@request_timeout ||= DEFAULT_REQUEST_TIMEOUT).to_i
-      end
-    end
-
-    extend Timeout
+    extend Correios::SRO::Timeout
   end
 end

data/lib/correios/sro/destination.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'sax-machine'
 
 module Correios
@@ -6,7 +5,7 @@ module Correios
     class Destination
       include SAXMachine
 
-      element :local,  :as => :place 
+      element :local,  :as => :place
       element :codigo, :as => :code
       element :cidade, :as => :city
       element :bairro, :as => :neighborhood

data/lib/correios/sro/event.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'sax-machine'
 
 module Correios

data/lib/correios/sro/object.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'sax-machine'
 
 module Correios

data/lib/correios/sro/parser.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'nokogiri'
 
 module Correios
@@ -6,7 +5,7 @@ module Correios
     class Parser
       def objects(xml)
         objects = {}
-        xml = xml.backward_encode("UTF-8", "ISO-8859-1")
+        xml.encode!("UTF-8", "ISO-8859-1")
 
         doc = Nokogiri::XML(xml)
         doc.xpath("//objeto").each do |element|

data/lib/correios/sro/timeout.rb

@@ -0,0 +1,12 @@
+module Correios
+  module SRO
+    module Timeout
+      DEFAULT_REQUEST_TIMEOUT = 5 #seconds
+      attr_writer :request_timeout
+
+      def request_timeout
+        (@request_timeout ||= DEFAULT_REQUEST_TIMEOUT).to_i
+      end
+    end
+  end
+end

data/lib/correios/sro/tracker.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Correios
   module SRO
     class Tracker
@@ -6,7 +5,7 @@ module Correios
       attr_accessor :query_type, :result_mode
       attr_reader :object_numbers
 
-      DEFAULT_OPTIONS = { :query_type => :list, :result_mode => :last }
+      DEFAULT_OPTIONS = { query_type: :list, result_mode: :last }.freeze
 
       def initialize(options = {})
         DEFAULT_OPTIONS.merge(options).each do |attr, value|

data/lib/correios/sro/version.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
 module Correios
   module SRO
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end
-

data/lib/correios/sro/web_service.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'net/http'
 require 'uri'
 
@@ -6,8 +5,8 @@ module Correios
   module SRO
     class WebService
       URL = "http://websro.correios.com.br/sro_bin/sroii_xml.eventos"
-      QUERY_TYPES = { :list => "L", :range => "F" }
-      RESULT_MODES = { :all => "T", :last => "U" }
+      QUERY_TYPES =  { list: "L", range: "F" }
+      RESULT_MODES = { all:  "T", last:  "U" }
 
       def initialize(tracker)
         @uri = URI.parse(URL)
@@ -18,10 +17,10 @@ module Correios
         http = build_http
 
         request = build_request
-        log_request(request)
+        Correios::SRO.log_request request, @uri.to_s
 
         response = http.request(request)
-        log_response(response)
+        Correios::SRO.log_response response
 
         response.body
       end
@@ -42,46 +41,13 @@ module Correios
 
       def request_params
         {
-          :Usuario => @tracker.user,
-          :Senha => @tracker.password,
-          :Tipo => QUERY_TYPES[@tracker.query_type],
-          :Resultado => RESULT_MODES[@tracker.result_mode],
-          :Objetos => @tracker.object_numbers.join
+          Usuario: @tracker.user,
+          Senha: @tracker.password,
+          Tipo: QUERY_TYPES[@tracker.query_type],
+          Resultado: RESULT_MODES[@tracker.result_mode],
+          Objetos: @tracker.object_numbers.join
         }
       end
-
-      def log_request(request)
-        message = format_message(request) do
-          message =  with_line_break { "Correios-SRO-XML Request:" }
-          message << with_line_break { "POST #{URL}" }
-        end
-
-        Correios::SRO.log(message)
-      end
-
-      def log_response(response)
-        message = format_message(response) do
-          message =  with_line_break { "Correios-SRO-XML Response:" }
-          message << with_line_break { "HTTP/#{response.http_version} #{response.code} #{response.message}" }
-        end
-
-        Correios::SRO.log(message)
-      end
-
-      def format_message(http)
-        message = yield
-        message << with_line_break { format_headers_for(http) } if Correios::SRO.log_level == :debug
-        message << with_line_break { http.body }
-      end
-
-      def format_headers_for(http)
-        # I'm using an empty block in each_header method for Ruby 1.8.7 compatibility.
-        http.each_header{}.map { |name, values| "#{name}: #{values.first}" }.join("\n")
-      end
-
-      def with_line_break
-        "#{yield}\n"
-      end
     end
   end
 end

data/spec/correios/sro/event_spec.rb

@@ -1,14 +1,11 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe Correios::SRO::Event do
-  let(:event) { Correios::SRO::Event.new }
-
   [:receiver, :document, :comment].each do |method|
     describe "##{method}=" do
       it "strips string" do
-        event.send("#{method}=", "   Texto.   ")
-        event.send(method).should == "Texto."
+        subject.send("#{method}=", "   Texto.   ")
+        expect(subject.send(method)).to eql "Texto."
       end
     end
   end

data/spec/correios/sro/parser_spec.rb

@@ -1,55 +1,53 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe Correios::SRO::Parser do
   describe "#objects" do
-    let(:xml) { body_for :success_response_many_objects }
-    let(:parser) { Correios::SRO::Parser.new }
+    let(:xml) { Fixture.load :sro_many_objects }
 
     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.objects(xml)
+      expect(xml).to receive(:encode!).with("UTF-8", "ISO-8859-1")
+      subject.objects(xml)
     end
 
     ["SI047624825BR", "SX104110463BR"].each do |number|
       it "returns object number" do
-        objects = parser.objects(xml)
-        objects[number].number.should == number
+        objects = subject.objects(xml)
+        expect(objects[number].number).to eql number
       end
     end
 
     context "returns event" do
-      before(:each) { @objects = parser.objects(xml) }
+      before { @objects = subject.objects(xml) }
 
       { "SI047624825BR" => {
-          :type => "BDI",
-          :status => "01",
-          :date => "26/12/2011",
-          :hour => "15:22",
-          :description => "Entregue",
-          :receiver => "",
-          :document => "",
-          :comment => "?",
-          :place => "AC CENTRAL DE SAO PAULO",
-          :code => "01009972",
-          :city => "SAO PAULO",
-          :state => "SP",
-          :sto => "00024419"
+          type: "BDI",
+          status: "01",
+          date: "26/12/2011",
+          hour: "15:22",
+          description: "Entregue",
+          receiver: "",
+          document: "",
+          comment: "?",
+          place: "AC CENTRAL DE SAO PAULO",
+          code: "01009972",
+          city: "SAO PAULO",
+          state: "SP",
+          sto: "00024419"
         },
         "SX104110463BR" => {
-          :type => "BDE",
-          :status => "01",
-          :date => "08/12/2011",
-          :hour => "09:30",
-          :description => "Entregue",
-          :receiver => "",
-          :document => "",
-          :comment => "",
-          :place => "CEE JUNDIAI",
-          :code => "13211970",
-          :city => "JUNDIAI",
-          :state => "SP",
-          :sto => "74654209"
+          type: "BDE",
+          status: "01",
+          date: "08/12/2011",
+          hour: "09:30",
+          description: "Entregue",
+          receiver: "",
+          document: "",
+          comment: "",
+          place: "CEE JUNDIAI",
+          code: "13211970",
+          city: "JUNDIAI",
+          state: "SP",
+          sto: "74654209"
         },
       }.each do |number, first_event|
         first_event.each do |attr, value|
@@ -62,27 +60,27 @@ describe Correios::SRO::Parser do
     end
 
     context "returns destination" do
-      before(:each) { @objects = parser.objects(xml) }
+      before { @objects = subject.objects(xml) }
 
       { "SI047624825BR" => {
-          :place => "CTE VILA MARIA",
-          :code => "02170975",
-          :city => "SAO PAULO",
-          :neighborhood => "PQ NOVO MUNDO",
-          :state => "SP"
+          place: "CTE VILA MARIA",
+          code: "02170975",
+          city: "SAO PAULO",
+          neighborhood: "PQ NOVO MUNDO",
+          state: "SP"
         },
         "SX104110463BR" => {
-          :place => "CTE CAMPINAS",
-          :code => "13050971",
-          :city => "VALINHOS",
-          :neighborhood => "MACUCO",
-          :state => "SP"
+          place: "CTE CAMPINAS",
+          code: "13050971",
+          city: "VALINHOS",
+          neighborhood: "MACUCO",
+          state: "SP"
         },
       }.each do |number, destinations|
         destinations.each do |attr, value|
           it attr do
             destination = @objects[number].events[3].destination
-            destination.send(attr).should == value
+            expect(destination.send(attr)).to eql value
           end
         end
       end

data/spec/correios/sro/tracker_spec.rb

@@ -1,31 +1,29 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe Correios::SRO::Tracker do
   describe ".new" do
     it "creates with default values" do
-      sro = Correios::SRO::Tracker.new
-      sro.query_type.should == :list
-      sro.result_mode.should == :last
-      sro.object_numbers.should == []
+      expect(subject.query_type).to eql :list
+      expect(subject.result_mode).to eql :last
+      expect(subject.object_numbers).to eql []
     end
 
-    { :user => "PRODIS",
-      :password => "pim321",
-      :query_type => :range,
-      :result_mode => :all
+    { user: "PRODIS",
+      password: "pim321",
+      query_type: :range,
+      result_mode: :all
     }.each do |attr, value|
       context "when #{attr} is supplied" do
         it "sets #{attr}" do
           sro = Correios::SRO::Tracker.new(attr => value)
-          sro.send(attr).should == value
+          expect(sro.send(attr)).to eql value
         end
       end
 
       context "when #{attr} is supplied in a block" do
         it "sets #{attr}" do
           sro = Correios::SRO::Tracker.new { |t| t.send("#{attr}=", value) }
-          sro.send(attr).should == value
+          expect(sro.send(attr)).to eql value
         end
       end
     end
@@ -38,77 +36,76 @@ describe Correios::SRO::Tracker do
       Correios::SRO.configure { |config| config.log_enabled = true }
     end
 
-    let(:sro) { Correios::SRO::Tracker.new(:user => "PRODIS", :password => "pim321") }
+    let(:subject)  { Correios::SRO::Tracker.new(user: "PRODIS", password: "pim321") }
+    let(:response) { "" }
+    before { Correios::SRO::WebService.any_instance.stub(:request!).and_return(response) }
 
     context "to many objects" do
-      before(:each) { mock_request_for(:success_response_many_objects) }
+      let(:response) { Fixture.load :sro_many_objects }
 
       it "sets objects numbers" do
-        sro.get("SI047624825BR", "SX104110463BR")
-        sro.object_numbers.size.should == 2
-        sro.object_numbers.first.should == "SI047624825BR"
-        sro.object_numbers.last.should == "SX104110463BR"
-      end
+        subject.get("SI047624825BR", "SX104110463BR")
 
-      it "creates a WebService with correct params" do
-        web_service = Correios::SRO::WebService.new(sro)
-        Correios::SRO::WebService.should_receive(:new).with(sro).and_return(web_service)
-        sro.get("SI047624825BR", "SX104110463BR")
+        expect(subject.object_numbers.size).to eql 2
+        expect(subject.object_numbers.first).to eql "SI047624825BR"
+        expect(subject.object_numbers.last).to eql "SX104110463BR"
       end
 
       it "returns all objects" do
-        objects = sro.get("SI047624825BR", "SX104110463BR")
-        objects.size.should == 2
-        objects["SI047624825BR"].number.should == "SI047624825BR"
-        objects["SX104110463BR"].number.should == "SX104110463BR"
+        objects = subject.get("SI047624825BR", "SX104110463BR")
+
+        expect(objects.size).to eql 2
+
+        expect(objects["SI047624825BR"].number).to eql "SI047624825BR"
+        expect(objects["SI047624825BR"].events.first.description).to eql "Entregue"
+
+        expect(objects["SX104110463BR"].number).to eql "SX104110463BR"
+        expect(objects["SX104110463BR"].events.first.description).to eql "Entregue"
       end
 
       context "when only one object found" do
-        before(:each) { mock_request_for(:success_response_one_object) }
+        let(:response) { Fixture.load :sro_one_object }
 
         it "returns a Hash" do
-          objects = sro.get("SI047624825BR", "SX104110463BR")
-          objects.should be_an_instance_of Hash
+          objects = subject.get("SI047624825BR", "SX104110463BR")
+          expect(objects).to be_an_instance_of Hash
         end
 
         it "returns the object found" do
-          objects = sro.get("SI047624825BR", "SX104110463BR")
-          objects.size.should == 1
-          objects["SI047624825BR"].number.should == "SI047624825BR"
+          objects = subject.get("SI047624825BR", "SX104110463BR")
+
+          expect(objects.size).to eql 1
+          expect(objects["SI047624825BR"].number).to eql "SI047624825BR"
+          expect(objects["SI047624825BR"].events.first.description).to eql "Entregue"
         end
 
         it "returns nil in object not found" do
-          objects = sro.get("SI047624825BR", "SX104110463BR")
-          objects["SX104110463BR"].should be_nil
+          objects = subject.get("SI047624825BR", "SX104110463BR")
+          expect(objects["SX104110463BR"]).to be_nil
         end
       end
     end
 
     context "to one object" do
-      before(:each) { mock_request_for(:success_response_one_object) }
+      let(:response) { Fixture.load :sro_one_object }
 
       it "sets object number" do
-        sro.get("SI047624825BR")
-        sro.object_numbers.size.should == 1
-        sro.object_numbers.first.should == "SI047624825BR"
-      end
-
-      it "creates a WebService with correct params" do
-        web_service = Correios::SRO::WebService.new(sro)
-        Correios::SRO::WebService.should_receive(:new).with(sro).and_return(web_service)
-        sro.get("SI047624825BR")
+        subject.get("SI047624825BR")
+        expect(subject.object_numbers.size).to eql 1
+        expect(subject.object_numbers.first).to eql "SI047624825BR"
       end
 
       it "returns only one object" do
-        object = sro.get("SI047624825BR")
-        object.number.should == "SI047624825BR"
+        object = subject.get("SI047624825BR")
+        expect(object.number).to eql "SI047624825BR"
+        expect(object.events.first.description).to eql "Entregue"
       end
 
       context "when object not found" do
+        let(:response) { Fixture.load :sro_not_found }
+
         it "returns nil" do
-          mock_request_for(:failure_response_not_found)
-          object = sro.get("SI047624825BR")
-          object.should be_nil
+          expect(subject.get("SI047624825BR")).to be_nil
         end
       end
     end

data/spec/correios/sro/web_service_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe Correios::SRO::WebService do
@@ -9,12 +8,15 @@ describe Correios::SRO::WebService do
       Correios::SRO.configure { |config| config.log_enabled = true }
     end
 
-    let(:tracker) { Correios::SRO::Tracker.new }
-    let(:web_service) { Correios::SRO::WebService.new(tracker) }
+    let(:tracker) do
+      sro = Correios::SRO::Tracker.new(user: "ECT", password: "SRO")
+      sro.instance_variable_set :@object_numbers, ["SS123456789BR"]
+      sro
+    end
+    let(:subject) { Correios::SRO::WebService.new(tracker) }
 
-    it "returns XML response" do
-      mock_request_for("<xml><fake></fake>")
-      web_service.request!.should eql "<xml><fake></fake>"
+    it "returns XML response", vcr: { cassette_name: "sro_found_last" } do
+      expect(subject.request!).to include("<numero>SS123456789BR</numero>")
     end
   end
 end

data/spec/correios/sro_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe Correios::SRO do

data/spec/fixtures/cassettes/sro_found_last.yml

@@ -0,0 +1,57 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://websro.correios.com.br/sro_bin/sroii_xml.eventos
+    body:
+      encoding: US-ASCII
+      string: Usuario=ECT&Senha=SRO&Tipo=L&Resultado=U&Objetos=SS123456789BR
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 24 Feb 2014 01:12:34 GMT
+      Server:
+      - Oracle-Application-Server-10g/10.1.2.0.2 Oracle-HTTP-Server
+      Content-Length:
+      - '850'
+      Content-Type:
+      - text/html; charset=ISO-8859-1
+      X-Cache:
+      - MISS from 127.0.0.1
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSIgPz4K
+        PHNyb3htbD4KICAgPHZlcnNhbz4xLjA8L3ZlcnNhbz4KICAgPHF0ZD4xPC9x
+        dGQ+CiAgIDxUaXBvUGVzcXVpc2E+TGlzdGEgZGUgT2JqZXRvczwvVGlwb1Bl
+        c3F1aXNhPgogICA8VGlwb1Jlc3VsdGFkbz7abHRpbW8gZXZlbnRvPC9UaXBv
+        UmVzdWx0YWRvPgogICAgIDxvYmpldG8+CiAgICAgICA8bnVtZXJvPlNTMTIz
+        NDU2Nzg5QlI8L251bWVybz4KICAgICAgIDxldmVudG8+CiAgICAgICAgICA8
+        dGlwbz5STzwvdGlwbz4KICAgICAgICAgIDxzdGF0dXM+MDE8L3N0YXR1cz4K
+        ICAgICAgICAgIDxkYXRhPjE3LzA5LzIwMTM8L2RhdGE+CiAgICAgICAgICA8
+        aG9yYT4xMzo0ODwvaG9yYT4KICAgICAgICAgIDxkZXNjcmljYW8+RW5jYW1p
+        bmhhZG88L2Rlc2NyaWNhbz4KICAgICAgICAgIDxsb2NhbD5MQUJPUkFUT1JJ
+        TzAxLVNST0lJL0NFPC9sb2NhbD4KICAgICAgICAgIDxjb2RpZ28+NjAwMDA5
+        MDE8L2NvZGlnbz4KICAgICAgICAgIDxjaWRhZGU+Rk9SVEFMRVpBPC9jaWRh
+        ZGU+CiAgICAgICAgICA8dWY+Q0U8L3VmPgogICAgICAgICAgPHN0bz45OTk5
+        OTk5OTwvc3RvPgogICAgICAgPGRlc3Rpbm8+CiAgICAgICAgICA8bG9jYWw+
+        TEFCT1JBVE9SSU8wMi1TUk9JSS9DRTwvbG9jYWw+CiAgICAgICAgICA8Y29k
+        aWdvPjYwMDAwOTAyPC9jb2RpZ28+CiAgICAgICAgICA8Y2lkYWRlPkZPUlRB
+        TEVaQTwvY2lkYWRlPgogICAgICAgICAgPGJhaXJybz5BTERFT1RBPC9iYWly
+        cm8+CiAgICAgICAgICA8dWY+Q0U8L3VmPgogICAgICAgPC9kZXN0aW5vPgog
+        ICAgICA8L2V2ZW50bz4KICAgICA8L29iamV0bz4KPC9zcm94bWw+Cg==
+    http_version: 
+  recorded_at: Mon, 24 Feb 2014 01:12:40 GMT
+recorded_with: VCR 2.8.0

data/spec/spec_helper.rb

@@ -1,13 +1,21 @@
 require 'correios-sro-xml'
-require 'webmock/rspec'
+require 'coveralls'
+require 'vcr'
+require 'support/fixture'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Coveralls.wear!
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
   config.order = "random"
 end
 
-WebMock.disable_net_connect!
+VCR.configure do |config|
+  config.default_cassette_options = { :match_requests_on => [:uri, :method, :body] }
+  config.cassette_library_dir = 'spec/fixtures/cassettes'
+  config.hook_into :webmock
+  config.configure_rspec_metadata!
+end

data/spec/support/fixture.rb

@@ -0,0 +1,21 @@
+class Fixture
+  class << self
+    def load(name)
+      case name
+      when :sro_one_object,
+           :sro_many_objects,
+           :sro_many_objects_international,
+           :sro_not_found
+        read_file_for name
+      else
+        raise ArgumentError, "Fixture '#{name}' not found."
+      end
+    end
+
+    private
+
+    def read_file_for(filename)
+      File.open("#{File.expand_path("../../", __FILE__)}/fixtures/#{filename}.xml").read
+    end
+  end
+end

metadata

@@ -1,82 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: correios-sro-xml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
-- Prodis a.k.a. Fernando Hamasaki
+- Prodis a.k.a. Fernando Hamasaki de Amorim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log-me
-  requirement: &14781180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *14781180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &14780950 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *14780950
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: sax-machine
-  requirement: &14780720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *14780720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14780530 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14780530
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14780260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.14'
   type: :development
   prerelease: false
-  version_requirements: *14780260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &14780010 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.15.2
   type: :development
   prerelease: false
-  version_requirements: *14780010
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.2
 description: Tracking Objects System from Correios - SRO (Sistema de Rastreamento
   de Objetos dos Correios), using SRO XML Web Service, that allows to query up to
   50 orders simultaneously.
@@ -86,8 +145,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.rdoc
 - Gemfile
 - README.rdoc
@@ -99,7 +158,7 @@ files:
 - lib/correios/sro/event.rb
 - lib/correios/sro/object.rb
 - lib/correios/sro/parser.rb
-- lib/correios/sro/string.rb
+- lib/correios/sro/timeout.rb
 - lib/correios/sro/tracker.rb
 - lib/correios/sro/version.rb
 - lib/correios/sro/web_service.rb
@@ -109,39 +168,36 @@ files:
 - spec/correios/sro/tracker_spec.rb
 - spec/correios/sro/web_service_spec.rb
 - spec/correios/sro_spec.rb
+- spec/fixtures/cassettes/sro_found_last.yml
+- spec/fixtures/sro_many_objects.xml
+- spec/fixtures/sro_many_objects_international.xml
+- spec/fixtures/sro_not_found.xml
+- spec/fixtures/sro_one_object.xml
 - spec/spec_helper.rb
-- spec/support/mock_request.rb
-- spec/support/responses/failure_response_not_found.xml
-- spec/support/responses/success_response_many_objects.xml
-- spec/support/responses/success_response_many_objects_international.xml
-- spec/support/responses/success_response_one_object.xml
-homepage: http://github.com/prodis/correios-sro-xml
+- spec/support/fixture.rb
+homepage: http://prodis.blog.br/2012/08/17/correios-sro-xml-gem-para-rastreamento-de-objetos-dos-correios
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -695408557
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tracking Objects System from Correios - SRO (Sistema de Rastreamento de Objetos
   dos Correios).
 test_files:
@@ -150,9 +206,10 @@ test_files:
 - spec/correios/sro/tracker_spec.rb
 - spec/correios/sro/web_service_spec.rb
 - spec/correios/sro_spec.rb
+- spec/fixtures/cassettes/sro_found_last.yml
+- spec/fixtures/sro_many_objects.xml
+- spec/fixtures/sro_many_objects_international.xml
+- spec/fixtures/sro_not_found.xml
+- spec/fixtures/sro_one_object.xml
 - spec/spec_helper.rb
-- spec/support/mock_request.rb
-- spec/support/responses/failure_response_not_found.xml
-- spec/support/responses/success_response_many_objects.xml
-- spec/support/responses/success_response_many_objects_international.xml
-- spec/support/responses/success_response_one_object.xml
+- spec/support/fixture.rb

data/lib/correios/sro/string.rb

@@ -1,10 +0,0 @@
-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/spec/support/mock_request.rb

@@ -1,22 +0,0 @@
-# encoding: UTF-8
-
-def mock_request_for(response)
-  url = Regexp.new("http://websro.correios.com.br/sro_bin/sroii_xml.eventos")
-  WebMock::API.stub_request(:post, url).to_return(:status => 200, :body => body_for(response))
-end
-
-def body_for(response)
-  case response
-  when :success_response_one_object,
-       :success_response_many_objects,
-       :success_response_many_objects_international,
-       :failure_response_not_found
-    read_file_for(response)
-  else
-    response
-  end
-end
-
-def read_file_for(filename)
-  File.open("#{File.dirname(__FILE__)}/responses/#{filename}.xml").read
-end