correios-frete 1.5.1 → 1.5.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 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.
+
 == Versão 1.5.1
 - Novo: Construtor de Correios::Frete::Pacote recebendo itens.
 

data/Gemfile

@@ -5,10 +5,9 @@ gem "nokogiri", "~> 1.5.0"
 gem "sax-machine", "~> 0.1.0"
 
 group :development do
-  gem "bundler", "~> 1.0.21"
   gem "fakeweb", "~> 1.3.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rspec", "~> 2.8.0"
+  gem "jeweler", "~> 1.8.3"
+  gem "rspec", "~> 2.8"
   gem "ruby-debug", :platforms => :ruby_18
   gem "ruby-debug19", :require => "ruby-debug", :platforms => :ruby_19
 end

data/Gemfile.lock

@@ -6,10 +6,12 @@ GEM
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
+    json (1.6.5)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
@@ -18,6 +20,8 @@ GEM
     nokogiri (1.5.0)
     rake (0.9.2.2)
     rbx-require-relative (0.0.5)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -48,12 +52,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.21)
   fakeweb (~> 1.3.0)
-  jeweler (~> 1.6.4)
+  jeweler (~> 1.8.3)
   log-me (~> 0.0.2)
   nokogiri (~> 1.5.0)
-  rspec (~> 2.8.0)
+  rspec (~> 2.8)
   ruby-debug
   ruby-debug19
   sax-machine (~> 0.1.0)

data/README.rdoc

@@ -305,6 +305,7 @@ Para desabilitar o log, mudar o nível do log ou configurar um outro mecanismo d
 - {Daniel Konishi (dkonishi)}[https://github.com/dkonishi]
 - {Denis Tierno (detierno)}[https://github.com/detierno]
 - {Rafael Barbolo (barbolo)}[https://github.com/barbolo]
+- {Rafael Souza (rafaelss)}[https://github.com/rafaelss]
 - {Ricardo Bernardelli (bernardelli)}[https://github.com/bernardelli]
 
 == Copyright

data/Rakefile

@@ -15,7 +15,7 @@ require './lib/correios/frete/version'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "correios-frete"
-  gem.homepage = "http://prodis.blog.br/2011/07/03/gem-para-calculo-de-frete-dos-correios"
+  gem.homepage = "http://prodis.blog.br/correios-frete-gem-para-calculo-de-frete-dos-correios"
   gem.license = "MIT"
   gem.summary = %Q{Calculo de frete dos Correios.}
   gem.description = %Q{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.}

data/correios-frete.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "correios-frete"
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   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-01-26"
+  s.date = "2012-02-07"
   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 = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
     "spec/support/responses/success-response-many-services.xml",
     "spec/support/responses/success-response-one-service.xml"
   ]
-  s.homepage = "http://prodis.blog.br/2011/07/03/gem-para-calculo-de-frete-dos-correios"
+  s.homepage = "http://prodis.blog.br/correios-frete-gem-para-calculo-de-frete-dos-correios"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
@@ -59,20 +59,18 @@ Gem::Specification.new do |s|
       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<bundler>, ["~> 1.0.21"])
       s.add_development_dependency(%q<fakeweb>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8"])
       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<bundler>, ["~> 1.0.21"])
       s.add_dependency(%q<fakeweb>, ["~> 1.3.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.8"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
     end
@@ -80,10 +78,9 @@ Gem::Specification.new do |s|
     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<bundler>, ["~> 1.0.21"])
     s.add_dependency(%q<fakeweb>, ["~> 1.3.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.8"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
   end

data/lib/correios/frete/version.rb

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

data/spec/correios/frete/parser_spec.rb

@@ -3,36 +3,8 @@ require 'spec_helper'
 
 describe Correios::Frete::Parser do
   describe "#servicos" do
-    before :each do
-      @xml = """<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>
-                <Servicos>
-                  <cServico>
-                    <Codigo>41106</Codigo>
-                    <Valor>15,70</Valor>
-                    <PrazoEntrega>3</PrazoEntrega>
-                    <ValorMaoPropria>3,75</ValorMaoPropria>
-                    <ValorAvisoRecebimento>1,99</ValorAvisoRecebimento>
-                    <ValorValorDeclarado>1,50</ValorValorDeclarado>
-                    <EntregaDomiciliar>S</EntregaDomiciliar>
-                    <EntregaSabado>N</EntregaSabado>
-                    <Erro>-3</Erro>
-                    <MsgErro>Somente para teste</MsgErro>
-                  </cServico>
-                  <cServico>
-                    <Codigo>40010</Codigo>
-                    <Valor>17,80</Valor>
-                    <PrazoEntrega>1</PrazoEntrega>
-                    <ValorMaoPropria>3,70</ValorMaoPropria>
-                    <ValorAvisoRecebimento>0,00</ValorAvisoRecebimento>
-                    <ValorValorDeclarado>1,50</ValorValorDeclarado>
-                    <EntregaDomiciliar>S</EntregaDomiciliar>
-                    <EntregaSabado>S</EntregaSabado>
-                    <Erro>0</Erro>
-                    <MsgErro></MsgErro>
-                  </cServico>
-                </Servicos>"""
-      @parser = Correios::Frete::Parser.new
-    end
+    let(:xml) { body_for :success_response_many_services }
+    let(:parser) { Correios::Frete::Parser.new }
 
     { :pac => { :tipo => :pac,
                 :codigo => "41106",
@@ -58,7 +30,7 @@ describe Correios::Frete::Parser do
                   :msg_erro => nil }
     }.each do |service, attributes|
       it "returns #{service} data" do
-        servicos = @parser.servicos @xml
+        servicos = parser.servicos(xml)
 
         attributes.each do |attr, value|
           servicos[service].send(attr).should == value

data/spec/correios/frete/web_service_spec.rb

@@ -10,11 +10,11 @@ describe Correios::Frete::WebService do
     end
 
     let(:frete) { Correios::Frete::Calculador.new }
-    let(:webservice) { Correios::Frete::WebService.new(frete, [:pac, :sedex]) }
+    let(:web_service) { Correios::Frete::WebService.new(frete, [:pac, :sedex]) }
 
     it "returns XML response" do
       fake_request_for("<xml><fake></fake>")
-      webservice.request!.should == "<xml><fake></fake>"
+      web_service.request!.should == "<xml><fake></fake>"
     end
   end
 end

data/spec/support/fake_request.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 def fake_request_for(response)
   FakeWeb.register_uri(:get,
                        Regexp.new("http://ws.correios.com.br/calculador/CalcPrecoPrazo.aspx"),

data/spec/support/responses/success-response-many-services.xml

@@ -1 +1,27 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?><Servicos><cServico><Codigo>41106</Codigo><Valor>15,70</Valor><PrazoEntrega>3</PrazoEntrega><ValorMaoPropria>3,70</ValorMaoPropria><ValorAvisoRecebimento>0,00</ValorAvisoRecebimento><ValorValorDeclarado>1,50</ValorValorDeclarado><EntregaDomiciliar>S</EntregaDomiciliar><EntregaSabado>N</EntregaSabado><Erro>0</Erro><MsgErro></MsgErro></cServico><cServico><Codigo>40010</Codigo><Valor>17,80</Valor><PrazoEntrega>1</PrazoEntrega><ValorMaoPropria>3,70</ValorMaoPropria><ValorAvisoRecebimento>0,00</ValorAvisoRecebimento><ValorValorDeclarado>1,50</ValorValorDeclarado><EntregaDomiciliar>S</EntregaDomiciliar><EntregaSabado>S</EntregaSabado><Erro>0</Erro><MsgErro></MsgErro></cServico></Servicos>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<Servicos>
+  <cServico>
+    <Codigo>41106</Codigo>
+    <Valor>15,70</Valor>
+    <PrazoEntrega>3</PrazoEntrega>
+    <ValorMaoPropria>3,75</ValorMaoPropria>
+    <ValorAvisoRecebimento>1,99</ValorAvisoRecebimento>
+    <ValorValorDeclarado>1,50</ValorValorDeclarado>
+    <EntregaDomiciliar>S</EntregaDomiciliar>
+    <EntregaSabado>N</EntregaSabado>
+    <Erro>-3</Erro>
+    <MsgErro>Somente para teste</MsgErro>
+  </cServico>
+  <cServico>
+    <Codigo>40010</Codigo>
+    <Valor>17,80</Valor>
+    <PrazoEntrega>1</PrazoEntrega>
+    <ValorMaoPropria>3,70</ValorMaoPropria>
+    <ValorAvisoRecebimento>0,00</ValorAvisoRecebimento>
+    <ValorValorDeclarado>1,50</ValorValorDeclarado>
+    <EntregaDomiciliar>S</EntregaDomiciliar>
+    <EntregaSabado>S</EntregaSabado>
+    <Erro>0</Erro>
+    <MsgErro></MsgErro>
+  </cServico>
+</Servicos>

data/spec/support/responses/success-response-one-service.xml

@@ -1 +1,15 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?><cServico><Codigo>40010</Codigo><Valor>17,80</Valor><PrazoEntrega>1</PrazoEntrega><ValorMaoPropria>3,70</ValorMaoPropria><ValorAvisoRecebimento>0,00</ValorAvisoRecebimento><ValorValorDeclarado>1,50</ValorValorDeclarado><EntregaDomiciliar>S</EntregaDomiciliar><EntregaSabado>S</EntregaSabado><Erro>0</Erro><MsgErro></MsgErro></cServico></Servicos>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<Servicos>
+  <cServico>
+    <Codigo>40010</Codigo>
+    <Valor>17,80</Valor>
+    <PrazoEntrega>1</PrazoEntrega>
+    <ValorMaoPropria>3,70</ValorMaoPropria>
+    <ValorAvisoRecebimento>0,00</ValorAvisoRecebimento>
+    <ValorValorDeclarado>1,50</ValorValorDeclarado>
+    <EntregaDomiciliar>S</EntregaDomiciliar>
+    <EntregaSabado>S</EntregaSabado>
+    <Erro>0</Erro>
+    <MsgErro></MsgErro>
+  </cServico>
+</Servicos>

metadata

@@ -2,7 +2,7 @@
 name: correios-frete
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Prodis a.k.a. Fernando Hamasaki
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-26 00:00:00 Z
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: log-me
@@ -46,52 +46,41 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: fakeweb
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.21
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: jeweler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.6.4
+        version: "2.8"
   type: :development
   prerelease: false
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,10 +88,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,7 +99,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  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.
@@ -150,7 +139,7 @@ files:
 - spec/support/fake_request.rb
 - spec/support/responses/success-response-many-services.xml
 - spec/support/responses/success-response-one-service.xml
-homepage: http://prodis.blog.br/2011/07/03/gem-para-calculo-de-frete-dos-correios
+homepage: http://prodis.blog.br/correios-frete-gem-para-calculo-de-frete-dos-correios
 licenses: 
 - MIT
 post_install_message: