roles_for_mongoid 0.1.1 → 0.2.0

data/spec/spec_helper.rb

@@ -1,20 +1,30 @@
 require 'rspec'
 require 'rspec/autorun'
 require 'mongoid'
-require 'roles_for_mongoid'
+require 'roles_mongoid'
                  
-Mongoid.configure.master = Mongo::Connection.new.db('roles_for_mongoid')
+Mongoid.configure.master = Mongo::Connection.new.db('roles_mongoid')
 
 module Database
-  def self.teardown
-    Mongoid.database.collections.each do |coll|
-      coll.remove
-    end
+  def self.teardown     
+    # Mongoid.database.collections.each do |coll|
+    #   coll.remove
+    # end
   end
 end
 
+Mongoid.database.collections.each do |coll|
+  coll.remove
+end
+
+
 RSpec.configure do |config|
-  
+  config.mock_with :mocha
+  # config.before do
+  #   Mongoid.database.collections.each do |coll|
+  #     coll.remove
+  #   end
+  # end
 end
 
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +02:00
+date: 2010-09-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +30,72 @@ dependencies:
         - 0
         - 0
         - beta
-        - 17
-        version: 2.0.0.beta.17
+        - 19
+        version: 2.0.0.beta.19
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 17
+        version: 2.0.0.beta.17
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: require_all
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sugar-high
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 3
+        version: 0.2.3
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: roles_generic
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 2
+        version: 0.2.2
+  type: :runtime
+  version_requirements: *id005
 description: Facilitates adding Roles to your Mongoid user models
 email: kmandrup@gmail.com
 executables: []
@@ -46,27 +108,33 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
 - lib/generators/mongoid/roles/roles_generator.rb
-- lib/roles_for_mongoid.rb
-- lib/roles_for_mongoid/role.rb
-- lib/roles_for_mongoid/strategies/admin_flag.rb
-- lib/roles_for_mongoid/strategies/inline_role.rb
-- lib/roles_for_mongoid/strategies/inline_roles.rb
-- lib/roles_for_mongoid/strategies/role_relations.rb
-- lib/roles_for_mongoid/strategies/roles_mask.rb
-- lib/roles_for_mongoid/user.rb
+- lib/roles_mongoid.rb
+- lib/roles_mongoid/base.rb
+- lib/roles_mongoid/namespaces.rb
+- lib/roles_mongoid/role.rb
+- lib/roles_mongoid/strategy.rb
+- lib/roles_mongoid/strategy/multi/many_roles.rb
+- lib/roles_mongoid/strategy/multi/role_strings.rb
+- lib/roles_mongoid/strategy/multi/roles_mask.rb
+- lib/roles_mongoid/strategy/single/admin_flag.rb
+- lib/roles_mongoid/strategy/single/one_role.rb
+- lib/roles_mongoid/strategy/single/role_string.rb
 - roles_for_mongoid.gemspec
+- sandbox/roles_assign.rb
+- sandbox/single_role.rb
 - sandbox/test.rb
-- spec/roles_for_mongoid/user_admin_field_spec.rb
-- spec/roles_for_mongoid/user_inline_role_spec.rb
-- spec/roles_for_mongoid/user_inline_roles_spec.rb
-- spec/roles_for_mongoid/user_role_relations_spec.rb
-- spec/roles_for_mongoid/user_roles_mask_spec.rb
-- spec/spec.opts
+- spec/roles_mongoid/admin_flag_spec.rb
+- spec/roles_mongoid/many_roles_spec.rb
+- spec/roles_mongoid/one_role_spec.rb
+- spec/roles_mongoid/role_string_spec.rb
+- spec/roles_mongoid/role_strings_spec.rb
+- spec/roles_mongoid/roles_mask_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/roles_for_mm
@@ -101,9 +169,10 @@ signing_key:
 specification_version: 3
 summary: Facilitates adding Roles to your Mongoid user models
 test_files: 
-- spec/roles_for_mongoid/user_admin_field_spec.rb
-- spec/roles_for_mongoid/user_inline_role_spec.rb
-- spec/roles_for_mongoid/user_inline_roles_spec.rb
-- spec/roles_for_mongoid/user_role_relations_spec.rb
-- spec/roles_for_mongoid/user_roles_mask_spec.rb
+- spec/roles_mongoid/admin_flag_spec.rb
+- spec/roles_mongoid/many_roles_spec.rb
+- spec/roles_mongoid/one_role_spec.rb
+- spec/roles_mongoid/role_string_spec.rb
+- spec/roles_mongoid/role_strings_spec.rb
+- spec/roles_mongoid/roles_mask_spec.rb
 - spec/spec_helper.rb

data/lib/roles_for_mongoid.rb

@@ -1 +0,0 @@
-require 'roles_for_mongoid/user'

data/lib/roles_for_mongoid/role.rb

@@ -1,4 +0,0 @@
-class Role
-  include Mongoid::Document
-  field :name, :type => String  
-end  

data/lib/roles_for_mongoid/strategies/admin_flag.rb

@@ -1,17 +0,0 @@
-module Mongoid::AdminFlag        
-  def self.included base
-    base.extend ClassMethods
-    base.field :admin, :type => Boolean      
-  end
-
-  module ClassMethods      
-    def in_role(role_name) 
-      case role_name.downcase.to_sym
-      when :admin
-        where(:admin => true)
-      else
-        where(:admin => false)
-      end          
-    end
-  end
-end

data/lib/roles_for_mongoid/strategies/inline_role.rb

@@ -1,6 +0,0 @@
-module Mongoid::InlineRole
-  def self.included base
-    base.field :role, :type => String
-    base.scope :in_role,  lambda { |role_name| base.where(:role => role_name) }  
-  end
-end

data/lib/roles_for_mongoid/strategies/inline_roles.rb

@@ -1,13 +0,0 @@
-module Mongoid::InlineRoles
-  def self.included base
-    base.extend ClassMethods      
-    base.field :roles, :type => Array
-    base.scope :in_role,   lambda { |role_name|  base.where(:roles => [role_name]) }
-  end
-
-  module ClassMethods
-    def in_roles(*roles)
-      where(:roles.in => roles.flatten)
-    end
-  end
-end

data/lib/roles_for_mongoid/strategies/role_relations.rb

@@ -1,34 +0,0 @@
-require 'roles_for_mongoid/role'
-
-module Mongoid::RoleRelations
-  def self.included base
-    base.extend ClassMethods
-    base.references_many :roles, :stored_as => :array
-  end
-
-  module ClassMethods    
-    def in_role(role_name)  
-      in_roles(role_name)
-    end
-
-    # old way!
-    # def in_roles *role_names
-    #   roles = Role.where(:name.in => role_names.flatten).to_a
-    #   arr_ids = roles.map{|role| role._id}  
-    #   all.to_a.select do |user|
-    #     user.roles.to_a.any? do |role| 
-    #       arr_ids.include?(role._id)
-    #     end
-    #   end
-    # end
-
-    def in_roles(*role_names)
-      begin
-        role_ids = Role.where(:name.in => role_names.flatten).to_a.map(&:_id)
-        criteria.in(:role_ids => role_ids).to_a      
-      rescue
-        return []
-      end
-    end  
-  end
-end

data/lib/roles_for_mongoid/strategies/roles_mask.rb

@@ -1,52 +0,0 @@
-module Mongoid
-  module RolesMask
-    def self.included base
-      base.extend ClassMethods      
-      base.field :roles_mask, :type => Integer, :default => 1
-    end
-
-    module ClassMethods
-      attr_accessor :available_roles    
-  
-      def in_role(role)     
-        mask = calc_index(role.to_s)
-        all.select do |user| 
-          (user.roles_mask & mask) > 0
-        end
-      end    
-
-      def in_roles(*roles)
-        all.select do |user| 
-          roles.flatten.any? do |role|
-            mask = calc_index(role.to_s)
-            (user.roles_mask & mask) > 0
-          end
-        end
-      end    
-  
-      def calc_index(r)
-        2**available_roles.index(r)
-      end      
-    end
-
-    def available_roles
-      self.class.available_roles    
-    end
-
-    def calc_index(r)
-      self.class.calc_index(r)
-    end
-
-    def roles=(*roles)    
-      self.roles_mask = (roles.flatten & available_roles).map { |r| calc_index(r) }.sum
-    end
-
-    def roles
-      self.available_roles.reject { |r| ((roles_mask || 0) & self.calc_index(r)).zero? }
-    end
-
-    def role?(role)
-      roles.include?(role.to_s)
-    end
-  end
-end

data/lib/roles_for_mongoid/user.rb

@@ -1,12 +0,0 @@
-require 'require_all'
-require 'active_support/inflector'
-
-class User    
-  include Mongoid::Document
-  
-  def self.role_strategy type
-    include "Mongoid::#{type.to_s.camelize}".constantize    
-  end
-end
-
-require_all File.dirname(__FILE__) + '/strategies'

data/spec/roles_for_mongoid/user_admin_field_spec.rb

@@ -1,24 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-User.role_strategy :admin_flag
-
-describe "Roles for Mongoid" do
-  after :each do
-    Database.teardown
-  end
-
-  before :each do
-    guest_user = User.new :name => 'Kristian', :admin => false
-    admin_user = User.new :name => 'Admin user', :admin => true
-    admin_user.save                                        
-    guest_user.save
-  end
-
-  describe "Admin flag strategy " do
-
-    it "should return first user maching role" do
-      User.in_role('guest').first.name.should == 'Kristian'
-      User.in_role('admin').first.name.should == 'Admin user'
-    end
-  end
-end

data/spec/roles_for_mongoid/user_inline_role_spec.rb

@@ -1,23 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-User.role_strategy :inline_role
-
-describe "Roles for Mongoid" do
-  after :each do
-    Database.teardown
-  end
-
-  before :each do
-    guest_user = User.new :name => 'Kristian', :role => 'guest'
-    admin_user = User.new :name => 'Admin user', :role => 'admin' 
-    admin_user.save                                        
-    guest_user.save
-  end
-
-  describe "Inline role strategy" do
-    it "should return first user maching role" do
-      User.in_role('guest').first.name.should == 'Kristian'
-      User.in_role('admin').first.name.should == 'Admin user'
-    end
-  end
-end

data/spec/roles_for_mongoid/user_inline_roles_spec.rb

@@ -1,27 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-User.role_strategy :inline_roles
-
-describe "Roles for Mongoid" do
-  after :each do
-    Database.teardown
-  end
-
-  before :each do
-    guest_user = User.new(:name => 'Kristian', :roles => ['guest']).save
-    admin_user = User.new(:name => 'Admin user', :roles => ['admin']).save
-    author_user = User.new(:name => 'Author', :roles => ['author']).save
-  end
-
-  describe "Inline roles strategy" do
-
-    it "should return first user matching role" do
-      User.in_role('admin').first.name.should == 'Admin user'
-    end
-
-    it "should return all users matching any of the roles" do 
-      User.in_roles(['guest', 'admin']).to_a.size.should == 2
-      User.in_roles('guest', 'admin').to_a.size.should == 2
-    end
-  end
-end

data/spec/roles_for_mongoid/user_role_relations_spec.rb

@@ -1,37 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-User.role_strategy :role_relations
-
-describe "Roles for Mongoid" do  
-  
-  after :each do
-    Database.teardown
-  end
-
-  before :each do
-    guest_user = User.create(:name => 'Kristian')
-    admin_user = User.create(:name => 'Admin user')
-    author_user = User.create(:name => 'Author')
-
-    guest_user.roles.create(:name => 'guest')
-    guest_user.save      
-
-    admin_user.roles.create(:name => 'admin')
-    admin_user.save      
-
-    author_user.roles.create(:name => 'author')
-    author_user.save      
-  end    
-  
-  describe "Role relations strategy" do
-    it "should return first user matching role" do    
-      User.in_role('guest').first.name.should == 'Kristian'      
-      User.in_role('admin').first.name.should == 'Admin user'
-    end
-    
-    # it "should return all users matching any of the roles" do
-    #   User.in_roles(['guest', 'admin']).all.size.should == 2
-    #   User.in_roles('guest', 'admin').all.size.should == 2 
-    # end    
-  end
-end