oa-globocom 0.2.0 → 0.4.5

data/lib/oa-globocom/version.rb

@@ -1,8 +1,8 @@
 module OAGloboCom
   module VERSION
     MAJOR = 0
-    MINOR = 2
-    PATCH = 0
+    MINOR = 4
+    PATCH = 5
     
     STRING = [MAJOR, MINOR, PATCH] * '.'
   end

data/lib/oa-globocom.rb

@@ -1,5 +1 @@
-$:.push File.expand_path('lib', __FILE__)
-
-require 'oa-core'
-require 'globocom-auth'
-require 'omni_auth/strategies/globocom'
+require File.dirname(__FILE__) + '/omni_auth/strategies/globocom'

data/lib/omni_auth/strategies/globocom.rb

@@ -1,6 +1,7 @@
-require 'globocom-auth/config'
-require 'globocom-auth/user'
-require 'globocom-auth/gateway'
+require 'rubygems'
+require 'oa-core'
+require 'cadun'
+require 'cadun/config'
 
 module OmniAuth
   module Strategies
@@ -8,20 +9,20 @@ module OmniAuth
       include OmniAuth::Strategy
       
       def initialize(app, options = {})
-        GloboComAuth::Config.load_file(options[:config])
+        Cadun::Config.load_file(options[:config])
         
-        super(app, :globocom, options)
+        super(app, :cadun, options)
       end
       
       def request_phase
-        redirect "#{GloboComAuth::Config.login_url}/#{service_id}?url=#{callback_url}"
+        redirect "#{Cadun::Config.login_url}/#{service_id}?url=#{callback_url}"
       end
       
       def callback_phase
         begin
           super
         rescue => e
-          fail!(:invalid_credentials, e)
+          fail!(e.message, e.message)
         end
       end
       
@@ -30,7 +31,7 @@ module OmniAuth
       end
       
       def user
-        @user ||= GloboComAuth::User.new(:glb_id => request.params['GLBID'], :ip => client_ip, :service_id => service_id)
+        @user ||= Cadun::User.new(:glb_id => request.params['GLBID'], :ip => client_ip, :service_id => service_id)
       end
       
       def service_id
@@ -55,7 +56,7 @@ module OmniAuth
       end
       
       def self.build_auth_hash(user, request = nil)
-        hash = { :provider => "globocom", :uid => user.id, :user_info => user.to_hash.merge(:birthday =>  user.birthday.strftime('%d/%m/%Y')) }
+        hash = { :provider => "cadun", :uid => user.id, :user_info => user.to_hash.merge(:birthday =>  user.birthday.strftime('%d/%m/%Y')) }
         hash[:user_info].merge!(:GLBID => request.params['GLBID'], :url => request.params['url']) if request
         
         hash

data/oa-globocom.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths = %w(lib)
   
-  s.add_dependency 'oa-core'
-  s.add_dependency 'globocom-auth', '0.1.0'
+  s.add_dependency 'oa-core', '~> 0.2.6'
+  s.add_dependency 'cadun', '~> 0.5.3'
   s.add_development_dependency 'rack'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rr'
   s.add_development_dependency 'fakeweb'

data/spec/omni_auth/strategies/globocom_spec.rb

@@ -9,7 +9,7 @@ describe OmniAuth::Strategies::GloboCom do
   describe "#request_phase" do
     context "when it has a referer" do
       before do
-        strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/globocom", "rack.session" => {}, "HTTP_HOST" => "test.localhost")
+        strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/cadun", "rack.session" => {}, "HTTP_HOST" => "test.localhost")
 
         @status, @headers, @body = strategy.request_phase
       end
@@ -19,13 +19,13 @@ describe OmniAuth::Strategies::GloboCom do
       end
 
       describe "headers" do
-        it { @headers.should include("Location" => "https://login.dev.globoi.com/login/1?url=http%3A%2F%2Ftest.localhost%2Fauth%2Fglobocom%2Fcallback") }
+        it { @headers.should include("Location" => "https://login.dev.globoi.com/login/1?url=http%3A%2F%2Ftest.localhost%2Fauth%2Fcadun%2Fcallback") }
       end
     end
     
     context "when it has a referer and a different port" do
       before do
