rolify 2.2.0 → 2.2.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.
Files changed (6) hide show
  1. data/.travis.yml +4 -0
  2. data/CHANGELOG.rdoc +3 -0
  3. data/README.rdoc +1 -1
  4. data/lib/rolify/role.rb +3 -3
  5. data/lib/rolify/version.rb +1 -1
  6. metadata +14 -14
data/.travis.yml CHANGED
@@ -6,3 +6,7 @@ rvm:
6
6
  - rbx
7
7
  - jruby
8
8
  - ree
9
+
10
+ before_install:
11
+ - gem update --system
12
+ - gem --version
data/CHANGELOG.rdoc CHANGED
@@ -1,3 +1,6 @@
1
+ = 2.2.1 (Jan 24, 2012)
2
+ * Fixed a backward incompatible change introduced in Rails 3.2 release (<tt>find_or_create_by_* generated methods</tt>)
3
+
1
4
  = 2.2 (Jan 18, 2012)
2
5
  * fixed a bug in the initiliazer file regarding dynamic shortcuts
3
6
 
data/README.rdoc CHANGED
@@ -1,4 +1,4 @@
1
- = rolify {<img src="https://secure.travis-ci.org/EppO/rolify.png?branch=master">}[http://travis-ci.org/EppO/rolify]
1
+ = rolify {<img src="https://secure.travis-ci.org/EppO/rolify.png?branch=v3">}[http://travis-ci.org/EppO/rolify] {<img src="https://gemnasium.com/EppO/rolify.png">}[https://gemnasium.com/EppO/rolify]
2
2
 
3
3
  Very simple Roles library without any authorization enforcement supporting scope on resource object.
4
4
 
data/lib/rolify/role.rb CHANGED
@@ -35,9 +35,9 @@ module Rolify
35
35
  module Roles
36
36
 
37
37
  def has_role(role_name, resource = nil)
38
- role = Rolify.role_cname.find_or_create_by_name_and_resource_type_and_resource_id(:name => role_name,
39
- :resource_type => (resource.is_a?(Class) ? resource.to_s : resource.class.name if resource),
40
- :resource_id => (resource.id if resource && !resource.is_a?(Class)))
38
+ role = Rolify.role_cname.find_or_create_by_name_and_resource_type_and_resource_id(role_name,
39
+ (resource.is_a?(Class) ? resource.to_s : resource.class.name if resource),
40
+ (resource.id if resource && !resource.is_a?(Class)))
41
41
  if !roles.include?(role)
42
42
  self.class.define_dynamic_method(role_name, resource) if Rolify.dynamic_shortcuts
43
43
  self.role_ids |= [role.id]
data/lib/rolify/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rolify
2
- VERSION = "2.2.0"
2
+ VERSION = "2.2.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rolify
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.2.1
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-01-19 00:00:00.000000000 Z
12
+ date: 2012-01-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activerecord
16
- requirement: &70251408798360 !ruby/object:Gem::Requirement
16
+ requirement: &70366014260120 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70251408798360
24
+ version_requirements: *70366014260120
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sqlite3
27
- requirement: &70251408797820 !ruby/object:Gem::Requirement
27
+ requirement: &70366014259660 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70251408797820
35
+ version_requirements: *70366014259660
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: ammeter
38
- requirement: &70251408797180 !ruby/object:Gem::Requirement
38
+ requirement: &70366014259180 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70251408797180
46
+ version_requirements: *70366014259180
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
- requirement: &70251408796620 !ruby/object:Gem::Requirement
49
+ requirement: &70366014258680 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70251408796620
57
+ version_requirements: *70366014258680
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &70251408795980 !ruby/object:Gem::Requirement
60
+ requirement: &70366014258220 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70251408795980
68
+ version_requirements: *70366014258220
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bundler
71
- requirement: &70251408795220 !ruby/object:Gem::Requirement
71
+ requirement: &70366014257800 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70251408795220
79
+ version_requirements: *70366014257800
80
80
  description: ! 'Very simple Roles library without any authorization enforcement (built
81
81
  to use with cancan) supporting scope on resource: user.is_moderator?(Forum.first)
82
82
  => # return false if user is moderator of another Forum '