roles_for_mongoid 0.2.1 → 0.2.2

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/Gemfile

@@ -0,0 +1,15 @@
+source :rubygems
+source 'http://gems.github.com/'
+
+group :default do
+  gem "mongoid",           '~> 2.0.0.beta.18'
+  gem 'bson',              '~> 1.0.7'
+  gem "activesupport",     '~> 3.0.0'
+  gem "require_all",       '~> 1.2.0' 
+  gem "sugar-high",        '~> 0.2.10'        
+  gem "roles_generic",     '~> 0.2.6'        
+end
+
+group :test do
+  gem "rspec", '~> 2.0.0.beta.22'
+end

data/README.markdown

@@ -20,12 +20,30 @@ It also implements the following Role strategies:
 
 ## Rails generator
 
-Might work but needs testing ;)
+The library comes with a Rails 3 generator that lets you populate a user model with a role strategy of your choice. 
 
-Example:
+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.
 
-<code>$ rails g mongoid:roles User --strategy admin_flag --roles admin guest</code>
+* admin_flag
+* many_roles
+* one_role
+* roles_mask
+* role_string
+* role_strings
+
+*Roles generator*
+
+Apply :admin_flag Role strategy to User model using default roles :admin and :guest (default)
+
+<code>$ rails g mongoid:roles User --strategy admin_flag</code>
+
+Apply :admin_flag Role strategy to User model using default roles and extra role :author
+
+<code>$ rails g mongoid: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 mongoid: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,13 +7,14 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/roles_for_mm"
     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 "mongoid",           '~> 2.0.0.beta.17'
+    gem.add_dependency "mongoid",           '~> 2.0.0.beta.18'
+    gem.add_dependency 'bson',              '~> 1.0.7'
     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 "require_all",       '~> 1.2.0' 
+    gem.add_dependency "sugar-high",        '~> 0.2.10'        
+    gem.add_dependency "roles_generic",     '~> 0.2.7'        
 
   end
   Jeweler::GemcutterTasks.new

data/VERSION

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

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

@@ -34,9 +34,11 @@ module RoleStrategy::Mongoid
       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 || _roles.empty?
+        
+        role_relations = role_class.find_roles(_roles) 
         self.send("#{role_attribute}=", role_relations)
         save
       end

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

@@ -30,9 +30,11 @@ module RoleStrategy::Mongoid
 
     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
+      def roles=(*_roles) 
+        _roles = get_roles(_roles)
+        return nil if !_roles || _roles.empty?
+                
+        first_role = _roles.flatten.first
         role_relation = role_class.find_role(first_role)  
         self.send("#{role_attribute}=", role_relation)
         one_role.save
@@ -41,8 +43,8 @@ module RoleStrategy::Mongoid
       
       # 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

data/lib/roles_mongoid.rb

@@ -2,6 +2,7 @@ require 'roles_generic'
 require 'require_all'    
 require 'set'
 require 'sugar-high/array'
+require 'sugar-high/kind_of'
 require 'mongoid'
 require 'bson'
 require 'roles_mongoid/namespaces'

data/roles_for_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_for_mongoid}
-  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-11}
+  s.date = %q{2010-09-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 = [
@@ -17,9 +17,11 @@ Gem::Specification.new do |s|
      "README.markdown"
   ]
   s.files = [
-    ".document",
+    ".bundle/config",
+     ".document",
      ".gitignore",
      ".rspec",
+     "Gemfile",
      "LICENSE",
      "README.markdown",
      "Rakefile",
@@ -74,27 +76,30 @@ 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_runtime_dependency(%q<mongoid>, ["~> 2.0.0.beta.17"])
+      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_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.10"])
+      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<mongoid>, ["~> 2.0.0.beta.17"])
+      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<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.10"])
+      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<mongoid>, ["~> 2.0.0.beta.17"])
+    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<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.10"])
+    s.add_dependency(%q<roles_generic>, ["~> 0.2.7"])
   end
 end
 

data/spec/roles_mongoid/one_role_spec.rb

@@ -27,7 +27,7 @@ describe "Roles for Mongoid" do
       @user.save     
 
       @admin_user = User.create(:name => 'Admin user')
-      @admin_user.role = :admin            
+      @admin_user.role = Role.where(:name => :admin).to_a.first
       @admin_user.save
     end
     

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require 'rspec/autorun'
+require 'rspec/core'
 require 'mongoid'
 require 'roles_mongoid'
                  

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-11 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         - 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 
@@ -47,14 +47,29 @@ dependencies:
         - 0
         - 0
         - beta
-        - 17
-        version: 2.0.0.beta.17
+        - 18
+        version: 2.0.0.beta.18
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: bson
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 7
+        version: 1.0.7
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,26 +80,26 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: require_all
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sugar-high
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,14 +107,14 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 10
+        version: 0.2.10
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: roles_generic
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,10 +122,10 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 2
-        version: 0.2.2
+        - 7
+        version: 0.2.7
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 description: Makes it easy to set a role strategy on your User model in Mongoid
 email: kmandrup@gmail.com
 executables: []
@@ -121,9 +136,11 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- .bundle/config
 - .document
 - .gitignore
 - .rspec
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile