cadun 0.6.3 → 0.8.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 399f65d6c228bfd42251428d958eef3b70d4e9ed
+  data.tar.gz: 8fe58a64bbc8c0122e9c007bc6b46fd1dfbe3a1f
+SHA512:
+  metadata.gz: b841555e589ba6e287a992667cda4be58b764f28fabe1508bb4d8046a210e74753c0f06a2fa09706100ba69a2e0af59261dd4b2f22ad84dfcd323b59ed961a77
+  data.tar.gz: 6eab8517c5641d4f4ff0bf431201c886b1dd284b2caf4e454d95df07133a357bc75023dd687b052606d9fb9c90aab73f779eca78d21fefb32927ac732d1474a4

data/.gitignore

@@ -1,5 +1,4 @@
 *.gem
 .bundle
-.rvmrc
-Gemfile.lock
 pkg/*
+vendor/ruby

data/.rvmrc

@@ -0,0 +1,6 @@
+rvm 1.9.2@ruby-cadun
+
+if [ ! -x "`which bundle`" ]; then
+    gem install bundler
+    bundle
+fi

data/Gemfile.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: .
+  specs:
+    cadun (0.8.3)
+      activesupport (>= 3.0.0)
+      builder (>= 2.1.2)
+      i18n
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.3.2)
+    archive-tar-minitar (0.5.2)
+    builder (3.1.4)
+    columnize (0.3.6)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    multi_json (1.4.0)
+    rake (10.0.2)
+    rr (1.0.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    webmock (1.9.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cadun!
+  rake
+  rr
+  rspec
+  ruby-debug19
+  webmock

data/{benchmark → bench}/curl_x_restclient.rb

@@ -4,7 +4,7 @@ require 'curb'
 require 'restclient'
 
 n = 100
-url = "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/email/fab1@spam.la"
+url = "http://autenticacao.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/email/fab1@spam.la"
 
 Benchmark.bm do |x|
   x.report("restclient") { n.times { RestClient.get(url) } }

data/cadun.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.name              = 'cadun'
   s.version           = Cadun::VERSION::STRING
   s.platform          = Gem::Platform::RUBY
-  s.authors           = %w(Bruno Azisaka Maciel)
-  s.email             = %w(bruno@azisaka.com.br)
+  s.authors           = %w(Cadun)
+  s.email             = %w(cadun@corp.globo.com)
   s.homepage          = ''
   s.summary           = "A wrapper for the Globo.com's authentication/authorization API"
   s.description       = "A wrapper for the Globo.com's authentication/authorization API"
@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths     = %w(lib)
-  
+
   s.add_dependency 'i18n'
   s.add_dependency 'activesupport', '>= 3.0.0'
   s.add_dependency 'builder', '>= 2.1.2'
-  s.add_dependency 'curb'
+  s.add_development_dependency "ruby-debug19"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rr'

data/lib/cadun.rb

@@ -1,8 +1,9 @@
 require 'date'
 require 'yaml'
-require 'curb'
+require 'net/http'
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/object'
 require "#{File.dirname(__FILE__)}/cadun/gateway"
 require "#{File.dirname(__FILE__)}/cadun/user"
 require "#{File.dirname(__FILE__)}/cadun/config"
+require "#{File.dirname(__FILE__)}/cadun/error"

data/lib/cadun/error.rb

@@ -0,0 +1,9 @@
+module Cadun
+  module Error
+    class NotAuthorized < Exception
+    end
+
+    class Timeout < Exception
+    end
+  end
+end

data/lib/cadun/gateway.rb

@@ -1,54 +1,80 @@
 module Cadun
   class Gateway
     attr_reader :opts
-  
+
     def self.provision(user_id, service_id)
-      request = Curl::Easy.http_put("#{Config.restclient_url}/service/provisionamento", "{\"usuarioId\":\"#{user_id}\",\"servicoId\":\"#{service_id}\"}") do |curl|
-        curl.headers['Content-Type'] = 'application/json'
-      end
-      
-      request.response_code == 200
+      uri = URI("#{Config.restclient_url}/service/provisionamento")
+
+      req = Net::HTTP::Put.new(uri.request_uri)
+      req.content_type = 'application/json'
+
+      res = Gateway.http_request uri, req, %|{"usuarioId":"#{user_id}","servicoId":"#{service_id}"}|
+      res.code == "200"
     end
-  
+
     def initialize(opts = {})
       @opts = opts
     end
-    
+
     def content
-      @content ||= Hash.from_xml(content_resource)["pessoa"]
+      unless @content
+        content = content_resource
+        @content = (Hash.from_xml(content)["pessoa"] if content.present?) || {}
+      end
+      @content
     end
-  
+
     def content_resource
-      Curl::Easy.perform("#{Config.auth_url}/cadunii/ws/resources/pessoa/#{subject}").body_str
-    end
-    
-    def subject
-      if opts[:email]; "email/#{opts[:email]}"
-      elsif opts[:cadun_id]; opts[:cadun_id]
+      subject = if opts[:email]
+        "email/#{opts[:email]}"
+      elsif opts[:cadun_id]
+        opts[:cadun_id]
       else
-        raise Exception.new(authorization["status"]) unless authorized?
+        raise Cadun::Error::NotAuthorized.new(authorization["status"]) unless authorization["status"] == "AUTORIZADO"
         authorization["usuarioID"]
       end
+
+      uri = URI("#{Config.auth_url}/cadunii/ws/resources/pessoa/#{subject}")
+
+      req = Net::HTTP::Get.new(uri.request_uri)
+
+      res = Gateway.http_request uri, req
+      res.body
+
     end
-    
-    def authorized?
-      authorization["status"] == "AUTORIZADO"
-    end
-    
+
     def authorization
       @authorization ||= Hash.from_xml(authorization_resource)["usuarioAutorizado"]
     end
-  
+
     def authorization_resource
       %w(glb_id ip service_id).each { |i| raise ArgumentError.new("#{i} is missing") unless opts[i.to_sym] }
-      
       authorization_data = { "glbId" => opts[:glb_id], "ip" => opts[:ip], "servicoID" => opts[:service_id] }.to_xml(:root => "usuarioAutorizado", :indent => 0)
-    
-      request = Curl::Easy.http_put("#{Config.auth_url}/ws/rest/autorizacao", authorization_data) do |curl|
-        curl.headers['Content-Type'] = 'text/xml'
+
+      uri = URI("#{Config.auth_url}/ws/rest/autorizacao")
+
+      req = Net::HTTP::Put.new(uri.request_uri)
+      req.content_type = 'text/xml'
+
+      res = Gateway.http_request uri, req, authorization_data
+      res.body
+
+    end
+
+    private
+
+    def self.http_request(uri, req, body=nil)
+      begin
+        http = Net::HTTP.new(uri.host, uri.port)
+
+        http.open_timeout = Config.open_timeout if Config.respond_to? :open_timeout
+        http.read_timeout = Config.read_timeout if Config.respond_to? :read_timeout
+
+        http.request req, body
+      rescue Timeout::Error
+        raise Cadun::Error::Timeout.new("timeout to #{req.class.name} resource #{uri.host + uri.path}")
       end
 
-      request.body_str
     end
   end
-end
+end

data/lib/cadun/user.rb

@@ -1,71 +1,78 @@
 module Cadun
-  class User    
-    { "id"             => "cadun_id", 
-      "nome"           => "name", 
-      "emailPrincipal" => "email",
-      "tipoUsuario"    => "user_type", 
+  class User
+    { "id"             => "cadun_id",
+      "nome"           => "name",
+      "tipoUsuario"    => "user_type",
       "sexo"           => "gender",
-      "bairro"         => "neighborhood", 
+      "bairro"         => "neighborhood",
       "cep"            => "zipcode",
       "complemento"    => "complement" }.each { |path, method| define_method(method) { gateway.content[path] } }
-    
+
     alias :id :cadun_id
-    
+
     def self.find_by_email(email)
-      email = "#{email}@globomail.com" unless email =~ /^.*@.*$/
+      email = "#{email}@globo.com" unless email =~ /^.*@.*$/
       new(:email => email)
     end
-    
+
     def self.find_by_id(cadun_id)
       new(:cadun_id => cadun_id)
     end
-    
+
     def initialize(options = {})
       @options = options
     end
     
+    def email
+      emailPrincipal || emailAlternativo
+    end
+
     def address
-      "#{endereco}, #{numero}"
+      "#{endereco}, #{numero}" if endereco and numero
     end
-    
+
     def birthday
-      Date.parse(dataNascimento)
+      Date.parse(dataNascimento) if dataNascimento
     end
-  
+
     def phone
-      "#{telefoneResidencialDdd} #{telefoneResidencial}"
+      "#{telefoneResidencialDdd} #{telefoneResidencial}" if telefoneResidencial and telefoneResidencialDdd
     end
-    
+
     def mobile
-      "#{telefoneCelularDdd} #{telefoneCelular}"
+      "#{telefoneCelularDdd} #{telefoneCelular}" if telefoneCelularDdd and telefoneCelular
     end
-    
+
     def country
       pais['nome'] if pais.present?
     end
-    
+
     def city
       cidade['nome'] if cidade.present?
     end
-    
+
     def state
       estado['sigla'] if estado.present?
     end
-    
+
     def to_hash
       %w(address birthday cadun_id city complement country cpf email gender login mobile name neighborhood phone state status user_type zipcode).inject(Hash.new(0)) { |hash, method| hash[method.to_sym] = (send(method) rescue nil); hash }
     end
-    
+
     def provision_to_service(service_id)
       Gateway.provision(id, service_id)
     end
-    
+
     def method_missing(method)
       gateway.content[method.to_s]
     end
-    
+
+    def assinante?
+      Hash.from_xml(gateway.authorization_resource)['usuarioAutorizado']['tipoUsuario'] == 'ASSINANTE'
+    end
+
     def gateway
       @gateway ||= Gateway.new(@options)
     end
   end
-end
+end

data/lib/cadun/version.rb

@@ -1,7 +1,7 @@
 module Cadun
   module VERSION
     MAJOR = 0
-    MINOR = 6
+    MINOR = 8
     PATCH = 3
 
     STRING = [MAJOR, MINOR, PATCH] * '.'

data/script/console

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+irb -r ./script/loader.rb

data/script/loader.rb

@@ -0,0 +1,3 @@
+require File.expand_path("../../lib/cadun.rb", __FILE__)
+
+Cadun::Config.load_file("#{File.dirname(__FILE__)}/../spec/support/fixtures/config.yml")

data/spec/cadun/config_spec.rb

@@ -1,18 +1,30 @@
 require 'spec_helper'
 
 describe Cadun::Config do
+  def self.verify_method(method, value)
+    describe "##{method}" do
+      subject { Cadun::Config.send(method) }
+      specify { should == value }
+    end
+  end
+
   before { load_config }
-  subject { Cadun::Config }
-  
-  its(:login_url)  { should == "https://login.qa01.globoi.com/login" }
-  its(:logout_url) { should == "https://login.qa01.globoi.com/Servlet/do/logout" }
-  its(:auth_url)   { should == "http://isp-authenticator.qa01.globoi.com:8280" }
-  
+
+  verify_method "login_url" , "https://login.qa01.globoi.com/login"
+  verify_method "logout_url", "https://login.qa01.globoi.com/Servlet/do/logout"
+  verify_method "auth_url"  , "http://autenticacao.qa01.globoi.com:8280"
+
+  verify_method "open_timeout", 0.3
+  verify_method "read_timeout", 0.4
+
   context "when the file changes" do
     before { load_another_config }
-    
-    its(:login_url) { should == "https://login.globo.com/login" }
-    its(:logout_url) { should == "https://login.globo.com/Servlet/do/logout" }
-    its(:auth_url) { should == "http://autenticacao.globo.com:8080" }
+
+    verify_method "login_url", "https://login.globo.com/login"
+    verify_method "logout_url", "https://login.globo.com/Servlet/do/logout"
+    verify_method "auth_url", "http://autenticacao.globo.com:8080"
+
+    verify_method "open_timeout", 0.5
+    verify_method "read_timeout", 0.6
   end
-end
+end

data/spec/cadun/gateway_spec.rb

@@ -1,68 +1,103 @@
 require 'spec_helper'
 
 describe Cadun::Gateway do  
+  let(:autorizacao_service_url) { "http://autenticacao.qa01.globoi.com:8280/ws/rest/autorizacao" }
+
   before { load_config }
-  
-  describe "#provision" do
-    subject { Cadun::Gateway.provision(123456, 2515) }
-    
+
+  describe "#provision" do  
+    let(:service_url) { "http://cadun-rest.qa01.globoi.com/service/provisionamento" }
     context "when the service is provisioned to the user" do
-      before { stub_request(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento").to_return(:status => [200]) }
-      it { should be_true }
+      before { stub_request(:put, service_url).to_return(:status => [200]) }
+
+      subject { Cadun::Gateway.provision(123456, 2515) }
+      specify { should be_true }
     end
-  
-    context "when the service has been provisioned to the user" do
-      before { stub_request(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento").to_return(:status => [304]) }
-      it { should be_false }
+
+    context "when the service is provisioned to the user" do
+      before { stub_request(:put, service_url).to_return(:status => [304]) }
+
+      subject { Cadun::Gateway.provision(123456, 2515) }
+      it { subject.should be_false }
     end
-    
+
     context "when the service is not found" do
-      before { stub_request(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento").to_return(:status => [404]) }
-      it { should be_false }
+      before { stub_request(:put, service_url).to_return(:status => [404]) }
+
+      subject { Cadun::Gateway.provision(123456, 2515) }
+      it { subject.should be_false }
+    end
+
+    context "when the service returns HTTP 50x error" do
+      before { stub_request(:put, service_url).to_return(:status => [503]) }
+
+      subject { Cadun::Gateway.provision(123456, 2515) }
+      it { subject.should be_false }
+    end
+
+    context "when the request timed out" do
+      before { stub_request(:put, service_url).to_timeout }
+
+      subject { Cadun::Gateway.provision(123456, 2515) }
+
+      it "should raise an exception" do
+        -> { subject }.should raise_error(TimeoutError)
+      end
     end
   end
-  
+
   describe "#content" do
+    let(:service_url) { "http://autenticacao.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/1" }
     let(:gateway) { Cadun::Gateway.new(:glb_id => "GLB_ID", :ip => "127.0.0.1", :service_id => 2626) }
-    subject { gateway.content }
-    
+
     context "when status not AUTORIZADO" do
-      before { stub_request(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao").to_return(:body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>NAO_AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>") }
-      it { expect { subject }.to raise_error(Exception) }
+      before do
+        stub_request(:put, autorizacao_service_url).to_return(:body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>NAO_AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
+      end
+
+      it { proc { gateway.content }.should raise_error(Cadun::Error::NotAuthorized) }
     end
 
     context "when status AUTORIZADO" do
       before do
-        stub_request(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao").to_return(:body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
-        stub_request(:get, "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/1").to_return(:body => "<?xml version='1.0' encoding='utf-8'?><pessoa><nome>Barack Obama</nome></pessoa>")
+        stub_request(:put, autorizacao_service_url).to_return(:body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
+        stub_request(:get, service_url).to_return(:body => "<?xml version='1.0' encoding='utf-8'?><pessoa><nome>Barack Obama</nome></pessoa>")
       end
 
-      it { should include('nome' => 'Barack Obama') }
+      it { proc { gateway.content }.should_not raise_error(Cadun::Error::NotAuthorized) }
+
+      it "should parse the resource" do
+        gateway.content['nome'].should == 'Barack Obama'
+      end
     end
   end
-  
+
   describe "#authorization" do
-    subject { gateway.authorization }
-    
     context "when all information is given" do
       let(:gateway) { Cadun::Gateway.new(:glb_id => "GLB_ID", :ip => "127.0.0.1", :service_id => 2626) }
-      before { stub_request(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao").to_return(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><usuarioAutorizado><glbId>GLB_ID</glbId><ip>127.0.0.1</ip><servicoID type=\"integer\">2626</servicoID></usuarioAutorizado>", :body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>") }
-      it { subject.should include('usuarioID' => '1') }
+
+      before do
+        stub_request(:put, autorizacao_service_url).to_return(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><usuarioAutorizado><glbId>GLB_ID</glbId><ip>127.0.0.1</ip><servicoID type=\"integer\">2626</servicoID></usuarioAutorizado>", :body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
+      end
+
+      it "should parse the authorization request" do
+        gateway.authorization['usuarioID'].should == '1'
+      end
     end
-    
+
     context "when glb_id is not given" do
       let(:gateway) { Cadun::Gateway.new }
-      it { expect { subject }.to raise_error(ArgumentError, "glb_id is missing") }
+      it { proc { gateway.authorization }.should raise_error(ArgumentError, "glb_id is missing") }
     end
-    
+
     context "when ip is not given" do
       let(:gateway) { Cadun::Gateway.new(:glb_id => "1") }
-      it { expect { subject }.to raise_error(ArgumentError, "ip is missing") } 
+      it { proc { gateway.authorization }.should raise_error(ArgumentError, "ip is missing") }
     end
-    
+
     context "when service_id is not given" do
       let(:gateway) { Cadun::Gateway.new(:glb_id => "1", :ip => "1") }
-      it { expect { subject }.to raise_error(ArgumentError, "service_id is missing") }
+      it { proc { gateway.authorization }.should raise_error(ArgumentError, "service_id is missing") }
     end
   end
-end
+end

data/spec/cadun/user_spec.rb

@@ -2,105 +2,123 @@
 require 'spec_helper'
 
 describe Cadun::User do
+
+  def self.verify_method(method, value)
+    describe "##{method}" do
+      specify { subject.send(method).should == value }
+    end
+  end
+
   before do
     load_config
     stub_requests
   end
-  
+
   context "when the user id is not given" do
     subject { Cadun::User.new :ip => "127.0.0.1", :service_id => 2626, :glb_id => "GLB_ID" }
-    
+
     it "should load the gateway only when it's needed" do
-      mock(Cadun::Gateway).new(hash_including(:ip => "127.0.0.1", :service_id => 2626, :glb_id => "GLB_ID")) do 
+      mock(Cadun::Gateway).new(:ip => "127.0.0.1", :service_id => 2626, :glb_id => "GLB_ID") do
         mock(Cadun::Gateway).content { Hash.new }
       end
-      
+
       subject.login
     end
-    
+
     it "should not load the gateway when the user is initialized" do
       dont_allow(Cadun::Gateway).new
       subject
     end
 
-    its(:id)            { should == "21737810" }
-    its(:name)          { should == "Fabricio Rodrigo Lopes" }
-    its(:birthday)      { should == Date.new(1983, 02, 22) }
-    its(:phone)         { should == "21 22881060" }
-    its(:mobile)        { should == "21 99999999" }
-    its(:email)         { should == "fab1@spam.la" }
-    its(:gender)        { should == "MASCULINO" }
-    its(:city)          { should == "Rio de Janeiro" }
-    its(:state)         { should == "RJ" }
-    its(:status)        { should == "ATIVO" }
-    its(:address)       { should == "Rua Uruguai, 59" }
-    its(:neighborhood)  { should == "Andaraí" }
-    its(:cpf)           { should == "09532034765" }
-    its(:login)         { should == "fabricio_fab1" }
-    its(:country)       { should == "Brasil" }
-    its(:user_type)     { should == "NAO_ASSINANTE" }
-    its(:cadun_id)      { should == "21737810" }
-    its(:complement)    { should == "807" }
+    verify_method "id", "21737810"
+    verify_method "name", "Fabricio Rodrigo Lopes"
+    verify_method "birthday", Date.new(1983, 02, 22)
+    verify_method "phone", "21 22881060"
+    verify_method "mobile", "21 99999999"
+    verify_method "email", "fab1@spam.la"
+    verify_method "gender", "MASCULINO"
+    verify_method "city", "Rio de Janeiro"
+    verify_method "state", "RJ"
+    verify_method "status", "ATIVO"
+    verify_method "address", "Rua Uruguai, 59"
+    verify_method "neighborhood", "Andaraí"
+    verify_method "cpf", "09532034765"
+    verify_method "login", "fabricio_fab1"
+    verify_method "country", "Brasil"
+    verify_method "user_type", "NAO_ASSINANTE"
+    verify_method "cadun_id", "21737810"
+    verify_method "complement", "807"
   end
-  
+
   describe "#to_hash" do
     context "when the user has all data" do
       subject { Cadun::User.new(:cadun_id => "10001000").to_hash }
-      
-      it { should include :cadun_id => "10001000" }
-      it { should include :name => "Guilherme Chico" }
-      it { should include :email => "fab1@spam.la" }
-      it { should include :user_type => "NAO_ASSINANTE" }
-      it { should include :gender => "MASCULINO" }
-      it { should include :neighborhood => "Andaraí" }
-      it { should include :city => "Rio de Janeiro" }
-      it { should include :state => "RJ" }
-      it { should include :country => "Brasil" }
-      it { should include :address => "Rua Uruguai, 59" }
-      it { should include :birthday => Date.new(1983, 02, 22) }
-      it { should include :phone => "21 22881060" }
-      it { should include :mobile => "21 99999999" }
-      it { should include :login => "fabricio_fab1" }
-      it { should include :cpf => "09532034765" }
-      it { should include :zipcode => "20510060" }
-      it { should include :status => "ATIVO" }
-      it { should include :complement => "807" }
+
+      specify { should include(:cadun_id => "10001000") }
+      specify { should include(:name => "Guilherme Chico") }
+      specify { should include(:email => "fab1@spam.la") }
+      specify { should include(:user_type => "NAO_ASSINANTE") }
+      specify { should include(:gender => "MASCULINO") }
+      specify { should include(:neighborhood => "Andaraí") }
+      specify { should include(:city => "Rio de Janeiro") }
+      specify { should include(:state => "RJ") }
+      specify { should include(:country => "Brasil") }
+      specify { should include(:address => "Rua Uruguai, 59") }
+      specify { should include(:birthday => Date.new(1983, 02, 22)) }
+      specify { should include(:phone => "21 22881060") }
+      specify { should include(:mobile => "21 99999999") }
+      specify { should include(:login => "fabricio_fab1") }
+      specify { should include(:cpf => "09532034765") }
+      specify { should include(:zipcode => "20510060") }
+      specify { should include(:status => "ATIVO") }
+      specify { should include(:complement => "807") }
     end
-    
+
     context "when the user has minimal data" do
       subject { Cadun::User.find_by_email("fulano_adm_campanha@globomail.com") }
-      
-      its(:id)      { should == "23370159" }
-      its(:city)    { should be_nil }
-      its(:state)   { should be_nil }
-      its(:country) { should be_nil }
+      specify { subject.id.should == "23370159" }
+      specify { subject.city.should == nil }
+      specify { subject.state.should == nil }
+      specify { subject.country.should == nil }
     end
   end
-  
+
   describe ".find_by_email" do
     context "given an email without domain" do
       subject { Cadun::User.find_by_email("silvano") }
-      its(:id) { should == "24510533" }
+      verify_method "id", "24510533"
     end
-    
+
     context "given an email with domain" do
       subject { Cadun::User.find_by_email("silvano@corp.globo.com") }
-      its(:id) { should == "24510533" }
+      verify_method "id", "24510533"
     end
   end
-  
+
   describe ".find_by_id" do
-    subject { Cadun::User.find_by_id("10001000") }
-    its(:id) { should == "10001000" }
+    context "when the user exists" do
+      subject { Cadun::User.find_by_id("10001000") }
+      verify_method "id", "10001000"
+    end
+
+    context "when the user doesn't exists" do
+      subject { Cadun::User.find_by_id("999999") }
+
+      %w{ id name birthday phone mobile email gender city state status
+          address neighborhood cpf login country user_type cadun_id
+          complement }.each do |method|
+        verify_method method, nil
+      end
+    end
   end
-  
+
   describe "#provision_to_service" do
     it "should call gateway's provision" do
       mock(Cadun::Gateway).provision(1, 6969)
-      
+
       user = Cadun::User.new
       mock(user).id { 1 }
       user.provision_to_service(6969)
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,25 +1,27 @@
 require "#{File.dirname(__FILE__)}/../lib/cadun"
 require 'webmock/rspec'
+require 'ruby-debug'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-RSpec.configure do |config|  
+RSpec.configure do |config|
   config.mock_with :rr
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
-  
+
   config.before(:suite) do
     WebMock.disable_net_connect!(:allow_localhost => true)
   end
 end
 
 def stub_requests
-  stub_request(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/autorizacao.xml"))
-  stub_request(:get, "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/21737810").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/pessoa.xml"))
-  stub_request(:get, "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/10001000").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/pessoa_2.xml"))
-  stub_request(:get, "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/email/silvano@globo.com").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/email.xml"))
-  stub_request(:get, "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/email/silvano@corp.globo.com").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/email.xml"))
-  stub_request(:get, "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/email/fulano_adm_campanha@globomail.com").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/email2.xml"))
+  stub_request(:put, "http://autenticacao.qa01.globoi.com:8280/ws/rest/autorizacao").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/autorizacao.xml"))
+  stub_request(:get, "http://autenticacao.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/21737810").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/pessoa.xml"))
+  stub_request(:get, "http://autenticacao.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/999999").to_return(:status => 302)
+  stub_request(:get, "http://autenticacao.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/10001000").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/pessoa_2.xml"))
+  stub_request(:get, "http://autenticacao.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/email/silvano@globo.com").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/email.xml"))
+  stub_request(:get, "http://autenticacao.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/email/silvano@corp.globo.com").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/email.xml"))
+  stub_request(:get, "http://autenticacao.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/email/fulano_adm_campanha@globomail.com").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/email2.xml"))
   stub_request(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento").to_return(:body => File.new("#{File.dirname(__FILE__)}/support/fixtures/provisionamento.json"))
 end
 
@@ -29,4 +31,4 @@ end
 
 def load_another_config
   Cadun::Config.load_file "#{File.dirname(__FILE__)}/support/fixtures/another_config.yml"
-end
+end

data/spec/support/fixtures/another_config.yml

@@ -2,4 +2,6 @@ cadun:
   logout_url: https://login.globo.com/Servlet/do/logout
   login_url: https://login.globo.com/login
   auth_url: http://autenticacao.globo.com:8080
-  restclient_url: http://cadun-rest.globoi.com
+  restclient_url: http://cadun-rest.globoi.com
+  open_timeout: 0.5 # in seconds
+  read_timeout: 0.6 # in seconds

data/spec/support/fixtures/config.yml

@@ -1,5 +1,7 @@
 cadun:
   logout_url: https://login.qa01.globoi.com/Servlet/do/logout
   login_url: https://login.qa01.globoi.com/login
-  auth_url: http://isp-authenticator.qa01.globoi.com:8280
-  restclient_url: http://cadun-rest.qa01.globoi.com
+  auth_url: http://autenticacao.qa01.globoi.com:8280
+  restclient_url: http://cadun-rest.qa01.globoi.com
+  open_timeout: 0.3 # in seconds
+  read_timeout: 0.4 # in seconds

metadata

@@ -1,124 +1,150 @@
 --- !ruby/object:Gem::Specification
 name: cadun
 version: !ruby/object:Gem::Version
-  version: 0.6.3
-  prerelease: 
+  version: 0.8.3
 platform: ruby
 authors:
-- Bruno
-- Azisaka
-- Maciel
+- Cadun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70300104786900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300104786900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70300104779400 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300104779400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70300104778780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70300104778780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
-  name: curb
-  requirement: &70300104636920 !ruby/object:Gem::Requirement
-    none: false
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70300104636920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300104634980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300104634980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300104633980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300104633980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70300104633280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300104633280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70300104632720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300104632720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A wrapper for the Globo.com's authentication/authorization API
 email:
-- bruno@azisaka.com.br
+- cadun@corp.globo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
+- Gemfile.lock
 - Rakefile
-- benchmark/curl_x_restclient.rb
+- bench/curl_x_restclient.rb
 - cadun.gemspec
 - lib/cadun.rb
 - lib/cadun/config.rb
+- lib/cadun/error.rb
 - lib/cadun/gateway.rb
 - lib/cadun/user.rb
 - lib/cadun/version.rb
+- script/console
+- script/loader.rb
 - spec/cadun/config_spec.rb
 - spec/cadun/gateway_spec.rb
 - spec/cadun/user_spec.rb
@@ -133,26 +159,25 @@ files:
 - spec/support/fixtures/provisionamento.json
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A wrapper for the Globo.com's authentication/authorization API
 test_files: []