cantango 0.8.9.2 → 0.8.9.3

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.
Files changed (8) hide show
  1. data/VERSION +1 -1
  2. data/cantango.gemspec +3 -2
  3. data/lib/cantango.rb +1 -0
  4. data/lib/cantango/api/options.rb +6 -1
  5. data/lib/cantango/api/user.rb +2 -2
  6. data/lib/cantango/api/user/session.rb +34 -0
  7. data/lib/cantango/permits/permit.rb +2 -1
  8. metadata +34 -33
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.8.9.2
1
+ 0.8.9.3
data/cantango.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "cantango"
8
- s.version = "0.8.9.2"
8
+ s.version = "0.8.9.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Kristian Mandrup", "Stanislaw Pankevich"]
12
- s.date = "2011-10-11"
12
+ s.date = "2011-10-14"
13
13
  s.description = "Define your permission rules as role- or role group specific permits.\nIntegrates well with multiple Devise user acounts.\nIncludes rules caching.\nStore permissions in yaml file or key-value store"
14
14
  s.email = "kmandrup@gmail.com, s.pankevich@gmail.com"
15
15
  s.extra_rdoc_files = [
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
55
55
  "lib/cantango/api/user/ability.rb",
56
56
  "lib/cantango/api/user/can.rb",
57
57
  "lib/cantango/api/user/scope.rb",
58
+ "lib/cantango/api/user/session.rb",
58
59
  "lib/cantango/api/user_account.rb",
59
60
  "lib/cantango/api/user_account/ability.rb",
60
61
  "lib/cantango/api/user_account/can.rb",
data/lib/cantango.rb CHANGED
@@ -38,6 +38,7 @@ module CanTango
38
38
  end
39
39
 
40
40
  def debug_ability candidate, actions, subjects, *extra_args
41
+ puts "Ability: #{actions} on #{subjects}"
41
42
  puts "permits allowed:" << permits_allowed(candidate, actions, subjects, *extra_args).inspect
42
43
  puts "permits denied:" << permits_denied(candidate, actions, subjects, *extra_args).inspect
43
44
  end
data/lib/cantango/api/options.rb CHANGED
@@ -10,10 +10,15 @@ module CanTango
10
10
  opts
11
11
  end
12
12
 
13
+ def self.options_list
14
+ [:session, :request, :params, :controller, :domain, :cookies]
15
+ end
16
+
13
17
  private
14
18
 
19
+ # [:session, :request, :params, :controller, :domain, :cookies]
15
20
  def options_list
16
- [:session, :request, :params, :controller, :domain]
21
+ self.class.options_list
17
22
  end
18
23
  end
19
24
  end
data/lib/cantango/api/user.rb CHANGED
@@ -1,11 +1,11 @@
1
1
  module CanTango
2
2
  module Api
3
3
  module User
4
- autoload_modules :Ability, :Can, :Scope
4
+ autoload_modules :Ability, :Can, :Scope, :Session
5
5
 
6
6
  module All
7
7
  def self.included base
8
- [:Ability, :Can, :Scope].each do |api|
8
+ [:Ability, :Can, :Scope, :Session].each do |api|
9
9
  base.send :include, clazz(api)
10
10
  end
11
11
  end
data/lib/cantango/api/user/session.rb ADDED
@@ -0,0 +1,34 @@
1
+ module CanTango
2
+ module Api
3
+ module User
4
+ module Session
5
+ # Example: generated from types of accounts! (see below)
6
+ # def admin_can?(*args)
7
+ # current_ability(:admin).can?(*args)
8
+ # end
9
+ def self.included(base)
10
+ ::CanTango.config.users.registered.each do |user|
11
+ base.class_eval %{
12
+ def session_#{user}
13
+ current_#{user} if respond_to? :current_#{user}
14
+ guest_user
15
+ end
16
+ }
17
+ end
18
+
19
+ # give me any logged in user or the guest user
20
+ def any_user *types
21
+ types = types.flatten.select_labels.map(&:to_sym)
22
+ c_user = ::CanTango.config.users.registered.each do |user|
23
+ send(:"current_#{user}") if respond_to?(:"current_#{user}") && (types.empty? || types.include?(user))
24
+ end.compact.first
25
+ c_user || guest_user
26
+ end
27
+
28
+ def guest_user
29
+ CanTango.config.guest.user
30
+ end
31
+ end
32
+ end
33
+ end
34
+ end
data/lib/cantango/permits/permit.rb CHANGED
@@ -66,7 +66,8 @@ module CanTango
66
66
  ability.options
67
67
  end
68
68
 
69
- [:session, :controller, :request, :params].each do |obj|
69
+ # [:session, :controller, :request, :params, :domain, :cookies].each do |obj|
70
+ CanTango::Api::Options.options_list.each do |obj|
70
71
  class_eval %{
71
72
  def #{obj}
72
73
  options[:#{obj}]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cantango
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.9.2
4
+ version: 0.8.9.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2011-10-11 00:00:00.000000000Z
13
+ date: 2011-10-14 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &2158162380 !ruby/object:Gem::Requirement
17
+ requirement: &2164545660 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 3.0.1
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2158162380
25
+ version_requirements: *2164545660
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: cancan
28
- requirement: &2158161880 !ruby/object:Gem::Requirement
28
+ requirement: &2164544920 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '1.4'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2158161880
36
+ version_requirements: *2164544920
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: sugar-high
39
- requirement: &2158161400 !ruby/object:Gem::Requirement
39
+ requirement: &2164544400 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 0.6.0
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *2158161400
47
+ version_requirements: *2164544400
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: sweetloader
50
- requirement: &2158160900 !ruby/object:Gem::Requirement
50
+ requirement: &2164537260 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 0.1.0
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *2158160900
58
+ version_requirements: *2164537260
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: hashie
61
- requirement: &2158160400 !ruby/object:Gem::Requirement
61
+ requirement: &2164536780 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0.4'
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *2158160400
69
+ version_requirements: *2164536780
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: rspec-rails
72
- requirement: &2158159920 !ruby/object:Gem::Requirement
72
+ requirement: &2164536240 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: 2.6.1
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *2158159920
80
+ version_requirements: *2164536240
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: forgery
83
- requirement: &2158159340 !ruby/object:Gem::Requirement
83
+ requirement: &2164535660 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: '0.3'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *2158159340
91
+ version_requirements: *2164535660
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: factory_girl
94
- requirement: &2158158780 !ruby/object:Gem::Requirement
94
+ requirement: &2164535180 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '0'
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *2158158780
102
+ version_requirements: *2164535180
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: sqlite3
105
- requirement: &2158158300 !ruby/object:Gem::Requirement
105
+ requirement: &2164534680 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: '0'
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *2158158300
113
+ version_requirements: *2164534680
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: sourcify
116
- requirement: &2158157820 !ruby/object:Gem::Requirement
116
+ requirement: &2164534060 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: '0'
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *2158157820
124
+ version_requirements: *2164534060
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: dkastner-moneta
127
- requirement: &2158157320 !ruby/object:Gem::Requirement
127
+ requirement: &2164533580 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: '1.0'
133
133
  type: :development
134
134
  prerelease: false
135
- version_requirements: *2158157320
135
+ version_requirements: *2164533580
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: rspec
138
- requirement: &2158156740 !ruby/object:Gem::Requirement
138
+ requirement: &2164533100 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: 2.4.0
144
144
  type: :development
145
145
  prerelease: false
146
- version_requirements: *2158156740
146
+ version_requirements: *2164533100
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: jeweler
149
- requirement: &2158156240 !ruby/object:Gem::Requirement
149
+ requirement: &2164532460 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: 1.6.4
155
155
  type: :development
156
156
  prerelease: false
157
- version_requirements: *2158156240
157
+ version_requirements: *2164532460
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: bundler
160
- requirement: &2158155760 !ruby/object:Gem::Requirement
160
+ requirement: &2164531980 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: 1.0.1
166
166
  type: :development
167
167
  prerelease: false
168
- version_requirements: *2158155760
168
+ version_requirements: *2164531980
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: rdoc
171
- requirement: &2158155260 !ruby/object:Gem::Requirement
171
+ requirement: &2164531440 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
174
  - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
176
176
  version: '0'
177
177
  type: :development
178
178
  prerelease: false
179
- version_requirements: *2158155260
179
+ version_requirements: *2164531440
180
180
  description: ! 'Define your permission rules as role- or role group specific permits.
181
181
 
182
182
  Integrates well with multiple Devise user acounts.
@@ -229,6 +229,7 @@ files:
229
229
  - lib/cantango/api/user/ability.rb
230
230
  - lib/cantango/api/user/can.rb
231
231
  - lib/cantango/api/user/scope.rb
232
+ - lib/cantango/api/user/session.rb
232
233
  - lib/cantango/api/user_account.rb
233
234
  - lib/cantango/api/user_account/ability.rb
234
235
  - lib/cantango/api/user_account/can.rb
@@ -822,7 +823,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
822
823
  version: '0'
823
824
  segments:
824
825
  - 0
825
- hash: -112989363302876815
826
+ hash: -1258033149394138173
826
827
  required_rubygems_version: !ruby/object:Gem::Requirement
827
828
  none: false
828
829
  requirements: