rolify 3.2.0 → 3.3.0

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
@@ -14,11 +10,11 @@ end
 
 Rolify.use_mongoid
 
-# Mongoid models
+# Standard user and role classes
 class User
   include Mongoid::Document
   rolify
-  
+
   field :login, :type => String
 end
 
@@ -26,9 +22,8 @@ class Role
   include Mongoid::Document
   has_and_belongs_to_many :users
   belongs_to :resource, :polymorphic => true
-  
+
   field :name, :type => String
-  index({ :name => 1 }, { :unique => true })
   index(
     {
       :name => 1,
@@ -37,28 +32,41 @@ class Role
     },
     { :unique => true }
   )
-  
+
   scopify
 end
 
-class Forum
+# Resourcifed and rolifed at the same time
+class HumanResource
   include Mongoid::Document
-  #resourcify done during specs setup to be able to use custom user classes
-  
-  field :name, :type => String
-end
+  resourcify :resources
+  rolify
 
-class Group
-  include Mongoid::Document
-  #resourcify done during specs setup to be able to use custom user classes
-  
-  field :name, :type => String
+  field :login, :type => String
 end
 
+#class Power
+#  include Mongoid::Document
+#  has_and_belongs_to_many :human_resources
+#  belongs_to :resource, :polymorphic => true
+#  scopify
+#
+#  field :name, :type => String
+#  index(
+#    {
+#      :name => 1,
+#      :resource_type => 1,
+#      :resource_id => 1
+#    },
+#    { :unique => true }
+#  )
+#end
+
+# Custom role and class names
 class Customer
   include Mongoid::Document
   rolify :role_cname => "Privilege"
-  
+
   field :login, :type => String
 end
 
@@ -66,9 +74,9 @@ class Privilege
   include Mongoid::Document
   has_and_belongs_to_many :customers
   belongs_to :resource, :polymorphic => true
-  
+  scopify
+
   field :name, :type => String
-  index({ :name => 1 }, { :unique => true })
   index(
     {
       :name => 1,
@@ -77,6 +85,59 @@ class Privilege
     },
     { :unique => true }
   )
-  
-  scopify
 end
+
+# Namespaced models
+module Admin
+  class Moderator
+    include Mongoid::Document
+    rolify :role_cname => "Admin::Right"
+
+    field :login, :type => String
+  end
+
+  class Right
+    include Mongoid::Document
+    has_and_belongs_to_many :moderators, :class_name => 'Admin::Moderator'
+    belongs_to :resource, :polymorphic => true
+    scopify
+
+    field :name, :type => String
+    index(
+      {
+        :name => 1,
+        :resource_type => 1,
+        :resource_id => 1
+      },
+      { :unique => true }
+    )
+  end
+end
+
+# Resources classes
+class Forum
+  include Mongoid::Document
+  #resourcify done during specs setup to be able to use custom user classes
+
+  field :name, :type => String
+end
+
+class Group
+  include Mongoid::Document
+  #resourcify done during specs setup to be able to use custom user classes
+
+  field :name, :type => String
+  field :parent_id, :type => Integer
+
+  def subgroups
+    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

@@ -1,20 +1,17 @@
-User.destroy_all
-Role.destroy_all
-Forum.destroy_all
-Group.destroy_all
-Privilege.destroy_all
-Customer.destroy_all
-
 # Users
-User.create(:login => "admin")
-User.create(:login => "moderator")
-User.create(:login => "god")
-User.create(:login => "zombie")
+[ User, Customer, Admin::Moderator ].each do |user|
+  user.destroy_all
+  
+  user.create(:login => "admin")
+  user.create(:login => "moderator")
+  user.create(:login => "god")
+  user.create(:login => "zombie")
+end
 
-Customer.create(:login => "admin")
-Customer.create(:login => "moderator")
-Customer.create(:login => "god")
-Customer.create(:login => "zombie")
+# Roles
+[ Role, Privilege, Admin::Right ].each do |role|
+  role.destroy_all
+end
 
 # Resources
 Forum.create(:name => "forum 1")
@@ -23,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

@@ -1,15 +1,19 @@
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  create_table(:roles) do |t|
+  [ :roles, :privileges, :admin_rights ].each do |table|
+    create_table(table) do |t|
     t.string :name
     t.references :resource, :polymorphic => true
-
+  
     t.timestamps
+    end
   end
-  
-  create_table(:users) do |t|
-    t.string :login
+
+  [ :users, :human_resources, :customers, :admin_moderators ].each do |table|
+    create_table(table) do |t|
+      t.string :login
+    end
   end
 
   create_table(:users_roles, :id => false) do |t|
@@ -17,25 +21,32 @@ ActiveRecord::Schema.define do
     t.references :role
   end
   
-  create_table(:forums) do |t|
-    t.string :name
+  create_table(:human_resources_roles, :id => false) do |t|
+    t.references :human_resource
+    t.references :role
   end
   
-  create_table(:groups) do |t|
-    t.string :name
+  create_table(:customers_privileges, :id => false) do |t|
+    t.references :customer
+    t.references :privilege
+  end
+  
+  create_table(:moderators_rights, :id => false) do |t|
+    t.references :moderator
+    t.references :right
   end
 
-  create_table(:privileges) do |t|
+  create_table(:forums) do |t|
     t.string :name
-    t.references :resource, :polymorphic => true
   end
 
-  create_table(:customers) do |t|
-    t.string :login
+  create_table(:groups) do |t|
+    t.integer :parent_id
+    t.string :name
   end
-
-  create_table(:customers_privileges, :id => false) do |t|
-    t.references :customer
-    t.references :privilege
+  
+  create_table(:teams, :id => false) do |t|
+    t.primary_key :team_code
+    t.string :name
   end
 end

metadata

@@ -1,126 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.2.0
-  prerelease: 
+  version: 3.3.0
 platform: ruby
 authors:
 - Florent Monbillard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70098036310660 !ruby/object:Gem::Requirement
-    none: false
+  name: ammeter
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70098036310660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &70098036309620 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70098036309620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70098036308480 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70098036308480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: &70098036307720 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70098036307720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ammeter
-  requirement: &70098036307200 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70098036307200
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70098036306500 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70098036306500
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70098036305440 !ruby/object:Gem::Requirement
-    none: false
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70098036305440
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &70098036304660 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: *70098036304660
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid-rspec
-  requirement: &70098036303960 !ruby/object:Gem::Requirement
-    none: false
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70098036303960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70098036303500 !ruby/object:Gem::Requirement
-    none: false
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70098036303500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        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.
@@ -130,22 +131,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - UPGRADE.rdoc
-- lib/generators/rolify/role/role_generator.rb
-- lib/generators/rolify/role/templates/README
-- lib/generators/rolify/role/templates/README-active_record
-- lib/generators/rolify/role/templates/README-mongoid
-- lib/generators/rolify/role/templates/initializer.rb
-- lib/generators/rolify/role/templates/migration.rb
-- lib/generators/rolify/role/templates/role-active_record.rb
-- lib/generators/rolify/role/templates/role-mongoid.rb
+- 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
+- lib/generators/mongoid/rolify_generator.rb
+- lib/generators/mongoid/templates/README-mongoid
+- lib/generators/rolify/rolify_generator.rb
+- lib/generators/rolify/templates/README
+- lib/generators/rolify/templates/initializer.rb
+- lib/generators/rolify/templates/role-active_record.rb
+- lib/generators/rolify/templates/role-mongoid.rb
+- lib/generators/rolify/user_generator.rb
 - lib/rolify.rb
 - lib/rolify/adapters/active_record/resource_adapter.rb
 - lib/rolify/adapters/active_record/role_adapter.rb
@@ -157,16 +163,23 @@ files:
 - lib/rolify/configure.rb
 - lib/rolify/dynamic.rb
 - lib/rolify/finders.rb
+- lib/rolify/matchers.rb
 - lib/rolify/railtie.rb
 - lib/rolify/resource.rb
 - lib/rolify/role.rb
 - lib/rolify/utils.rb
 - lib/rolify/version.rb
 - rolify.gemspec
-- spec/generators/rolify/role/role_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
+- spec/rolify/matchers_spec.rb
+- spec/rolify/namespace_spec.rb
 - spec/rolify/resource_spec.rb
+- spec/rolify/resourcifed_and_rolifed_spec.rb
 - spec/rolify/role_spec.rb
 - spec/rolify/shared_contexts.rb
 - spec/rolify/shared_examples/shared_examples_for_add_role.rb
@@ -188,33 +201,38 @@ 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: '0'
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 1.8.17
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Roles library with resource scoping
 test_files:
-- spec/generators/rolify/role/role_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
+- spec/rolify/matchers_spec.rb
+- spec/rolify/namespace_spec.rb
 - spec/rolify/resource_spec.rb
+- spec/rolify/resourcifed_and_rolifed_spec.rb
 - spec/rolify/role_spec.rb
 - spec/rolify/shared_contexts.rb
 - spec/rolify/shared_examples/shared_examples_for_add_role.rb
@@ -234,3 +252,4 @@ test_files:
 - spec/support/adapters/mongoid.yml
 - spec/support/data.rb
 - spec/support/schema.rb
+has_rdoc: 

data/lib/generators/rolify/role/role_generator.rb

@@ -1,49 +0,0 @@
-require 'rails/generators/migration'
-
-module Rolify
-  module Generators
-    class RoleGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-
-      source_root File.expand_path('../templates', __FILE__)
-      argument :role_cname, :type => :string, :default => "Role"
-      argument :user_cname, :type => :string, :default => "User"
-      argument :orm_adapter, :type => :string, :default => "active_record"
-      #class_option :dynamic_shortcuts, :type => :boolean, :default => false
-
-      desc "Generates a model with the given NAME and a migration file."
-
-      def generate_role
-        template "role-#{orm_adapter}.rb", "app/models/#{role_cname.underscore}.rb"
-        inject_into_file(model_path, :after => inject_rolify_method) do
-          "  rolify" + (role_cname == "Role" ? "" : " :role_cname => '#{role_cname.camelize}'") + "\n"
-        end
-      end
-
-      def copy_role_file
-        template "initializer.rb", "config/initializers/rolify.rb"
-        migration_template "migration.rb", "db/migrate/rolify_create_#{role_cname.tableize}" if orm_adapter == "active_record"
-      end
-
-      def model_path
-        File.join("app", "models", "#{user_cname.underscore}.rb")
-      end
-      
-      def self.next_migration_number(path)
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
-      end
-      
-      def show_readme
-        readme "README-#{orm_adapter}" if behavior == :invoke
-      end
-      
-      def inject_rolify_method
-        if orm_adapter == "active_record"
-          /class #{user_cname.camelize}\n|class #{user_cname.camelize} .*\n/
-        else
-          /include Mongoid::Document\n|include Mongoid::Document .*\n/
-        end
-      end
-    end
-  end
-end

data/lib/generators/rolify/role/templates/README

@@ -1,11 +0,0 @@
-===============================================================================
-
-Now, you just have to run the migration using rake command:
-
-   rake db:migrate
-
-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.
-
-===============================================================================

data/lib/generators/rolify/role/templates/README-active_record

@@ -1,21 +0,0 @@
-===============================================================================
-
-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 
-argument otherwise the default is role.rb), you can add your own business logic 
-inside.
-
-Inside your User class (or the name you gave as argument otherwise the default 
-is user.rb), rolify method has been inserted to provide rolify methods.
-
-Now, if you just have to run the migration using rake command:
-
-   rake db:migrate
-
-and you will be able to add the resourcify method inside all models you want 
-scoped by a role.
-
-===============================================================================

data/lib/generators/rolify/role/templates/migration.rb

@@ -1,19 +0,0 @@
-class RolifyCreate<%= role_cname.pluralize.camelize %> < ActiveRecord::Migration
-  def change
-    create_table(:<%= role_cname.tableize %>) do |t|
-      t.string :name
-      t.references :resource, :polymorphic => true
-
-      t.timestamps
-    end
-
-    create_table(:<%= (user_cname.tableize + "_" + role_cname.tableize) %>, :id => false) do |t|
-      t.references :<%= user_cname.underscore.singularize %>
-      t.references :<%= role_cname.underscore.singularize %>
-    end
-
-    add_index(:<%= role_cname.tableize %>, :name)
-    add_index(:<%= role_cname.tableize %>, [ :name, :resource_type, :resource_id ])
-    add_index(:<%= "#{user_cname.tableize}_#{role_cname.tableize}" %>, [ :<%= user_cname.underscore.singularize %>_id, :<%= role_cname.underscore.singularize %>_id ])
-  end
-end

data/lib/generators/rolify/role/templates/role-active_record.rb

@@ -1,6 +0,0 @@
-class <%= role_cname.camelize %> < ActiveRecord::Base
-  has_and_belongs_to_many :<%= user_cname.tableize %>, :join_table => :<%= "#{user_cname.tableize}_#{role_cname.tableize}" %>
-  belongs_to :resource, :polymorphic => true
-  
-  scopify
-end