oa-cadun 3.1.4 → 3.2.0

data/lib/oa-cadun/version.rb

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

data/lib/omni_auth/strategies/cadun.rb

@@ -18,6 +18,14 @@ module OmniAuth
         redirect "#{Config.login_url}/#{service_id}?url=#{callback_url}"
       end
       
+      def callback_phase
+        begin
+          super
+        rescue => e
+          fail!(:invalid_credentials, e)
+        end
+      end
+      
       def auth_hash
         self.class.build_auth_hash(user, request)
       end

data/oa-cadun.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
   
   s.add_dependency 'oa-core'
-  s.add_dependency 'cadun', '0.2.4'
+  s.add_dependency 'cadun', '0.3.0'
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rr'

data/spec/omni_auth/strategies/cadun_spec.rb

@@ -44,6 +44,34 @@ describe OmniAuth::Strategies::Cadun do
     end
   end
   
+  describe "#callback_phase" do
+    context "when the authorization fails" do
+      before do
+        FakeWeb.register_uri :put, "http://isp-authenticator.dev.globoi.com:8280/ws/rest/autorizacao",
+                             :body => nil
+
+        strategy.call! Rack::MockRequest.env_for("http://localhost/auth/cadun/callback", "rack.session" => {})
+      end
+
+      subject { strategy.callback_phase }
+
+      specify { strategy.env['omniauth.auth'].should be_nil }
+      specify { strategy.env['omniauth.error.type'].should == :invalid_credentials }
+    end
+    
+    context "when the authorization succeeds" do
+      before do
+        stub_requests
+        strategy.call! Rack::MockRequest.env_for("http://localhost/auth/cadun/callback", "rack.session" => {})
+      end
+
+      subject { strategy.callback_phase }
+
+      specify { strategy.env['omniauth.auth'].should_not be_nil }
+      specify { strategy.env['omniauth.error.type'].should be_nil }
+    end
+  end
+  
   describe "#auth_hash" do
     before do
       stub_requests
@@ -69,7 +97,7 @@ describe OmniAuth::Strategies::Cadun do
       specify { subject[:user_info].should include(:email => "fab1@spam.la") }
       specify { subject[:user_info].should include(:gender => "MASCULINO") }
       specify { subject[:user_info].should include(:GLBID => "GLBID") }
-      specify { subject[:user_info].should include(:user_id => "21737810") }
+      specify { subject[:user_info].should include(:cadun_id => "21737810") }
       specify { subject[:user_info].should include(:mobile => "21 99999999") }
       specify { subject[:user_info].should include(:name => "Fabricio Rodrigo Lopes") }
       specify { subject[:user_info].should include(:neighborhood => "Andaraí") }

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'rack/mock'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-RSpec.configure do |config|
+RSpec.configure do |config|  
   config.before :suite do
     FakeWeb.allow_net_connect = false
   end

metadata

@@ -2,7 +2,7 @@
 name: oa-cadun
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.4
+  version: 3.2.0
 platform: ruby
 authors: 
 - Bruno
@@ -12,8 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -03:00
-default_executable: 
+date: 2011-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oa-core
@@ -34,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.4
+        version: 0.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -107,7 +106,6 @@ files:
 - spec/support/fixtures/autorizacao.xml
 - spec/support/fixtures/config.yml
 - spec/support/fixtures/pessoa.xml
-has_rdoc: true
 homepage: https://github.com/azisaka/oa-cadun
 licenses: []
 
@@ -131,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for CadUn