oa-cadun 3.1.0 → 3.1.1

data/Gemfile

@@ -1,3 +1,2 @@
 source "http://rubygems.org"
-
 gemspec

data/README.md

@@ -9,10 +9,22 @@ The goal of this gem is to create a bridge between Cadun and your app through Om
 Add into your Gemfile
 
     gem "oa-cadun"
+    
+## Configuration
   
-Then configure the middleware with the CadUn's service id
+The middleware has 2 important options: `:service_id` and `:config_file`.
+:service_id is the number of your service on CadUn.
+:config_file is the YAML formatted file with the urls you want to use:
+
+    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
+
+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::Cadun, :service_id => 1234
+    config.middleware.use OmniAuth::Strategies::Cadun, :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:
 
@@ -22,11 +34,12 @@ After that, you just need to follow the OmniAuth standard configuration creating
       end
 
       def create
-        auth = request.env['omniauth.auth']
-      
-        if auth and auth['id']
-          user = User.find_by_id(auth['id'])
-          user = User.create_from_omniauth(auth) unless user
+        if auth = request.env['omniauth.auth']
+          user = begin
+            User.find(auth['uid'])
+          rescue ActiveRecord::RecordNotFound
+            User.create_from_omniauth(auth)
+          end
           
           session[:user_id] = user.id
           redirect_to root_url
@@ -51,21 +64,23 @@ And set your routes:
     match "/auth/cadun/logout" => "sessions#destroy"
     
 
-## Dynamic Service Ids
+## Tips: Dynamic Service Ids
 
 Let's say your application works with many service ids. You can work with a "SETUP" step.
 
 Add to the configuration:
 
-    config.middleware.use OmniAuth::Strategies::Cadun, :service_id => 1234, :setup => true
+    config.middleware.use OmniAuth::Strategies::Cadun, :service_id => 1234, :setup => true, :config => "cadun.yml"
     
 Then add to your callback controller:
 
-    def setup
-      request.env['omniauth.strategy'].options[:service_id] = object.service_id
-      render :nothing => true, :status => 404
+    class SessionsController < ActionController::Base
+      def setup
+        request.env['omniauth.strategy'].options[:service_id] = object.service_id
+        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.
+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-cadun/version.rb

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

data/lib/omni_auth/strategies/cadun.rb

@@ -25,13 +25,13 @@ module OmniAuth
           :user_info => {
             :id => user.id,
             :GLBID => request.params['GLBID'],
-            :url => request.params['url'],          
+            :url => request.params['url'],
             :email => user.email,
             :status => user.status,
             :nickname => user.login,
             :name => user.name,
             :address => user.address,
-            :suburb => user.suburb,
+            :neighborhood => user.neighborhood,
             :city => user.city,
             :state => user.state,
             :country => user.country,

data/oa-cadun.gemspec

@@ -1,24 +1,22 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "oa-cadun/version"
+require "#{File.dirname(__FILE__)}/lib/oa-cadun/version"
 
 Gem::Specification.new do |s|
-  s.name        = "oa-cadun"
+  s.name        = 'oa-cadun'
   s.version     = OACadun::VERSION::STRING
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Bruno Azisaka Maciel"]
-  s.email       = ["bruno@azisaka.com.br"]
-  s.homepage    = ""
-  s.summary     = %q{OmniAuth strategy for CadUn}
-  s.description = %q{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}
+  s.authors     = %w(Bruno Azisaka Maciel)
+  s.email       = %w(bruno@azisaka.com.br)
+  s.homepage    = 'https://github.com/azisaka/oa-cadun'
+  s.summary     = 'OmniAuth strategy for CadUn'
+  s.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'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  s.require_paths = %w(lib)
   
   s.add_dependency 'oa-core'
-  s.add_dependency 'cadun', '0.2.0'
+  s.add_dependency 'cadun', '0.2.1'
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rr'

data/spec/omni_auth/strategies/cadun_spec.rb

@@ -4,12 +4,12 @@ require 'spec_helper'
 describe OmniAuth::Strategies::Cadun do
 
   let(:app) { lambda { |env| [200, {}, ['Hello']] } }
-  let(:strategy) { OmniAuth::Strategies::Cadun.new(app, :service_id => 1, :config => File.join(File.dirname(__FILE__), "..", "..", "support", "fixtures", "config.yml")) }
+  let(:strategy) { OmniAuth::Strategies::Cadun.new app, :service_id => 1, :config => "#{File.dirname(__FILE__)}/../../support/fixtures/config.yml" }
   
   describe "#request_phase" do
     context "when it has a referer" do
       before do
-        strategy.call!(Rack::MockRequest.env_for("http://test.localhost/auth/cadun", "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
@@ -47,29 +47,38 @@ describe OmniAuth::Strategies::Cadun do
   describe "#auth_hash" do
     before do
       stub_requests
-      strategy.call!(Rack::MockRequest.env_for("http://localhost?GLBID=GLBID&url=/go_back", "rack.session" => {}))
+      strategy.call! Rack::MockRequest.env_for("http://localhost?GLBID=GLBID&url=/go_back", "rack.session" => {})
     end
     
-    subject { strategy.auth_hash[:user_info] }
+    subject { strategy.auth_hash }
     
-    specify { should include(:GLBID => "GLBID") }
-    specify { should include(:id => "21737810") }
-    specify { should include(:email => "fab1@spam.la") }
-    specify { should include(:status => "ATIVO") }
-    specify { should include(:nickname => "fabricio_fab1") }
-    specify { should include(:name => "Fabricio Rodrigo Lopes") }
-    specify { should include(:address => "Rua Uruguai, 59") }
-    specify { should include(:suburb => "Andaraí") }
-    specify { should include(:city => "Rio de Janeiro") }
-    specify { should include(:state => "RJ") }
-    specify { should include(:country => "Brasil") }
-    specify { should include(:gender => "MASCULINO") }
-    specify { should include(:birthday => "22/02/1983") }
-    specify { should include(:mobile => "21 99999999") }
-    specify { should include(:phone => "21 22881060") }
-    specify { should include(:cpf => "09532034765") }
-    specify { should include(:url => "/go_back") }
-  
+    describe ":uid" do
+      specify { subject[:uid].should == "21737810" }
+    end
+    
+    describe ":provider" do
+      specify { subject[:provider].should == "cadun" }
+    end
+    
+    describe ":user_info" do
+      specify { subject[:user_info].should include(:GLBID => "GLBID") }
+      specify { subject[:user_info].should include(:id => "21737810") }
+      specify { subject[:user_info].should include(:email => "fab1@spam.la") }
+      specify { subject[:user_info].should include(:status => "ATIVO") }
+      specify { subject[:user_info].should include(:nickname => "fabricio_fab1") }
+      specify { subject[:user_info].should include(:name => "Fabricio Rodrigo Lopes") }
+      specify { subject[:user_info].should include(:address => "Rua Uruguai, 59") }
+      specify { subject[:user_info].should include(:neighborhood => "Andaraí") }
+      specify { subject[:user_info].should include(:city => "Rio de Janeiro") }
+      specify { subject[:user_info].should include(:state => "RJ") }
+      specify { subject[:user_info].should include(:country => "Brasil") }
+      specify { subject[:user_info].should include(:gender => "MASCULINO") }
+      specify { subject[:user_info].should include(:birthday => "22/02/1983") }
+      specify { subject[:user_info].should include(:mobile => "21 99999999") }
+      specify { subject[:user_info].should include(:phone => "21 22881060") }
+      specify { subject[:user_info].should include(:cpf => "09532034765") }
+      specify { subject[:user_info].should include(:url => "/go_back") }
+    end
   end
 
 end

metadata

@@ -2,10 +2,12 @@
 name: oa-cadun
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors: 
-- Bruno Azisaka Maciel
+- Bruno
+- Azisaka
+- Maciel
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -32,7 +34,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -106,7 +108,7 @@ files:
 - spec/support/fixtures/config.yml
 - spec/support/fixtures/pessoa.xml
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/azisaka/oa-cadun
 licenses: []
 
 post_install_message: 
@@ -133,9 +135,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for CadUn
-test_files: 
-- spec/omni_auth/strategies/cadun_spec.rb
-- spec/spec_helper.rb
-- spec/support/fixtures/autorizacao.xml
-- spec/support/fixtures/config.yml
-- spec/support/fixtures/pessoa.xml
+test_files: []
+