nakamura 0.12 → 0.14

data/lib/nakamura/file.rb

@@ -53,13 +53,19 @@ module SlingFile
       return @sling.execute_get(path)
     end
 
-    def manage_members(id, add_viewers, delete_viewers, add_managers, delete_managers)
+    def manage_members(id, add_viewers, delete_viewers, add_managers, delete_managers, add_editors=nil, delete_editors=nil)
       path = "#{url_for_pooled_file(id)}.members.html"
       params = {}
       params[":viewer"] ||= add_viewers
       params[":viewer@Delete"] ||= delete_viewers
       params[":manager"] ||= add_managers
       params[":manager@Delete"] ||= delete_managers
+      if add_editors != nil
+        params[":editor"] ||= add_editors
+      end
+      if delete_editors != nil
+        params[":editor@Delete"] ||= delete_editors
+      end
       return @sling.execute_post(path, params)
     end
 

data/lib/nakamura/users.rb

@@ -192,7 +192,7 @@ module SlingUsers
     def update_user(sling)
         data = {}
         if (!firstName.nil? and !lastName.nil? and !email.nil?)
-            data[":sakai:profile-import"] = "{'basic': {'access': 'everybody', 'elements': {'email': {'value': '#{email}'}, 'firstName': {'value': '#{firstName}'}, 'lastName': {'value': '#{lastName}'}}}}"
+            data[":sakai:profile-import"] = JSON.generate({'basic' => {'access' => 'everybody', 'elements' => {'email' => {'value' => email}, 'firstName' => {'value' => firstName}, 'lastName' => {'value' => lastName}}}})
             # data[":sakai:pages-template"] = "/var/templates/site/defaultuser"
         end
 
@@ -294,7 +294,7 @@ module SlingUsers
         }
 
         if (!user.firstName.nil? and !user.lastName.nil? and !user.email.nil?)
-            data[":sakai:profile-import"] = "{'basic': {'access': 'everybody', 'elements': {'email': {'value': '#{user.email}'}, 'firstName': {'value': '#{user.firstName}'}, 'lastName': {'value': '#{user.lastName}'}}}}"
+            data[":sakai:profile-import"] = JSON.generate({'basic' => {'access' => 'everybody', 'elements' => {'email' => {'value' => user.email}, 'firstName' => {'value' => user.firstName}, 'lastName' => {'value' => user.lastName}}}})
             # data[":sakai:pages-template"] = "/var/templates/site/defaultuser"
         end
 

data/lib/nakamura.rb

@@ -183,9 +183,26 @@ module SlingInterface
       return res
     end
     
-    def delete_file(path) 
+    def delete_file(path, query_params=nil)
+      if (query_params != nil)
+        param_string = query_params.collect { |k,v|
+          val = case v
+                  when String then
+                    v
+                  when Numeric then
+                    v.to_s
+                  else
+                    v.to_json
+                end
+          CGI.escape(k) + "=" + CGI.escape(val)
+        }.join("&")
+        path = "#{path}?#{param_string}"
+      end
       uri = URI.parse(path)
-      req = Net::HTTP::Delete.new(uri.path)
+      path = uri.path
+      path = path + "?" + uri.query if uri.query
+      @log.debug("DELETE: #{path} (as '#{@user.name}')")
+      req = Net::HTTP::Delete.new(path)
       res = sendRequest(uri, req)
       dump_response(res)
       return res
@@ -281,8 +298,8 @@ module SlingInterface
 
     def do_login() 
       path = url_for("/system/sling/formlogin")
-      req = Net::HTTP::Post.new(path)
       uri = URI.parse(path)
+      req = Net::HTTP::Post.new(uri.path)
       req.set_form_data({ "sakaiauth:un" => @user.name, "sakaiauth:pw" => @user.password, "sakaiauth:login" => 1 })
       res = createHttp(uri).start{ |http| http.request(req) }
       if ( res.code == "200" ) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nakamura
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.14'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-08-02 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/full_group_creator.rb
-- lib/nakamura/users.rb
 - lib/nakamura/contacts.rb
+- lib/nakamura/file.rb
+- lib/nakamura/full_group_creator.rb
 - lib/nakamura/message.rb
 - lib/nakamura/osgiconf.rb
 - lib/nakamura/search.rb
-- lib/nakamura/file.rb
+- lib/nakamura/test.rb
+- lib/nakamura/users.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.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby library for interacting with Sakai Nakamura.