rolify 3.1.0 → 3.2.0.rc2

data/spec/rolify/shared_examples/shared_examples_for_roles.rb

@@ -4,7 +4,7 @@ require "rolify/shared_examples/shared_examples_for_has_role"
 require "rolify/shared_examples/shared_examples_for_has_all_roles"
 require "rolify/shared_examples/shared_examples_for_has_any_role"
 require "rolify/shared_examples/shared_examples_for_remove_role"
-
+require "rolify/shared_examples/shared_examples_for_finders"
 
 shared_examples_for Rolify::Role do
   before(:all) do
@@ -16,17 +16,14 @@ shared_examples_for Rolify::Role do
     Group.resourcify :role_cname => role_class.to_s
   end
 
-  context "in a Instance level" do 
+  context "in the Instance level " do 
     before(:all) do
       admin = user_class.first
       admin.add_role :admin
       admin.add_role :moderator, Forum.first
-      admin
     end
 
-    subject do
-      user_class.first
-    end
+    subject { user_class.first }
 
     [ :has_role, :grant, :add_role ].each do |method_alias|
       it { should respond_to(method_alias.to_sym).with(1).arguments }
@@ -49,30 +46,45 @@ shared_examples_for Rolify::Role do
 
     it { should_not respond_to(:is_admin?) }
     it { should_not respond_to(:is_moderator_of?) }
-  end
+    
+    describe "#has_role" do 
+      it_should_behave_like "#add_role_examples", "String", :to_s
+      it_should_behave_like "#add_role_examples", "Symbol", :to_sym
+    end
 
-  describe "#has_role" do 
-    it_should_behave_like "#add_role_examples", "String", :to_s
-    it_should_behave_like "#add_role_examples", "Symbol", :to_sym
-  end
+    describe "#has_role?" do    
+      it_should_behave_like "#has_role?_examples", "String", :to_s
+      it_should_behave_like "#has_role?_examples", "Symbol", :to_sym
+    end
 
-  describe "#has_role?" do    
-    it_should_behave_like "#has_role?_examples", "String", :to_s
-    it_should_behave_like "#has_role?_examples", "Symbol", :to_sym
-  end
+    describe "#has_all_roles?" do
+      it_should_behave_like "#has_all_roles?_examples", "String", :to_s
+      it_should_behave_like "#has_all_roles?_examples", "Symbol", :to_sym
+    end
 
-  describe "#has_all_roles?" do
-    it_should_behave_like "#has_all_roles?_examples", "String", :to_s
-    it_should_behave_like "#has_all_roles?_examples", "Symbol", :to_sym
-  end
-  
-  describe "#has_any_role?" do
-    it_should_behave_like "#has_any_role?_examples", "String", :to_s
-    it_should_behave_like "#has_any_role?_examples", "Symbol", :to_sym
+    describe "#has_any_role?" do
+      it_should_behave_like "#has_any_role?_examples", "String", :to_s
+      it_should_behave_like "#has_any_role?_examples", "Symbol", :to_sym
+    end
+
+    describe "#has_no_role" do
+      it_should_behave_like "#remove_role_examples", "String", :to_s
+      it_should_behave_like "#remove_role_examples", "Symbol", :to_sym
+    end
   end
-  
-  describe "#has_no_role" do
-    it_should_behave_like "#remove_role_examples", "String", :to_s
-    it_should_behave_like "#remove_role_examples", "Symbol", :to_sym
+  context "with new instance" do
+    let(:user) { user_class.new }
+    before do
+      user.add_role :admin
+      user.add_role :moderator, Forum.first
+    end
+    subject { user }
+    it { should have_role :admin }
+    it { should have_role :moderator, Forum.first }    
+    
+  end  
+  context "on the Class level ", :scope => :mixed do  
+    it_should_behave_like :finders, "String", :to_s
+    it_should_behave_like :finders, "Symbol", :to_sym
   end
 end

data/spec/rolify/shared_examples/shared_examples_for_scopes.rb

@@ -0,0 +1,38 @@
+require "rolify/shared_contexts"
+
+shared_examples_for "Role.scopes" do |param_name, param_method|
+  before(:all) do
+    role_class.destroy_all
+  end
+  
+  subject { user_class.first }
+  
+  describe ".global" do 
+    let!(:admin_role) { subject.add_role :admin }
+    let!(:staff_role) { subject.add_role :staff }
+     
+    it { subject.roles.global.should == [ admin_role, staff_role ] }
+  end
+  
+  describe ".class_scoped" do
+    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 ] }
+  end
+  
+  describe ".instance_scoped" do
+    let!(:visitor_role) { subject.add_role :visitor, Forum.first }
+    let!(:zombie_role) { subject.add_role :visitor, Forum.last }
+    let!(:anonymous_role) { subject.add_role :anonymous, Group.last }
+    
+    it { subject.roles.instance_scoped.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

@@ -1,4 +1,6 @@
 require 'rubygems'
+require "bundler/setup"
+
 require 'rolify'
 require 'ammeter/init'
 
@@ -10,4 +12,15 @@ load File.dirname(__FILE__) + '/support/data.rb'
 def reset_defaults
   Rolify.use_defaults
   Rolify.use_mongoid if ENV['ADAPTER'] == "mongoid"
+end
+
+def provision_user(user, roles)
+  roles.each do |role|
+    if role.is_a? Array
+      user.add_role *role
+    else
+      user.add_role role
+    end
+  end
+  user
 end

data/spec/support/adapters/active_record.rb

@@ -13,6 +13,8 @@ end
 class Role < ActiveRecord::Base
   has_and_belongs_to_many :users, :join_table => :users_roles
   belongs_to :resource, :polymorphic => true
+  
+  extend Rolify::Adapter::Scopes
 end
 
 class Forum < ActiveRecord::Base
@@ -30,4 +32,6 @@ end
 class Privilege < ActiveRecord::Base
   has_and_belongs_to_many :customers, :join_table => :customers_privileges
   belongs_to :resource, :polymorphic => true
+  
+  extend Rolify::Adapter::Scopes
 end

data/spec/support/adapters/mongoid.rb

@@ -1,8 +1,6 @@
 require 'mongoid'
 
-Mongoid.configure do |config|
-  config.master = Mongo::Connection.new.db("godfather")
-end
+Mongoid.load!("spec/support/adapters/mongoid.yml", :test)
 
 ::Mongoid::Document.module_eval do
   def self.included(base)
@@ -26,6 +24,17 @@ class Role
   belongs_to :resource, :polymorphic => true
   
   field :name, :type => String
+  index({ :name => 1 }, { :unique => true })
+  index(
+    {
+      :name => 1,
+      :resource_type => 1,
+      :resource_id => 1
+    },
+    { :unique => true }
+  )
+  
+  scopify
 end
 
 class Forum
@@ -55,4 +64,15 @@ class Privilege
   belongs_to :resource, :polymorphic => true
   
   field :name, :type => String
+  index({ :name => 1 }, { :unique => true })
+  index(
+    {
+      :name => 1,
+      :resource_type => 1,
+      :resource_id => 1
+    },
+    { :unique => true }
+  )
+  
+  scopify
 end

data/spec/support/adapters/mongoid.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      database: godfather
+      hosts:
+        - localhost:27017

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.1.0
-  prerelease: 
+  version: 3.2.0.rc2
+  prerelease: 6
 platform: ruby
 authors:
 - Florent Monbillard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70359244800420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,43 +21,63 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359244800420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70359244799000 !ruby/object:Gem::Requirement
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359244799000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: &70359244797140 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70359244797140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &70359244794900 !ruby/object:Gem::Requirement
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70359244794900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70359244792460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359244792460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70359244791380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359244791380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70359244788860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359244788860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70359244786160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,9 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359244786160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Very simple Roles library without any authorization enforcement supporting
-  scope on resource objects (instance or class)
+  scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
+  ORMs.
 email:
 - f.monbillard@gmail.com
 executables: []
@@ -126,11 +167,14 @@ files:
 - lib/rolify.rb
 - lib/rolify/adapters/active_record/resource_adapter.rb
 - lib/rolify/adapters/active_record/role_adapter.rb
+- lib/rolify/adapters/active_record/scopes.rb
 - lib/rolify/adapters/base.rb
 - lib/rolify/adapters/mongoid/resource_adapter.rb
 - lib/rolify/adapters/mongoid/role_adapter.rb
+- lib/rolify/adapters/mongoid/scopes.rb
 - lib/rolify/configure.rb
 - lib/rolify/dynamic.rb
+- lib/rolify/finders.rb
 - lib/rolify/railtie.rb
 - lib/rolify/resource.rb
 - lib/rolify/role.rb
@@ -144,18 +188,22 @@ files:
 - spec/rolify/role_spec.rb
 - spec/rolify/shared_contexts.rb
 - spec/rolify/shared_examples/shared_examples_for_add_role.rb
+- spec/rolify/shared_examples/shared_examples_for_callbacks.rb
 - spec/rolify/shared_examples/shared_examples_for_dynamic.rb
+- spec/rolify/shared_examples/shared_examples_for_finders.rb
 - spec/rolify/shared_examples/shared_examples_for_has_all_roles.rb
 - spec/rolify/shared_examples/shared_examples_for_has_any_role.rb
 - spec/rolify/shared_examples/shared_examples_for_has_role.rb
 - spec/rolify/shared_examples/shared_examples_for_remove_role.rb
 - spec/rolify/shared_examples/shared_examples_for_roles.rb
+- spec/rolify/shared_examples/shared_examples_for_scopes.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
 - spec/support/adapters/mongoid.rb
+- spec/support/adapters/mongoid.yml
 - spec/support/data.rb
 - spec/support/schema.rb
-homepage: https://github.com/EppO/rolify
+homepage: http://eppo.github.com/rolify/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -170,12 +218,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Roles library with resource scoping
@@ -187,14 +235,18 @@ test_files:
 - spec/rolify/role_spec.rb
 - spec/rolify/shared_contexts.rb
 - spec/rolify/shared_examples/shared_examples_for_add_role.rb
+- spec/rolify/shared_examples/shared_examples_for_callbacks.rb
 - spec/rolify/shared_examples/shared_examples_for_dynamic.rb
+- spec/rolify/shared_examples/shared_examples_for_finders.rb
 - spec/rolify/shared_examples/shared_examples_for_has_all_roles.rb
 - spec/rolify/shared_examples/shared_examples_for_has_any_role.rb
 - spec/rolify/shared_examples/shared_examples_for_has_role.rb
 - spec/rolify/shared_examples/shared_examples_for_remove_role.rb
 - spec/rolify/shared_examples/shared_examples_for_roles.rb
+- spec/rolify/shared_examples/shared_examples_for_scopes.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
 - spec/support/adapters/mongoid.rb
+- spec/support/adapters/mongoid.yml
 - spec/support/data.rb
 - spec/support/schema.rb