bhf 0.4.15 → 0.4.16

Sign up to get free protection for your applications and to get access to all the features.
@@ -20,10 +20,12 @@ class Bhf::ApplicationController < ActionController::Base
20
20
  end
21
21
 
22
22
  def setup_current_account
23
- if Bhf::Engine.config.current_admin_account
24
- # TODO: wtf ActionDispatch::Cookies::CookieOverflow
25
- account = session[Bhf::Engine.config.current_admin_account.to_s]
26
- @current_account = account.class.find(account.id)
23
+ if session[Bhf::Engine.config.session_account_id]
24
+ @current_account = Bhf::Engine.config.account_model.constantize.send(
25
+ Bhf::Engine.config.account_model_find_method.to_sym,
26
+ session[Bhf::Engine.config.session_account_id.to_s]
27
+ )
28
+ # => User.find(current_account.id)
27
29
  end
28
30
  end
29
31
 
data/lib/engine.rb CHANGED
@@ -10,7 +10,9 @@ module Bhf
10
10
  config.on_login_fail = :root_url
11
11
  config.logout_path = :logout_path
12
12
  config.session_auth_name = :is_admin
13
- config.current_admin_account = nil
13
+ config.session_account_id = :admin_account_id
14
+ config.account_model = 'User'
15
+ config.account_model_find_method = 'find'
14
16
  config.css = []
15
17
 
16
18
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bhf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.15
4
+ version: 0.4.16
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-21 00:00:00.000000000Z
12
+ date: 2012-06-22 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70256895455520 !ruby/object:Gem::Requirement
16
+ requirement: &70315233368400 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70256895455520
24
+ version_requirements: *70315233368400
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: kaminari
27
- requirement: &70256895454280 !ruby/object:Gem::Requirement
27
+ requirement: &70315233351980 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.12.4
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70256895454280
35
+ version_requirements: *70315233351980
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: haml-rails
38
- requirement: &70256895451340 !ruby/object:Gem::Requirement
38
+ requirement: &70315233350720 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.3.4
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70256895451340
46
+ version_requirements: *70315233350720
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: sass-rails
49
- requirement: &70256895434680 !ruby/object:Gem::Requirement
49
+ requirement: &70315233349700 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 3.1.4
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70256895434680
57
+ version_requirements: *70315233349700
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mootools-rails
60
- requirement: &70256895432680 !ruby/object:Gem::Requirement
60
+ requirement: &70315233348780 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: 1.0.1
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70256895432680
68
+ version_requirements: *70315233348780
69
69
  description: Gets you there on time
70
70
  email: anton.pawlik@gmail.com
71
71
  executables: []