oa-cadun 0.1.1 → 0.2

data/lib/oa-cadun.rb

@@ -1,11 +1,14 @@
-$:.push File.expand_path("lib", __FILE__)
+$:.push File.expand_path('lib', __FILE__)
 
 require 'uri'
 require 'cgi'
 require 'net/http'
-require 'oa-core'
 require 'nokogiri'
 require 'date'
-require 'oa-cadun/gateway'
-require 'oa-cadun/user'
-require 'omni_auth/strategies/cadun'
+require 'oa-core'
+require 'cadun'
+require 'omni_auth/strategies/cadun'
+
+module OACadun
+  VERSION = '0.2'
+end

data/lib/omni_auth/strategies/cadun.rb

@@ -14,9 +14,9 @@ module OmniAuth
       end
       
       def auth_hash
-        @params = CGI.parse(URI.parse(env["REQUEST_URI"]).query)
-        @glb_id = params["GLBID"].first
-        @url = params["url"].first
+        @params = CGI.parse(URI.parse(env['REQUEST_URI']).query)
+        @glb_id = params['GLBID'].first
+        @url = params['url'].first
         
         { :GLBID => glb_id,
           :url => url,
@@ -39,7 +39,7 @@ module OmniAuth
       
       protected
       def user
-        @user ||= OACadun::User.new(glb_id, env["REMOTE_ADDR"], service_id)
+        @user ||= ::Cadun::User.new(glb_id, env['REMOTE_ADDR'], service_id)
       end
       
       def service_id

data/oa-cadun.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "version"
+require "oa-cadun"
 
 Gem::Specification.new do |s|
   s.name        = "oa-cadun"
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency 'oa-core'
+  s.add_dependency 'cadun'
   s.add_dependency 'nokogiri'
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rspec'

data/spec/omni_auth/strategies/cadun_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe OmniAuth::Strategies::Cadun do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: oa-cadun
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: "0.2"
 platform: ruby
 authors: 
 - Bruno Azisaka Maciel
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -03:00
+date: 2011-05-17 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,82 +21,75 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: cadun
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: nokogiri
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: rr
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: The goal of this gem is to allow the developer to use CadUn (a login webservice made by Globo.com) in any web app using OmniAuth
 email: 
 - bruno@azisaka.com.br
@@ -119,13 +107,8 @@ files:
 - README.md
 - Rakefile
 - lib/oa-cadun.rb
-- lib/oa-cadun/gateway.rb
-- lib/oa-cadun/user.rb
 - lib/omni_auth/strategies/cadun.rb
-- lib/version.rb
 - oa-cadun.gemspec
-- spec/oa-cadun/gateway_spec.rb
-- spec/oa-cadun/user_spec.rb
 - spec/omni_auth/strategies/cadun_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/autorizacao.xml
@@ -144,29 +127,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for CadUn
 test_files: 
-- spec/oa-cadun/gateway_spec.rb
-- spec/oa-cadun/user_spec.rb
 - spec/omni_auth/strategies/cadun_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/autorizacao.xml

data/lib/oa-cadun/gateway.rb

@@ -1,32 +0,0 @@
-module OACadun
-  class Gateway
-    def initialize(glb_id, ip, service_id)
-      @glb_id, @ip, @service_id = glb_id, ip, service_id
-    end
-  
-    def content
-      @content ||= Nokogiri::XML(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
-    end
-  
-    def resource
-      @resource ||= connection.get("/cadunii/ws/resources/pessoa/#{authorization.xpath("usuarioID").text}", {'Content-Type' => 'text/xml'}).body
-    end
-
-    def connection
-      @connection ||= Net::HTTP.new(*(development? ? ["isp-authenticator.dev.globoi.com", 8280] : ["autenticacao.globo.com", 8080] ))
-    end
-   
-    protected
-    def development?
-      if defined?(Rails)
-        Rails.env.development?
-      else
-        true
-      end
-    end
-  end
-end

data/lib/oa-cadun/user.rb

@@ -1,40 +0,0 @@
-module OACadun
-  class User
-    attr_reader :gateway
-    
-    { "id"                       => "id", 
-      "nome"                     => "name", 
-      "emailPrincipal"           => "email", 
-      "sexo"                     => "gender",
-      "bairro"                   => "suburb", 
-      "cidade/nome"              => "city", 
-      "estado/sigla"             => "state",
-      "pais/nome"                => "country" }.each do |path, method|
-      define_method(method) { gateway.content.xpath(path).text }
-    end
-    
-    def initialize(glb_id, ip, service_id)
-      @gateway = Gateway.new(@glb_id, @ip, @service_id)
-    end
-    
-    def address
-      "#{endereco}, #{numero}"
-    end
-    
-    def birthday
-      Date.parse(dataNascimento)
-    end
-  
-    def phone
-      "#{telefoneResidencialDdd} #{telefoneResidencial}"
-    end
-    
-    def mobile
-      "#{telefoneCelularDdd} #{telefoneCelular}"
-    end
-    
-    def method_missing(method)
-      gateway.content.xpath(method.to_s).text
-    end
-  end
-end

data/lib/version.rb

@@ -1,3 +0,0 @@
-module OACadun
-  VERSION = "0.1.1"
-end

data/spec/oa-cadun/gateway_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe OACadun::Gateway do  
-  subject { OACadun::Gateway.new("GLB_ID", "127.0.0.1", 2626) }
-  
-  describe "#content" do
-    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 "#connection" do
-    context "when the environment is development" do
-      before { mock(subject).development? { true } }
-      
-      it "should request from the development server" do
-        mock(Net::HTTP).new("isp-authenticator.dev.globoi.com", 8280)
-        subject.connection
-      end
-    end
-    
-    context "when the environment is not development" do
-      before { mock(subject).development? { false } }
-      
-      it "should request from the production server" do
-        mock(Net::HTTP).new("autenticacao.globo.com", 8080)
-        subject.connection
-      end
-    end
-  end
-  
-  describe "#authorization" do
-    it "should parse the authorization request" do
-      connection = mock
-      response = mock
-      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
-    end
-  end
-end

data/spec/oa-cadun/user_spec.rb

@@ -1,68 +0,0 @@
-require 'spec_helper'
-
-describe OACadun::User do
-  
-  before { stub_requests }
-  
-  subject { OACadun::User.new("GLB_ID", "127.0.0.1", 2626) }
-  
-  describe "#id" do
-    it { subject.id.should == "21737810" }
-  end
-  
-  describe "#name" do
-    it { subject.name.should == "Fabricio Rodrigo Lopes" }
-  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" }
-  end
-  
-  describe "#country" do
-    it { subject.country.should == "Brasil" }
-  end
-end