cadun 0.2.1 → 0.2.2

data/lib/cadun/gateway.rb

@@ -1,7 +1,7 @@
 module Cadun
   class Gateway
-    def initialize(glb_id, ip, service_id)
-      @glb_id, @ip, @service_id = glb_id, ip, service_id
+    def initialize(options = {})
+      @options = options 
     end
 
     def content
@@ -18,7 +18,7 @@ module Cadun
     
     protected
     def content_resource
-      get "/cadunii/ws/resources/pessoa/#{authorization.xpath("usuarioID").text}"
+      get "/cadunii/ws/resources/pessoa/#{@options[:user_id] || authorization.xpath("usuarioID").text}"
     end
 
     def get(path)
@@ -26,7 +26,7 @@ module Cadun
     end
     
     def authorization_resource
-      put "/ws/rest/autorizacao", "<usuarioAutorizado><glbId>#{@glb_id}</glbId><ip>#{@ip}</ip><servicoID>#{@service_id}</servicoID></usuarioAutorizado>"
+      put "/ws/rest/autorizacao", "<usuarioAutorizado><glbId>#{@options[:glb_id]}</glbId><ip>#{@options[:ip]}</ip><servicoID>#{@options[:service_id]}</servicoID></usuarioAutorizado>"
     end
     
     def put(path, data)

data/lib/cadun/user.rb

@@ -4,7 +4,8 @@ module Cadun
     
     { "id"                       => "id", 
       "nome"                     => "name", 
-      "emailPrincipal"           => "email", 
+      "emailPrincipal"           => "email",
+      "tipoUsuario"              => "user_type", 
       "sexo"                     => "gender",
       "bairro"                   => "neighborhood", 
       "cidade/nome"              => "city", 
@@ -13,8 +14,8 @@ module Cadun
       define_method(method) { gateway.content.xpath(path).text }
     end
     
-    def initialize(glb_id, ip, service_id)
-      @gateway = Gateway.new(glb_id, ip, service_id)
+    def initialize(options = {})
+      @gateway = Gateway.new(options)
     end
     
     def address

data/lib/cadun/version.rb

@@ -2,7 +2,7 @@ module Cadun
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY] * '.'
   end

data/spec/cadun/gateway_spec.rb

@@ -9,7 +9,7 @@ describe Cadun::Gateway do
     mock(subject).connection { connection }
   end
   
-  subject { Cadun::Gateway.new("GLB_ID", "127.0.0.1", 2626) }
+  subject { Cadun::Gateway.new(:glb_id => "GLB_ID", :ip => "127.0.0.1", :service_id => 2626) }
   
   describe "#content" do
     before do

data/spec/cadun/user_spec.rb

@@ -2,9 +2,6 @@
 require 'spec_helper'
 
 describe Cadun::User do
-  include Cadun
-  
-  subject { User.new "GLB_ID", "127.0.0.1", 2626 }
   
   def self.verify_method(method, value)
     describe "##{method}" do
@@ -17,38 +14,57 @@ describe Cadun::User do
     stub_requests
   end
   
-  it "should load the gateway" do
-    mock(Gateway).new "GLB_ID", "127.0.0.1", 2626
-    subject
+  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" do
+      mock(Cadun::Gateway).new(hash_including(:ip => "127.0.0.1", :service_id => 2626, :glb_id => "GLB_ID"))
+      subject
+    end
+
+    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"
+  end
+  
+  context "when the user id is given" do
+    subject { Cadun::User.new :user_id => "10001000", :ip => "127.0.0.1" }
+    
+    it "should load the gateway" do
+      mock(Cadun::Gateway).new(hash_including(:ip => "127.0.0.1", :user_id => "10001000"))
+      subject
+    end
+
+    verify_method "id", "10001000"
+
+    verify_method "name", "Guilherme Chico"
   end
-                
-  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"
 end

data/spec/spec_helper.rb

@@ -23,6 +23,9 @@ def stub_requests
 
   FakeWeb.register_uri :get, "http://isp-authenticator.dev.globoi.com:8280/cadunii/ws/resources/pessoa/21737810", 
                        :body => "#{File.dirname(__FILE__)}/support/fixtures/pessoa.xml"
+                       
+  FakeWeb.register_uri :get, "http://isp-authenticator.dev.globoi.com:8280/cadunii/ws/resources/pessoa/10001000", 
+                       :body => "#{File.dirname(__FILE__)}/support/fixtures/pessoa_2.xml"
 end
 
 def load_config

data/spec/support/fixtures/pessoa_2.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<pessoa>
+  <id>10001000</id>
+  <alteracao>2011-04-25T00:00:00-03:00</alteracao>
+  <bairro>Andaraí</bairro>
+  <cep>20510060</cep>
+  <cidade>
+    <estadoId>19</estadoId>
+    <id>7043</id>
+    <nome>Rio de Janeiro</nome>
+  </cidade>
+  <cidadeId>7043</cidadeId>
+  <complemento>807</complemento>
+  <cookie>0000097QgXvo9pYpqTFi1p21BBPvV0Al</cookie>
+  <cpf>09532034765</cpf>
+  <criacao>2009-05-08T00:00:00-03:00</criacao>
+  <dataNascimento>1983-02-22T00:00:00-03:00</dataNascimento>
+  <emailPrincipal>fab1@spam.la</emailPrincipal>
+  <endereco>Rua Uruguai</endereco>
+  <estado>
+    <id>19</id>
+    <nome>Rio de Janeiro</nome>
+    <paisId>1</paisId>
+    <sigla>RJ</sigla>
+  </estado>
+  <estadoId>19</estadoId>
+  <ipCadastro>127.0.0.1</ipCadastro>
+  <login>fabricio_fab1</login>
+  <modulos>
+    <criacao>2009-05-08T10:04:35-03:00</criacao>
+    <moduloID>2</moduloID>
+    <pessoaID>21737810</pessoaID>
+  </modulos>
+  <modulos>
+    <alteracao>2011-04-14T18:04:15-03:00</alteracao>
+      <criacao>2009-05-08T10:04:35-03:00</criacao>
+      <moduloID>1</moduloID>
+      <pessoaID>21737810</pessoaID>
+  </modulos>
+  <modulos>
+    <criacao>2009-05-08T10:04:35-03:00</criacao>
+    <moduloID>3</moduloID>
+    <pessoaID>21737810</pessoaID>
+  </modulos>
+  <modulos>
+    <criacao>2009-05-08T10:04:35-03:00</criacao>
+    <moduloID>4</moduloID>
+    <pessoaID>21737810</pessoaID>
+  </modulos>
+  <modulos>
+    <criacao>2009-05-08T10:04:35-03:00</criacao>
+    <moduloID>7</moduloID>
+    <pessoaID>21737810</pessoaID>
+  </modulos>
+  <nome>Guilherme Chico</nome>
+  <numero>59</numero>
+  <optinCelular>false</optinCelular>
+  <optinGlobo>true</optinGlobo>
+  <optinParceiros>true</optinParceiros>
+  <origemId>181</origemId>
+  <pais>
+    <id>1</id>
+    <nome>Brasil</nome>
+    <sigla>BR</sigla>
+  </pais>
+  <paisId>1</paisId>
+  <perguntaId>3</perguntaId>
+  <resposta>preto</resposta>
+  <servicoOrigemId>807</servicoOrigemId>
+  <sexo>MASCULINO</sexo>
+  <status>ATIVO</status>
+  <telefoneCelular>99999999</telefoneCelular>
+  <telefoneCelularDdd>21</telefoneCelularDdd>
+  <telefoneResidencial>22881060</telefoneResidencial>
+  <telefoneResidencialDdd>21</telefoneResidencialDdd>
+  <tipoUsuario>NAO_ASSINANTE</tipoUsuario>
+</pessoa>

metadata

@@ -2,7 +2,7 @@
 name: cadun
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Bruno
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -03:00
+date: 2011-05-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - spec/support/fixtures/autorizacao.xml
 - spec/support/fixtures/config.yml
 - spec/support/fixtures/pessoa.xml
+- spec/support/fixtures/pessoa_2.xml
 has_rdoc: true
 homepage: https://github.com/azisaka/Cadun
 licenses: []