roles_data_mapper 0.1.0 → 0.1.1

data/README.markdown

@@ -27,23 +27,29 @@ This gem is based on Jeweler, so simply:
 
 ## Rails generator
 
-_Note_:
-
-*The Rails generator is a bit "rusty" and hasn't been tested with the latest changes. I hope to update it soon.*
-
 The library comes with a Rails 3 generator that lets you populate a user model with a given role strategy 
 The following role strategies are included by default. Add your own by adding extra files inside the strategy folder, one file for each role strategy is recommended.
 
 * admin_flag
-* inline_role
-* inline_roles
-* role_relations
-* role_mask
+* many_roles
+* one_role
+* roles_mask
+* role_string
 
-Example:
+*Roles generator*
+
+Apply :admin_flag Role strategy to User model using default roles :admin and :guest (default)
 
 <code>$ rails g data_mapper:roles User --strategy admin_flag</code>
 
+Apply :admin_flag Role strategy to User model using default roles and extra role :author
+
+<code>$ rails g data_mapper:roles_migration User --strategy admin_flag --roles author</code>
+
+Apply :one_role Role strategy to User model without default roles, only with roles :user, :special and :editor
+
+<code>$ rails g data_mapper:roles_migration User --strategy one_role --roles user special editor --no-default-roles</code>
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

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.beta.19"
+    gem.add_development_dependency "rspec", "~> 2.0.0.beta.22"
 
     gem.add_dependency "dm-core",       "~> 1.0"
     gem.add_dependency "dm-types",      "~> 1.0"
     gem.add_dependency "dm-migrations", "~> 1.0"
 
-    gem.add_dependency "activesupport",    "~> 3.0.0"
-    gem.add_dependency "require_all",       '~> 1.1.0' 
-    gem.add_dependency "sugar-high",        '~> 0.2.3'
-    gem.add_dependency "roles_generic",     '~> 0.2.2'
+    gem.add_dependency "activesupport",     "~> 3.0.0"
+    gem.add_dependency "require_all",       '~> 1.2.0' 
+    gem.add_dependency "sugar-high",        '~> 0.2.11'
+    gem.add_dependency "roles_generic",     '~> 0.2.7'
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

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

@@ -53,9 +53,11 @@ module RoleStrategy::DataMapper
       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)
         self.save
       end

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

@@ -36,10 +36,11 @@ module RoleStrategy::DataMapper
 
     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)      
+        return nil if _roles.none?
+        _roles = get_roles(_roles)        
+
+        role_relation = role_class.find_role(_roles.first)  
         self.send("#{role_attribute}=", role_relation)
         save
       end
@@ -47,13 +48,10 @@ module RoleStrategy::DataMapper
       
       # query assigned roles
       def roles
-        role = self.send(role_attribute).name.to_sym
-        [role]
+        role = self.send(role_attribute)
+        role ? [role.name.to_sym] : []        
       end
-      
-      def roles_list
-        self.roles.to_a
-      end      
+      alias_method :roles_list, :roles
     end
 
     extend Roles::Generic::User::Configuration

data/roles_data_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_data_mapper}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-12}
+  s.date = %q{2010-09-23}
   s.description = %q{Makes it easy to set a role strategy on your User model in DataMapper}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -67,33 +67,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.19"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_runtime_dependency(%q<dm-core>, ["~> 1.0"])
       s.add_runtime_dependency(%q<dm-types>, ["~> 1.0"])
       s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.3"])
-      s.add_runtime_dependency(%q<roles_generic>, ["~> 0.2.2"])
+      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"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_dependency(%q<dm-core>, ["~> 1.0"])
       s.add_dependency(%q<dm-types>, ["~> 1.0"])
       s.add_dependency(%q<dm-migrations>, ["~> 1.0"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_dependency(%q<require_all>, ["~> 1.1.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.3"])
-      s.add_dependency(%q<roles_generic>, ["~> 0.2.2"])
+      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"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
     s.add_dependency(%q<dm-core>, ["~> 1.0"])
     s.add_dependency(%q<dm-types>, ["~> 1.0"])
     s.add_dependency(%q<dm-migrations>, ["~> 1.0"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-    s.add_dependency(%q<require_all>, ["~> 1.1.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.3"])
-    s.add_dependency(%q<roles_generic>, ["~> 0.2.2"])
+    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"])
   end
 end
 

data/spec/generator_spec_helper.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require 'rspec/autorun'     
+require 'rspec/core'
 require 'rails3_artifactor'
 require 'generator-spec'
 require 'roles_generic'

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require 'rspec/autorun'
+require 'rspec/core'
 require 'dm-core'
 require 'dm-types'
 require 'dm-migrations'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,15 +23,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 19
-        version: 2.0.0.beta.19
+        - 22
+        version: 2.0.0.beta.22
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -101,9 +101,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -117,8 +117,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 11
+        version: 0.2.11
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -132,8 +132,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 2
-        version: 0.2.2
+        - 7
+        version: 0.2.7
   type: :runtime
   version_requirements: *id008
 description: Makes it easy to set a role strategy on your User model in DataMapper