rolify 1.1.0 → 1.2.0

data/.travis.yml

@@ -1,3 +1,9 @@
 rvm:
   - 1.9.2
+  - 1.9.3
   - ruby-head
+  - rbx-19mode
+  - jruby
+
+env:
+  - JRUBY_OPTS="--1.9"

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 1.2 (Nov 4, 2011)
+* fixed a strange bug, probably rails related (thanks to @scottkf)
+  * when using rails in development mode, the <tt>config.cache_classes = false</tt> makes the role class to be loaded at every call and can lead to a <tt>AssociationTypeMismatch</tt>
+  * use of <tt>role_ids</tt> array instead of the <tt>roles</tt> association
+* now running on JRuby (<b>specs are still failing for JRuby though</b>)
+
 = 1.1 (Oct 14, 2011)
 * added a spec to test the rails generator using ammeter gem
 * Gemfile cleanup, moved all dependencies in gemspec instead

data/README.rdoc

@@ -1,4 +1,4 @@
-= rolify {<img src="https://secure.travis-ci.org/EppO/rolify.png">}[http://travis-ci.org/EppO/rolify]
+= rolify {<img src="https://secure.travis-ci.org/EppO/rolify.png?branch=master">}[http://travis-ci.org/EppO/rolify]
 Very simple Roles library without any authorization enforcement supporting scope on resource object.
 
 Let's see an example:  
@@ -12,6 +12,7 @@ This library was intended to be used with CanCan[https://github.com/ryanb/cancan
 
 * >= Rails 3.1
 * ActiveRecord ORM
+* ruby 1.9 (JRuby and Rubinius support on going)
 
 == Installation
 

data/lib/rolify/role.rb

@@ -33,7 +33,7 @@ module Rolify
                                                                                         :resource_id => (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.roles << role
+        self.role_ids |= [role.id]
       end
     end
   

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/rolify.gemspec

@@ -21,7 +21,11 @@ Gem::Specification.new do |s|
   
   s.add_dependency "activerecord", ">= 3.1.0"
   
-  s.add_development_dependency "sqlite3"
+  if RUBY_ENGINE == "jruby"
+    s.add_development_dependency "activerecord-jdbcsqlite3-adapter"
+  else
+    s.add_development_dependency "sqlite3"
+  end
   s.add_development_dependency "ammeter"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rolify'
 require 'ammeter/init'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Base.logger = Logger.new(File.open('logs/database.log', 'a'))
 
 load File.dirname(__FILE__) + '/support/schema.rb'
 load File.dirname(__FILE__) + '/support/models.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152413060 !ruby/object:Gem::Requirement
+  requirement: &70283269093580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152413060
+  version_requirements: *70283269093580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152483900 !ruby/object:Gem::Requirement
+  requirement: &70283269093060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152483900
+  version_requirements: *70283269093060
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &2152578220 !ruby/object:Gem::Requirement
+  requirement: &70283269092560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152578220
+  version_requirements: *70283269092560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160177360 !ruby/object:Gem::Requirement
+  requirement: &70283269092080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160177360
+  version_requirements: *70283269092080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160394640 !ruby/object:Gem::Requirement
+  requirement: &70283269091560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160394640
+  version_requirements: *70283269091560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160528120 !ruby/object:Gem::Requirement
+  requirement: &70283269091120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160528120
+  version_requirements: *70283269091120
 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 '
@@ -108,7 +107,6 @@ files:
 - spec/support/data.rb
 - spec/support/models.rb
 - spec/support/schema.rb
-has_rdoc: true
 homepage: https://github.com/EppO/rolify
 licenses: []
 post_install_message: 
@@ -129,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Roles library with resource scoping