Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BFA9C105 for ; Thu, 19 Jul 2012 13:03:53 +0000 (UTC) Received: (qmail 88632 invoked by uid 500); 19 Jul 2012 13:03:53 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 88610 invoked by uid 500); 19 Jul 2012 13:03:53 -0000 Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list dev@deltacloud.apache.org Received: (qmail 88598 invoked by uid 99); 19 Jul 2012 13:03:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2012 13:03:53 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of mfojtik@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2012 13:03:45 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6JD3OCO020751 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 Jul 2012 09:03:24 -0400 Received: from dhcp-29-121.brq.redhat.com (dhcp-29-121.brq.redhat.com [10.34.29.121]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6JD1l2x031416 for ; Thu, 19 Jul 2012 09:03:23 -0400 From: mfojtik@redhat.com To: dev@deltacloud.apache.org Subject: [PATCH core 15/16] Core: Added possibility to create blob using string in blob_data Date: Thu, 19 Jul 2012 15:02:48 +0200 Message-Id: <1342702969-51397-15-git-send-email-mfojtik@redhat.com> In-Reply-To: <1342702969-51397-1-git-send-email-mfojtik@redhat.com> References: <1342702969-51397-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 From: Michal Fojtik Signed-off-by: Michal fojtik --- server/lib/deltacloud/drivers/mock/mock_driver.rb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/server/lib/deltacloud/drivers/mock/mock_driver.rb b/server/lib/deltacloud/drivers/mock/mock_driver.rb index 72ba642..582fb6a 100644 --- a/server/lib/deltacloud/drivers/mock/mock_driver.rb +++ b/server/lib/deltacloud/drivers/mock/mock_driver.rb @@ -402,12 +402,22 @@ module Deltacloud::Drivers::Mock :id => blob_id, :name => blob_id, :bucket => bucket_id, - :content_length => blob_data[:tempfile].length, - :content_type => blob_data[:type], :last_modified => Time.now, :user_metadata => BlobHelper::rename_metadata_headers(blob_meta, ''), - :content => blob_data[:tempfile].read } + if blob_data.kind_of? Hash + blob.merge!({ + :content_length => blob_data[:tempfile].length, + :content_type => blob_data[:type], + :content => blob_data[:tempfile].read + }) + elsif blob_data.kind_of? String + blob.merge!({ + :content_length => blob_data.size, + :content_type => 'text/plain', + :content => blob_data + }) + end @client.store(:blobs, blob) Blob.new(blob) end -- 1.7.10.2