devise-multi_auth 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1c2273883de4342a30a7691f0b9058c9218cac
-  data.tar.gz: 0f5f945e83ed6704de1cbe8ec817bda29b30be29
+  metadata.gz: 2ff584c3f4b354f13dbb722df1b68fa277fb7290
+  data.tar.gz: ecd4357db53bb60f0599178c0c23022b149bee17
 SHA512:
-  metadata.gz: 907c37ca48b673a45d516dfcee309720fd6f073c6f9643b235005e70e99b91f8ec247544b0584040af789ae57b95432492a88d0cd4a1aeae8ccc35129924e0df
-  data.tar.gz: bffe368c9c69b318c86f313e9116f21e0ab79d0861bd02e94f51ae7601fcf721a2dfceab97e863e38ae4255d2b1c5fe3b4d6d0ea7a58402fba7660c01d856e5f
+  metadata.gz: 2d6bd2163bb04a0595185a5de78ebd1105774a1fd03ccf8df7b55bf4d491ddcc7d0e277c9dc2dc4ad4b69aa90a898ebe8cecd7eee0a511de694ce9b98c6d76ac
+  data.tar.gz: 01a27cfc31cc9fd8ab45658b87b4e4ce8d4b57d8fb59777497142f4bd169ca17f260241bccacb9cf787cde7a890ed351d2b84625a5c596ab8c26b4951ae8edcd

data/README.md

@@ -1,4 +1,4 @@
-# Devise::MultiAuth [![Version](https://badge.fury.io/rb/devise-multi_auth.png)](http://badge.fury.io/rb/devise-multi_auth)
+# Devise::MultiAuth [![Build Status](https://travis-ci.org/jeremyf/devise-multi_auth.png?branch=master)](https://travis-ci.org/jeremyf/devise-multi_auth) [![Version](https://badge.fury.io/rb/devise-multi_auth.png)](http://badge.fury.io/rb/devise-multi_auth)
 
 A [Devise](https://github.com/plataformatec/devise) plugin leveraging [omniauth](https://github.com/intridea/omniauth) to
 expose alternate means for authenticating existing users.
@@ -22,3 +22,7 @@ And then execute:
 $ bundle
 $ rails generate devise:multi_auth:install
 ```
+
+## TODO
+
+At present, this [Rails Engine](http://guides.rubyonrails.org/engines.html) does not expose an obvious means for initiating the connecting between an existing account and an omniauth-enabled account (i.e. login via Github).

data/Rakefile

@@ -5,7 +5,11 @@ rescue LoadError
 end
 
 APP_RAKEFILE = File.expand_path("../spec/internal/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+begin
+  load 'rails/tasks/engine.rake'
+rescue LoadError
+  puts "Warning: Unable to find #{APP_RAKEFILE}; internal application's tasks will not be loaded."
+end
 
 require 'engine_cart/rake_task'
 
@@ -18,4 +22,6 @@ RSpec::Core::RakeTask.new(:spec)
 namespace :spec do
   desc 'Rebuild and run the specs'
   task :travis => ['engine_cart:clean', 'engine_cart:generate', 'spec']
-end
+end
+
+task :default => :spec

data/lib/devise/multi_auth/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module MultiAuth
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/devise_multi_auth.rb

@@ -10,11 +10,12 @@ module Devise::MultiAuth
   end
 
   def oauth_client_for(provider_name, config = {})
-    config_args = Devise.omniauth_configs.fetch(provider_name.to_sym).args.dup
-    options = config_args.extract_options!
-    client_id = config_args[0]
-    secret = config_args[1]
-    OAuth2::Client.new(client_id, secret, options[:client_options] || {})
+    default_args = Devise.omniauth_configs.fetch(provider_name.to_sym).args.dup
+    default_options = default_args.extract_options!
+    options = config.fetch(:options) { default_options[:client_options] || {} }
+    client_id = config.fetch(:client_id) { default_args[0] }
+    secret = config.fetch(:secret) { default_args[1] }
+    OAuth2::Client.new(client_id, secret, options)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-multi_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jeremy.n.friesen@gmail.com