authentifyd 0.1.0.2 → 0.1.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. data/app/controllers/authentifyd/application_controller.rb +1 -0
  2. data/app/controllers/authentifyd/authentications_controller.rb +1 -0
  3. data/app/controllers/authentifyd/confirmations_controller.rb +1 -2
  4. data/app/controllers/authentifyd/passwords_controller.rb +1 -1
  5. data/app/controllers/authentifyd/registrations_controller.rb +1 -1
  6. data/app/controllers/authentifyd/sessions_controller.rb +1 -1
  7. data/app/controllers/authentifyd/unlocks_controller.rb +1 -1
  8. data/lib/authentifyd.rb +7 -10
  9. data/lib/authentifyd/engine.rb +0 -4
  10. data/lib/authentifyd/version.rb +1 -1
  11. metadata +23 -23
data/app/controllers/authentifyd/application_controller.rb CHANGED
@@ -2,5 +2,6 @@ module Authentifyd
2
2
  class ApplicationController < ActionController::Base
3
3
  include Localyzed::LocalyzedController
4
4
  helper Authentifyd::ApplicationHelper
5
+ layout Authentifyd.custom_layout || 'authentifyd/application'
5
6
  end
6
7
  end
data/app/controllers/authentifyd/authentications_controller.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  class Authentifyd::AuthenticationsController < Authentifyd::ApplicationController
2
2
  include Localyzed::LocalyzedController
3
+
3
4
  skip_before_filter :redirect_to_localized_path_if, :only => [:create, :failure]
4
5
 
5
6
  before_filter :authenticate_user!, :except => [:create, :link, :add]
data/app/controllers/authentifyd/confirmations_controller.rb CHANGED
@@ -1,6 +1,5 @@
1
1
  class Authentifyd::ConfirmationsController < Devise::ConfirmationsController
2
2
  include Localyzed::LocalyzedController
3
3
  helper Authentifyd::ApplicationHelper
4
-
5
- layout "authentifyd/application"
4
+ layout Authentifyd.custom_layout || 'authentifyd/application'
6
5
  end
data/app/controllers/authentifyd/passwords_controller.rb CHANGED
@@ -2,5 +2,5 @@ class Authentifyd::PasswordsController < Devise::PasswordsController
2
2
  include Localyzed::LocalyzedController
3
3
  helper Authentifyd::ApplicationHelper
4
4
 
5
- layout "authentifyd/application"
5
+ layout Authentifyd.custom_layout || 'authentifyd/application'
6
6
  end
data/app/controllers/authentifyd/registrations_controller.rb CHANGED
@@ -2,7 +2,7 @@ class Authentifyd::RegistrationsController < Devise::RegistrationsController
2
2
  include Localyzed::LocalyzedController
3
3
  helper Authentifyd::ApplicationHelper
4
4
 
5
- layout "authentifyd/application"
5
+ layout Authentifyd.custom_layout || 'authentifyd/application'
6
6
  before_filter :define_body_class
7
7
 
8
8
  def new
data/app/controllers/authentifyd/sessions_controller.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  class Authentifyd::SessionsController < Devise::SessionsController
2
2
  include Localyzed::LocalyzedController
3
3
  helper Authentifyd::ApplicationHelper
4
- layout "authentifyd/application"
4
+ layout Authentifyd.custom_layout || 'authentifyd/application'
5
5
  # before_filter :define_body_class
6
6
 
7
7
  before_filter :define_body_class
data/app/controllers/authentifyd/unlocks_controller.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  class Authentifyd::UnlocksController < Devise::UnlocksController
2
2
  include Localyzed::LocalyzedController
3
3
  helper Authentifyd::ApplicationHelper
4
- layout "authentifyd/application"
4
+ layout Authentifyd.custom_layout || 'authentifyd/application'
5
5
  end
data/lib/authentifyd.rb CHANGED
@@ -12,9 +12,9 @@ require "authentifyd/engine"
12
12
  module Authentifyd
13
13
 
14
14
  mattr_accessor :devise_config, :omniauth_config,
15
- :path, :path_prefix, :custom_head_snippet,
15
+ :mount_path, :path_prefix, :custom_head_snippet,
16
16
  :custom_bottom_snippet, :top_navbar_snippet,
17
- :default_after_sign_in_path
17
+ :default_after_sign_in_path, :custom_layout
18
18
 
