roles_generic 0.2.6 → 0.2.7

data/Rakefile

@@ -8,41 +8,15 @@ begin
     gem.homepage = "http://github.com/kristianmandrup/roles_for_mm"
     gem.authors = ["Kristian Mandrup"]
     gem.add_development_dependency "rspec",           "~> 2.0.0.beta.22"
-    gem.add_development_dependency "generator-spec",  "~> 0.6.1"
+    gem.add_development_dependency "generator-spec",  "~> 0.6.5"
 
-    gem.add_dependency "require_all",       "~> 1.1.0"
+    gem.add_dependency "require_all",       "~> 1.2.0"
     gem.add_dependency "activesupport",     "~> 3.0.0"    
-    gem.add_dependency 'sugar-high',        "~> 0.2.5" 
-    gem.add_dependency 'rails3_artifactor', '~> 0.1.4'
+    gem.add_dependency 'sugar-high',        "~> 0.2.10" 
+    gem.add_dependency 'rails3_artifactor', '~> 0.2.5'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
-
-# require 'spec/rake/spectask'
-# Spec::Rake::SpecTask.new(:spec) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.spec_files = FileList['spec/**/*_spec.rb']
-# end
-# 
-# Spec::Rake::SpecTask.new(:rcov) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.pattern = 'spec/**/*_spec.rb'
-#   spec.rcov = true
-# end
-# 
-# task :spec => :check_dependencies
-# 
-# task :default => :spec
-# 
-# require 'rake/rdoctask'
-# Rake::RDocTask.new do |rdoc|
-#   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-# 
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title = "roles_for_mm #{version}"
-#   rdoc.rdoc_files.include('README*')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/roles_generic/generic/role.rb

@@ -2,7 +2,21 @@ module Roles::Generic::Role
   module InstanceMethods
     def role_class
       self.class.role_class_name
-    end      
+    end  
+
+    def get_roles _roles
+      raise "Role class #{role_class} does not have a #find_role(role) method" if !role_class.respond_to? :find_role
+      _roles = _roles.flatten.compact    
+      _roles = _roles.select{|role| role.kind_of?(role_class) || role.kind_of_label?}
+      _roles.map! do |role| 
+        case role
+        when role_class
+          role.name
+        else
+          role.to_s
+        end
+      end        
+    end
   end
 
   module ClassMethods 

data/lib/roles_generic/generic/user/class_methods.rb

@@ -26,7 +26,6 @@ module Roles::Generic::User
     #
     # declare valid roles
     def roles(*roles) 
-      puts "role_class: #{role_class_name}"
       self.valid_roles = Array[*roles].flatten.map { |r| r.to_sym }
     end
   end

data/lib/roles_generic/role.rb

@@ -14,13 +14,13 @@ class Role
   
   def self.find_role role_name    
     roles.to_a.select do |r| 
-      r.name == role_name
+      r.name.to_sym == role_name.to_sym
     end.first
   end  
 
   def self.find_roles *role_names
     result = Set.new
-    role_names.flatten.each do |role_name| 
+    role_names.to_symbols.each do |role_name| 
       found_role = find_role(role_name)
       result << found_role if found_role
     end

data/lib/roles_generic/strategy/multi/many_roles.rb

@@ -6,10 +6,10 @@ module RoleStrategy::Generic
 
     module Implementation      
       # assign roles
-      def roles=(*roles)  
-        raise "Role class #{role_class} does not have a #find_role(role) method" if !role_class.respond_to? :find_role
-
-        role_relations = role_class.find_roles(*roles)
+      def roles=(*_roles)          
+        _roles = get_roles(_roles)
+        return nil if !_roles || _roles.empty?        
+        role_relations = role_class.find_roles(_roles)
         role_relations.each do |role_relation| 
           self.send("#{role_attribute}=", role_relation) if role_relation.kind_of?(role_class)
         end      
@@ -20,8 +20,10 @@ module RoleStrategy::Generic
         self.send(role_attribute)
       end
 
-      def roles_list     
-        [roles].flatten.map{|r| r.name }.compact
+      def roles_list
+        _roles = [roles].flatten.compact
+        return [] if _roles.empty?
+        _roles.map{|r| r.name }.compact
       end
     end
 

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

@@ -6,10 +6,11 @@ module RoleStrategy::Generic
 
     module Implementation       
       # assign roles
-      def roles=(*roles)      
-        raise "Role class #{role_class} does not have a #find_role(role) method" if !role_class.respond_to? :find_role
+      def roles=(*_roles)      
+        _roles = get_roles(_roles)
+        return nil if !_roles || _roles.empty?        
 
-        first_role = roles.flatten.first
+        first_role = _roles.flatten.first
         role_relation = role_class.find_role(first_role)
         if role_relation && role_relation.kind_of?(role_class)
           self.send("#{role_attribute}=", role_relation)

data/roles_generic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_generic}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-13}
+  s.date = %q{2010-09-23}
   s.description = %q{Generic role strategies sharing the same API. Easy to insert in any model}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -99,26 +99,26 @@ Gem::Specification.new do |s|
 
     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_development_dependency(%q<generator-spec>, ["~> 0.6.1"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<generator-spec>, ["~> 0.6.5"])
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.5"])
-      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.1.4"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.2.5"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
-      s.add_dependency(%q<generator-spec>, ["~> 0.6.1"])
-      s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
+      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.5"])
-      s.add_dependency(%q<rails3_artifactor>, ["~> 0.1.4"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.5"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
-    s.add_dependency(%q<generator-spec>, ["~> 0.6.1"])
-    s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+    s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
+    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.5"])
-    s.add_dependency(%q<rails3_artifactor>, ["~> 0.1.4"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.5"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,8 @@ dependencies:
         segments: 
         - 0
         - 6
-        - 1
-        version: 0.6.1
+        - 5
+        version: 0.6.5
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,9 +59,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -90,8 +90,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 5
-        version: 0.2.5
+        - 10
+        version: 0.2.10
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -104,9 +104,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 4
-        version: 0.1.4
+        - 2
+        - 5
+        version: 0.2.5
   type: :runtime
   version_requirements: *id006
 description: Generic role strategies sharing the same API. Easy to insert in any model