rolify 3.3.0.rc4 → 3.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: adb734bf9468069dbead78c35683ac1ace1525d8
+  data.tar.gz: b4a221f3435dda2c84ccccf7086bc4a41eadda8d
+SHA512:
+  metadata.gz: 7168a6699067f23cf85cb6b74b599a043e26720be10c9746e7910cc7cbdc296b5d9ffe5922ea2d8484167ccb3c9c6ce6c347efddb20c14c7d843791d0f186e52
+  data.tar.gz: 2f701c24d16d9dccbac72a270a93f9cd6e470dd60584c548812a97a09458b75f00829d5b0320ae3ab080d123c713c2c5ad32282b4c615b8ebf11e672dd576de9

data/.gitignore

@@ -4,6 +4,7 @@ Gemfile.lock
 gemfiles/*.lock
 pkg/*
 tmp/*
+coverage/*
 log*/*
 .rbx/*
 .rspec

data/.travis.yml

@@ -15,9 +15,3 @@ env:
 services: mongodb
 
 before_script: rails --version
-
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: jruby-19mode
-    - gemfile: gemfiles/Gemfile.rails-4.0

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 case ENV["ADAPTER"]
 when nil, "active_record"
   group :test do
-    gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
+    gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.rc", :platform => "jruby"
     gem "sqlite3", :platform => "ruby"
   end
   gem "activerecord", ">= 3.2.0", :require => "active_record"
@@ -14,4 +14,8 @@ else
   raise "Unknown model adapter: #{ENV["ADAPTER"]}"
 end
 
+group :test do
+  gem 'coveralls', :require => false
+end
+
 gemspec

data/README.md

@@ -1,4 +1,5 @@
-# rolify [![Gem Version](https://badge.fury.io/rb/rolify.png)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/EppO/rolify.png)](http://travis-ci.org/EppO/rolify) [![dependency status](https://gemnasium.com/EppO/rolify.png)](https://gemnasium.com/EppO/rolify) [![Code Climate](https://codeclimate.com/github/EppO/rolify.png)](https://codeclimate.com/github/EppO/rolify)
+# rolify [![Gem Version](https://badge.fury.io/rb/rolify.png)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/EppO/rolify.png)](http://travis-ci.org/EppO/rolify) [![dependency status](https://gemnasium.com/EppO/rolify.png)](https://gemnasium.com/EppO/rolify) [![Code Climate](https://codeclimate.com/github/EppO/rolify.png)](https://codeclimate.com/github/EppO/rolify) [![Coverage Status](https://coveralls.io/repos/EppO/rolify/badge.png?branch=master)](https://coveralls.io/r/EppO/rolify)
+
 
 Very simple Roles library without any authorization enforcement supporting scope on resource object.
 
@@ -25,7 +26,7 @@ This library can be easily integrated with any authentication gem ([devise](http
 In <b>Rails 3</b>, add this to your Gemfile and run the +bundle+ command.
 
 ```ruby
-  gem "rolify"
+gem "rolify"
 ```
 
 ## Getting Started
@@ -35,7 +36,13 @@ In <b>Rails 3</b>, add this to your Gemfile and run the +bundle+ command.
 First, create your Role model and migration file using this generator:
 
 ```
-  rails g rolify Role User
+rails g rolify Role User
+```
+
+**NB** for versions of Rolify prior to 3.3, use:
+
+```
+rails g rolify:role Role User
 ```
 
 Role and User classes are the default. You can specify any Role class name you want. This is completly a new file so any name can do the job.
@@ -48,7 +55,7 @@ If you want to use Mongoid instead of ActiveRecord, just add `--orm=mongoid` arg
 Let's migrate !
 
 ```
-  rake db:migrate
+rake db:migrate
 ```
 
 ### 3.1 Configure your user model
@@ -56,13 +63,13 @@ Let's migrate !
 This gem adds the `rolify` method to your User class. You can also specify optional callbacks on the User class for when roles are added or removed:
 
 ```ruby
-  class User < ActiveRecord::Base
-    rolify :before_add => :before_add_method
+class User < ActiveRecord::Base
+  rolify :before_add => :before_add_method
 
-    def before_add_method(role)
-      # do something before it gets added
-    end
+  def before_add_method(role)
+    # do something before it gets added
   end
+end
 ```
 
 The `rolify` method accepts the following callback options:
@@ -90,22 +97,22 @@ end
 To define a global role:
 
 ```ruby
-  user = User.find(1)
-  user.add_role :admin
+user = User.find(1)
+user.add_role :admin
 ```
 
 To define a role scoped to a resource instance
 
 ```ruby
-  user = User.find(2)
-  user.add_role :moderator, Forum.first
+user = User.find(2)
+user.add_role :moderator, Forum.first
 ```
 
 To define a role scoped to a resource class
 
 ```ruby
-  user = User.find(3)
-  user.add_role :moderator, Forum
+user = User.find(3)
+user.add_role :moderator, Forum
 ```
 
 That's it !
@@ -115,45 +122,45 @@ That's it !
 To check if a user has a global role: 
 
 ```ruby
-  user = User.find(1)
-  user.add_role :admin # sets a global role
-  user.has_role? :admin
-  => true
+user = User.find(1)
+user.add_role :admin # sets a global role
+user.has_role? :admin
+=> true
 ```
 
 To check if a user has a role scoped to a resource instance:
 
 ```ruby
-  user = User.find(2)
-  user.add_role :moderator, Forum.first # sets a role scoped to a resource instance
-  user.has_role? :moderator, Forum.first
-  => true
-  user.has_role? :moderator, Forum.last
-  => false
+user = User.find(2)
+user.add_role :moderator, Forum.first # sets a role scoped to a resource instance
+user.has_role? :moderator, Forum.first
+=> true
+user.has_role? :moderator, Forum.last
+=> false
 ```
 
 To check if a user has a role scoped to a resource class:
 
 ```ruby
-  user = User.find(3)
-  user.add_role :moderator, Forum # sets a role scoped to a resource class
-  user.has_role? :moderator, Forum
-  => true
-  user.has_role? :moderator, Forum.first
-  => true
-  user.has_role? :moderator, Forum.last
-  => true
+user = User.find(3)
+user.add_role :moderator, Forum # sets a role scoped to a resource class
+user.has_role? :moderator, Forum
+=> true
+user.has_role? :moderator, Forum.first
+=> true
+user.has_role? :moderator, Forum.last
+=> true
 ```
 
 A global role overrides resource role request: 
 
 ```ruby
-  user = User.find(4)
-  user.add_role :moderator # sets a global role
-  user.has_role? :moderator, Forum.first
-  => true
-  user.has_role? :moderator, Forum.last
-  => true
+user = User.find(4)
+user.add_role :moderator # sets a global role
+user.has_role? :moderator, Forum.first
+=> true
+user.has_role? :moderator, Forum.last
+=> true
 ```
 
 ### 6. Resource roles querying 
@@ -163,27 +170,30 @@ Starting from rolify 3.0, you can search roles on instance level or class level
 #### Instance level
 
 ```ruby
-  forum = Forum.first
-  forum.roles
-  # => [ list of roles that are only binded to forum instance ]
-  forum.applied_roles
-  # => [ list of roles binded to forum instance and to the Forum class ]
+forum = Forum.first
+forum.roles
+# => [ list of roles that are only binded to forum instance ]
+forum.applied_roles
+# => [ list of roles binded to forum instance and to the Forum class ]
 ```
 
 #### Class level
 
 ```ruby
-  Forum.with_role(:admin)
-  # => [ list of Forum instances that has role "admin" binded to it ] 
-  Forum.with_role(:admin, current_user)
-  # => [ list of Forum instances that has role "admin" binded to it and belongs to current_user roles ]
-  
-  Forum.find_roles
-  # => [ list of roles that binded to any Forum instance or to the Forum class ]
-  Forum.find_roles(:admin)
-  # => [ list of roles that binded to any Forum instance or to the Forum class with "admin" as a role name ]
-  Forum.find_roles(:admin, current_user)
-  # => [ list of roles that binded to any Forum instance or to the Forum class with "admin" as a role name and belongs to current_user roles ]
+Forum.with_role(:admin)
+# => [ list of Forum instances that has role "admin" binded to it ] 
+Forum.with_role(:admin, current_user)
+# => [ list of Forum instances that has role "admin" binded to it and belongs to current_user roles ]
+
+User.with_any_role(:user, :admin)
+# => [ list of User instances that has role "admin" or "user" binded to it ]
+
+Forum.find_roles
+# => [ list of roles that binded to any Forum instance or to the Forum class ]
+Forum.find_roles(:admin)
+# => [ list of roles that binded to any Forum instance or to the Forum class with "admin" as a role name ]
+Forum.find_roles(:admin, current_user)
+# => [ list of roles that binded to any Forum instance or to the Forum class with "admin" as a role name and belongs to current_user roles ]
 ```
 
 ## Resources
@@ -199,8 +209,12 @@ Starting from rolify 3.0, you can search roles on instance level or class level
 
 Please read the [upgrade instructions](UPGRADE.rdoc).
 
+## Known issues
+
+If you are using Mongoid and/or less-rails gem, please read [this](https://github.com/EppO/rolify/wiki/FAQ#when-i-start-rails-using-server-console-whatever-i-get-this-error)
+
 ## Questions or Problems?
 
-If you have any issue or feature request with/for rolify, please add an [issue on GitHub](https://github.com/EppO/rolify/issues) or fork the project and send a pull request.
+If you have any issue or feature request with/for rolify, please create an new [issue on GitHub](https://github.com/EppO/rolify/issues) **specifying the ruby runtime, rails and rolify versions you're using and the gems listed in your Gemfile**, or fork the project and send a pull request.
 
 To get the specs running you should call `bundle` and then `rake`. See the spec/README for more information.

data/Rakefile

@@ -1,8 +1,11 @@
 require 'bundler'
 require 'rspec/core/rake_task'
+require 'coveralls/rake/task'
 
 Bundler::GemHelper.install_tasks
 
+Coveralls::RakeTask.new
+
 RSpec::Core::RakeTask.new(:generators) do |task|
   task.pattern = "spec/generators/**/*_spec.rb"
 end
