roles_mongoid 0.2.4 → 0.3.1

data/lib/roles_mongoid/strategy/single/admin_flag.rb

@@ -1,3 +1,5 @@
+require 'roles_mongoid/strategy/single'
+
 module RoleStrategy::Mongoid
   module AdminFlag    
     def self.default_role_attribute
@@ -24,26 +26,26 @@ module RoleStrategy::Mongoid
     end
 
     module Implementation
-      def role_attribute
-        strategy_class.roles_attribute_name
-      end
-          
-      # assign roles
-      def roles=(*new_roles)                                 
-        first_role = new_roles.flatten.first
-        if valid_role?(first_role)
-          self.send("#{role_attribute}=", new_roles.flatten.first.admin?) 
-        else
-          raise ArgumentError, "The role #{first_role} is not a valid role"
-        end
-      end
+      include Roles::Mongoid::Strategy::Single
 
-      # query assigned roles
-      def roles
-        role = self.send(role_attribute) ? strategy_class.admin_role_key : strategy_class.default_role_key
-        [role]
+      def new_role role
+        role = role.kind_of?(Array) ? role.flatten.first : role
+        role.admin?
       end
-      alias_method :roles_list, :roles
+      
+      def get_role
+        self.send(role_attribute) ? strategy_class.admin_role_key : strategy_class.default_role_key
+      end 
+      
+      def present_roles *roles
+        roles = roles.flat_uniq
+        roles.map{|role| role ? :admin : :guest}
+      end   
+      
+      def set_empty_role
+        self.send("#{role_attribute}=", false)
+      end      
+
 
     end # Implementation
     

data/lib/roles_mongoid/strategy/single/one_role.rb

@@ -1,3 +1,5 @@
+require 'roles_mongoid/strategy/single'
+
 module RoleStrategy::Mongoid
   module OneRole
     def self.default_role_attribute
@@ -13,42 +15,71 @@ module RoleStrategy::Mongoid
       def role_attribute
         strategy_class.roles_attribute_name.to_sym
       end       
+
+      def role_attribute_id
+        "#{role_attribute}_id"
+      end       
          
-      def in_role(role_name)  
-        in_roles(role_name)
+      def in_role(role_name)      
+        in_any_role(role_name)
       end
 
-      def in_roles(*role_names)
-        begin
-          role_ids = Role.where(:name.in => role_names.to_strings).to_a.map(&:user_id)
-          where(:_id.in => role_ids)
+      def in_any_role(*role_names)
+        begin                       
+          the_roles = Role.where(:name.in => role_names.to_strings).to_a 
+          role_ids = the_roles.map(&:_id).map(&:to_s)
+          where(:"#{role_attribute_id}".in => role_ids)
         rescue 
           return []
         end
       end  
     end
 
-    module Implementation      
-      # assign roles
-      def roles=(*_roles) 
-        _roles = get_roles(_roles)
-        return nil if _roles.none?                
-                
-        role_relation = role_class.find_role(_roles.first)  
-        self.send("#{role_attribute}=", role_relation)
-        one_role.save
-      end
-      alias_method :role=, :roles=
+    module Implementation  
+      include Roles::Mongoid::Strategy::Single 
       
-      # query assigned roles
-      def roles
-        role = self.send(role_attribute)
-        role ? [role.name.to_sym] : []
+      def new_role role
+        role_class.find_role(extract_role role)        
+      end  
+      
+      def new_roles *roles
+        new_role roles.flatten.first
+      end     
+      
+      def present_roles *roles
+        roles.map{|role| extract_role role}
+      end                 
+      
+      def set_empty_role
+        self.send("#{role_attribute}=", nil)
       end
+
+      def select_valid_roles *role_names
+        role_names = role_names.flat_uniq.select{|role| valid_role? role }
+        has_role_class? ? role_class.find_roles(role_names).to_a : role_names
+      end           
       
-      def roles_list
-        self.roles.to_a
-      end      
+      #     
+      # # assign roles
+      # def roles=(*_roles) 
+      #   _roles = get_roles(_roles)
+      #   return nil if _roles.none?                
+      #           
+      #   role_relation = role_class.find_role(_roles.first)  
+      #   self.send("#{role_attribute}=", role_relation)
+      #   one_role.save
+      # end
+      # alias_method :role=, :roles=
+      # 
+      # # query assigned roles
+      # def roles
+      #   role = self.send(role_attribute)
+      #   role ? [role.name.to_sym] : []
+      # end
+      # 
+      # def roles_list
+      #   self.roles.to_a
+      # end      
     end
 
     extend Roles::Generic::User::Configuration

data/lib/roles_mongoid/strategy/single/role_string.rb

@@ -1,3 +1,5 @@
+require 'roles_mongoid/strategy/single'
+
 module RoleStrategy::Mongoid
   module RoleString    
     def self.default_role_attribute
@@ -11,36 +13,66 @@ module RoleStrategy::Mongoid
     module ClassMethods
       def role_attribute
         strategy_class.roles_attribute_name.to_sym
-      end 
-
-      def in_role(role_name) 
-        where(role_attribute => role_name)
+      end       
+         
+      def in_role(role_name)      
+        in_any_role(role_name)
       end
+
+      def in_any_role(*role_names)
+        begin                       
+          where(:"#{role_attribute}".in => role_names)
+        rescue 
+          return []
+        end
+      end  
     end
 
     
-    module Implementation 
-      def role_attribute
-        strategy_class.roles_attribute_name
-      end 
-                  
-      # assign roles
-      def roles=(*roles)
-        self.role = roles.select_labels.first.to_s
-      end 
+    module Implementation   
+      include Roles::Mongoid::Strategy::Single
+
+      def new_role role
+        role = role.kind_of?(Array) ? role.first : role
+        role.to_s
+      end
+
+      def new_roles *roles
+        new_role roles.flatten.first
+      end
       
-      def role= role_name
-        if role_name.kind_of_label? && valid_role?(role_name)
-          self.send("#{role_attribute}=", role_name.to_s) 
-        end        
+      def present_role role
+        return role if role.kind_of? Array
+        role.split(',').map(&:to_sym)
       end
 
-      # query assigned roles
-      def roles
-        role = self.send(role_attribute)
-        [role.to_sym]
+      def set_empty_role
+        self.send("#{role_attribute}=", "")
       end
-      alias_method :roles_list, :roles
+
+      alias_method :present_roles, :present_role
+      
+      # def role_attribute
+      #   strategy_class.roles_attribute_name
+      # end 
+      #             
+      # # assign roles
+      # def roles=(*roles)
+      #   self.role = roles.select_labels.first.to_s
+      # end 
+      # 
+      # def role= role_name
+      #   if role_name.kind_of_label? && valid_role?(role_name)
+      #     self.send("#{role_attribute}=", role_name.to_s) 
+      #   end        
+      # end
+      # 
+      # # query assigned roles
+      # def roles
+      #   role = self.send(role_attribute)
+      #   [role.to_sym]
+      # end
+      # alias_method :roles_list, :roles
     end
 
     extend Roles::Generic::User::Configuration

data/lib/roles_mongoid/strategy/single.rb

@@ -0,0 +1,34 @@
+require 'roles_mongoid/strategy/shared'
+
+class Symbol
+  def admin?
+    self == :admin
+  end
+end
+
+module Roles::Mongoid
+  module Strategy
+    module Single
+      include Shared            
+      # assigns first valid role from list of roles
+      def add_roles *role_names
+        new_roles = select_valid_roles(role_names) 
+        new_role = new_roles.first if !new_roles.empty?
+        set_role new_role
+      end
+
+      # should remove the current single role (set = nil) 
+      # only if it is contained in the list of roles to be removed
+      def remove_roles *role_names
+        roles = role_names.flat_uniq
+        set_empty_role if roles_diff(roles).empty?
+        true
+      end 
+      
+      def roles_list
+        raise 'the method #roles should be present' if !respond_to? :roles
+        present_roles(roles)
+      end            
+    end
+  end
+end

data/roles_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_mongoid}
-  s.version = "0.2.4"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-06}
+  s.date = %q{2010-11-23}
   s.description = %q{Makes it easy to set a role strategy on your User model in Mongoid}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -32,9 +32,12 @@ Gem::Specification.new do |s|
      "lib/roles_mongoid/namespaces.rb",
      "lib/roles_mongoid/role.rb",
      "lib/roles_mongoid/strategy.rb",
+     "lib/roles_mongoid/strategy/multi.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/shared.rb",
+     "lib/roles_mongoid/strategy/single.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",
@@ -43,13 +46,15 @@ Gem::Specification.new do |s|
      "sandbox/single_role.rb",
      "sandbox/test.rb",
      "spec/generator_spec_helper.rb",
-     "spec/generators/roles_generator_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/roles_mongoid/generators/roles_generator_spec.rb",
+     "spec/roles_mongoid/strategy/api_examples.rb",
+     "spec/roles_mongoid/strategy/multi/many_roles_spec.rb",
+     "spec/roles_mongoid/strategy/multi/role_strings_spec.rb",
+     "spec/roles_mongoid/strategy/multi/roles_mask_spec.rb",
+     "spec/roles_mongoid/strategy/single/admin_flag_spec.rb",
+     "spec/roles_mongoid/strategy/single/one_role_spec.rb",
+     "spec/roles_mongoid/strategy/single/role_string_spec.rb",
+     "spec/roles_mongoid/strategy/user_setup.rb",
      "spec/spec_helper.rb",
      "tmp/rails/app/models/user.rb",
      "tmp/rails/config/routes.rb"
@@ -61,13 +66,15 @@ Gem::Specification.new do |s|
   s.summary = %q{Implementation of Roles generic API for Mongoid}
   s.test_files = [
     "spec/generator_spec_helper.rb",
-     "spec/generators/roles_generator_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/roles_mongoid/generators/roles_generator_spec.rb",
+     "spec/roles_mongoid/strategy/api_examples.rb",
+     "spec/roles_mongoid/strategy/multi/many_roles_spec.rb",
+     "spec/roles_mongoid/strategy/multi/role_strings_spec.rb",
+     "spec/roles_mongoid/strategy/multi/roles_mask_spec.rb",
+     "spec/roles_mongoid/strategy/single/admin_flag_spec.rb",
+     "spec/roles_mongoid/strategy/single/one_role_spec.rb",
+     "spec/roles_mongoid/strategy/single/role_string_spec.rb",
+     "spec/roles_mongoid/strategy/user_setup.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -76,30 +83,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.beta.18"])
-      s.add_runtime_dependency(%q<bson>, ["~> 1.0.7"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.1"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.19"])
+      s.add_runtime_dependency(%q<bson>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.11"])
-      s.add_runtime_dependency(%q<roles_generic>, ["~> 0.2.7"])
+      s.add_runtime_dependency(%q<roles_generic>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+      s.add_runtime_dependency(%q<logging_assist>, ["~> 0.1.6"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
-      s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.18"])
-      s.add_dependency(%q<bson>, ["~> 1.0.7"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_dependency(%q<rspec>, [">= 2.1"])
+      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<bson>, [">= 1.1.1"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
-      s.add_dependency(%q<roles_generic>, ["~> 0.2.7"])
+      s.add_dependency(%q<roles_generic>, [">= 0.3.0"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+      s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
-    s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.18"])
-    s.add_dependency(%q<bson>, ["~> 1.0.7"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+    s.add_dependency(%q<rspec>, [">= 2.1"])
+    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<bson>, [">= 1.1.1"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
-    s.add_dependency(%q<roles_generic>, ["~> 0.2.7"])
+    s.add_dependency(%q<roles_generic>, [">= 0.3.0"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+    s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
   end
 end
 

data/sandbox/single_role.rb

@@ -12,7 +12,7 @@ end
 class Role
   include Mongoid::Document
   field :name, :type => String
-  referenced_in :user  
+  references_many :users #one_role, :class_name => 'Role'
 
   class << self
     def find_roles(*role_names)
@@ -36,27 +36,41 @@ end
 
 class User 
   include Mongoid::Document  
-  include Blip
+  # include Blip
   field :name, :type => String  
-  references_one :role
-  # do_it 
+  referenced_in :one_role, :class_name =>  'Role'
   
+  # do_it   
 end
 
-user = User.create
-role = Role.create 
-
-puts "role: #{role.inspect}"
-user.role = role
+user = User.create :name => 'Sandy'
+user2 = User.create :name => 'Mike'
+role = Role.create :name => 'Guest'
+role2 = Role.create :name => 'Admin'
 
 user.save
+user2.save
+
+user.one_role = role2 #<< [role, role2]
+role.users << [user, user2]
+user2.one_role = role
+
+# role.users << user
+# role.users << user2
+
+role.save 
+
+puts "user: #{user.inspect}"
+puts "user2 #{user2.inspect}"
+puts "role: #{role.inspect}"  
+puts "role users: #{role.users.to_a.inspect}"  
+
 
 # Role.create :name => 'guest'
 # Role.create :name => 'admin'
 # 
 # user = User.create :name => 'Kristian'
 # 
-# puts user.inspect
 # 
 # user.role.create :name => :guest
 # user.save
@@ -64,5 +78,5 @@ user.save
 # user.role = Role.find_role(:guest).first
 # user.save
 
-puts user.role.inspect
+