devise-multi_auth 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff584c3f4b354f13dbb722df1b68fa277fb7290
-  data.tar.gz: ecd4357db53bb60f0599178c0c23022b149bee17
+  metadata.gz: 93c42eb9fd43d69aaff590dd248b90cf5d7380f1
+  data.tar.gz: 01b1dccb4afa06f5217dc06fc229e04dec18af0c
 SHA512:
-  metadata.gz: 2d6bd2163bb04a0595185a5de78ebd1105774a1fd03ccf8df7b55bf4d491ddcc7d0e277c9dc2dc4ad4b69aa90a898ebe8cecd7eee0a511de694ce9b98c6d76ac
-  data.tar.gz: 01a27cfc31cc9fd8ab45658b87b4e4ce8d4b57d8fb59777497142f4bd169ca17f260241bccacb9cf787cde7a890ed351d2b84625a5c596ab8c26b4951ae8edcd
+  metadata.gz: b2e715ed0ddcdac20aa11a48e74b5d6bf91e509303804ba6ea64f2e7b127d2659a94efb54cebd4836f0ba121bdab4c4b45ba74649a9e3a0d63afdaeb5d1cb179
+  data.tar.gz: c86669718c3fe9b35f50b44e831dc402be045bec9c29dadbff8028a3f1a1cf1e38ac5c2a54fa522583a37d072f4028b4561e729fbd9d0d0434d4569c60c404ae

data/Rakefile

@@ -24,4 +24,4 @@ namespace :spec do
   task :travis => ['engine_cart:clean', 'engine_cart:generate', 'spec']
 end
 
-task :default => :spec
+task :default => 'spec:travis'

data/app/controllers/devise/multi_auth/authentications_controller.rb

@@ -13,6 +13,7 @@ module Devise::MultiAuth
       omni = request.env["omniauth.auth"]
       if @user = Authentication.find_user_by_provider_and_uid(omni['provider'], omni['uid'])
         set_flash_message(:notice, :success, kind: omni['provider']) if is_navigational_format?
+        Devise::MultiAuth.capture_successful_external_authentication(@user, omni)
         sign_in_and_redirect @user, event: :authentication
       else
         session["devise.auth_data"] = request.env["omniauth.auth"].except('extra')

data/lib/devise/multi_auth.rb

@@ -0,0 +1,20 @@
+require "devise/multi_auth/engine"
+
+module Devise::MultiAuth
+  module_function
+
+  def capture_successful_external_authentication(user, auth, config = {})
+    service = config.fetch(:service) { CaptureSuccessfulExternalAuthentication }
+    service.call(user, auth)
+  end
+
+  def oauth_client_for(provider_name, config = {})
+    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

data/lib/devise/multi_auth/version.rb

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

data/lib/devise_multi_auth.rb

@@ -1,21 +1,2 @@
 require "devise"
-require "devise/multi_auth/engine"
-
-module Devise::MultiAuth
-  module_function
-
-  def capture_successful_external_authentication(user, auth, config = {})
-    service = config.fetch(:service) { CaptureSuccessfulExternalAuthentication }
-    service.call(user, auth)
-  end
-
-  def oauth_client_for(provider_name, config = {})
-    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
+require "devise/multi_auth"

data/lib/generators/devise/multi_auth/install/install_generator.rb

@@ -5,6 +5,7 @@ module Devise::MultiAuth
     source_root File.expand_path('../templates', __FILE__)
 
     class_option :install_devise, default: false, type: :boolean
+    class_option :skip_migrate, default: false, type: :boolean
 
     def install_devise
       if options[:install_devise]
@@ -14,16 +15,18 @@ module Devise::MultiAuth
     end
 
     def install_authentications_controller
+      gem "omniauth-github"
       routing_code = %(, controllers: { omniauth_callbacks: 'devise/multi_auth/authentications' }\n)
       insert_into_file 'config/routes.rb', routing_code, { :after => /devise_for :users/, :verbose => false }
     end
 
-    def install_warden_initializer
-      template('devise_multi_auth_initializer.rb.erb', 'config/initializers/devise_multi_auth_initializer.rb')
-    end
-
     def install_migrations
       rake 'devise_multi_auth:install:migrations'
+      if ! options[:skip_migrate]
+        rake 'db:migrate'
+      end
     end
+
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-multi_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - jeremy.n.friesen@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,10 +149,10 @@ files:
 - db/migrate/20140204141526_create_authentications.rb
 - lib/devise/multi_auth/engine.rb
 - lib/devise/multi_auth/version.rb
+- lib/devise/multi_auth.rb
 - lib/devise-multi_auth.rb
 - lib/devise_multi_auth.rb
 - lib/generators/devise/multi_auth/install/install_generator.rb
-- lib/generators/devise/multi_auth/install/templates/devise_multi_auth_initializer.rb.erb
 - lib/tasks/devise-multi_auth_tasks.rake
 - LICENSE
 - Rakefile

data/lib/generators/devise/multi_auth/install/templates/devise_multi_auth_initializer.rb.erb

@@ -1,6 +0,0 @@
-Warden::Manager.after_authentication do |user, auth, opts|
-  Devise::MultiAuth.capture_successful_external_authentication(
-    user,
-    auth.request.env['omniauth.auth']
-  )
-end