ixtlan 0.4.2 → 0.4.3

data/lib/ixtlan/models/user.rb

@@ -144,7 +144,7 @@ module Ixtlan
 
         model.property :id, ::DataMapper::Types::Serial, :field => "uidnumber"
 
-        model.property :login, String, :required => true, :field => "uid", :length => 4..32, :unique_index => true, :format => /^[a-zA-Z0-9]*$/, :writer => :private
+        model.property :login, String, :required => true, :field => "uid", :length => 4..32, :unique_index => true, :format => /^[a-zA-Z0-9._-]*$/, :writer => :private
 
         model.property :name, String, :required => true, :format => /^[^<">]*$/, :length => 2..64, :field => "cn"
 

data/lib/ixtlan/version.rb

@@ -1,3 +1,3 @@
 module Ixtlan
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

data/spec/user_spec.rb

@@ -98,7 +98,7 @@ describe Ixtlan::Models::User do
 
   describe 'user_admin and locales/domains_admin' do
     before(:each) do
-      @admin = User.create(:login => 'admin_user', :email => 'admin_user@example.com', :name => 'admin', :current_user => @root)
+      @admin = User.first(:login => 'admin_user') || User.create(:login => 'admin_user', :email => 'admin_user@example.com', :name => 'admin', :current_user => @root)
       @admin.groups << @users
       @admin.groups << @locales
       @admin.groups << @domains
@@ -112,7 +112,7 @@ describe Ixtlan::Models::User do
     end
 
     it 'should be able to create an user' do
-      u = User.new(:login => 'user', :email => 'user@example.com', :name => 'user', :current_user => @admin)
+      u = User.new(:login => 'user1', :email => 'user1@example.com', :name => 'user', :current_user => @admin)
       u.update_all_children(@groups)
       u.save
 
@@ -127,7 +127,7 @@ describe Ixtlan::Models::User do
     end
 
     it 'should be able to create an user but ignore disallowed group root' do
-      u = User.new(:login => 'user', :email => 'user@example.com', :name => 'user', :current_user => @admin)
+      u = User.new(:login => 'user2', :email => 'user2@example.com', :name => 'user', :current_user => @admin)
 
       groups = @groups.dup
       groups[:group] << { :id => @root_group.id.to_s }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 4
-    - 2
-  version: 0.4.2
+    - 3
+  version: 0.4.3
 platform: ruby
 authors: 
   - mkristian
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +05:30
+date: 2011-02-13 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency