omni_auth_passaporte_web 2.0.0 → 3.0.0

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in kumade.gemspec
 gemspec

data/Gemfile.lock

@@ -1,48 +1,38 @@
 PATH
   remote: .
   specs:
-    omni_auth_passaporte_web (2.0.0)
-      oa-oauth (= 0.3.2)
+    omni_auth_passaporte_web (3.0.0)
+      multi_json (>= 1.0.4)
+      omniauth-oauth (~> 1.0.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.2.7)
-    diff-lcs (1.1.2)
-    faraday (0.7.6)
-      addressable (~> 2.2)
-      multipart-post (~> 1.1)
-      rack (~> 1.1)
-    multi_json (1.0.4)
-    multi_xml (0.4.2)
-    multipart-post (1.1.5)
-    oa-core (0.3.2)
-    oa-oauth (0.3.2)
-      faraday (~> 0.7.3)
-      multi_json (~> 1.0.0)
-      multi_xml (~> 0.4.0)
-      oa-core (= 0.3.2)
-      oauth (~> 0.4.0)
-      oauth2 (~> 0.5.0)
-    oauth (0.4.5)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
-    rack (1.4.1)
-    rake (0.8.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    diff-lcs (1.2.1)
+    hashie (1.2.0)
+    multi_json (1.6.1)
+    oauth (0.4.7)
+    omniauth (1.1.3)
+      hashie (~> 1.2)
+      rack
+    omniauth-oauth (1.0.1)
+      oauth
+      omniauth (~> 1.0)
+    rack (1.5.2)
+    rake (10.0.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   omni_auth_passaporte_web!
-  rake (= 0.8.4)
-  rspec (= 2.6.0)
+  rake (~> 10.0.3)
+  rspec (~> 2.13.0)

data/README

@@ -0,0 +1 @@
+For usage example with Rails, see: https://github.com/myfreecomm/exemplo_passaporte_web_rails_3_2

data/lib/omni_auth_passaporte_web.rb

@@ -1,7 +1,7 @@
+# encoding: utf-8
 $:.unshift(File.dirname(__FILE__))
 
-gem 'oa-oauth'
-
-require 'omniauth/oauth'
+require 'multi_json'
+require 'omniauth-oauth'
 require 'oauth/signature/plaintext'
-require 'omni_auth_passaporte_web/passaporte_web'
+require 'omni_auth_passaporte_web/passaporte_web'

data/lib/omni_auth_passaporte_web/passaporte_web.rb

@@ -1,6 +1,4 @@
-require 'omniauth/oauth'
-require 'multi_json'
-
+# encoding: utf-8
 module OmniAuth
   module Strategies
     #
@@ -8,47 +6,53 @@ module OmniAuth
     #
     # Usage:
     #
-    #    use OmniAuth::Strategies::PassaporteWeb, 'consumerkey', 'consumersecret', {:site=> 'http://sandbox.app.passaporteweb.com.br'}
+    #    use OmniAuth::Strategies::PassaporteWeb, 'consumerkey', 'consumersecret', :client_options => {:site => 'http://sandbox.app.passaporteweb.com.br'}
     #
     class PassaporteWeb < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key, consumer_secret, options = {})
-        @site = options.delete(:site) || 'https://sandbox.app.passaporteweb.com.br'
-        super(app, :passaporte_web, consumer_key, consumer_secret,
-                options.merge({:site => @site ,
-                :request_token_path => "/sso/initiate",
-                :authorize_path     => "/sso/authorize",
-                :access_token_path  => "/sso/token",
-                :signature_method => "PLAINTEXT"
-              }))
-      end
 
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['uuid'],
-          'user_info' => user_info,
-          'extra' => {
-            'user_hash' => user_data
-          }
-        })
-      end
+      # Give your strategy a name.
+      option :name, "passaporte_web"
+
+      # This is where you pass the options you would pass when
+      # initializing your consumer from the OAuth gem.
+      option :client_options, {
+        :site => "http://sandbox.app.passaporteweb.com.br",
+        :request_token_path => "/sso/initiate",
+        :authorize_path => "/sso/authorize",
+        :access_token_path => "/sso/token",
+        :signature_method => "PLAINTEXT"
+      }
 
-      protected
+      # These are called after authentication has succeeded. If
+      # possible, you should try to set the UID without making
+      # additional calls (if the user id is returned with the token
+      # or as a URI parameter). This may not be possible with all
+      # providers.
+      # uid{ request.params['uuid'] }
+      uid{ user_data['uuid'] }
 
-        def user_data
-          @result ||= @access_token.post('/sso/fetchuserdata', nil)
-          @data ||= MultiJson.decode(@result.body)
-        end
+      info do
+        {
+          'uuid' => user_data['uuid'],
+          'nickname' => user_data['nickname'],
+          'email' => user_data['email'],
+          'first_name' => user_data['first_name'],
+          'last_name' => user_data['last_name'],
+          'name' => [user_data['first_name'], user_data['last_name']].join(' ').strip,
+        }
+      end
+
+      extra do
+        {
+          'user_hash' => user_data
+        }
+      end
 
