oa-globocom 0.4.5 → 0.4.6

data/README.md

@@ -7,9 +7,9 @@ The goal of this gem is to create a bridge between Globo.com's authentication an
 Add into your Gemfile
 
     gem "oa-globocom"
-    
+
 ## Configuration
-  
+
 The middleware has 2 important options: `:service_id` and `:config_file`.
 :service_id is the number of your service at Globo.com.
 :config_file is the YAML formatted file with the urls you want to use:
@@ -17,13 +17,12 @@ The middleware has 2 important options: `:service_id` and `:config_file`.
     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: isp-authenticator.dev.globoi.com:8280
 
 The `config_file` must be in that format, otherwise it won't work. The final result will look like this:
 
     config.middleware.use OmniAuth::Strategies::GloboCom, :service_id => 1234, :config_file => "#{File.dirname(__FILE__)}/cadun.yml"
-    
+
 After that, you just need to follow the OmniAuth standard configuration creating a callback controller to handle the CadUn's redirect. Something like this:
 
     class SessionsController < ActionController::Base
@@ -38,7 +37,7 @@ After that, you just need to follow the OmniAuth standard configuration creating
           rescue ActiveRecord::RecordNotFound
             User.create_from_omniauth(auth)
           end
-          
+
           session[:user_id] = user.id
           redirect_to root_url
         else
@@ -52,7 +51,7 @@ After that, you just need to follow the OmniAuth standard configuration creating
         redirect_to root_url
       end
     end
-    
+
 That way the controller will check if OmniAuth has returned the Globo.com's data, if so it will find or create an user, if not it will redirect the user back to the CadUn authentication screen.
 
 And set your routes:
@@ -60,7 +59,7 @@ And set your routes:
     match "/auth/cadun" => "sessions#new"
     match "/auth/cadun/callback" => "sessions#create"
     match "/auth/cadun/logout" => "sessions#destroy"
-    
+
 
 ## Tips: Dynamic Service Ids
 
@@ -69,7 +68,7 @@ Let's say your application works with many service ids. You can work with a "SET
 Add to the configuration:
 
     config.middleware.use OmniAuth::Strategies::GloboCom, :service_id => 1234, :setup => true, :config => "cadun.yml"
-    
+
 Then add to your callback controller:
 
     class SessionsController < ActionController::Base
@@ -78,7 +77,7 @@ Then add to your callback controller:
         render :nothing => true, :status => 404
       end
     end
-    
+
 It's really important to finish the action with a 404 status. It says to OmniAuth that it can go ahead and complete the flow.
 
 The setup step can change the options of the Strategy, so you can change the service id and the redirect will go to any service you set up.

data/lib/oa-globocom/version.rb

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

data/lib/omni_auth/strategies/globocom.rb

@@ -8,10 +8,10 @@ module OmniAuth
     class GloboCom
       include OmniAuth::Strategy
       
-      def initialize(app, options = {})
-        Cadun::Config.load_file(options[:config])
+      def initialize(app, opts = {})
+        Cadun::Config.load_file(opts[:config])
         
-        super(app, :cadun, options)
+        super(app, :cadun, opts)
       end
       
       def request_phase
@@ -27,7 +27,10 @@ module OmniAuth
       end
       
       def auth_hash
-        self.class.build_auth_hash(user, request)
+        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
       end
       
       def user
@@ -54,13 +57,6 @@ module OmniAuth
           env['REMOTE_ADDR']
         end
       end
-      
-      def self.build_auth_hash(user, request = nil)
-        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
-      end
     end
   end
 end

data/oa-globocom.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
   
   s.add_dependency 'oa-core', '~> 0.2.6'
-  s.add_dependency 'cadun', '~> 0.5.3'
+  s.add_dependency 'cadun', '~> 0.5.5'
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

data/spec/omni_auth/strategies/globocom_spec.rb

@@ -48,8 +48,8 @@ describe OmniAuth::Strategies::GloboCom do
       end
 
       it { strategy.env['omniauth.auth'].should be_nil }
-      it { strategy.env['omniauth.error'].should == "not authorized" }
-      it { strategy.env['omniauth.error.type'].should == :"not authorized" }
+      it { strategy.env['omniauth.error'].should == "Unauthorized" }
+      it { strategy.env['omniauth.error.type'].should == :Unauthorized }
     end
     
     context "when the authorization succeeds" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oa-globocom
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000Z
+date: 2011-07-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oa-core
-  requirement: &2161634800 !ruby/object:Gem::Requirement
+  requirement: &2156660480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,21 +23,21 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *2161634800
+  version_requirements: *2156660480
 - !ruby/object:Gem::Dependency
   name: cadun
-  requirement: &2161634300 !ruby/object:Gem::Requirement
+  requirement: &2156659980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2161634300
+  version_requirements: *2156659980
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2161633920 !ruby/object:Gem::Requirement
+  requirement: &2156689280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161633920
+  version_requirements: *2156689280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161633460 !ruby/object:Gem::Requirement
+  requirement: &2156688820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161633460
+  version_requirements: *2156688820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161633040 !ruby/object:Gem::Requirement
+  requirement: &2156688400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161633040
+  version_requirements: *2156688400
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2161632620 !ruby/object:Gem::Requirement
+  requirement: &2156687980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161632620
+  version_requirements: *2156687980
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2161632200 !ruby/object:Gem::Requirement
+  requirement: &2156687560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161632200
+  version_requirements: *2156687560
 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: