scottmotte-merb_auth_slice_multisite 0.6.0 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION.yml +1 -1
- data/lib/merb_auth_slice_multisite.rb +8 -8
- metadata +1 -1
data/VERSION.yml
CHANGED
|
@@ -12,13 +12,6 @@ if defined?(Merb::Plugins)
|
|
|
12
12
|
# Register the Slice for the current host application
|
|
13
13
|
Merb::Slices::register(__FILE__)
|
|
14
14
|
|
|
15
|
-
# Register the custom strategy so that this slice may utilize it
|
|
16
|
-
# from http://github.com/wycats/merb/blob/784ac7d71780d1a7cfb9152ba4cb0
|
|
17
|
-
# e18a990ab7a/merb-auth/merb-auth-more/lib/merb-auth-more.rb
|
|
18
|
-
basic_path = File.expand_path(File.dirname(__FILE__)) / "merb-auth-more" / "strategies" / "multisite"
|
|
19
|
-
|
|
20
|
-
Merb::Authentication.register(:multisite_password_form, basic_path / "multisite_password_form.rb")
|
|
21
|
-
|
|
22
15
|
# Slice configuration - set this in a before_app_loads callback.
|
|
23
16
|
# By default a Slice uses its own layout, so you can swicht to
|
|
24
17
|
# the main application layout or no layout at all if needed.
|
|
@@ -45,7 +38,14 @@ if defined?(Merb::Plugins)
|
|
|
45
38
|
def self.init
|
|
46
39
|
require 'merb-auth-more/mixins/redirect_back'
|
|
47
40
|
unless MerbAuthSliceMultisite[:no_default_strategies]
|
|
48
|
-
|
|
41
|
+
# Register the custom strategy so that this slice may utilize it
|
|
42
|
+
# from http://github.com/wycats/merb/blob/784ac7d71780d1a7cfb9152ba4cb0
|
|
43
|
+
# e18a990ab7a/merb-auth/merb-auth-more/lib/merb-auth-more.rb
|
|
44
|
+
basic_path = File.expand_path(File.dirname(__FILE__)) / "merb-auth-more" / "strategies" / "multisite"
|
|
45
|
+
Merb::Authentication.register(:multisite_password_form, basic_path / "multisite_password_form.rb")
|
|
46
|
+
|
|
47
|
+
# activate the strategy
|
|
48
|
+
::Merb::Authentication.activate!(:multisite_password_form)
|
|
49
49
|
end
|
|
50
50
|
|
|
51
51
|
|