-        def user_info
-          {
-            'nickname' => user_data['nickname'],
-            'email' => user_data['email'],
-            'first_name' => user_data['first_name'],
-            'last_name' => user_data['last_name'],
-            'name' => [user_data['first_name'], user_data['last_name']].join(' ').strip,
-          }
-        end
+      def user_data
+        @result ||= access_token.post('/sso/fetchuserdata', nil)
+        @user_data ||= MultiJson.decode(@result.body)
+      end
 
     end
   end
-end
+end

data/omni_auth_passaporte_web.gemspec

@@ -1,11 +1,11 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{omni_auth_passaporte_web}
-  s.version = "2.0.0"
-  s.authors = ["Marcos Tapajos"]
-  s.email = ["marcos@tapajos.me"]
+  s.version = "3.0.0"
+  s.authors = ["Rodrigo Tassinari de Oliveira", "Marcos Tapajos"]
+  s.email = ["rodrigo@pittlandia.net", "marcos@tapajos.me"]
   s.homepage = %q{http://myfreecomm.com.br}
   s.summary = %q{Autenticação via SSO usando o Passaporte Web}
   s.description = s.summary
@@ -13,7 +13,8 @@ Gem::Specification.new do |s|
   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.add_dependency('oa-oauth', '0.3.2')
-  s.add_development_dependency('rspec', '2.6.0')
-  s.add_development_dependency('rake', '0.8.4')
+  s.add_dependency('omniauth-oauth', '~> 1.0.1')
+  s.add_dependency('multi_json', '>= 1.0.4')
+  s.add_development_dependency('rspec', '~>  2.13.0')
+  s.add_development_dependency('rake', '~> 10.0.3')
 end

data/spec/omni_auth_passaporte_web/passaporte_web_spec.rb

@@ -18,23 +18,16 @@ describe OmniAuth::Strategies::PassaporteWeb do
       :oauth_version=>"1.0",
       :access_token_path=>"/sso/token",
       :scheme=>:header,
-      :site=>"https://sandbox.app.passaporteweb.com.br"
+      :site=>"http://sandbox.app.passaporteweb.com.br"
     }
   end
 
   describe ".auth_hash" do
     it "should return auth_hash using server" do
-      @access_token_mock.should_receive(:token).and_return("token")
-      @access_token_mock.should_receive(:secret).and_return("secret")
+      @access_token_mock.should_receive(:token).twice.and_return("token")
+      @access_token_mock.should_receive(:secret).twice.and_return("secret")
       @access_token_mock.should_receive(:post).with("/sso/fetchuserdata", nil).once.and_return(mock(:body => "{\"nickname\":\"nick\",\"last_name\":\"Tapajos\",\"email\":\"mail\",\"first_name\":\"Marcos\"}"))
-      @passaporte_web.auth_hash.should == {
-        "user_info"=>{"name"=>"Marcos Tapajos", "nickname"=>"nick", "last_name"=>"Tapajos", "first_name"=>"Marcos", "email"=>"mail"},
-        "uid"=>nil,
-        "credentials"=>{"token"=>"token", "secret"=>"secret"},
-        "extra"=>{"user_hash"=>{"nickname"=>"nick", "last_name"=>"Tapajos", "first_name"=>"Marcos", "email"=>"mail"},
-        "access_token"=>@access_token_mock},
-        "provider"=>"passaporte_web"
-      }
+      @passaporte_web.auth_hash.to_hash.should == {"provider"=>"passaporte_web", "uid"=>nil, "info"=>{"uuid"=>nil, "nickname"=>"nick", "email"=>"mail", "first_name"=>"Marcos", "last_name"=>"Tapajos", "name"=>"Marcos Tapajos"}, "credentials"=>{"token"=>"token", "secret"=>"secret"}, "extra"=>{"access_token"=>@access_token_mock, "user_hash"=>{"nickname"=>"nick", "last_name"=>"Tapajos", "email"=>"mail", "first_name"=>"Marcos"}}}
     end
   end
 

metadata

@@ -1,51 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: omni_auth_passaporte_web
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
+- Rodrigo Tassinari de Oliveira
 - Marcos Tapajos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: oa-oauth
-  requirement: &70299455344160 !ruby/object:Gem::Requirement
+  name: omniauth-oauth
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70299455344160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70299455343460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *70299455343460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70299455342580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 10.0.3
   type: :development
   prerelease: false
-  version_requirements: *70299455342580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
 description: Autenticação via SSO usando o Passaporte Web
 email:
+- rodrigo@pittlandia.net
 - marcos@tapajos.me
 executables: []
 extensions: []
@@ -54,6 +87,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- README
 - Rakefile
 - lib/omni_auth_passaporte_web.rb
 - lib/omni_auth_passaporte_web/passaporte_web.rb
@@ -75,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2469858658958075657
+      hash: -242045153821639831
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,10 +118,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2469858658958075657
+      hash: -242045153821639831
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Autenticação via SSO usando o Passaporte Web