omniauth-multiple_providers 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2a587c796b1c63782f0857c794316e1f0d2024
-  data.tar.gz: 76f395b427c7c63b266dddb2c68f1dc697b21634
+  metadata.gz: 3b309f8c673b807d4fc3495e08cd905d519b46f2
+  data.tar.gz: 36ca9bc0adb509b2a9b8d498e34783ac25277587
 SHA512:
-  metadata.gz: 5f9561cb2a41dfbcb2220ab48f4684984a0dc8356fd02d42ecfa07c0fc24928b355ae992f88be9d85ff2d38c80124483e1b8a97f87cfa2312e25c100acf18ca9
-  data.tar.gz: 7eb08462cae8ac9643cbb108f9b96080849121f3a24dd48f48bc1a841429051dd4ac36da2648112022ac23d076892b92c072495fc9719e9a0953dfbf40e3cd6a
+  metadata.gz: 687527de65efb1d720bee91f874daa15a1fe696452062ed740987d71d5a7df753255cb30ddb497f94d387ad09ace2f6766a8eb327eb19415250d9ceb4f5041d6
+  data.tar.gz: a533d6f7cab5e352e90f0ce3f39e9512629c36a17582510f872b6403bbaefe909e7be72b9c4cc8db0eb77dca7044648f56e0977bc86918d95bdf98fad63b8a70

data/README.md

@@ -41,6 +41,8 @@ Or install it yourself as:
 
     $ gem install omniauth-multiple_providers
 
+## Usage
+
 `app/models/user.rb` (generated by Devise) do not use `:omniauthable`.
 
 ``` ruby
@@ -60,21 +62,19 @@ $ rails generate omniauth:multiple_providers:install
 $ rake db:migrate # => create provider_users table
 ```
 
-## Usage
-
 You can use `new_omniauth_path(provider: :provider_name)`, and It redirect_to `/auth/:provider_name`.
 And automatically receive callback, and Save to `ProviderUser`(app/models/provider_user.rb).
 
 ``` haml
 %ul
   %li
-    = link_to new_omniauth_path(provider: :twitter), 'data-no-turbolink' => true do
+    = link_to new_omniauth_path(provider: :twitter) do
       Signup with Twitter
   %li
-    = link_to new_omniauth_path(provider: :facebook), 'data-no-turbolink' => true do
+    = link_to new_omniauth_path(provider: :facebook) do
       Signup with Facebook
   %li
-    = link_to new_omniauth_path(provider: :github), 'data-no-turbolink' => true do
+    = link_to new_omniauth_path(provider: :github) do
       Signup with Github
 ```
 
@@ -85,6 +85,11 @@ And if you remove connection to Providers,
   cancel connection
 ```
 
+## TODO
+
+- Drop Dependency of Devise
+- Configuratable with initializer
+
 ## Contributing
 
 1. Fork it

data/app/controllers/omniauth/multiple_providers_controller.rb

@@ -1,5 +1,7 @@
 module Omniauth
   class MultipleProvidersController < ApplicationController
+
+    # PATH: new_omniauth_path(provider: 'twitter')
     def new
       if %w[twitter github google_oauth2 facebook].include?(params[:provider])
         redirect_to "/auth/#{params[:provider]}"
@@ -13,7 +15,7 @@ module Omniauth
       if @user.new_record?
         redirect_to new_user_session_path, flash: {error: "ユーザデータの保存に失敗しました：#{@user.errors.full_messages.join(', ')}"}
       elsif @user.email.blank?
-        redirect_to prepare_path
+        redirect_to new_user_registration_path(@user)
       else
         sign_in(@user)
         redirect_to root_path, notice: 'OK'
@@ -24,6 +26,7 @@ module Omniauth
       redirect_to root_path, flash: {error: 'OAuth認証に失敗しました'}
     end
 
+    # PATH: omniauth_path('twitter'), method: :delete
     def destroy
       if up = current_user.provider_users.find_by(provider: params[:id])
         up.destroy

data/lib/omniauth/multiple_providers/models/concerns/omniauthable.rb

@@ -48,12 +48,18 @@ module Omniauth
           if up = ProviderUser.find_by(uid: auth['uid'], provider: auth['provider'])
             up.user
           else
-            nil
+            # Hmmm...
+            # FIXME to be configuratable
+            # Do this If you trust provider email
+            if user = User.find_by(email: auth['email'])
+              user
+            else
+              nil
+            end
           end
         end
 
         def create_by_oauth(auth)
-          logger.debug "##### Auth Hash: #{auth.to_json}"
           case auth['provider']
           when 'twitter'
             # Twitter not give me email from api

data/lib/omniauth/multiple_providers/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module MultipleProviders
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/omniauth-multiple_providers.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
+  spec.add_dependency 'devise'
   spec.add_dependency 'omniauth'
   spec.add_dependency 'activesupport'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-multiple_providers
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Takuya Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement