anadea-identity 0.3.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: def097b4755e88a07d17eecba90fcd1c6b9d8a7c
4
- data.tar.gz: 84fee48d01725a0c1af1f1909d9d79902f576d40
3
+ metadata.gz: a855b4caa5766ebee3f45727946a4c96c31f9a27
4
+ data.tar.gz: 66bea8bbf0b6c3ff3c4e6ce53bb895c24005c62b
5
5
  SHA512:
6
- metadata.gz: 1748897c4af3e599fe9d4139a99194b748746918d1bbc04eef4b16ab2c32e984a63c27cca498fa654e79272b2e394562fd398c8cf8a032e99f7a7378d8220f76
7
- data.tar.gz: 4552d1ed458b5bfcedeeb8bb040243fb2feb6feddb7986a1af4198056a9fcbe6f1d253b76489f24ad1bc58ee20823e47b043167723a0d27536d66c952864faa1
6
+ metadata.gz: 1ff68cd0f9eb194cf8cd85300a30418862b7c747719146c1e58cfc8b3ab322eb1e97a15d7c3283cddf51e7ceeb2054b84f3def4d5f68e89e2e5e537422b3c01b
7
+ data.tar.gz: 1492e2d54525d93835840a6dc0f8ad37be3a3dbe9a29a02da0933305f4bca198d324fafad266430b02177dd4e96b052ef8c75560d284b74a44b9d713fc8b00cf
data/config/routes.rb CHANGED
@@ -1,9 +1,9 @@
1
1
  Rails.application.routes.draw do
2
2
  if Identity.auth_routes
3
- devise_for :users, Identity.auth_routes.reverse_merge(
3
+ devise_for :users, {
4
4
  class_name: Identity.user_class_name,
5
5
  module: :devise,
6
- controllers: { omniauth_callbacks: "identity/omniauth_callbacks" }
7
- )
6
+ controllers: Identity.controllers
7
+ }.deep_merge(Identity.auth_routes)
8
8
  end
9
9
  end
data/lib/identity.rb CHANGED
@@ -20,6 +20,13 @@ module Identity
20
20
  user_class_name.constantize
21
21
  end
22
22
 
23
+ def self.controllers
24
+ if Devise.omniauth_providers.any?
25
+ { omniauth_callbacks: "identity/omniauth_callbacks" }
26
+ else
27
+ { }
28
+ end
29
+ end
23
30
 
24
31
  def self.setup
25
32
  yield self
@@ -1,3 +1,3 @@
1
1
  module Identity
2
- VERSION = "0.3.0"
2
+ VERSION = "0.3.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: anadea-identity
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anadea team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-28 00:00:00.000000000 Z
11
+ date: 2015-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails