oa-globocom 0.4.10 → 0.5.0

data/lib/oa-globocom/version.rb

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

data/lib/omni_auth/strategies/globocom.rb

@@ -11,10 +11,10 @@ module OmniAuth
       attr_reader :logger
       
       def initialize(app, opts = {})
-        Cadun::Config.load_file(opts[:config])
+        Cadun::Config.load_file opts[:config]
         
         @logger = opts[:logger]
-        super(app, :cadun, opts)
+        super app, :cadun, opts
       end
       
       def request_phase
@@ -25,21 +25,21 @@ module OmniAuth
         begin
           super
         rescue Exception => e
-          logger.error(log_exception(e)) if logger
+          logger.error log_exception(e) if logger
           
-          fail!(e.message, e.message)
+          fail! e.message, e.message
         end
       end
       
       def auth_hash
-        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 = { :provider => "cadun", :uid => user.id, :info => user.to_hash.merge(:birthday => user.birthday.strftime('%d/%m/%Y')) }
+        hash[:credentials] = { :GLBID => request.params['GLBID'], :url => request.params['url'] } if request
         
         hash
       end
       
       def user
-        @user ||= Cadun::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
@@ -52,15 +52,11 @@ module OmniAuth
         scheme = request.env['rack.url_scheme']
         
         callback_url = "#{scheme}://#{uri}#{port}/auth/#{name}/callback"
-        URI.escape(callback_url, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+        URI.escape callback_url, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
       end
       
       def client_ip
-        if env['HTTP_X_FORWARDED_FOR'] and not env['HTTP_X_FORWARDED_FOR'].empty?
-          env['HTTP_X_FORWARDED_FOR'].split(',').last.strip
-        else
-          env['REMOTE_ADDR']
-        end
+        env['HTTP_X_FORWARDED_FOR'].present? ? env['HTTP_X_FORWARDED_FOR'].split(',').last.strip : env['REMOTE_ADDR']
       end
       
       def log_env

data/oa-globocom.gemspec

@@ -15,12 +15,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths = %w(lib)
   
-  s.add_dependency 'oa-core', '~> 0.2.6'
+  s.add_dependency 'omniauth', '~> 1.0.0'
   s.add_dependency 'cadun', '~> 0.6.0'
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rr'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'timecop'
 end

data/spec/omni_auth/strategies/globocom_spec.rb

@@ -79,54 +79,59 @@ describe OmniAuth::Strategies::GloboCom do
     end
     
     describe ":user_info" do
-      subject { strategy.auth_hash[:user_info] }
+      subject { strategy.auth_hash[:info] }
+      
+      it { should include :address => "Rua Uruguai, 59" }
+      it { should include :birthday => "22/02/1983" }
+      it { should include :city => "Rio de Janeiro" }
+      it { should include :country => "Brasil" }
+      it { should include :cpf => "09532034765" }
+      it { should include :email => "fab1@spam.la" }
+      it { should include :gender => "MASCULINO" }
+      it { should include :cadun_id => "21737810" }
+      it { should include :mobile => "21 99999999" }
+      it { should include :name => "Fabricio Rodrigo Lopes" }
+      it { should include :neighborhood => "Andaraí" }
+      it { should include :login => "fabricio_fab1" }
+      it { should include :phone => "21 22881060" }
+      it { should include :state => "RJ" }
+      it { should include :status => "ATIVO" }
+      it { should include :user_type => "NAO_ASSINANTE" }
+      it { should include :zipcode => "20510060" }
+      it { should include :complement => "807" }
+    end
+    
+    describe ":credentials" do
+      subject { strategy.auth_hash[:credentials] }
       
-      it { should include(:address => "Rua Uruguai, 59") }
-      it { should include(:birthday => "22/02/1983") }
-      it { should include(:city => "Rio de Janeiro") }
-      it { should include(:country => "Brasil") }
-      it { should include(:cpf => "09532034765") }
-      it { should include(:email => "fab1@spam.la") }
-      it { should include(:gender => "MASCULINO") }
       it { should include(:GLBID => "GLBID") }
-      it { should include(:cadun_id => "21737810") }
-      it { should include(:mobile => "21 99999999") }
-      it { should include(:name => "Fabricio Rodrigo Lopes") }
-      it { should include(:neighborhood => "Andaraí") }
-      it { should include(:login => "fabricio_fab1") }
-      it { should include(:phone => "21 22881060") }
-      it { should include(:state => "RJ") }
-      it { should include(:status => "ATIVO") }
       it { should include(:url => "/go_back") }
-      it { should include(:user_type => "NAO_ASSINANTE") }
-      it { should include(:zipcode => "20510060") }
-      it { should include(:complement => "807") }
     end
   end
   
   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/cadun", "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/cadun", "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/cadun", "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/cadun", "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/cadun", "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
@@ -145,41 +150,38 @@ describe OmniAuth::Strategies::GloboCom do
     it "should render the log" do
       stub_fail_requests
       
-      Timecop.travel(Time.now) do
+      Timecop.travel(Time.local(2011, 11, 24, 1, 2, 0)) do
         strategy.call! Rack::MockRequest.env_for("http://localhost/auth/cadun/callback?GLBID=GLBID", "rack.session" => {}, "REMOTE_ADDR" => "127.0.0.1")
       
-        exception = Exception.new('NAO_AUTORIZADO')
-        strategy.log_exception(exception).should == "#{Time.now.strftime("%d/%m/%Y %H:%M")} - SERVER_NAME: localhost | PATH_INFO: /auth/cadun/callback | QUERY_STRING: GLBID=GLBID | EXCEPTION: NAO_AUTORIZADO"
+        exception = Exception.new 'NAO_AUTORIZADO'
+        strategy.log_exception(exception).should == "24/11/2011 01:02 - SERVER_NAME: localhost | PATH_INFO: /auth/cadun/callback | QUERY_STRING: GLBID=GLBID | EXCEPTION: NAO_AUTORIZADO"
       end
     end
   end
   
-  describe "logging failures" do
-    before do
-      pending("RR doesn't implement superclass stubs. I don't know how to figure it out yet.")
-    end
-    
+  describe "logging failures" do    
     it "should log the failure" do
-      strategy = OmniAuth::Strategies::GloboCom.new app, :service_id => 1, :config => "#{File.dirname(__FILE__)}/../../support/fixtures/config.yml", :logger => Logger.new($stdout)
+      logger = double('logger')
+      
+      strategy = OmniAuth::Strategies::GloboCom.new app, :service_id => 1, :config => "#{File.dirname(__FILE__)}/../../support/fixtures/config.yml", :logger => logger
       stub_fail_requests
       
-      logger = mock('logger')
-      mock(logger).error('SERVER_NAME: localhost | PATH_INFO: /auth/cadun/callback | QUERY_STRING: GLBID=GLBID | EXCEPTION: Exception')
-      stub(strategy).call_app! { raise Exception }
-      stub(strategy).logger { logger }
+      Timecop.travel(Time.local(2011, 11, 24, 1, 2, 0)) do
+        logger.should_receive(:error).with("24/11/2011 01:02 - SERVER_NAME: localhost | PATH_INFO: /auth/cadun/callback | QUERY_STRING: GLBID=GLBID | EXCEPTION: NAO_AUTORIZADO")
+        strategy.stub!(:call_app!).and_raise Exception
+        strategy.stub!(:logger).and_return logger
       
-      strategy.call! Rack::MockRequest.env_for("http://localhost/auth/cadun/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
     end
     
     it "should not log the failure" do
       stub_fail_requests
       
-      logger = mock('logger')
-      dont_allow(logger).error
-      stub(strategy).call_app! { raise Exception }
-      stub(strategy).logger { nil }
+      strategy.stub!(:call_app!).and_raise Exception
+      strategy.should_not_receive :log_exception
       
-      strategy.call! Rack::MockRequest.env_for("http://localhost/auth/cadun/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
   end
 end

data/spec/spec_helper.rb

@@ -6,8 +6,8 @@ require 'timecop'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|  
-  config.mock_with :rr
-  config.filter_run :focus => true
+  config.mock_with :rspec
+  config.filter_run :wip => true
   config.run_all_when_everything_filtered = true
   
   config.before(:suite) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oa-globocom
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-11-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: oa-core
-  requirement: &2153613060 !ruby/object:Gem::Requirement
+  name: omniauth
+  requirement: &70284217905800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153613060
+  version_requirements: *70284217905800
 - !ruby/object:Gem::Dependency
   name: cadun
-  requirement: &2153612560 !ruby/object:Gem::Requirement
+  requirement: &70284217905180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153612560
+  version_requirements: *70284217905180
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153612180 !ruby/object:Gem::Requirement
+  requirement: &70284217904680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153612180
+  version_requirements: *70284217904680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153611720 !ruby/object:Gem::Requirement
+  requirement: &70284217904020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153611720
+  version_requirements: *70284217904020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153611300 !ruby/object:Gem::Requirement
+  requirement: &70284217892560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,21 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153611300
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &2156103020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2156103020
+  version_requirements: *70284217892560
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156102600 !ruby/object:Gem::Requirement
+  requirement: &70284217892140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156102600
+  version_requirements: *70284217892140
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2156102180 !ruby/object:Gem::Requirement
+  requirement: &70284217891720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156102180
+  version_requirements: *70284217891720
 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:
@@ -146,7 +135,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: OmniAuth strategy for Globo.com authentication system