@@ -11,7 +14,7 @@ RSpec::Core::RakeTask.new(:rolify) do |task|
   task.pattern = "spec/rolify/**/*_spec.rb"
 end
 
-task :default => :spec
+task :default => [ :spec, 'coveralls:push' ]
 
 desc "Run all specs"
 task "spec" do

data/gemfiles/Gemfile.rails-3.2

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 case ENV["ADAPTER"]
 when nil, "active_record"
   group :test do
-    gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
+    gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.rc", :platform => "jruby"
     gem "sqlite3", :platform => "ruby"
   end
   gem "activerecord", "~> 3.2.0", :require => "active_record"
@@ -14,4 +14,8 @@ else
   raise "Unknown model adapter: #{ENV["ADAPTER"]}"
 end
 
+group :test do
+  gem 'coveralls', :require => false
+end
+
 gemspec :path => '../'

data/gemfiles/Gemfile.rails-4.0

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 case ENV["ADAPTER"]
 when nil, "active_record"
-  gem "activerecord", "~> 4.0.0.beta1", :require => "active_record"
+  gem "activerecord", "~> 4.0.0.rc", :require => "active_record"
 when "mongoid"
   gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
   gem "bson_ext", :platform => "ruby"
@@ -11,7 +11,7 @@ else
 end
 
 group :test do
-  gem "rails", "~> 4.0.0.beta1"
+  gem "rails", "~> 4.0.0.rc"
   gem "ammeter"
   gem "rake"
   gem "rspec"
@@ -19,8 +19,9 @@ group :test do
   gem "fuubar"
   gem "bundler"
   
-  gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.0.beta", :platform => "jruby"
   gem "sqlite3", :platform => "ruby"
-  gem "activerecord", "~> 4.0.0.beta1", :require => "active_record"
+  gem "activerecord", "~> 4.0.0.rc", :require => "active_record"
   gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
+  gem 'coveralls', :require => false
 end

data/lib/generators/mongoid/rolify_generator.rb

@@ -44,7 +44,7 @@ module Mongoid
   
   scopify
 RUBY
-        content % { :user_cname => user_cname.constantize.table_name }
+        content % { :user_cname => user_cname.constantize.collection_name }
       end
     end
   end

data/lib/generators/rolify/templates/README

@@ -4,7 +4,7 @@ An initializer file has been created here: config/initializers/rolify.rb, you
 can change rolify settings to match your needs. 
 Defaults values are commented out.
 
-A Role class has been been created in app/models (with the name you gave as 
+A Role class has been created in app/models (with the name you gave as 
 argument otherwise the default is role.rb), you can add your own business logic 
 inside.
 

data/lib/rolify.rb

@@ -9,19 +9,22 @@ require 'rolify/adapters/base'
 module Rolify
   extend Configure
 
-  attr_accessor :role_cname, :adapter, :role_table_name
+  attr_accessor :role_cname, :adapter, :role_join_table_name, :role_table_name
 
   def rolify(options = {})
     include Role
     extend Dynamic if Rolify.dynamic_shortcuts
-    
+
     options.reverse_merge!({:role_cname => 'Role'})
     self.role_cname = options[:role_cname]
     self.role_table_name = self.role_cname.tableize.gsub(/\//, "_")
 
-    join_table = "#{self.to_s.tableize.gsub(/\//, "_")}_#{self.role_table_name}"
+    default_join_table = "#{self.to_s.tableize.gsub(/\//, "_")}_#{self.role_table_name}"
+    options.reverse_merge!({:role_join_table_name => default_join_table})
+    self.role_join_table_name = options[:role_join_table_name]
+
     rolify_options = { :class_name => options[:role_cname].camelize }
-    rolify_options.merge!({ :join_table => join_table }) if Rolify.orm == "active_record"
+    rolify_options.merge!({ :join_table => self.role_join_table_name }) if Rolify.orm == "active_record"
     rolify_options.merge!(options.reject{ |k,v| ![ :before_add, :after_add, :before_remove, :after_remove ].include? k.to_sym })
 
     has_and_belongs_to_many :roles, rolify_options
@@ -32,22 +35,22 @@ module Rolify
 
   def resourcify(association_name = :roles, options = {})
     include Resource
-    
+
     options.reverse_merge!({ :role_cname => 'Role', :dependent => :destroy })
     resourcify_options = { :class_name => options[:role_cname].camelize, :as => :resource, :dependent => options[:dependent] }
     self.role_cname = options[:role_cname]
     self.role_table_name = self.role_cname.tableize.gsub(/\//, "_")
 
     has_many association_name, resourcify_options
-    
+
     self.adapter = Rolify::Adapter::Base.create("resource_adapter", self.role_cname, self.name)
   end
-  
+
   def scopify
     require "rolify/adapters/#{Rolify.orm}/scopes.rb"
-    extend Rolify::Adapter::Scopes 
+    extend Rolify::Adapter::Scopes
   end
-  
+
   def role_class
     self.role_cname.constantize
   end

data/lib/rolify/adapters/active_record/resource_adapter.rb

@@ -7,6 +7,7 @@ module Rolify
         resources = relation.joins("INNER JOIN #{quote(roles_table)} ON #{quote(roles_table)}.resource_type = '#{relation.to_s}' AND
                                     (#{quote(roles_table)}.resource_id IS NULL OR #{quote(roles_table)}.resource_id = #{quote(relation.table_name)}.#{relation.primary_key})")
         resources = resources.where("#{quote(roles_table)}.name IN (?) AND #{quote(roles_table)}.resource_type = ?", Array(role_name), relation.to_s)
+        resources = resources.select("#{quote(relation.table_name)}.*")
         resources
       end
 

data/lib/rolify/adapters/active_record/role_adapter.rb

@@ -35,7 +35,11 @@ module Rolify
       end
 
       def scope(relation, conditions)
-        query = relation.scoped
+        if Rails.version < "4.0"
+          query = relation.scoped
+        else
+          query = relation.all
+        end
         query = query.joins(:roles)
         query = where(query, conditions)
         query

data/lib/rolify/railtie.rb

@@ -3,7 +3,7 @@ require 'rails'
 
 module Rolify
   class Railtie < Rails::Railtie
-    initializer 'rolify.initialize' do
+    initializer 'rolify.initialize', :after do
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::Base.send :extend, Rolify
       end

data/lib/rolify/role.rb

@@ -64,11 +64,9 @@ module Rolify
 
     def method_missing(method, *args, &block)
       if method.to_s.match(/^is_(\w+)_of[?]$/) || method.to_s.match(/^is_(\w+)[?]$/)
-        if self.class.role_class.where(:name => $1).count > 0
-          resource = args.first
-          self.class.define_dynamic_method $1, resource
-          return has_role?("#{$1}", resource)
-        end
+        resource = args.first
+        self.class.define_dynamic_method $1, resource
+        return has_role?("#{$1}", resource)
       end unless !Rolify.dynamic_shortcuts
       super
     end

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "3.3.0.rc4"
+  VERSION = "3.3.0"
 end

data/spec/generators/rolify/{rolify_generator_spec.rb → rolify_activerecord_generator_spec.rb}

@@ -1,9 +1,10 @@
 require 'generators_helper'
 
+require 'rails/all'
 # Generators are not automatically loaded by Rails
 require 'generators/rolify/rolify_generator'
 
-describe Rolify::Generators::RolifyGenerator do
+describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_record' do
   # Tell the generator where to put its output (what it thinks of as Rails.root)
   destination File.expand_path("../../../../tmp", __FILE__)
   teardown :cleanup_destination_root
@@ -22,10 +23,10 @@ describe Rolify::Generators::RolifyGenerator do
     before { 
       capture(:stdout) {
         generator.create_file "app/models/user.rb" do
-<<-RUBY
-  class User < ActiveRecord::Base
-  end
-RUBY
+          <<-RUBY
+          class User < ActiveRecord::Base
+          end
+          RUBY
         end
       }
       require File.join(destination_root, "app/models/user.rb")
@@ -114,13 +115,13 @@ RUBY
     before { 
       capture(:stdout) {
         generator.create_file "app/models/admin/user.rb" do
-<<-RUBY
-module Admin
-  class User < ActiveRecord::Base
-    self.table_name_prefix = 'admin_'
-  end
-end
-RUBY
+          <<-RUBY
+          module Admin
+            class User < ActiveRecord::Base
+              self.table_name_prefix = 'admin_'
+            end
+          end
+          RUBY
         end
       }
       require File.join(destination_root, "app/models/admin/user.rb")
@@ -159,96 +160,4 @@ RUBY
       it { should contain "create_table(:admin_users_admin_roles, :id => false) do" }
     end
   end
-  
-  describe 'specifying ORM adapter' do 
-    before(:all) { arguments [ "Role", "User", "--orm=mongoid" ] }
-    
-    before { 
-      capture(:stdout) {
-        generator.create_file "app/models/user.rb" do
-<<-RUBY
-class User
-  include Mongoid::Document
-
-  field :login, :type => String
 end
-RUBY
-        end
-      }
-      require File.join(destination_root, "app/models/user.rb")
-      run_generator
-    }
-      
-    describe 'config/initializers/rolify.rb' do
-      subject { file('config/initializers/rolify.rb') }
-      it { should exist }
-      it { should contain "Rolify.configure do |config|"}
-      it { should_not contain "# config.use_mongoid" }
-      it { should contain "# config.use_dynamic_shortcuts" }
-    end
-    
-    describe 'app/models/role.rb' do
-      subject { file('app/models/role.rb') }
-      it { should exist }
-      it { should contain "class Role\n" }
-      it { should contain "has_and_belongs_to_many :users\n" }
-      it { should contain "belongs_to :resource, :polymorphic => true" }
-      it { should contain "field :name, :type => String" }
-      it { should contain "  index({\n"
-                          "      { :name => 1 },\n"
-                          "      { :resource_type => 1 },\n"
-                          "      { :resource_id => 1 }\n"
-                          "    },\n"
-                          "    { unique => true })"}
-    end
-    
-    describe 'app/models/user.rb' do
-      subject { file('app/models/user.rb') }
-      it { should contain /class User\n  include Mongoid::Document\n  rolify\n/ }
-    end
-  end
-  
-  describe 'specifying namespaced User and Role class names and ORM adapter' do
-    before(:all) { arguments %w(Admin::Role Admin::User --orm=mongoid) }
-    
-    before { 
-      capture(:stdout) {
-        generator.create_file "app/models/admin/user.rb" do
-<<-RUBY
-module Admin
-  class User
-    include Mongoid::Document
-  end
-end
-RUBY
-        end
-      }
-      require File.join(destination_root, "app/models/admin/user.rb")
-      run_generator
-    }
-    
-    describe 'config/initializers/rolify.rb' do
-      subject { file('config/initializers/rolify.rb') }
-      
-      it { should exist }
-      it { should contain "Rolify.configure(\"Admin::Role\") do |config|"}
-      it { should contain "# config.use_dynamic_shortcuts" }
-      it { should_not contain "# config.use_mongoid" }
-    end
-    
-    describe 'app/models/admin/role.rb' do
-      subject { file('app/models/admin/role.rb') }
-      
-      it { should exist }
-      it { should contain "class Admin::Role" }
-      it { should contain "has_and_belongs_to_many :admin_users" }
-      it { should contain "belongs_to :resource, :polymorphic => true" }
-    end
-    
-    describe 'app/models/admin/user.rb' do
-      subject { file('app/models/admin/user.rb') }
-      
-      it { should contain /class User\n    include Mongoid::Document\n  rolify :role_cname => 'Admin::Role'\n/ }
-    end
-  end
-end

data/spec/generators/rolify/rolify_mongoid_generator_spec.rb

@@ -0,0 +1,112 @@
+require 'generators_helper'
+
+require 'mongoid'
+
+# Generators are not automatically loaded by Rails
+require 'generators/rolify/rolify_generator'
+
+describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'mongoid' do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../tmp", __FILE__)
+  teardown :cleanup_destination_root
+  
+  before { 
+    prepare_destination
+  }
+  
+  def cleanup_destination_root
+    FileUtils.rm_rf destination_root
+  end
+
+  describe 'specifying ORM adapter' do 
+    before(:all) { arguments [ "Role", "User", "--orm=mongoid" ] }
+    
+    before { 
+      capture(:stdout) {
+        generator.create_file "app/models/user.rb" do
+<<-RUBY
+class User
+  include Mongoid::Document
+
+  field :login, :type => String
+end
+RUBY
+        end
+      }
+      require File.join(destination_root, "app/models/user.rb")
+      run_generator
+    }
+      
+    describe 'config/initializers/rolify.rb' do
+      subject { file('config/initializers/rolify.rb') }
+      it { should exist }
+      it { should contain "Rolify.configure do |config|"}
+      it { should_not contain "# config.use_mongoid" }
+      it { should contain "# config.use_dynamic_shortcuts" }
+    end
+    
+    describe 'app/models/role.rb' do
+      subject { file('app/models/role.rb') }
+      it { should exist }
+      it { should contain "class Role\n" }
+      it { should contain "has_and_belongs_to_many :users\n" }
+      it { should contain "belongs_to :resource, :polymorphic => true" }
+      it { should contain "field :name, :type => String" }
+      it { should contain "  index({\n"
+                          "      { :name => 1 },\n"
+                          "      { :resource_type => 1 },\n"
+                          "      { :resource_id => 1 }\n"
+                          "    },\n"
+                          "    { unique => true })"}
+    end
+    
+    describe 'app/models/user.rb' do
+      subject { file('app/models/user.rb') }
+      it { should contain /class User\n  include Mongoid::Document\n  rolify\n/ }
+    end
+  end
+  
+  describe 'specifying namespaced User and Role class names and ORM adapter' do
+    before(:all) { arguments %w(Admin::Role Admin::User --orm=mongoid) }
+    
+    before { 
+      capture(:stdout) {
+        generator.create_file "app/models/admin/user.rb" do
+<<-RUBY
+module Admin
+  class User
+    include Mongoid::Document
+  end
+end
+RUBY
+        end
+      }
+      require File.join(destination_root, "app/models/admin/user.rb")
+      run_generator
+    }
+    
+    describe 'config/initializers/rolify.rb' do
+      subject { file('config/initializers/rolify.rb') }
+      
+      it { should exist }
+      it { should contain "Rolify.configure(\"Admin::Role\") do |config|"}
+      it { should contain "# config.use_dynamic_shortcuts" }
+      it { should_not contain "# config.use_mongoid" }
+    end
+    
+    describe 'app/models/admin/role.rb' do
+      subject { file('app/models/admin/role.rb') }
+      
+      it { should exist }
+      it { should contain "class Admin::Role" }
+      it { should contain "has_and_belongs_to_many :admin_users" }
+      it { should contain "belongs_to :resource, :polymorphic => true" }
+    end
+    
+    describe 'app/models/admin/user.rb' do
+      subject { file('app/models/admin/user.rb') }
+      
+      it { should contain /class User\n    include Mongoid::Document\n  rolify :role_cname => 'Admin::Role'\n/ }
+    end
+  end
+end

data/spec/generators_helper.rb

@@ -5,10 +5,17 @@ require 'rolify'
 require 'rolify/matchers'
 require 'rails/all'
 
+require 'coveralls'
+Coveralls.wear_merged!
+
 module TestApp
   class Application < ::Rails::Application
     config.root = File.dirname(__FILE__)
   end
 end
 
-require 'ammeter/init'
+require 'ammeter/init'
+
+ENV['ADAPTER'] ||= 'active_record'
+
+

data/spec/rolify/namespace_spec.rb

@@ -13,6 +13,10 @@ describe "Rolify.namespace" do
     Admin::Right
   end
   
+  def join_table
+    "moderators_rights"
+  end
+  
   it_behaves_like Rolify::Role
   it_behaves_like "Role.scopes"
   it_behaves_like Rolify::Dynamic

data/spec/rolify/resource_spec.rb

@@ -38,9 +38,16 @@ describe Rolify::Resource do
         it "should include Forum instances with forum role" do
           subject.with_role(:forum).should =~ [ Forum.first, Forum.last ]
         end
+        
         it "should include Forum instances with godfather role" do
           subject.with_role(:godfather).should =~ Forum.all.to_a
         end
+        
+        it "should be able to modify the resource", :if => ENV['ADAPTER'] == 'active_record' do
+          forum_resource = subject.with_role(:forum).first
+          forum_resource.name = "modified name"
+          expect(forum_resource.save).not_to raise_error
+        end
       end
 
       context "on the Group class" do

data/spec/rolify/shared_examples/shared_examples_for_callbacks.rb

@@ -12,7 +12,9 @@ shared_examples_for "Rolify.callbacks" do
   describe "rolify association callbacks", :if => (Rolify.orm == "active_record") do
     describe "before_add" do
       it "should receive callback" do
-        user_class.rolify :before_add => :role_callback, :role_cname => role_class.to_s
+        rolify_options = { :role_cname => role_class.to_s, :before_add => :role_callback }
+        rolify_options[:role_join_table_name] = join_table if defined? join_table
+        user_class.rolify rolify_options
         @user = user_class.first
         @user.stub(:role_callback)
         @user.should_receive(:role_callback)
@@ -22,7 +24,9 @@ shared_examples_for "Rolify.callbacks" do
 
     describe "after_add" do
       it "should receive callback" do
-        user_class.rolify :after_add => :role_callback, :role_cname => role_class.to_s
+        rolify_options = { :role_cname => role_class.to_s, :after_add => :role_callback }
+        rolify_options[:role_join_table_name] = join_table if defined? join_table
+        user_class.rolify rolify_options
         @user = user_class.first
         @user.stub(:role_callback)
         @user.should_receive(:role_callback)
@@ -32,7 +36,9 @@ shared_examples_for "Rolify.callbacks" do
 
     describe "before_remove" do
       it "should receive callback" do
-        user_class.rolify :before_remove => :role_callback, :role_cname => role_class.to_s
+        rolify_options = { :role_cname => role_class.to_s, :before_remove => :role_callback }
+        rolify_options[:role_join_table_name] = join_table if defined? join_table
+        user_class.rolify rolify_options
         @user = user_class.first
         @user.add_role :admin
         @user.stub(:role_callback)
@@ -44,7 +50,9 @@ shared_examples_for "Rolify.callbacks" do
 
     describe "after_remove" do
       it "should receive callback" do
-        user_class.rolify :after_remove => :role_callback, :role_cname => role_class.to_s
+        rolify_options = { :role_cname => role_class.to_s, :after_remove => :role_callback }
+        rolify_options[:role_join_table_name] = join_table if defined? join_table
+        user_class.rolify rolify_options
         @user = user_class.first
         @user.add_role :admin
         @user.stub(:role_callback)

data/spec/rolify/shared_examples/shared_examples_for_dynamic.rb

@@ -2,7 +2,9 @@ shared_examples_for Rolify::Dynamic do
   before(:all) do
     Rolify.dynamic_shortcuts = true
     role_class.destroy_all
-    user_class.rolify :role_cname => role_class.to_s
+    rolify_options = { :role_cname => role_class.to_s }
+    rolify_options[:role_join_table_name] = join_table if defined? join_table
+    user_class.rolify rolify_options
     Forum.resourcify :roles, :role_cname => role_class.to_s
     Group.resourcify :roles, :role_cname => role_class.to_s
   end
@@ -12,6 +14,7 @@ shared_examples_for Rolify::Dynamic do
       admin = user_class.first
       admin.add_role :admin
       admin.add_role :moderator, Forum.first
+      admin.add_role :solo
       admin
     end
 
@@ -22,12 +25,22 @@ shared_examples_for Rolify::Dynamic do
     it { subject.is_admin?.should be(true) }
     it { subject.is_admin?.should be(true) }
     it { subject.is_admin?.should be(true) }
+    
+    context "removing the role on the last user having it" do
+      before do
+        subject.remove_role :solo
+      end
+      
+      it { should_not respond_to(:is_solo?) }
+      it { subject.is_solo?.should be(false) }
+    end
   end
   
   context "using a resource scoped role" do
     subject do 
       moderator = user_class.where(:login => "moderator").first
       moderator.add_role :moderator, Forum.first
+      moderator.add_role :sole_mio, Forum.last
       moderator
     end
     
@@ -44,12 +57,22 @@ shared_examples_for Rolify::Dynamic do
     it { subject.is_moderator_of?(Group).should be(false) }
     it { subject.is_moderator_of?(Group.first).should be(false) }
     it { subject.is_moderator_of?(Group.last).should be(false) }
+    
+    context "removing the role on the last user having it" do
+      before do
+        subject.remove_role :sole_mio, Forum.last
+      end
+      
+      it { should_not respond_to(:is_sole_mio?) }
+      it { subject.is_sole_mio?.should be(false) }
+    end
   end
   
   context "using a class scoped role" do
     subject do 
       manager = user_class.where(:login => "god").first
       manager.add_role :manager, Forum
+      manager.add_role :only_me, Forum
       manager
     end
     
@@ -68,6 +91,15 @@ shared_examples_for Rolify::Dynamic do
     it { subject.is_manager_of?(Group).should be(false) }
     it { subject.is_manager_of?(Group.first).should be(false) }
     it { subject.is_manager_of?(Group.last).should be(false) }
+    
+    context "removing the role on the last user having it" do
+      before do
+        subject.remove_role :only_me, Forum
+      end
+      
+      it { should_not respond_to(:is_only_me?) }
+      it { subject.is_only_me?.should be(false) }
+    end
   end
   
   context "if the role doesn't exist in the database" do
@@ -85,6 +117,7 @@ shared_examples_for Rolify::Dynamic do
       it { should_not respond_to(:is_god?) }
       
       it { subject.is_superman?.should be(false) }
+      it { subject.is_god?.should be(false) }
     end
     
     context "using a resource scope role" do
@@ -105,6 +138,14 @@ shared_examples_for Rolify::Dynamic do
       it { subject.is_batman_of?(Group).should be(false) }
       it { subject.is_batman_of?(Group.first).should be(false) }
       it { subject.is_batman_of?(Group.last).should be(false) }
+      
+      it { subject.is_god?.should be(false) }
+      it { subject.is_god_of?(Forum).should be(false) }
+      it { subject.is_god_of?(Forum.first).should be(false) }
+      it { subject.is_god_of?(Forum.last).should be(false) }
+      it { subject.is_god_of?(Group).should be(false) }
+      it { subject.is_god_of?(Group.first).should be(false) }
+      it { subject.is_god_of?(Group.last).should be(false) }
     end
   end
 end

data/spec/rolify/shared_examples/shared_examples_for_roles.rb

@@ -11,13 +11,15 @@ shared_examples_for Rolify::Role do
   before(:all) do
     reset_defaults
     Rolify.dynamic_shortcuts = false
-    user_class.rolify :role_cname => role_class.to_s
+    rolify_options = { :role_cname => role_class.to_s }
+    rolify_options[:role_join_table_name] = join_table if defined? join_table
+    user_class.rolify rolify_options
     role_class.destroy_all
     Forum.resourcify :roles, :role_cname => role_class.to_s
     Group.resourcify :roles, :role_cname => role_class.to_s
   end
 
-  context "in the Instance level " do 
+  context "in the Instance level" do 
     before(:all) do
       admin = user_class.first
       admin.add_role :admin

data/spec/rolify/shared_examples/shared_examples_for_scopes.rb

@@ -28,7 +28,7 @@ shared_examples_for "Role.scopes" do
     let!(:zombie_role) { subject.add_role :visitor, Forum.last }
     let!(:anonymous_role) { subject.add_role :anonymous, Group.last }
     
-    it { subject.roles.instance_scoped.all.entries.should =~ [ visitor_role, zombie_role, anonymous_role ] }
+    it { subject.roles.instance_scoped.to_a.entries.should =~ [ visitor_role, zombie_role, anonymous_role ] }
     it { subject.roles.instance_scoped(Forum).should =~ [ visitor_role, zombie_role ] }
     it { subject.roles.instance_scoped(Forum.first).should =~ [ visitor_role ] }
     it { subject.roles.instance_scoped(Forum.last).should =~ [ zombie_role ] }

data/spec/spec_helper.rb

@@ -5,6 +5,9 @@ require 'rolify'
 require 'rolify/matchers'
 require 'rails/all'
 
+require 'coveralls'
+Coveralls.wear_merged!
+
 ENV['ADAPTER'] ||= 'active_record'
 
 load File.dirname(__FILE__) + "/support/adapters/#{ENV['ADAPTER']}.rb"

data/spec/support/adapters/active_record.rb

@@ -43,11 +43,11 @@ module Admin
   end
   
   class Moderator < ActiveRecord::Base
-    rolify :role_cname => "Admin::Right"
+    rolify :role_cname => "Admin::Right", :role_join_table_name => "moderators_rights"
   end
 
   class Right < ActiveRecord::Base
-    has_and_belongs_to_many :moderators, :class_name => "Admin::Moderator",:join_table => :admin_moderators_admin_rights
+    has_and_belongs_to_many :moderators, :class_name => "Admin::Moderator", :join_table => "moderators_rights"
     belongs_to :resource, :polymorphic => true
 
     extend Rolify::Adapter::Scopes
@@ -72,5 +72,5 @@ class Team < ActiveRecord::Base
   #resourcify done during specs setup to be able to use custom user classes
   self.primary_key = "team_code"
   
-  default_scope order(:team_code)
+  default_scope { order(:team_code) }
 end

data/spec/support/schema.rb

@@ -31,7 +31,7 @@ ActiveRecord::Schema.define do
     t.references :privilege
   end
   
-  create_table(:admin_moderators_admin_rights, :id => false) do |t|
+  create_table(:moderators_rights, :id => false) do |t|
     t.references :moderator
     t.references :right
   end

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc4
-  prerelease: 6
+  version: 3.3.0
 platform: ruby
 authors:
 - Florent Monbillard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Very simple Roles library without any authorization enforcement supporting
@@ -148,8 +131,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
@@ -188,7 +171,8 @@ files:
 - lib/rolify/version.rb
 - rolify.gemspec
 - spec/README.rdoc
-- spec/generators/rolify/rolify_generator_spec.rb
+- spec/generators/rolify/rolify_activerecord_generator_spec.rb
+- spec/generators/rolify/rolify_mongoid_generator_spec.rb
 - spec/generators_helper.rb
 - spec/rolify/config_spec.rb
 - spec/rolify/custom_spec.rb
@@ -217,31 +201,31 @@ files:
 - spec/support/schema.rb
 homepage: http://eppo.github.com/rolify/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Roles library with resource scoping
 test_files:
 - spec/README.rdoc
-- spec/generators/rolify/rolify_generator_spec.rb
+- spec/generators/rolify/rolify_activerecord_generator_spec.rb
+- spec/generators/rolify/rolify_mongoid_generator_spec.rb
 - spec/generators_helper.rb
 - spec/rolify/config_spec.rb
 - spec/rolify/custom_spec.rb
@@ -268,3 +252,4 @@ test_files:
 - spec/support/adapters/mongoid.yml
 - spec/support/data.rb
 - spec/support/schema.rb
+has_rdoc: