Merge branch 'master' of https://github.com/davidsantiago/jclouds

* 'master' of https://github.com/davidsantiago/jclouds:
  Additional refinements to blobstore.clj updates.
  Updates to improve blobstore.clj.

blobstore/src/main/clojure/org/jclouds/blobstore.clj

@@ -44,9 +44,9 @@ See http://code.google.com/p/jclouds for details."
   (:import [java.io File FileOutputStream OutputStream]
            java.util.Properties
            [org.jclouds.blobstore
-            AsyncBlobStore BlobStore BlobStoreContext BlobStoreContextFactory
+            AsyncBlobStore domain.BlobBuilder BlobStore BlobStoreContext
-            domain.BlobMetadata domain.StorageMetadata domain.Blob
+            BlobStoreContextFactory domain.BlobMetadata domain.StorageMetadata
-            options.ListContainerOptions]
+            domain.Blob options.ListContainerOptions]
            org.jclouds.io.Payloads
            org.jclouds.io.payloads.PhantomPayload
            java.util.Arrays
@@ -267,6 +267,7 @@ Note: (apply concat coll) or (lazy-cat coll) are not lazy wrt coll itself."
    :put. For :put requests, :content-length must be specified. Optionally,
    :content-type, :content-disposition, :content-language, :content-encoding
     and :content-md5  may be given."
+  {:deprecated "1.0-beta-10"}
   ([container-name path]
      (sign-blob-request container-name path {:method :get} *blobstore*))
   ([container-name path
@@ -299,6 +300,33 @@ Note: (apply concat coll) or (lazy-cat coll) are not lazy wrt coll itself."
                     (.setContentLanguage content-language))
                   payload)))))))
 
+(defn sign-get
+  "Get a signed http GET request for manipulating a blob in another
+   application, Ex. curl."
+  ([container-name name]
+     (sign-get container-name name *blobstore*))
+  ([container-name name ^BlobStore blobstore]
+      (.signGetBlob (.. blobstore getContext getSigner) container-name name)))
+
+(defn sign-put
+  "Get a signed http PUT request for manipulating a blob in another
+   application, Ex. curl. A Blob with at least the name and content-length
+   must be given."
+  ([container-name blob]
+     (sign-put container-name blob *blobstore*))
+  ([container-name ^Blob blob ^BlobStore blobstore]
+      (.signPutBlob (.. blobstore getContext getSigner)
+                    container-name
+                    blob)))
+
+(defn sign-delete
+  "Get a signed http DELETE request for manipulating a blob in another
+   applicaiton, Ex. curl."
+  ([container-name name]
+     (sign-delete container-name name *blobstore*))
+  ([container-name name ^BlobStore blobstore]
+     (.signRemoveBlob (.. blobstore getContext getSigner) container-name name)))
+
 (defn get-blob-stream
   "Get an inputstream from the blob at a given path"
   ([container-name path]
@@ -340,21 +368,51 @@ example:
             (.inDirectory (new ListContainerOptions) dir))))
 (defn blob
   "create a new blob with the specified payload"
+  {:deprecated "1.0-beta-10"}
     ([#^String name payload]
      (blob name payload *blobstore*))
     ([#^String name payload #^BlobStore blobstore]
       (doto (.newBlob blobstore name)
                  (.setPayload payload))))
 
+(defn blob2
+  "Create a new blob with the specified payload and options."
+  ([^String name option-map]
+     (blob2 name option-map *blobstore*))
+  ([^String name
+    {:keys [payload content-type content-length content-md5 calculate-md5
+            content-disposition content-encoding content-language metadata]}
+    ^BlobStore blobstore]
+     {:pre [(not (and content-md5 calculate-md5))
+            (not (and (nil? payload) calculate-md5))]}
+     (let [blob-builder (if payload
+                          (.payload (.blobBuilder blobstore name) payload)
+                          (.forSigning (.blobBuilder blobstore name)))
+           blob-builder (if content-length ;; Special case, arg is prim.
+                          (.contentLength blob-builder content-length)
+                          blob-builder)
+           blob-builder (if calculate-md5 ;; Only do calculateMD5 OR contentMD5.
+                          (.calculateMD5 blob-builder)
+                          (if content-md5
+                            (.contentMD5 blob-builder content-md5)
+                            blob-builder))]
+       (doto blob-builder
+         (.contentType content-type)
+         (.contentDisposition content-disposition)
+         (.contentEncoding content-encoding)
+         (.contentLanguage content-language)
+         (.userMetadata metadata))
+       (.build blob-builder))))
+
 (defn md5-blob
   "add a content md5 to a blob, or make a new blob that has an md5.
 note that this implies rebuffering, if the blob's payload isn't repeatable"
   ([#^Blob blob]
      (Payloads/calculateMD5 blob))
   ([#^String name payload]
-     (blob name payload *blobstore*))
+     (md5-blob name payload *blobstore*))
   ([#^String name payload #^BlobStore blobstore]
-     (md5-blob (blob name payload blobstore))))
+     (md5-blob (blob2 name {:payload payload} blobstore))))
 
 (defn upload-blob
   "Create anrepresenting text data:

blobstore/src/test/clojure/org/jclouds/blobstore_test.clj

@@ -21,6 +21,7 @@
   (:use [org.jclouds.blobstore] :reload-all)
   (:use [clojure.test])
   (:import [org.jclouds.blobstore BlobStoreContextFactory]
+           [org.jclouds.crypto CryptoStreams]
            [java.io ByteArrayOutputStream]
            [org.jclouds.util Strings2]))
 
@@ -146,6 +147,46 @@
       (is (= "f" (first (.get (.getHeaders request) "Content-Disposition"))))
       (is (= "g" (first (.get (.getHeaders request) "Content-Encoding")))))))
 
+(deftest sign-get-test
+  (let [request (sign-get "container" "path")]
+    (is (= "http://localhost/container/path" (str (.getEndpoint request))))
+    (is (= "GET" (.getMethod request)))))
+
+(deftest sign-put-test
+  (let [request (sign-put "container"
+                          (blob2 "path" {:content-length 10}))]
+    (is (= "http://localhost/container/path" (str (.getEndpoint request))))
+    (is (= "PUT" (.getMethod request)))
+    (is (= "10" (first (.get (.getHeaders request) "Content-Length"))))
+    (is (nil?
+         (first (.get (.getHeaders request) "Content-Type"))))))
+
+(deftest sign-put-with-headers-test
+  (let [request (sign-put
+                 "container"
+                 (blob2 "path" {:content-length 10
+                                :content-type "x"
+                                :content-language "en"
+                                :content-disposition "f"
+                                :content-encoding "g"}))]
+    (is (= "PUT" (.getMethod request)))
+    (is (= "10" (first (.get (.getHeaders request) "Content-Length"))))
+    (is (= "x" (first (.get (.getHeaders request) "Content-Type"))))
+    (is (= "en" (first (.get (.getHeaders request) "Content-Language"))))
+    (is (= "f" (first (.get (.getHeaders request) "Content-Disposition"))))
+    (is (= "g" (first (.get (.getHeaders request) "Content-Encoding"))))))
+
+(deftest sign-delete-test
+  (let [request (sign-delete "container" "path")]
+    (is (= "http://localhost/container/path" (str (.getEndpoint request))))
+    (is (= "DELETE" (.getMethod request)))))
+
+(deftest blob2-test
+  (let [a-blob (blob2 "test-name" {:payload (.getBytes "test-payload")
+                                   :calculate-md5 true})]
+    (is (= (seq (.. a-blob (getPayload) (getContentMetadata) (getContentMD5)))
+           (seq (CryptoStreams/md5 (.getBytes "test-payload")))))))
+
 ;; TODO: more tests involving blob-specific functions
 
 (deftest corruption-hunt