rolify 3.3.0.rc3 → 3.3.0

data/spec/rolify/shared_examples/shared_examples_for_dynamic.rb

@@ -1,8 +1,10 @@
-shared_examples_for Rolify::Dynamic do 
+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_has_any_role.rb

@@ -1,7 +1,7 @@
 shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
   context "using #{param_name} as parameter" do
     context "with a global role", :scope => :global do
-      before(:all) do
+      before do
         subject.add_role "staff".send(param_method)
       end
       
@@ -20,7 +20,7 @@ shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
     end
     
     context "with a class scoped role", :scope => :class do
-      before(:all) do
+      before do
         subject.add_role "player".send(param_method), Forum
         subject.add_role "superhero".send(param_method)
       end
@@ -40,7 +40,7 @@ shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
     end
     
     context "with a instance scoped role", :scope => :instance do
-      before(:all) do
+      before do
         subject.add_role "visitor".send(param_method), Forum.last
         subject.add_role "leader", Group
         subject.add_role "warrior"

data/spec/rolify/shared_examples/shared_examples_for_only_has_role.rb

@@ -36,7 +36,7 @@ shared_examples_for "#only_has_role?_examples" do |param_name, param_method|
       end
       
       context "with multiple roles" do
-        before(:all) { subject.add_role "multiple_global_roles".send(param_method) }
+        before { subject.add_role "multiple_global_roles".send(param_method) }
         
         it { subject.only_has_role?("global_role".send(param_method)).should be_false }
       end
@@ -93,7 +93,7 @@ shared_examples_for "#only_has_role?_examples" do |param_name, param_method|
       end
       
       context "with multiple roles" do
-        before(:all) { subject.add_role "multiple_class_roles".send(param_method) }
+        before { subject.add_role "multiple_class_roles".send(param_method) }
         
         it { subject.only_has_role?("class_role".send(param_method), Forum).should be_false }
         it { subject.only_has_role?("class_role".send(param_method), Forum.first).should be_false }
@@ -164,7 +164,7 @@ shared_examples_for "#only_has_role?_examples" do |param_name, param_method|
       end
     
       context "with multiple roles" do
-        before(:all) { subject.add_role "multiple_instance_roles".send(param_method), Forum.first }
+        before { subject.add_role "multiple_instance_roles".send(param_method), Forum.first }
         
         it { subject.only_has_role?("instance_role".send(param_method), Forum.first).should be_false }
         it { subject.only_has_role?("instance_role".send(param_method), :any).should be_false }

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
@@ -82,7 +84,7 @@ shared_examples_for Rolify::Role do
   context "with a new instance" do
     let(:user) { user_class.new }
 
-    before(:all) do
+    before do
       user.add_role :admin
       user.add_role :moderator, Forum.first
     end

data/spec/rolify/shared_examples/shared_examples_for_scopes.rb

@@ -1,7 +1,7 @@
 require "rolify/shared_contexts"
 
-shared_examples_for "Role.scopes" do |param_name, param_method|
-  before(:each) do
+shared_examples_for "Role.scopes" do
+  before do
     role_class.destroy_all
   end
   
@@ -18,9 +18,9 @@ shared_examples_for "Role.scopes" do |param_name, param_method|
     let!(:manager_role) { subject.add_role :manager, Group }
     let!(:moderator_role) { subject.add_role :moderator, Forum }
     
-    it { subject.roles.class_scoped.should == [ manager_role, moderator_role ] }
-    it { subject.roles.class_scoped(Group).should == [ manager_role ] }
-    it { subject.roles.class_scoped(Forum).should == [ moderator_role ] }
+    it { subject.roles.class_scoped.should =~ [ manager_role, moderator_role ] }
+    it { subject.roles.class_scoped(Group).should =~ [ manager_role ] }
+    it { subject.roles.class_scoped(Forum).should =~ [ moderator_role ] }
   end
   
   describe ".instance_scoped" do
@@ -28,11 +28,11 @@ shared_examples_for "Role.scopes" do |param_name, param_method|
     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(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 ] }
-    it { subject.roles.instance_scoped(Group.last).should == [ 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 ] }
+    it { subject.roles.instance_scoped(Group.last).should =~ [ anonymous_role ] }
     it { subject.roles.instance_scoped(Group.first).should be_empty }
   end
 end

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
@@ -66,4 +66,11 @@ class Group < ActiveRecord::Base
   def subgroups
     Group.where(:parent_id => id)
   end
+end
+
+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) }
 end

data/spec/support/adapters/mongoid.rb

@@ -2,10 +2,6 @@ require 'mongoid'
 
 Mongoid.load!("spec/support/adapters/mongoid.yml", :test)
 
-RSpec.configure do |config|
-  config.include Mongoid::Matchers
-end
-
 ::Mongoid::Document.module_eval do
   def self.included(base)
     base.extend Rolify
@@ -137,3 +133,11 @@ class Group
     Group.in(:parent_id => _id)
   end
 end
+
+class Team
+  include Mongoid::Document
+  #resourcify done during specs setup to be able to use custom user classes
+
+  field :team_code, :type => Integer
+  field :name, :type => String
+end

data/spec/support/data.rb

@@ -20,3 +20,6 @@ Forum.create(:name => "forum 3")
 
 Group.create(:name => "group 1")
 Group.create(:name => "group 2")
+
+Team.create(:team_code => "1", :name => "PSG")
+Team.create(:team_code => "2", :name => "MU")

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
@@ -44,4 +44,9 @@ ActiveRecord::Schema.define do
     t.integer :parent_id
     t.string :name
   end
+  
+  create_table(:teams, :id => false) do |t|
+    t.primary_key :team_code
+    t.string :name
+  end
 end

metadata

@@ -1,192 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc3
-  prerelease: 6
+  version: 3.3.0
 platform: ruby
 authors:
 - Florent Monbillard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  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: bson_ext
+  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: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  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: rake
+  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: 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: mongoid-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 description: Very simple Roles library without any authorization enforcement supporting
   scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
   ORMs.
@@ -196,14 +131,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - UPGRADE.rdoc
+- gemfiles/Gemfile.rails-3.2
+- gemfiles/Gemfile.rails-4.0
 - lib/generators/active_record/rolify_generator.rb
 - lib/generators/active_record/templates/README
 - lib/generators/active_record/templates/migration.rb
@@ -233,7 +170,9 @@ files:
 - lib/rolify/utils.rb
 - lib/rolify/version.rb
 - rolify.gemspec
-- spec/generators/rolify/rolify_generator_spec.rb
+- spec/README.rdoc
+- 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
@@ -262,30 +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/generators/rolify/rolify_generator_spec.rb
+- spec/README.rdoc
+- 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
@@ -312,3 +252,4 @@ test_files:
 - spec/support/adapters/mongoid.yml
 - spec/support/data.rb
 - spec/support/schema.rb
+has_rdoc: