aegis 1.1.6 → 1.1.7

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/aegis.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{aegis}
-  s.version = "1.1.6"
+  s.version = "1.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2009-11-11}
+  s.date = %q{2010-02-24}
   s.description = %q{Aegis is a role-based permission system, where all users are given a role. It is possible to define detailed and complex permissions for each role very easily.}
   s.email = %q{github@makandra.de}
   s.extra_rdoc_files = [
@@ -105,3 +105,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/aegis/has_role.rb

@@ -3,7 +3,7 @@ module Aegis
   
     def validates_role_name(options = {})
       validates_each :role_name do |record, attr, value|
-        options[:message] ||= ActiveRecord::Errors.default_error_messages[:inclusion]
+        options[:message] ||= I18n.translate('activerecord.errors.messages.inclusion')
         role = ::Permissions.find_role_by_name(value)
         record.errors.add attr, options[:message] if role.nil?
       end
@@ -96,8 +96,8 @@ module Aegis
         alias_method_chain :respond_to?, :aegis_permissions
         
         def set_default_aegis_role_name
-          if new_record?
-            self.aegis_role_name ||= self.class.aegis_default_role_name
+          if new_record? && self.aegis_role_name.blank?
+            self.aegis_role_name = self.class.aegis_default_role_name
           end
         end
         

data/test/has_role_options_test.rb

@@ -44,6 +44,10 @@ class HasRoleOptionsTest < ActiveSupport::TestCase
     should "create new instances with that role" do
       assert_equal :admin, TrustFundKid.new.role.name
     end
+    
+    should "set that role if the initial role name is blank" do
+      assert_equal :admin, TrustFundKid.new(:role_name => "").role.name
+    end
   
     should "ignore the default if another role is given" do
       assert_equal :student, TrustFundKid.new(:role_name => "student").role.name

data/test/validation_test.rb

@@ -44,6 +44,12 @@ class ValidationTest < ActiveSupport::TestCase
       
     end
     
+    should "use add the default inclusion error message on role_name" do
+      @user.role_name = ""
+      @user.valid?
+      assert_equal I18n.translate('activerecord.errors.messages.inclusion'), @user.errors.on(:role_name)
+    end
+    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aegis
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors: 
 - Henning Koch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 +01:00
+date: 2010-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: []