19
19
  def self.devise_config
20
20
  (@@devise_config || {}).reverse_merge({
@@ -26,18 +26,15 @@ module Authentifyd
26
26
  })
27
27
  end
28
28
 
29
- def self.path
30
- @@path ||= "/"
29
+ def self.mount_path
30
+ @@mount_path ||= "/"
31
31
  end
32
32
 
33
33
  def self.embeddable_callback_path(_path)
34
- (Authentifyd.path_prefix ? "#{Authentifyd.path_prefix}/" : '') + Authentifyd.path + _path
34
+ (Authentifyd.path_prefix ? "#{Authentifyd.path_prefix}/" : '') + Authentifyd.mount_path + _path
35
35
  end
36
36
 
37
- def self.configure(config = {})
38
- @@custom_head_snippet = config[:custom_head_snippet]
39
- @@custom_bottom_snippet = config[:custom_bottom_snippet]
40
- @@top_navbar_snippet = config[:top_navbar_snippet]
41
- @@default_after_sign_in_path = config[:default_after_sign_in_path]
37
+ def self.setup
38
+ yield self
42
39
  end
43
40
  end
data/lib/authentifyd/engine.rb CHANGED
@@ -10,9 +10,5 @@ module Authentifyd
10
10
 
11
11
  config.authentifyd = ActiveSupport::OrderedOptions.new
12
12
 
13
- initializer "authentifyd.configure" do |app|
14
- Authentifyd.configure(app.config.authentifyd)
15
- end
16
-
17
13
  end
18
14
  end
data/lib/authentifyd/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Authentifyd
2
- VERSION = "0.1.0.2"
2
+ VERSION = "0.1.0.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: authentifyd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.2
4
+ version: 0.1.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2014-04-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70176699897840 !ruby/object:Gem::Requirement
16
+ requirement: &70278705079880 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.9
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70176699897840
24
+ version_requirements: *70278705079880
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: devise
27
- requirement: &70176699896540 !ruby/object:Gem::Requirement
27
+ requirement: &70278705094160 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - =
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 2.1.2
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70176699896540
35
+ version_requirements: *70278705094160
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise-encryptable
38
- requirement: &70176699911500 !ruby/object:Gem::Requirement
38
+ requirement: &70278705092480 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - =
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.1.2
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70176699911500
46
+ version_requirements: *70278705092480
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: omniauth
49
- requirement: &70176699910780 !ruby/object:Gem::Requirement
49
+ requirement: &70278705090380 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - =
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.1.4
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70176699910780
57
+ version_requirements: *70278705090380
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: omniauth-facebook
60
- requirement: &70176699910260 !ruby/object:Gem::Requirement
60
+ requirement: &70278705088880 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - =
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.4.0
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70176699910260
68
+ version_requirements: *70278705088880
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: omniauth-twitter
71
- requirement: &70176699909540 !ruby/object:Gem::Requirement
71
+ requirement: &70278705087380 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - =
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 1.0.0
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70176699909540
79
+ version_requirements: *70278705087380
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: omniauth-google-oauth2
82
- requirement: &70176699908800 !ruby/object:Gem::Requirement
82
+ requirement: &70278705102380 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - =
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.2.1
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70176699908800
90
+ version_requirements: *70278705102380
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: haml-rails
93
- requirement: &70176699908200 !ruby/object:Gem::Requirement
93
+ requirement: &70278705101420 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70176699908200
101
+ version_requirements: *70278705101420
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: localyzed
104
- requirement: &70176699907220 !ruby/object:Gem::Requirement
104
+ requirement: &70278705099740 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 0.0.5
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70176699907220
112
+ version_requirements: *70278705099740
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: mysql2
115
- requirement: &70176699906720 !ruby/object:Gem::Requirement
115
+ requirement: &70278705098660 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70176699906720
123
+ version_requirements: *70278705098660
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rspec-rails
126
- requirement: &70176699906040 !ruby/object:Gem::Requirement
126
+ requirement: &70278705097460 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70176699906040
134
+ version_requirements: *70278705097460
135
135
  description: Devise + Omniauth Authentication encapsulated in an Engine. Uses Devise.
136
136
  Parts taken from perens-instant-user and sso-devise-omniauth-provider
137
137
  email: