nakamura 0.5 → 0.6

data/lib/nakamura.rb

@@ -53,9 +53,9 @@ module Net::HTTPHeader
   
   def encode_kvpair(k, vs)
     if vs.nil? or vs == '' then
-      "#{urlencode(k)}="
+      "#{CGI::escape(k)}="
     else
-      Array(vs).map {|v| "#{urlencode(k)}=#{urlencode(v.to_s)}" }
+      Array(vs).map {|v| "#{CGI::escape(k)}=#{CGI::escape(v.to_s)}" }
     end
   end
 end
@@ -88,6 +88,9 @@ module SlingInterface
     
     def initialize(server="http://localhost:8080/", trustedauth=false)
       @server = server
+      if not @server.end_with? '/'
+        @server += '/'
+      end
       @serveruri = URI.parse(server)
       @user = SlingUsers::User.admin_user()
       @trustedauth = trustedauth
@@ -284,10 +287,10 @@ module SlingInterface
       res = createHttp(uri).start{ |http| http.request(req) }
       if ( res.code == "200" ) 
         save_cookies(res)
-	@log.info("Login Ok, cookie was  {#@cookies}")
+        @log.info("Login Ok, cookie was  {#@cookies}")
         @loggedin = true
       else
-	@log.info("Failed to perform login, got "+res.code+" response code")
+        @log.info("Failed to perform login, got "+res.code+" response code")
       end
     end
     

data/lib/nakamura/contacts.rb

@@ -74,7 +74,7 @@ module SlingContacts
    end
 
 		def find_contacts(state)
-			result = @sling.execute_get(@sling.url_for("var/contacts/findstate?state=#{state}"))
+			result = @sling.execute_get(@sling.url_for("var/contacts/findstate.json?state=#{state}"))
     	return JSON.parse(result.body)
 		end
     

data/lib/nakamura/full_group_creator.rb

@@ -22,9 +22,7 @@ module SlingUsers
 
     def initialize(sling, file_log = nil)
       @sling = sling
-      @sling.log.level = Logger::INFO
       super sling
-      @log.level = Logger::INFO
       @file_log = file_log
     end
 
@@ -55,7 +53,7 @@ module SlingUsers
         }]
       })}
 
-      result = @sling.execute_post(@sling.url_for($GROUP_URI), params)
+      result = @sling.execute_post(@sling.url_for($GROUP_WORLD_URI), params)
       if (result.code.to_i > 299)
         @log.error result.body
         return nil

data/lib/nakamura/search.rb

@@ -10,10 +10,6 @@ module SlingSearch
       @sling = sling
     end
 
-    def search_for(string)
-      return json_search("content", "q" => string)
-    end
-
     def create_search_template(name, language, template)
       return @sling.create_node("#{$SEARCH}#{name}", "sakai:query-language" => language, "sakai:query-template" => template, "sling:resourceType" => "sakai/search") 
     end
@@ -30,9 +26,14 @@ module SlingSearch
       return json_search("sites", "q" => sitepropertyvalue)
     end
     
+    def search_for_file(query)
+      return json_search('files/allfiles.json', 'q' => query)
+    end
+
     private
     def json_search(template, params)
-      return JSON.parse(@sling.execute_get(@sling.url_for($SEARCH + template) + ".json?" + params.collect{|k,v| URI.escape(k) + "=" + URI.escape(v)}.join("&")).body)
+      url = @sling.url_for($SEARCH + template) + ".json?" + params.collect{|k,v| URI.escape(k) + "=" + URI.escape(v)}.join("&")
+      return JSON.parse(@sling.execute_get(url).body)
     end
   end
 

data/lib/nakamura/test.rb

@@ -18,6 +18,8 @@ module SlingTest
     @s = SlingInterface::Sling.new()
     @um = SlingUsers::UserManager.new(@s)
     @search = SlingSearch::SearchManager.new(@s)
+    @fm = SlingFile::FileManager.new(@s)
+
     @created_nodes = []
     @created_users = []
     @created_groups = []
@@ -28,11 +30,11 @@ module SlingTest
 
   def teardown
     if ( @delete ) then
-		@s.switch_user(SlingUsers::User.admin_user)
-		@created_nodes.reverse.each { |n| @s.delete_node(n) }
-		@created_groups.each { |g| @um.delete_group(g) }
-		@created_users.each { |u| @um.delete_user(u.name) }
-	end
+      @s.switch_user(SlingUsers::User.admin_user)
+      @created_nodes.reverse.each { |n| @s.delete_node(n) }
+      @created_groups.each { |g| @um.delete_group(g) }
+      @created_users.each { |u| @um.delete_user(u.name) }
+    end
   end
 
   def create_node(path, props={})
@@ -49,6 +51,19 @@ module SlingTest
     return res
   end
 
+  def create_pooled_content(filename, content, props={})
+    res = @fm.upload_pooled_file(filename,{},'text/plain')
+    assert_not_nil(res)
+    assert_equal(true, res.code.to_i >= 200 && res.code.to_i < 300, "Expected to be able to create node #{res.body}")
+    json = JSON.parse(res.body)
+    assert_not_nil(json[filename])
+    assert_not_nil(json[filename]['poolId'])
+
+    path = "/p/#{json[filename]['poolId']}"
+    @created_nodes << path unless @created_nodes.include?(path)
+    return path
+  end
+
   def create_user(username, firstname = nil, lastname = nil)
     u = @um.create_user(username, firstname, lastname)
     assert_not_nil(u, "Expected user to be created: #{username}")

data/lib/nakamura/users.rb

@@ -4,7 +4,8 @@ require 'digest/sha1'
 require 'logger'
 
 $USERMANAGER_URI="system/userManager/"
-$GROUP_URI="system/world/create"
+$GROUP_URI="#{$USERMANAGER_URI}group.create.html"
+$GROUP_WORLD_URI="system/world/create"
 $USER_URI="#{$USERMANAGER_URI}user.create.html"
 $DEFAULT_PASSWORD="testuser"
 
@@ -351,7 +352,7 @@ module SlingUsers
           "creator" => "true"
         }]
       })}
-      result = @sling.execute_post(@sling.url_for($GROUP_URI), params)
+      result = @sling.execute_post(@sling.url_for($GROUP_WORLD_URI), params)
       if (result.code.to_i > 299)
         @log.error(result.body)
         return nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nakamura
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies: []
 description: Ruby library for interacting with Sakai Nakamura. Provides convenience
   methods for adding users and groups and other similar tasks.
@@ -18,14 +18,14 @@ 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/search.rb
-- lib/nakamura/test.rb
-- lib/nakamura/users.rb
+- lib/nakamura/file.rb
 - lib/nakamura.rb
 homepage: http://sakaiproject.org
 licenses: []