Rename create-blob to upload-blob.

This commit is contained in:
phil 2010-03-26 00:33:12 +00:00
parent 94b6efe802
commit 91f09690b6
2 changed files with 8 additions and 8 deletions

View File

@ -237,11 +237,11 @@ example:
(.list (as-blobstore blobstore) container-name (.list (as-blobstore blobstore) container-name
(.inDirectory (new ListContainerOptions) dir)))) (.inDirectory (new ListContainerOptions) dir))))
(defn create-blob (defn upload-blob
"Create an blob representing text data: "Create an blob representing text data:
container, name, string -> etag" container, name, string -> etag"
([container-name name data] ;; TODO: allow payload to be a stream ([container-name name data] ;; TODO: allow payload to be a stream
(create-blob container-name name data *blobstore*)) (upload-blob container-name name data *blobstore*))
([container-name name data blobstore] ([container-name name data blobstore]
(put-blob container-name (put-blob container-name
(doto (.newBlob blobstore name) (doto (.newBlob blobstore name)

View File

@ -41,12 +41,12 @@
(deftest list-container-test (deftest list-container-test
(is (create-container "container")) (is (create-container "container"))
(is (empty? (list-container "container"))) (is (empty? (list-container "container")))
(is (create-blob "container" "blob1" "blob1")) (is (upload-blob "container" "blob1" "blob1"))
(is (create-blob "container" "blob2" "blob2")) (is (upload-blob "container" "blob2" "blob2"))
(is (= 2 (count (list-container "container")))) (is (= 2 (count (list-container "container"))))
(is (= 1 (count (list-container "container" :max-results 1)))) (is (= 1 (count (list-container "container" :max-results 1))))
(create-directory "container" "dir") (create-directory "container" "dir")
(is (create-blob "container" "dir/blob2" "blob2")) (is (upload-blob "container" "dir/blob2" "blob2"))
(is (= 3 (count (list-container "container")))) (is (= 3 (count (list-container "container"))))
(is (= 4 (count (list-container "container" :recursive)))) (is (= 4 (count (list-container "container" :recursive))))
(is (= 1 (count (list-container "container" :in-directory "dir"))))) (is (= 1 (count (list-container "container" :in-directory "dir")))))
@ -57,7 +57,7 @@
data "test content" data "test content"
data-file (java.io.File/createTempFile "jclouds" "data")] data-file (java.io.File/createTempFile "jclouds" "data")]
(try (create-container container-name) (try (create-container container-name)
(create-blob container-name name data) (upload-blob container-name name data)
(download-blob container-name name data-file) (download-blob container-name name data-file)
(is (= data (slurp (.getAbsolutePath data-file)))) (is (= data (slurp (.getAbsolutePath data-file))))
(finally (.delete data-file))))) (finally (.delete data-file)))))
@ -74,7 +74,7 @@
data "test content" data "test content"
data-file (java.io.File/createTempFile "jclouds" "data")] data-file (java.io.File/createTempFile "jclouds" "data")]
(try (create-container container-name) (try (create-container container-name)
(create-blob container-name name data) (upload-blob container-name name data)
(is (thrown? Exception (is (thrown? Exception
(download-blob container-name name data-file))) (download-blob container-name name data-file)))
(finally (.delete data-file)))))) (finally (.delete data-file))))))
@ -92,7 +92,7 @@
(when-not (blob-exists? container-name name) (when-not (blob-exists? container-name name)
(let [data-stream (java.io.ByteArrayOutputStream.)] (let [data-stream (java.io.ByteArrayOutputStream.)]
(dotimes [i 5000000] (.write data-stream i)) (dotimes [i 5000000] (.write data-stream i))
(create-blob container-name name (.toByteArray data-stream)))) (upload-blob container-name name (.toByteArray data-stream))))
;; download ;; download
(let [total (atom total-downloads)] (let [total (atom total-downloads)]