roles_active_record 0.4.8 → 0.4.9

data/Changelog.textile

@@ -1,6 +1,12 @@
 h1. Changelog
 
-h2. V. 0.4.6.5
+h2. May 9, 2011
+
+*version 0.4.9*
+
+- Added #default_role and #default_role instance methods and #default_role and #default_role= class methods.
+- The #default_role class method attempts to set the default role of the class to an available role that matches the class name, or the class name with User at the end removed (fx GuestUser becomes :guest). 
+
+
 
-* Feb 9/2011 - merged johanlunds/master to support Rubygems 1.5 and resolve dependencies
 

data/README.textile

@@ -50,9 +50,16 @@ h3. Strategy: admin_flag
     
   strategy :admin_flag, :default
   valid_roles_are :admin, :guest
+  
+  def initialize attributes = {}
+    super
+    add_role default_role
+  end  
 end
 </pre>
 
+Here the initializer initially sets the role of the user tothe default_role, which is the available role matching the class name (or nil in case no match)
+
 h3. Strategy: one_role
 
 For strategies that use a separate Role model you must call the class method #role_class with the name of the role class

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/roles_active_record/base.rb

@@ -10,10 +10,28 @@ module Roles::ActiveRecord
   def self.included(base) 
     base.extend Roles::Base
     base.extend ClassMethods
+    base.send :include, InstanceMethods
     base.orm_name = :active_record
   end
 
+  module InstanceMethods
+    def default_role?
+      has_role?(default_role)
+    end
+
+    def default_role
+      self.class.default_role
+    end
+  end
+
   module ClassMethods      
+    def default_role
+      self.to_s.gsub(/(.+)User$/, '\1').underscore.to_sym
+    end 
+
+    def default_role= drole
+      @default_role = drole
+    end 
 
     def valid_single_strategies
       [:admin_flag, :one_role, :role_string]

data/lib/roles_active_record/role.rb

@@ -10,7 +10,7 @@ module Roles::Base
         end
       end
     end
-  end  
+  end
 end
 
 module RoleClass

data/lib/roles_active_record/strategy/shared.rb

@@ -1,6 +1,6 @@
 module Roles::ActiveRecord
   module Strategy
-    module Shared
+    module Shared                  
       def set_role role
         update_attributes(role_attribute => new_role(role))
       end

data/lib/roles_active_record/strategy/single.rb

@@ -9,7 +9,8 @@ end
 module Roles::ActiveRecord
   module Strategy
     module Single
-      include Shared            
+      include Shared
+      
       # assigns first valid role from list of roles
       def add_roles *role_names
         new_roles = select_valid_roles(role_names) 

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

@@ -28,6 +28,7 @@ module RoleStrategy::ActiveRecord
       def set_role role 
         # set_empty_role
         role = role.first if role.kind_of? Array
+        # puts "set_role: #{role.inspect}"        
         self.send("#{role_attribute}=", role)
         # role.users << self
       end

data/roles_active_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-05-08}
+  s.date = %q{2011-05-09}
   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 = [

data/spec/fixtures/many_roles_setup.rb

@@ -3,4 +3,10 @@ class User < ActiveRecord::Base
   
   strategy :many_roles
   valid_roles_are :admin, :guest, :user
+  
+  def initialize attributes = {}
+    super
+#    role = default_role
+    add_role default_role
+  end  
 end

data/spec/fixtures/one_role_setup.rb

@@ -3,4 +3,10 @@ class User < ActiveRecord::Base
   
   strategy :one_role
   valid_roles_are :admin, :guest, :user
+  
+  def initialize attributes = {}
+    super
+#    role = default_role
+    add_role default_role
+  end
 end

data/spec/roles_active_record/strategy/api.rb

@@ -24,7 +24,6 @@ describe 'Roles Generic API' do
     end
   end
 
-
   # it "should be true that a User that includes Roles::Generic has a complete Roles::Generic interface" do
   #   # mutation API
   #   [:roles=, :role=, :add_roles, :add_role, :remove_role, :remove_roles, :exchange_roles, :exchange_role].each do |api_method|

data/spec/roles_active_record/strategy/api_examples.rb

@@ -47,6 +47,29 @@ describe "Roles for Active Record: #{api_name}" do
       @admin_user.class.respond_to?(class_api_method).should be_true
     end
   end 
+
+  describe '#default_role' do
+    it "should be true that the default user role is empty when no valid role matches class name in lowercase (no :user)" do      
+      @default_user.class.default_role.should == :user      
+      @default_user.default_role.should == :user
+      @default_user.has_role?(:user).should be_true
+    end
+  
+    it "should be true that the User class has a valid role of :guest" do      
+      @default_user.valid_role?(:user).should be_true
+    end
+  end
+
+  describe '#default_role?' do
+    it "should be true that the default User has a role that is the default role" do      
+      @default_user.default_role?.should be_true
+    end
+
+    it "should not be that after changing the role it is still the default role" do
+      @default_user.role = :admin
+      @default_user.default_role?.should be_false
+    end  
+  end 
   
   describe '#valid_role?' do
     it "should be true that the admin user has a valid role of :guest" do      
@@ -197,7 +220,7 @@ describe "Roles for Active Record: #{api_name}" do
       u.role = :admin
       u.has_role?(:admin).should be_true
     end    
-
+  
     context 'the guest user' do
       it "should be valid after setting the role" do
         @guest_user.should be_valid
@@ -232,7 +255,7 @@ describe "Roles for Active Record: #{api_name}" do
       end
     end    
   end 
-
+  
   describe '#add_role' do
     it "should add user role :admin and :guest using #add_roles" do
       @empty_user.add_role :admin
@@ -249,7 +272,7 @@ describe "Roles for Active Record: #{api_name}" do
       end
     end        
   end 
-
+  
   describe '#add_roles' do
     it "should add user role :admin and :guest using #add_roles" do      
       if @empty_user.class.role_strategy.multiplicity == :multi

data/spec/roles_active_record/strategy/user_setup.rb

@@ -13,6 +13,8 @@ def default_user_setup
   @admin_user = User.create(:name => 'Admin user')
   @admin_user.roles = :admin            
   @admin_user.save
-  
+
+  @default_user = User.create(:name => 'def User')
+  @default_user.save
   # puts "Admin roles: #{@admin_user.roles_list}, #{@admin_user.inspect}, #{Role.all}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roles_active_record
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-08 00:00:00.000000000Z
+date: 2011-05-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2156655440 !ruby/object:Gem::Requirement
+  requirement: &2157347720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2156655440
+  version_requirements: *2157347720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156654800 !ruby/object:Gem::Requirement
+  requirement: &2157346800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.1
   type: :development
   prerelease: false
-  version_requirements: *2156654800
+  version_requirements: *2157346800
 - !ruby/object:Gem::Dependency
   name: generator-spec
-  requirement: &2156654120 !ruby/object:Gem::Requirement
+  requirement: &2157346080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2156654120
+  version_requirements: *2157346080
 - !ruby/object:Gem::Dependency
   name: migration_assist
-  requirement: &2156653540 !ruby/object:Gem::Requirement
+  requirement: &2157345380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *2156653540
+  version_requirements: *2157345380
 - !ruby/object:Gem::Dependency
   name: roles_generic
-  requirement: &2156652700 !ruby/object:Gem::Requirement
+  requirement: &2157344520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *2156652700
+  version_requirements: *2157344520
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2156652100 !ruby/object:Gem::Requirement
+  requirement: &2157343880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156652100
+  version_requirements: *2157343880
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2156651460 !ruby/object:Gem::Requirement
+  requirement: &2157343260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156651460
+  version_requirements: *2157343260
 - !ruby/object:Gem::Dependency
   name: meta_where
-  requirement: &2156650660 !ruby/object:Gem::Requirement
+  requirement: &2157342640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156650660
+  version_requirements: *2157342640
 description: Makes it easy to set a role strategy on your User model in Active Record
 email: kmandrup@gmail.com
 executables: []