adobeshare 0.0.2 → 0.0.3

data/Manifest.txt

@@ -7,6 +7,7 @@ lib/adobeshare.rb
 lib/adobeshare/version.rb
 lib/adobeshare/client.rb
 lib/adobeshare/node.rb
+lib/adobeshare/http.rb
 examples/sample.rb
 examples/config.yaml.sample
 setup.rb

data/README.txt

@@ -1,6 +1,6 @@
-= AdobeShare::Client -- Adobe Share API for Ruby
+= Adobe Share API for Ruby
 
-AdobeShare::Client is a library for upload and download documents using REST APIs for Adobe Share.
+a Ruby library for "Adobe Share" using REST Web Service APIs.
 
 * http://labs.adobe.com/technologies/share/ 
 * http://labs.adobe.com/wiki/index.php/Share:API
@@ -10,8 +10,9 @@ AdobeShare::Client is a library for upload and download documents using REST API
 === Create client class
 
   client = AdobeShare::Client.new
+  
     if you want to access via proxy,
-    add proxy param Adobe::Client.new "http://your.proxy.server:8080/"
+      add proxy param. client = Adobe::Client.new("http://your.proxy.server:8080/")
   
 === Set credentials
 
@@ -28,33 +29,28 @@ AdobeShare::Client is a library for upload and download documents using REST API
 
 ==== Upload
 
-  client.add_file `binary obj`, "test.pdf", "This is Test File"
+  client.add_file(binary_obj, "test.pdf", "This is a Test File")
 
 ==== Download
 
-  client.get_source `nodeid`
+  binary_obj = client.get_source(nodeid)
 
 ==== Delete
 
-  client.delete_node `nodeid`
+  client.delete_node(nodeid)
 
     
-  # `nodeid` is the same as `docid` in the Flash web interface.
-  # `nodeid` indicates both the documents and the folders. Maybe. 
-    
 === Logout
   client.logout
 
+  # `nodeid` is the same as `docid` in the Flash web interface.
+  # `nodeid` indicates both the documents and the folders. Maybe. 
+
 For details, please see examples/sample.rb
   
 == TODO
 
-* Test::Unit !!!
-
-and, these APIs are not implemented.
-* Moving or renaming a file or folder
-* Sharing a file
-* Adding or removing recipients from a share
+* Test::Unit or RSpec ???
 
 == Requirements
 
@@ -67,4 +63,4 @@ and, these APIs are not implemented.
 
 == Author
 
-* KATO Hideyuki <hideyuki at kato dot jp>
+* KATO Hideyuki <hkato at rubyforge.org>

data/lib/adobeshare/client.rb

@@ -3,7 +3,6 @@
 #
 # Copyright (c) KATO Hideyuki, 2007. All rights reserved.
 #
-require 'http-access2'
 require 'rexml/document'
 
 include REXML
@@ -36,7 +35,7 @@ module AdobeShare
     
     #
     def initialize proxy=nil
-      @client = HTTPAccess2::Client.new(proxy)
+      @client = HTTPClient.new(proxy, UA)
     end
     
     # Login to use Adobe Share service
@@ -120,29 +119,23 @@ module AdobeShare
       res = http_client_request("POST", uri, req, headers)
     end
     
-    private
-    
-    # TODO this method is not tested
     # Rename a node
     def rename_node(nodeid, newname)
       uri = ENDPOINT_DC + nodeid + "/?newname=" + newname
       res = http_client_request("MOVE", uri)
     end
     
-    # TODO this method is not tested
     # Move a node
     def move_node(nodeid, destnodeid, newname)
       uri = ENDPOINT_DC + nodeid + "/?destnodeid=" + destnodeid + "&newname=" + URI.encode(newname)
       res = http_client_request("MOVE", uri)
     end
     
-    # TODO this method is not tested
     # Replace file in an already existing node
-    def replace_file(file_name, description, nodeid, renditions=true)
-      add_file(file_name, description, nodeid, renditions)
+    def replace_file(data, file_name, description, nodeid, renditions=true)
+      add_file(data, file_name, description, nodeid, renditions)
     end
     
-    # TODO this method is not tested
     # Add new folder
     def add_folder(name, description, nodeid)
       if nodeid
@@ -160,12 +153,12 @@ module AdobeShare
       doc = Document.new res
     end
     
-    # TODO this method is not tested
     # Share a file
     def share_file(nodeid, users, message, level)
       uri = ENDPOINT_DC + nodeid + "/share/"
       req = Element.new "request"
       share = req.add_element "share"
+      users = [""] unless users
       users.each{|e|
         user = Element.new "user"
         user.text = e
@@ -175,28 +168,28 @@ module AdobeShare
       req.add_element "level"
       req.elements["message"].text = message
       req.elements["level"].text = level
-      res = http_client_request("POST", uri, req)
+      res = http_client_request("PUT", uri, req)
       doc = Document.new res
     end
     
-    # TODO this method is not tested
     # Unshare a file
     def unshare_file(nodeid)
       share_file(nodeid, nil, nil, 0)
     end
     
-    # TODO this method is not tested
     # Update a share file
     def update_share(nodeid, users_to_add, users_to_remove, message)
       uri = ENDPOINT_DC + nodeid + "/share/"
       req = Element.new "request"
       share = req.add_element "share"
+      users_to_add = [""] unless users_to_add
       users_to_add.each{|e|
         user = Element.new "user"
         user.text = e
         share.add_element user
       }
       unshare = req.add_element "unshare"
+      users_to_remove = [""] unless users_to_remove
       users_to_remove.each{|e|
         user = Element.new "user"
         user.text = e
@@ -259,13 +252,11 @@ module AdobeShare
       auth_string << "sessionid=\"#{@sessionid}\"," if @sessionid
       auth_string << "apikey=\"#{@apikey}\",data=\"#{data}\",sig=\"#{sig}\""
       headers["Authorization"] = auth_string
-      headers["User-Agent"] = UA
       headers
     end
     
     # Performs a generic HTTP request.
     def http_client_request(method, uri_s, request=nil, header_add={})
-      uri_s << "?method=MOVE" if method == "MOVE"
       uri = URI.parse uri_s
       headers = make_headers method, uri
       headers = headers.merge header_add
@@ -279,7 +270,7 @@ module AdobeShare
       when "DELETE"
         res = @client.delete(uri, headers)
       when "MOVE"
-        res = @client.post(uri, request, headers)
+        res = @client.move(uri, nil, headers)
       end
       body = res.body.content
       status_code = res.header.response_status_code
@@ -300,4 +291,4 @@ module AdobeShare
   end
   class ParameterError < RuntimeError
   end
-end
+end

data/lib/adobeshare/http.rb

@@ -0,0 +1,14 @@
+require 'http-access2'
+
+module AdobeShare  
+  #
+  # HTTPClient extensions
+  #
+  class HTTPClient < HTTPClient
+    
+    # MOVE Method extension
+    def move(uri, query = nil, extheader = {}, &block)
+      request('MOVE', uri, query, nil, extheader, &block)
+    end
+  end
+end

data/lib/adobeshare/version.rb

@@ -2,7 +2,7 @@ module AdobeShare #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/adobeshare.rb

@@ -3,6 +3,7 @@ $:.unshift File.dirname(__FILE__)
 require 'adobeshare/version'
 require 'adobeshare/client'
 require 'adobeshare/node'
+require 'adobeshare/http'
 
 module AdobeShare
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: adobeshare
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-10-09 00:00:00 +09:00
+  version: 0.0.3
+date: 2007-10-13 00:00:00 +09:00
 summary: Adobe Share API for Ruby
 require_paths: 
 - lib
@@ -38,6 +38,7 @@ files:
 - lib/adobeshare/version.rb
 - lib/adobeshare/client.rb
 - lib/adobeshare/node.rb
+- lib/adobeshare/http.rb
 - examples/sample.rb
 - examples/config.yaml.sample
 - setup.rb