roles_active_record 0.2.1 → 0.2.2

data/Rakefile

@@ -7,16 +7,16 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/roles_for_dm"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", "~> 2.0.0" 
+    gem.add_development_dependency "rspec", "~> 2.0.0.beta.22" 
     gem.add_development_dependency 'database_cleaner', '~> 0.5.2'
-    gem.add_development_dependency "generator-spec",  '~> 0.6.1'
+    gem.add_development_dependency "generator-spec",  '~> 0.6.5'
 
     gem.add_dependency "activerecord",    "~> 3.0.0"
     gem.add_dependency "activesupport",   "~> 3.0.0"
     gem.add_dependency "arel",            "~> 1.0.0"    
     gem.add_dependency "meta_where",      "~> 0.9.3"
-    gem.add_dependency "sugar-high",      "~> 0.2.5"
-    gem.add_dependency "require_all",     '~> 1.1.0' 
+    gem.add_dependency "sugar-high",      "~> 0.2.11"
+    gem.add_dependency "require_all",     '~> 1.2.0' 
     gem.add_dependency "roles_generic",   '~> 0.2.5'            
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

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

@@ -38,16 +38,20 @@ module RoleStrategy::ActiveRecord
       end 
       
       # 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.none?
+
+        role_relations = role_class.find_roles(_roles) 
         self.send("#{role_attribute}=", role_relations)
         save
       end
 
-      def add_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 add_roles(*_roles)  
+        _roles = get_roles(_roles)
+        return nil if _roles.none?                
+
+        role_relations = role_class.find_roles(_roles)
         puts "role_relations: #{role_relations.inspect}"
         self.send(role_attribute) << role_relations
         save

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

@@ -27,10 +27,11 @@ module RoleStrategy::ActiveRecord
 
     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
-        first_role = roles.flatten.first
-        role_relation = role_class.find_role(first_role) 
+      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)
       end
       alias_method :role=, :roles=

data/roles_active_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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{Makes it easy to set a role strategy on your User model in Active Record}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -133,38 +133,38 @@ 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"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_development_dependency(%q<database_cleaner>, ["~> 0.5.2"])
-      s.add_development_dependency(%q<generator-spec>, ["~> 0.6.1"])
+      s.add_development_dependency(%q<generator-spec>, ["~> 0.6.5"])
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<arel>, ["~> 1.0.0"])
       s.add_runtime_dependency(%q<meta_where>, ["~> 0.9.3"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.5"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.11"])
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<roles_generic>, ["~> 0.2.5"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_dependency(%q<database_cleaner>, ["~> 0.5.2"])
-      s.add_dependency(%q<generator-spec>, ["~> 0.6.1"])
+      s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
       s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_dependency(%q<arel>, ["~> 1.0.0"])
       s.add_dependency(%q<meta_where>, ["~> 0.9.3"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.5"])
-      s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
+      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<roles_generic>, ["~> 0.2.5"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
     s.add_dependency(%q<database_cleaner>, ["~> 0.5.2"])
-    s.add_dependency(%q<generator-spec>, ["~> 0.6.1"])
+    s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
     s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
     s.add_dependency(%q<arel>, ["~> 1.0.0"])
     s.add_dependency(%q<meta_where>, ["~> 0.9.3"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.5"])
-    s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
+    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<roles_generic>, ["~> 0.2.5"])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 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 
@@ -29,7 +29,9 @@ dependencies:
         - 2
         - 0
         - 0
-        version: 2.0.0
+        - beta
+        - 22
+        version: 2.0.0.beta.22
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -58,8 +60,8 @@ dependencies:
         segments: 
         - 0
         - 6
-        - 1
-        version: 0.6.1
+        - 5
+        version: 0.6.5
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -133,8 +135,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 5
-        version: 0.2.5
+        - 11
+        version: 0.2.11
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -147,9 +149,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency