rolify 2.2.0 → 2.2.1

data/.travis.yml

@@ -6,3 +6,7 @@ rvm:
   - rbx
   - jruby
   - ree
+
+before_install:
+  - gem update --system
+  - gem --version

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+= 2.2.1 (Jan 24, 2012)
+* Fixed a backward incompatible change introduced in Rails 3.2 release (<tt>find_or_create_by_* generated methods</tt>)
+
 = 2.2 (Jan 18, 2012)
 * fixed a bug in the initiliazer file regarding dynamic shortcuts 
 

data/README.rdoc

@@ -1,4 +1,4 @@
-= rolify {<img src="https://secure.travis-ci.org/EppO/rolify.png?branch=master">}[http://travis-ci.org/EppO/rolify]
+= 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]
 
 Very simple Roles library without any authorization enforcement supporting scope on resource object.
 

data/lib/rolify/role.rb

@@ -35,9 +35,9 @@ module Rolify
   module Roles
 
     def has_role(role_name, resource = nil)
-      role = Rolify.role_cname.find_or_create_by_name_and_resource_type_and_resource_id(:name => role_name, 
-                                                                                        :resource_type => (resource.is_a?(Class) ? resource.to_s : resource.class.name if resource), 
-                                                                                        :resource_id => (resource.id if resource && !resource.is_a?(Class)))
+      role = Rolify.role_cname.find_or_create_by_name_and_resource_type_and_resource_id(role_name, 
+                                                                                        (resource.is_a?(Class) ? resource.to_s : resource.class.name if resource), 
+                                                                                        (resource.id if resource && !resource.is_a?(Class)))
       if !roles.include?(role)
         self.class.define_dynamic_method(role_name, resource) if Rolify.dynamic_shortcuts
         self.role_ids |= [role.id]

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70251408798360 !ruby/object:Gem::Requirement
+  requirement: &70366014260120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251408798360
+  version_requirements: *70366014260120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70251408797820 !ruby/object:Gem::Requirement
+  requirement: &70366014259660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251408797820
+  version_requirements: *70366014259660
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70251408797180 !ruby/object:Gem::Requirement
+  requirement: &70366014259180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251408797180
+  version_requirements: *70366014259180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70251408796620 !ruby/object:Gem::Requirement
+  requirement: &70366014258680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251408796620
+  version_requirements: *70366014258680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70251408795980 !ruby/object:Gem::Requirement
+  requirement: &70366014258220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251408795980
+  version_requirements: *70366014258220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70251408795220 !ruby/object:Gem::Requirement
+  requirement: &70366014257800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251408795220
+  version_requirements: *70366014257800
 description: ! 'Very simple Roles library without any authorization enforcement (built
   to use with cancan) supporting scope on resource: user.is_moderator?(Forum.first)
   => # return false if user is moderator of another Forum '