-        strategy.call!(Rack::MockRequest.env_for("http://test.localhost:8080/auth/globocom", "rack.session" => {}, "HTTP_HOST" => "test.localhost", "SERVER_PORT" => "8080"))
+        strategy.call!(Rack::MockRequest.env_for("http://test.localhost:8080/auth/cadun", "rack.session" => {}, "HTTP_HOST" => "test.localhost", "SERVER_PORT" => "8080"))
 
         @status, @headers, @body = strategy.request_phase
       end
@@ -35,7 +35,7 @@ describe OmniAuth::Strategies::GloboCom do
       end
 
       describe "headers" do
-        it { @headers.should include("Location" => "https://login.dev.globoi.com/login/1?url=http%3A%2F%2Ftest.localhost%3A8080%2Fauth%2Fglobocom%2Fcallback") }
+        it { @headers.should include("Location" => "https://login.dev.globoi.com/login/1?url=http%3A%2F%2Ftest.localhost%3A8080%2Fauth%2Fcadun%2Fcallback") }
       end
     end
   end
@@ -44,18 +44,18 @@ describe OmniAuth::Strategies::GloboCom do
     context "when the authorization fails" do
       before do
         stub_fail_requests
-        strategy.call! Rack::MockRequest.env_for("http://localhost/auth/globocom/callback?GLBID=GLBID", "rack.session" => {}, "REMOTE_ADDR" => "127.0.0.1")
+        strategy.call! Rack::MockRequest.env_for("http://localhost/auth/cadun/callback?GLBID=GLBID", "rack.session" => {}, "REMOTE_ADDR" => "127.0.0.1")
       end
 
       it { strategy.env['omniauth.auth'].should be_nil }
-      it { strategy.env['omniauth.error'].message.should == "not authorized" }
-      it { strategy.env['omniauth.error.type'].should == :invalid_credentials }
+      it { strategy.env['omniauth.error'].should == "not authorized" }
+      it { strategy.env['omniauth.error.type'].should == :"not authorized" }
     end
     
     context "when the authorization succeeds" do
       before do
         stub_requests
-        strategy.call! Rack::MockRequest.env_for("http://localhost/auth/globocom/callback?GLBID=GLBID", "rack.session" => {}, "REMOTE_ADDR" => "127.0.0.1")
+        strategy.call! Rack::MockRequest.env_for("http://localhost/auth/cadun/callback?GLBID=GLBID", "rack.session" => {}, "REMOTE_ADDR" => "127.0.0.1")
       end
 
       it { strategy.env['omniauth.auth'].should_not be_nil }
@@ -75,7 +75,7 @@ describe OmniAuth::Strategies::GloboCom do
     end
     
     describe ":provider" do
-      it { strategy.auth_hash[:provider].should == "globocom" }
+      it { strategy.auth_hash[:provider].should == "cadun" }
     end
     
     describe ":user_info" do
@@ -106,27 +106,27 @@ describe OmniAuth::Strategies::GloboCom do
   
   describe "#client_ip" do
     it 'should return ip from REMOTE_ADDR when it comes alone' do
-      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/globocom", "rack.session" => {}, 'REMOTE_ADDR' =>  '200.201.0.15')
+      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/cadun", "rack.session" => {}, 'REMOTE_ADDR' =>  '200.201.0.15')
       strategy.client_ip.should == '200.201.0.15'
     end
 
     it 'should return ip from REMOTE_ADDR when HTTP_X_FORWARDED_FOR is empty' do
-      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/globocom", "rack.session" => {}, 'REMOTE_ADDR' =>  '200.201.0.20', 'HTTP_X_FORWARDED_FOR' => '')
+      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/cadun", "rack.session" => {}, 'REMOTE_ADDR' =>  '200.201.0.20', 'HTTP_X_FORWARDED_FOR' => '')
       strategy.client_ip.should == '200.201.0.20'
     end
 
     it 'should return ip from HTTP_X_FORWARDED_FOR when it comes alone' do
-      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/globocom", "rack.session" => {}, 'HTTP_X_FORWARDED_FOR' =>  '201.10.0.15')
+      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/cadun", "rack.session" => {}, 'HTTP_X_FORWARDED_FOR' =>  '201.10.0.15')
       strategy.client_ip.should == '201.10.0.15'
     end
 
     it 'should return ip from HTTP_X_FORWARDED_FOR even if REMOTE_ADDR is present' do
-      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/globocom", "rack.session" => {}, 'REMOTE_ADDR' =>  '200.201.0.15', 'HTTP_X_FORWARDED_FOR' =>  '201.10.0.16')
+      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/cadun", "rack.session" => {}, 'REMOTE_ADDR' =>  '200.201.0.15', 'HTTP_X_FORWARDED_FOR' =>  '201.10.0.16')
       strategy.client_ip.should == '201.10.0.16'
     end
 
     it 'should always return the last ip from HTTP_X_FORWARDED_FOR' do
-      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/globocom", "rack.session" => {}, 'HTTP_X_FORWARDED_FOR' =>  '201.10.0.15, 201.10.0.16, 201.10.0.17')
+      strategy.call! Rack::MockRequest.env_for("http://test.localhost/auth/cadun", "rack.session" => {}, 'HTTP_X_FORWARDED_FOR' =>  '201.10.0.15, 201.10.0.16, 201.10.0.17')
       strategy.client_ip.should == '201.10.0.17'
     end
   end

data/spec/spec_helper.rb

@@ -5,31 +5,21 @@ require 'rack/mock'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|  
-  config.before :suite do
-    FakeWeb.allow_net_connect = false
-  end
-  
-  config.before :each do
-    FakeWeb.clean_registry
-  end
-  
   config.mock_with :rr
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
+  
+  config.before(:suite) do
+    FakeWeb.allow_net_connect = false
+  end
 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")
-
-  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")
+  FakeWeb.register_uri(:put, "http://isp-authenticator.dev.globoi.com:8280/ws/rest/autorizacao", :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.dirname(__FILE__)}/support/fixtures/pessoa.xml")
 end
 
 def stub_fail_requests
-  FakeWeb.register_uri :put, "http://isp-authenticator.dev.globoi.com:8280/ws/rest/autorizacao",
-                       :body => File.join(File.dirname(__FILE__), "support", "fixtures", "autorizacao_fail.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")
+  FakeWeb.register_uri(:put, "http://isp-authenticator.dev.globoi.com:8280/ws/rest/autorizacao", :body => "#{File.dirname(__FILE__)}/support/fixtures/autorizacao_fail.xml")
+  FakeWeb.register_uri(:get, "http://isp-authenticator.dev.globoi.com:8280/cadunii/ws/resources/pessoa/21737810", :body => "#{File.dirname(__FILE__)}/support/fixtures/pessoa.xml")
 end

data/spec/support/fixtures/config.yml

@@ -1,5 +1,4 @@
 cadun:
   logout_url: https://login.dev.globoi.com/Servlet/do/logout
   login_url: https://login.dev.globoi.com/login
-  auth_url: isp-authenticator.dev.globoi.com
-  auth_port: 8280
+  auth_url: http://isp-authenticator.dev.globoi.com:8280

metadata

@@ -1,95 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oa-globocom
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.5
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Bruno
 - Azisaka
 - Maciel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: oa-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161634800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: globocom-auth
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2161634800
+- !ruby/object:Gem::Dependency
+  name: cadun
+  requirement: &2161634300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2161634300
+- !ruby/object:Gem::Dependency
   name: rack
+  requirement: &2161633920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2161633920
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2161633460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2161633460
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2161633040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2161633040
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2161632620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2161632620
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2161632200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: The goal of this gem is to allow the developer to use ContaGlobo.com (a login webservice made by Globo.com) in any web app using OmniAuth
-email: 
+  prerelease: false
+  version_requirements: *2161632200
+description: The goal of this gem is to allow the developer to use ContaGlobo.com
+  (a login webservice made by Globo.com) in any web app using OmniAuth
+email:
 - bruno@azisaka.com.br
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -109,30 +117,26 @@ files:
 - spec/support/fixtures/pessoa.xml
 homepage: https://github.com/azisaka/oa-globocom
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for Globo.com authentication system
 test_files: []
-