nakamura 0.14 → 0.15

data/lib/nakamura/test.rb

@@ -64,8 +64,18 @@ module SlingTest
     return path
   end
 
-  def create_user(username, firstname = nil, lastname = nil)
-    u = @um.create_user(username, firstname, lastname)
+  def create_user(username, firstname = nil, lastname = nil, email = nil)
+    if firstname.nil?
+      firstname = "first-#{username}"
+    end
+    if lastname.nil?
+      lastname = "last-#{username}"
+    end
+    if email.nil?
+      email = "#{username}@sakai.invalid"
+    end
+
+    u = @um.create_user(username, firstname, lastname, email)
     assert_not_nil(u, "Expected user to be created: #{username}")
     @created_users << u
     return u

data/lib/nakamura/users.rb

@@ -308,6 +308,8 @@ module SlingUsers
 
         if (!user.email.nil?)
             data["email"] = user.email
+        else
+            data["email"] = "#{user.firstName}@sakai.invalid"
         end
 
         result = @sling.execute_post(@sling.url_for("#{$USER_URI}"), data)
@@ -318,14 +320,15 @@ module SlingUsers
         return user
     end
 
-    def create_user(username, firstname = nil, lastname = nil)
+    def create_user(username, firstname = nil, lastname = nil, email = nil)
       @log.info "Creating user: #{username}"
       user = User.new(username)
       user.firstName = firstname
       user.lastName = lastname
+      user.email = email
 
-      if (!user.firstName.nil? and !user.lastName.nil? and user.email.nil?)
-         user.email = "#{username}@sakai.invalid"
+      if user.email.nil?
+          user.email = "#{username}@sakai.invalid"
       end
 
       return create_user_object(user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nakamura
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.15'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -34,15 +34,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/nakamura/test.rb
 - lib/nakamura/authz.rb
-- lib/nakamura/contacts.rb
-- lib/nakamura/file.rb
 - lib/nakamura/full_group_creator.rb
+- lib/nakamura/users.rb
+- lib/nakamura/contacts.rb
 - lib/nakamura/message.rb
 - lib/nakamura/osgiconf.rb
 - lib/nakamura/search.rb
-- lib/nakamura/test.rb
-- lib/nakamura/users.rb
+- lib/nakamura/file.rb
 - lib/nakamura.rb
 homepage: http://sakaiproject.org
 licenses: []
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Ruby library for interacting with Sakai Nakamura.