cadun 0.2.0 → 0.2.1

data/.gitignore

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

data/Gemfile

@@ -1,4 +1,2 @@
 source "http://rubygems.org"
-
-# Specify your gem's dependencies in cadun.gemspec
-gemspec
+gemspec

data/cadun.gemspec

@@ -1,23 +1,21 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require "cadun/version"
+require "#{File.dirname(__FILE__)}/lib/cadun/version"
 
 Gem::Specification.new do |s|
-  s.name        = "cadun"
-  s.version     = Cadun::VERSION::STRING
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Bruno Azisaka Maciel"]
-  s.email       = ["bruno@azisaka.com.br"]
-  s.homepage    = ""
-  s.summary     = ""
-  s.description = ""
+  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.homepage          = 'https://github.com/azisaka/Cadun'
+  s.summary           = 'A wrapper for the CadUn authentication/authorization API'
+  s.description       = 'A wrapper for the CadUn authentication/authorization API'
 
-  s.rubyforge_project = "cadun"
+  s.rubyforge_project = 'cadun'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- {spec}/*`.split("\n")
+  s.require_paths     = %w(lib)
   
   s.add_dependency 'nokogiri'
   s.add_development_dependency 'rack'

data/lib/cadun/gateway.rb

@@ -5,19 +5,32 @@ module Cadun
     end
 
     def content
-      @content ||= Nokogiri::XML(resource).children
+      @content ||= Nokogiri::XML(content_resource).children
     end
 
     def authorization
-      @authorization ||= Nokogiri::XML(connection.put("/ws/rest/autorizacao", "<usuarioAutorizado><glbId>#{@glb_id}</glbId><ip>#{@ip}</ip><servicoID>#{@service_id}</servicoID></usuarioAutorizado>", {'Content-Type' => 'text/xml'}).body).children
+      @authorization ||= Nokogiri::XML(authorization_resource).children
     end
 
-    def resource
-      @resource ||= connection.get("/cadunii/ws/resources/pessoa/#{authorization.xpath("usuarioID").text}", {'Content-Type' => 'text/xml'}).body
+    def connection
+      @connection ||= Net::HTTP.new(Config.auth_url, Config.auth_port)
+    end
+    
+    protected
+    def content_resource
+      get "/cadunii/ws/resources/pessoa/#{authorization.xpath("usuarioID").text}"
     end
 
-    def connection
-      @connection ||= Net::HTTP.new(*[Config.auth_url, Config.auth_port])
+    def get(path)
+      connection.get(path, {'Content-Type' => 'text/xml'}).body
+    end
+    
+    def authorization_resource
+      put "/ws/rest/autorizacao", "<usuarioAutorizado><glbId>#{@glb_id}</glbId><ip>#{@ip}</ip><servicoID>#{@service_id}</servicoID></usuarioAutorizado>"
+    end
+    
+    def put(path, data)
+      connection.put(path, data, {'Content-Type' => 'text/xml'}).body
     end
   end
 end

data/lib/cadun/user.rb

@@ -6,7 +6,7 @@ module Cadun
       "nome"                     => "name", 
       "emailPrincipal"           => "email", 
       "sexo"                     => "gender",
-      "bairro"                   => "suburb", 
+      "bairro"                   => "neighborhood", 
       "cidade/nome"              => "city", 
       "estado/sigla"             => "state",
       "pais/nome"                => "country" }.each do |path, method|

data/lib/cadun/version.rb

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

data/spec/cadun/config_spec.rb

@@ -1,61 +1,35 @@
 require 'spec_helper'
 
 describe Cadun::Config do
-  before do
-    Cadun::Config.load_file File.join(File.dirname(__FILE__), "..", "support", "fixtures", "config.yml")
-  end
-  
-  describe "#login_url" do
-    subject { Cadun::Config.login_url }
+  include Cadun
 
-    specify { should == "https://login.dev.globoi.com/login" }
-  end
-  
-  describe "#logout_url" do
-    subject { Cadun::Config.logout_url }
+  def self.verify_method(method, value)
+    describe "##{method}" do
+      subject { Cadun::Config.send(method) }
 
-    specify { should == "https://login.dev.globoi.com/Servlet/do/logout" }
+      specify { should == value }
+    end
   end
   
-  describe "#auth_url" do
-    subject { Cadun::Config.auth_url }
-
-    specify { should == "isp-authenticator.dev.globoi.com" }
-  end
+  before { load_config }
   
-  describe "#auth_port" do
-    subject { Cadun::Config.auth_port }
-
-    specify { should == 8280 }
-  end
+  verify_method "login_url", "https://login.dev.globoi.com/login"
+                
+  verify_method "logout_url", "https://login.dev.globoi.com/Servlet/do/logout"
+                
+  verify_method "auth_url", "isp-authenticator.dev.globoi.com"
+                
+  verify_method "auth_port", 8280
   
   context "when the file changes" do
-    before do
-      Cadun::Config.load_file File.join(File.dirname(__FILE__), "..", "support", "fixtures", "another_config.yml")
-    end
-
-    describe "#login_url" do
-      subject { Cadun::Config.login_url }
-
-      specify { should == "https://login.globo.com/login" }
-    end
-
-    describe "#logout_url" do
-      subject { Cadun::Config.logout_url }
-
-      specify { should == "https://login.globo.com/Servlet/do/logout" }
-    end
-
-    describe "#auth_url" do
-      subject { Cadun::Config.auth_url }
-
-      specify { should == "autenticacao.globo.com" }
-    end
-
-    describe "#auth_port" do
-      subject { Cadun::Config.auth_port }
-
-      specify { should == 8080 }
-    end
+    before { load_another_config }
+
+    verify_method "login_url", "https://login.globo.com/login"
+                  
+    verify_method "logout_url", "https://login.globo.com/Servlet/do/logout"
+                  
+    verify_method "auth_url", "autenticacao.globo.com"
+                  
+    verify_method "auth_port", 8080
   end
 end

data/spec/cadun/gateway_spec.rb

@@ -1,49 +1,36 @@
 require 'spec_helper'
 
 describe Cadun::Gateway do
-  before { load_config }
+  let(:connection) { mock }
+  let(:response) { mock }
+  
+  before do
+    load_config
+    mock(subject).connection { connection }
+  end
   
   subject { Cadun::Gateway.new("GLB_ID", "127.0.0.1", 2626) }
   
   describe "#content" do
+    before do
+      mock(subject).authorization { mock(mock).xpath("usuarioID") { mock(mock).text { "1" } } }
+      mock(response).body { "<?xml version='1.0' encoding='utf-8'?><pessoa><nome>Barack Obama</nome></pessoa>" }
+      mock(connection).get("/cadunii/ws/resources/pessoa/1", { 'Content-Type' => 'text/xml' }) { response }
+    end
+    
     it "should parse the resource" do
-      connection = mock
-      response = mock
-      body = "<?xml version='1.0' encoding='utf-8'?><pessoa><nome>Barack Obama</nome></pessoa>"
-      mock(response).body { body }
-      
-      mock(subject).authorization { Nokogiri::XML("<?xml version='1.0' encoding='utf-8'?><pessoa><usuarioID>1</usuarioID></pessoa>").children }
-      mock(connection).get("/cadunii/ws/resources/pessoa/1", {'Content-Type' => 'text/xml'}) { response }
-      mock(subject).connection { connection }
-      
       subject.content.xpath('nome').text.should == 'Barack Obama'
     end
   end
   
   describe "#authorization" do
-    it "should parse the authorization request" do
-      connection = mock
-      response = mock
+    before do
       mock(response).body { "<?xml version='1.0' encoding='utf-8'?><pessoa><usuarioID>1</id></usuarioID>" }
       mock(connection).put("/ws/rest/autorizacao", "<usuarioAutorizado><glbId>GLB_ID</glbId><ip>127.0.0.1</ip><servicoID>2626</servicoID></usuarioAutorizado>", {'Content-Type' => 'text/xml'}) { response }
-      mock(subject).connection { connection }
-      
-      subject.authorization.xpath('usuarioID').text.should == '1'
     end
-  end
-  
-  describe "#resource" do
-    it "should parse the resource request" do
-      connection = mock
-      response = mock
-      body = "<?xml version='1.0' encoding='utf-8'?><pessoa><nome>Barack Obama</nome></pessoa>"
-      mock(response).body { body }
-      
-      mock(subject).authorization { Nokogiri::XML("<?xml version='1.0' encoding='utf-8'?><pessoa><usuarioID>1</usuarioID></pessoa>").children }
-      mock(connection).get("/cadunii/ws/resources/pessoa/1", {'Content-Type' => 'text/xml'}) { response }
-      mock(subject).connection { connection }
-      
-      subject.resource.should == body
+    
+    it "should parse the authorization request" do
+      subject.authorization.xpath('usuarioID').text.should == '1'
     end
   end
 end

data/spec/cadun/user_spec.rb

@@ -2,76 +2,53 @@
 require 'spec_helper'
 
 describe Cadun::User do
+  include Cadun
   
-  before do
-    load_config
-    stub_requests
-  end
-  
-  it "should load a gateway" do
-    mock(Cadun::Gateway).new("GLB_ID", "127.0.0.1", 2626)
-    Cadun::User.new("GLB_ID", "127.0.0.1", 2626)
-  end
-  
-  subject { Cadun::User.new("GLB_ID", "127.0.0.1", 2626) }
-  
-  describe "#id" do
-    it { subject.id.should == "21737810" }
-  end
+  subject { User.new "GLB_ID", "127.0.0.1", 2626 }
   
-  describe "#name" do
-    it { subject.name.should == "Fabricio Rodrigo Lopes" }
+  def self.verify_method(method, value)
+    describe "##{method}" do
+      specify { subject.send(method).should == value }
+    end
   end
   
-  describe "#birthday" do
-    it { subject.birthday.should == Date.new(1983, 02, 22) }
-  end
-  
-  describe "#phone" do
-    it { subject.phone.should == "21 22881060" }
-  end
-  
-  describe "#mobile" do
-    it { subject.mobile.should == "21 99999999" }
-  end
-  
-  describe "#email" do
-    it { subject.email.should == "fab1@spam.la"}
-  end
-  
-  describe "#gender" do
-    it { subject.gender.should == "MASCULINO" }
-  end
-  
-  describe "#city" do
-    it { subject.city.should == "Rio de Janeiro"}
-  end
-  
-  describe "#state" do
-    it { subject.state.should == "RJ" }
-  end
-  
-  describe "#status" do
-    it { subject.status.should == "ATIVO" }
-  end
-  
-  describe "#address" do
-    it { subject.address.should == "Rua Uruguai, 59"}
-  end
-  
-  describe "#suburb" do
-    it { subject.suburb.should == "Andaraí" }
-  end
-  
-  describe "#cpf" do
-    it { subject.cpf.should == "09532034765" }
-  end
-  
-  describe "#login" do
-    it { subject.login.should == "fabricio_fab1" }
+  before do
+    load_config
+    stub_requests
   end
   
-  describe "#country" do
-    it { subject.country.should == "Brasil" }
-  end
+  it "should load the gateway" do
+    mock(Gateway).new "GLB_ID", "127.0.0.1", 2626
+    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"
 end

data/spec/spec_helper.rb

@@ -19,12 +19,16 @@ end
 
 def stub_requests
   FakeWeb.register_uri :put, "http://isp-authenticator.dev.globoi.com:8280/ws/rest/autorizacao",
-                       :body => File.join(File.dirname(__FILE__), "support", "fixtures", "autorizacao.xml")
+                       :body => "#{File.dirname(__FILE__)}/support/fixtures/autorizacao.xml"
 
   FakeWeb.register_uri :get, "http://isp-authenticator.dev.globoi.com:8280/cadunii/ws/resources/pessoa/21737810", 
-                       :body => File.join(File.dirname(__FILE__), "support", "fixtures", "pessoa.xml")
+                       :body => "#{File.dirname(__FILE__)}/support/fixtures/pessoa.xml"
 end
 
 def load_config
-  Cadun::Config.load_file File.join(File.dirname(__FILE__), "support", "fixtures", "config.yml")
+  Cadun::Config.load_file "#{File.dirname(__FILE__)}/support/fixtures/config.yml"
+end
+
+def load_another_config
+  Cadun::Config.load_file "#{File.dirname(__FILE__)}/support/fixtures/another_config.yml"
 end

metadata

@@ -2,10 +2,12 @@
 name: cadun
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
-- Bruno Azisaka Maciel
+- Bruno
+- Azisaka
+- Maciel
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -68,7 +70,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
-description: ""
+description: A wrapper for the CadUn authentication/authorization API
 email: 
 - bruno@azisaka.com.br
 executables: []
@@ -80,7 +82,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - Rakefile
 - cadun.gemspec
@@ -98,7 +99,7 @@ files:
 - spec/support/fixtures/config.yml
 - spec/support/fixtures/pessoa.xml
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/azisaka/Cadun
 licenses: []
 
 post_install_message: 
@@ -124,13 +125,6 @@ rubyforge_project: cadun
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: ""
-test_files: 
-- spec/cadun/config_spec.rb
-- spec/cadun/gateway_spec.rb
-- spec/cadun/user_spec.rb
-- spec/spec_helper.rb
-- spec/support/fixtures/another_config.yml
-- spec/support/fixtures/autorizacao.xml
-- spec/support/fixtures/config.yml
-- spec/support/fixtures/pessoa.xml
+summary: A wrapper for the CadUn authentication/authorization API
+test_files: []
+

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.2@cadun