cadun 0.6.1 → 0.6.3

data/lib/cadun/gateway.rb

@@ -19,15 +19,20 @@ module Cadun
     end
   
     def content_resource
-      subject = if opts[:email]; "email/#{opts[:email]}"
-        elsif opts[:cadun_id]; opts[:cadun_id]
-        else
-          raise Exception.new(authorization["status"]) unless authorization["status"] == "AUTORIZADO"
-          authorization["usuarioID"]
-        end
+      Curl::Easy.perform("#{Config.auth_url}/cadunii/ws/resources/pessoa/#{subject}").body_str
+    end
     
-      request = Curl::Easy.perform("#{Config.auth_url}/cadunii/ws/resources/pessoa/#{subject}")
-      request.body_str
+    def subject
+      if opts[:email]; "email/#{opts[:email]}"
+      elsif opts[:cadun_id]; opts[:cadun_id]
+      else
+        raise Exception.new(authorization["status"]) unless authorized?
+        authorization["usuarioID"]
+      end
+    end
+    
+    def authorized?
+      authorization["status"] == "AUTORIZADO"
     end
     
     def authorization
@@ -36,6 +41,7 @@ module Cadun
   
     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|

data/lib/cadun/user.rb

@@ -12,7 +12,7 @@ module Cadun
     alias :id :cadun_id
     
     def self.find_by_email(email)
-      email = "#{email}@globo.com" unless email =~ /^.*@.*$/
+      email = "#{email}@globomail.com" unless email =~ /^.*@.*$/
       new(:email => email)
     end
     

data/lib/cadun/version.rb

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

data/spec/cadun/config_spec.rb

@@ -1,29 +1,18 @@
 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 }
   
-  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://isp-authenticator.qa01.globoi.com:8280"
+  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" }
   
   context "when the file changes" do
-    
     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", "http://autenticacao.globo.com:8080"
+    
+    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" }
   end
 end

data/spec/cadun/gateway_spec.rb

@@ -3,46 +3,32 @@ require 'spec_helper'
 describe Cadun::Gateway do  
   before { load_config }
   
-  describe "#provision" do  
+  describe "#provision" do
+    subject { Cadun::Gateway.provision(123456, 2515) }
+    
     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]) }
-    
-      subject { Cadun::Gateway.provision(123456, 2515) }
-      specify { should be_true }
+      it { should be_true }
     end
   
-    context "when the service is provisioned to the user" do
+    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]) }
-    
-      subject { Cadun::Gateway.provision(123456, 2515) }
-      it { subject.should be_false }
+      it { 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]) }
-    
-      subject { Cadun::Gateway.provision(123456, 2515) }
-      it { subject.should be_false }
+      it { 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 => [503]) }
-    
-      subject { Cadun::Gateway.provision(123456, 2515) }
-      it { subject.should be_false }
-    end
-    
   end
   
   describe "#content" do
     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 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>NAO_AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
-      end
-      
-      it { proc { gateway.content }.should raise_error(Exception) }
+      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) }
     end
 
     context "when status AUTORIZADO" do
@@ -50,42 +36,33 @@ describe Cadun::Gateway 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>")
       end
-      
-      it { proc { gateway.content }.should_not raise_error(Exception) }
-      
-      it "should parse the resource" do
-        gateway.content['nome'].should == 'Barack Obama'
-      end
+
+      it { should include('nome' => 'Barack Obama') }
     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 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><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
-
+      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') }
     end
     
     context "when glb_id is not given" do
       let(:gateway) { Cadun::Gateway.new }
-      it { proc { gateway.authorization }.should raise_error(ArgumentError, "glb_id is missing") }
+      it { expect { subject }.to raise_error(ArgumentError, "glb_id is missing") }
     end
     
     context "when ip is not given" do
       let(:gateway) { Cadun::Gateway.new(:glb_id => "1") }
-      it { proc { gateway.authorization }.should raise_error(ArgumentError, "ip is missing") }
+      it { expect { subject }.to 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 { proc { gateway.authorization }.should raise_error(ArgumentError, "service_id is missing") }
+      it { expect { subject }.to raise_error(ArgumentError, "service_id is missing") }
     end
   end
 end

data/spec/cadun/user_spec.rb

@@ -2,13 +2,6 @@
 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
@@ -30,74 +23,75 @@ describe Cadun::User do
       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"
-    verify_method "cadun_id", "21737810"
-    verify_method "complement", "807"
+    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" }
   end
   
   describe "#to_hash" do
     context "when the user has all data" do
       subject { Cadun::User.new(:cadun_id => "10001000").to_hash }
-
-      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") }
+      
+      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" }
     end
     
     context "when the user has minimal data" do
       subject { Cadun::User.find_by_email("fulano_adm_campanha@globomail.com") }
-      specify { subject.id.should == "23370159" }
-      specify { subject.city.should == nil }
-      specify { subject.state.should == nil }
-      specify { subject.country.should == nil }
+      
+      its(:id)      { should == "23370159" }
+      its(:city)    { should be_nil }
+      its(:state)   { should be_nil }
+      its(:country) { should be_nil }
     end
   end
   
   describe ".find_by_email" do
     context "given an email without domain" do
       subject { Cadun::User.find_by_email("silvano") }
-      verify_method "id", "24510533"
+      its(:id) { should == "24510533" }
     end
     
     context "given an email with domain" do
       subject { Cadun::User.find_by_email("silvano@corp.globo.com") }
-      verify_method "id", "24510533"
+      its(:id) { should == "24510533" }
     end
   end
   
   describe ".find_by_id" do
     subject { Cadun::User.find_by_id("10001000") }
-    verify_method "id", "10001000"
+    its(:id) { should == "10001000" }
   end
   
   describe "#provision_to_service" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cadun
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2161593740 !ruby/object:Gem::Requirement
+  requirement: &70300104786900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161593740
+  version_requirements: *70300104786900
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161593240 !ruby/object:Gem::Requirement
+  requirement: &70300104779400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161593240
+  version_requirements: *70300104779400
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2161592740 !ruby/object:Gem::Requirement
+  requirement: &70300104778780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2161592740
+  version_requirements: *70300104778780
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2161592360 !ruby/object:Gem::Requirement
+  requirement: &70300104636920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161592360
+  version_requirements: *70300104636920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161591900 !ruby/object:Gem::Requirement
+  requirement: &70300104634980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161591900
+  version_requirements: *70300104634980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161611940 !ruby/object:Gem::Requirement
+  requirement: &70300104633980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161611940
+  version_requirements: *70300104633980
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2161611520 !ruby/object:Gem::Requirement
+  requirement: &70300104633280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161611520
+  version_requirements: *70300104633280
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2161611100 !ruby/object:Gem::Requirement
+  requirement: &70300104632720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161611100
+  version_requirements: *70300104632720
 description: A wrapper for the Globo.com's authentication/authorization API
 email:
 - bruno@azisaka.com.br
@@ -112,15 +112,13 @@ files:
 - .rspec
 - Gemfile
 - Rakefile
-- bench/curl_x_restclient.rb
+- benchmark/curl_x_restclient.rb
 - cadun.gemspec
 - lib/cadun.rb
 - lib/cadun/config.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
@@ -153,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A wrapper for the Globo.com's authentication/authorization API

data/script/console

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

data/script/loader.rb

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