azure 0.6.0 → 0.6.1

data/test/integration/blob/create_blob_snapshot_test.rb

@@ -1,80 +1,80 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require "integration/test_helper"
-require "azure/blob/blob_service"
-
-describe Azure::Blob::BlobService do
-  subject { Azure::Blob::BlobService.new }
-  after { TableNameHelper.clean }
-  
-  describe '#create_blob_snapshot' do
-    let(:container_name) { ContainerNameHelper.name }
-    let(:blob_name) { "blobname" }
-    let(:content) { content = ""; 1024.times.each{|i| content << "@" }; content }
-    let(:metadata) { { "CustomMetadataProperty"=>"CustomMetadataValue" } }
-    let(:options) { { :blob_content_type=>"application/foo", :metadata => metadata } }
-
-    before { 
-      subject.create_container container_name
-      subject.create_block_blob container_name, blob_name, content, options
-    }
-
-    it 'errors if the container does not exist' do
-      assert_raises(Azure::Core::Http::HTTPError) do
-        subject.create_blob_snapshot ContainerNameHelper.name, blob_name
-      end
-    end
-
-    it 'errors if the blob does not exist' do
-      assert_raises(Azure::Core::Http::HTTPError) do
-        subject.create_blob_snapshot container_name, "unknown-blob"
-      end
-    end
-
-    it 'creates a snapshot of blob contents, metadata, and properties' do
-      snapshot = subject.create_blob_snapshot container_name, blob_name
-
-      content2= ""
-      1024.times.each{|i| content2 << "!" }
-      options2 = options.dup
-      options2[:metadata] = options[:metadata].dup
-      options2[:blob_content_type] = "application/bar"
-      options2[:metadata]["CustomMetadataValue1"] = "NewMetadata"
-      subject.create_block_blob container_name, blob_name, content2, options2
-
-      # content/properties/metadata in blob is new version
-      blob, returned_content = subject.get_blob container_name, blob_name, { :start_range => 0, :end_range => 511 }
-      returned_content.length.must_equal 512
-      returned_content.must_equal content2[0..511]
-      blob.properties[:content_type].must_equal options2[:blob_content_type]
-      options2[:metadata].each { |k,v|
-        blob.metadata.must_include k.downcase
-        blob.metadata[k.downcase].must_equal v
-      }
-
-      # content/properties/metadata in snapshot is old version
-      blob, returned_content = subject.get_blob container_name, blob_name, { :start_range => 0, :end_range => 511, :snapshot => snapshot }
-
-      returned_content.length.must_equal 512
-      returned_content.must_equal content[0..511]
-      blob.properties[:content_type].must_equal options[:blob_content_type]
-      options[:metadata].each { |k,v|
-        blob.metadata.must_include k.downcase
-        blob.metadata[k.downcase].must_equal v
-      }
-
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+require "azure/blob/blob_service"
+
+describe Azure::Blob::BlobService do
+  subject { Azure::Blob::BlobService.new }
+  after { TableNameHelper.clean }
+  
+  describe '#create_blob_snapshot' do
+    let(:container_name) { ContainerNameHelper.name }
+    let(:blob_name) { "blobname" }
+    let(:content) { content = ""; 1024.times.each{|i| content << "@" }; content }
+    let(:metadata) { { "CustomMetadataProperty"=>"CustomMetadataValue" } }
+    let(:options) { { :blob_content_type=>"application/foo", :metadata => metadata } }
+
+    before { 
+      subject.create_container container_name
+      subject.create_block_blob container_name, blob_name, content, options
+    }
+
+    it 'errors if the container does not exist' do
+      assert_raises(Azure::Core::Http::HTTPError) do
+        subject.create_blob_snapshot ContainerNameHelper.name, blob_name
+      end
+    end
+
+    it 'errors if the blob does not exist' do
+      assert_raises(Azure::Core::Http::HTTPError) do
+        subject.create_blob_snapshot container_name, "unknown-blob"
+      end
+    end
+
+    it 'creates a snapshot of blob contents, metadata, and properties' do
+      snapshot = subject.create_blob_snapshot container_name, blob_name
+
+      content2= ""
+      1024.times.each{|i| content2 << "!" }
+      options2 = options.dup
+      options2[:metadata] = options[:metadata].dup
+      options2[:blob_content_type] = "application/bar"
+      options2[:metadata]["CustomMetadataValue1"] = "NewMetadata"
+      subject.create_block_blob container_name, blob_name, content2, options2
+
+      # content/properties/metadata in blob is new version
+      blob, returned_content = subject.get_blob container_name, blob_name, { :start_range => 0, :end_range => 511 }
+      returned_content.length.must_equal 512
+      returned_content.must_equal content2[0..511]
+      blob.properties[:content_type].must_equal options2[:blob_content_type]
+      options2[:metadata].each { |k,v|
+        blob.metadata.must_include k.downcase
+        blob.metadata[k.downcase].must_equal v
+      }
+
+      # content/properties/metadata in snapshot is old version
+      blob, returned_content = subject.get_blob container_name, blob_name, { :start_range => 0, :end_range => 511, :snapshot => snapshot }
+
+      returned_content.length.must_equal 512
+      returned_content.must_equal content[0..511]
+      blob.properties[:content_type].must_equal options[:blob_content_type]
+      options[:metadata].each { |k,v|
+        blob.metadata.must_include k.downcase
+        blob.metadata[k.downcase].must_equal v
+      }
+
+    end
+  end
+end

data/test/integration/blob/create_page_blob_test.rb

@@ -1,83 +1,83 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require "integration/test_helper"
-require "azure/blob/blob_service"
-
-describe Azure::Blob::BlobService do
-  subject { Azure::Blob::BlobService.new }
-  after { TableNameHelper.clean }
-  
-  describe '#create_page_blob' do
-    let(:container_name) { ContainerNameHelper.name }
-    let(:blob_name) { "blobname" }
-    let(:complex_blob_name) { 'qa-872053-/*"\'&.({[<+ ' + [ 0x7D, 0xEB, 0x8B, 0xA4].pack('U*') + '_' + "0" }
-    let(:length) { 1024 }
-    before { 
-      subject.create_container container_name
-    }
-
-    it 'creates a page blob' do
-      blob = subject.create_page_blob container_name, blob_name, length
-      blob.name.must_equal blob_name
-    end
-
-    it 'creates a page blob with complex name' do
-      blob = subject.create_page_blob container_name, complex_blob_name, length
-      blob.name.must_equal complex_blob_name
-
-      complex_blob_name.force_encoding("UTF-8")
-      found_complex_name = false
-      result = subject.list_blobs container_name
-      result.each { |blob|
-        found_complex_name = true if blob.name == complex_blob_name
-      }
-
-      found_complex_name.must_equal true
-    end
-
-    it 'sets additional properties when the options hash is used' do
-      options = {
-        :content_type=>"application/xml",
-        :content_encoding=>"utf-8",
-        :content_language=>"en-US",
-        :cache_control=>"max-age=1296000",
-        :metadata => { "CustomMetadataProperty"=>"CustomMetadataValue"}
-      }
-
-      blob = subject.create_page_blob container_name, blob_name, length, options
-      blob = subject.get_blob_properties container_name, blob_name
-      blob.name.must_equal blob_name
-      blob.properties[:content_type].must_equal options[:content_type]
-      blob.properties[:content_encoding].must_equal options[:content_encoding]
-      blob.properties[:cache_control].must_equal options[:cache_control]
-
-      blob = subject.get_blob_metadata container_name, blob_name
-      blob.name.must_equal blob_name
-      blob.metadata["custommetadataproperty"].must_equal "CustomMetadataValue"
-    end
-
-    it 'errors if the container does not exist' do
-      assert_raises(Azure::Core::Http::HTTPError) do
-        subject.create_page_blob ContainerNameHelper.name, blob_name, length
-      end
-    end
-
-    it 'errors if the length is not 512 byte aligned' do
-      assert_raises(Azure::Core::Http::HTTPError) do
-        subject.create_page_blob container_name, blob_name, length + 1
-      end
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+require "azure/blob/blob_service"
+
+describe Azure::Blob::BlobService do
+  subject { Azure::Blob::BlobService.new }
+  after { TableNameHelper.clean }
+  
+  describe '#create_page_blob' do
+    let(:container_name) { ContainerNameHelper.name }
+    let(:blob_name) { "blobname" }
+    let(:complex_blob_name) { 'qa-872053-/*"\'&.({[<+ ' + [ 0x7D, 0xEB, 0x8B, 0xA4].pack('U*') + '_' + "0" }
+    let(:length) { 1024 }
+    before { 
+      subject.create_container container_name
+    }
+
+    it 'creates a page blob' do
+      blob = subject.create_page_blob container_name, blob_name, length
+      blob.name.must_equal blob_name
+    end
+
+    it 'creates a page blob with complex name' do
+      blob = subject.create_page_blob container_name, complex_blob_name, length
+      blob.name.must_equal complex_blob_name
+
+      complex_blob_name.force_encoding("UTF-8")
+      found_complex_name = false
+      result = subject.list_blobs container_name
+      result.each { |blob|
+        found_complex_name = true if blob.name == complex_blob_name
+      }
+
+      found_complex_name.must_equal true
+    end
+
+    it 'sets additional properties when the options hash is used' do
+      options = {
+        :content_type=>"application/xml",
+        :content_encoding=>"utf-8",
+        :content_language=>"en-US",
+        :cache_control=>"max-age=1296000",
+        :metadata => { "CustomMetadataProperty"=>"CustomMetadataValue"}
+      }
+
+      blob = subject.create_page_blob container_name, blob_name, length, options
+      blob = subject.get_blob_properties container_name, blob_name
+      blob.name.must_equal blob_name
+      blob.properties[:content_type].must_equal options[:content_type]
+      blob.properties[:content_encoding].must_equal options[:content_encoding]
+      blob.properties[:cache_control].must_equal options[:cache_control]
+
+      blob = subject.get_blob_metadata container_name, blob_name
+      blob.name.must_equal blob_name
+      blob.metadata["custommetadataproperty"].must_equal "CustomMetadataValue"
+    end
+
+    it 'errors if the container does not exist' do
+      assert_raises(Azure::Core::Http::HTTPError) do
+        subject.create_page_blob ContainerNameHelper.name, blob_name, length
+      end
+    end
+
+    it 'errors if the length is not 512 byte aligned' do
+      assert_raises(Azure::Core::Http::HTTPError) do
+        subject.create_page_blob container_name, blob_name, length + 1
+      end
+    end
+  end
+end

data/test/integration/blob/delete_blob_test.rb

@@ -1,159 +1,159 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require "integration/test_helper"
-require "azure/blob/blob_service"
-
-describe Azure::Blob::BlobService do
-  subject { Azure::Blob::BlobService.new }
-  after { TableNameHelper.clean }
-
-  describe '#delete_blob' do
-    let(:container_name) { ContainerNameHelper.name }
-    let(:blob_name) { "blobname" }
-    let(:length) { 1024 }
-    before { 
-      subject.create_container container_name
-      subject.create_page_blob container_name, blob_name, length
-    }
-
-    it 'deletes a blob' do
-      subject.delete_blob container_name, blob_name
-    end
-
-    it 'errors if the container does not exist' do
-      assert_raises(Azure::Core::Http::HTTPError) do
-        subject.delete_blob ContainerNameHelper.name, blob_name
-      end
-    end
-
-    it 'errors if the blob does not exist' do
-      assert_raises(Azure::Core::Http::HTTPError) do
-        subject.delete_blob container_name, "unknown-blob"
-      end
-    end
-
-    describe 'when a blob has snapshots' do
-      let(:snapshot) {
-        subject.create_blob_snapshot container_name, blob_name
-      }
-
-      # ensure snapshot gets created before tests run. silly.
-      before { s = snapshot }
-
-      it 'deletes the blob, and all the snapshots for the blob, if optional paramters are not used' do
-        # verify snapshot exists
-        result = subject.list_blobs(container_name, { :snapshots=> true })
-
-        snapshot_exists = false
-        result.each { |b|
-          snapshot_exists = true if b.name == blob_name and b.snapshot == snapshot
-        }
-        snapshot_exists.must_equal true
-
-        # delete blob
-        subject.delete_blob container_name, blob_name
-
-        # verify blob is gone and snapshot remains
-        result = subject.list_blobs(container_name, { :snapshots=> true })
-        result.length.must_equal 0
-      end
-
-      it 'the snapshot parameter deletes a specific blob snapshot' do
-        # create a second snapshot
-        second_snapshot = subject.create_blob_snapshot container_name, blob_name
-
-        # verify two snapshots exist
-
-        result = subject.list_blobs(container_name, { :snapshots=> true })
-
-        snapshots = 0
-        result.each { |b|
-          snapshots += 1 if b.name == blob_name and b.snapshot != nil
-        }
-        snapshots.must_equal 2
-
-        subject.delete_blob container_name, blob_name, { :snapshot => snapshot }
-
-        # verify first snapshot is gone and blob remains
-        result = subject.list_blobs(container_name, { :snapshots=> true })
-        
-        snapshots = 0
-        blob_exists = false
-        result.each { |b|
-          blob_exists = true if b.name == blob_name and b.snapshot == nil
-          snapshots += 1 if b.name == blob_name and b.snapshot == second_snapshot 
-        }
-        blob_exists.must_equal true
-        snapshots.must_equal 1
-      end
-
-      it 'errors if the snapshot id provided does not exist' do
-        assert_raises(Azure::Core::Http::HTTPError) do
-          subject.delete_blob container_name, blob_name, { :snapshot => "thissnapshotidisinvalid" }
-        end
-      end
-
-      describe 'when :only is provided in the delete_snapshots parameter' do
-        let(:delete_snapshots) { :only }
-        it 'deletes all the snapshots for the blob, keeping the blob' do
-          # verify snapshot exists
-          result = subject.list_blobs(container_name, { :snapshots=> true })
-
-          snapshot_exists = false
-          result.each { |b|
-            snapshot_exists = true if b.name == blob_name and b.snapshot == snapshot
-          }
-          snapshot_exists.must_equal true
-
-          # delete snapshots
-          subject.delete_blob container_name, blob_name, { :snapshot => nil, :delete_snapshots => :only }
-
-          # verify snapshot is gone and blob remains
-          result = subject.list_blobs(container_name, { :snapshots=> true })
-          
-          snapshot_exists = false
-          blob_exists = false
-          result.each { |b|
-            blob_exists = true if b.name == blob_name and b.snapshot == nil
-            snapshot_exists = true if b.name == blob_name and b.snapshot == snapshot
-          }
-          blob_exists.must_equal true
-          snapshot_exists.must_equal false
-        end
-      end
-
-      describe 'when :include is provided in the delete_snapshots parameter' do
-        let(:delete_snapshots) { :include }
-        it 'deletes the blob and all of the snapshots for the blob' do
-          # verify snapshot exists
-          result = subject.list_blobs(container_name, { :snapshots=> true })
-
-          snapshot_exists = false
-          result.each { |b|
-            snapshot_exists = true if b.name == blob_name and b.snapshot == snapshot
-          }
-          snapshot_exists.must_equal true
-
-          # delete snapshots
-          subject.delete_blob container_name, blob_name, { :snapshot => nil, :delete_snapshots => :include }
-
-          # verify snapshot is gone and blob remains
-          result = subject.list_blobs(container_name, { :snapshots=> true })
-          result.length.must_equal 0
-        end
-      end
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+require "azure/blob/blob_service"
+
+describe Azure::Blob::BlobService do
+  subject { Azure::Blob::BlobService.new }
+  after { TableNameHelper.clean }
+
+  describe '#delete_blob' do
+    let(:container_name) { ContainerNameHelper.name }
+    let(:blob_name) { "blobname" }
+    let(:length) { 1024 }
+    before { 
+      subject.create_container container_name
+      subject.create_page_blob container_name, blob_name, length
+    }
+
+    it 'deletes a blob' do
+      subject.delete_blob container_name, blob_name
+    end
+
+    it 'errors if the container does not exist' do
+      assert_raises(Azure::Core::Http::HTTPError) do
+        subject.delete_blob ContainerNameHelper.name, blob_name
+      end
+    end
+
+    it 'errors if the blob does not exist' do
+      assert_raises(Azure::Core::Http::HTTPError) do
+        subject.delete_blob container_name, "unknown-blob"
+      end
+    end
+
+    describe 'when a blob has snapshots' do
+      let(:snapshot) {
+        subject.create_blob_snapshot container_name, blob_name
+      }
+
+      # ensure snapshot gets created before tests run. silly.
+      before { s = snapshot }
+
+      it 'deletes the blob, and all the snapshots for the blob, if optional paramters are not used' do
+        # verify snapshot exists
+        result = subject.list_blobs(container_name, { :snapshots=> true })
+
+        snapshot_exists = false
+        result.each { |b|
+          snapshot_exists = true if b.name == blob_name and b.snapshot == snapshot
+        }
+        snapshot_exists.must_equal true
+
+        # delete blob
+        subject.delete_blob container_name, blob_name
+
+        # verify blob is gone and snapshot remains
+        result = subject.list_blobs(container_name, { :snapshots=> true })
+        result.length.must_equal 0
+      end
+
+      it 'the snapshot parameter deletes a specific blob snapshot' do
+        # create a second snapshot
+        second_snapshot = subject.create_blob_snapshot container_name, blob_name
+
+        # verify two snapshots exist
+
+        result = subject.list_blobs(container_name, { :snapshots=> true })
+
+        snapshots = 0
+        result.each { |b|
+          snapshots += 1 if b.name == blob_name and b.snapshot != nil
+        }
+        snapshots.must_equal 2
+
+        subject.delete_blob container_name, blob_name, { :snapshot => snapshot }
+
+        # verify first snapshot is gone and blob remains
+        result = subject.list_blobs(container_name, { :snapshots=> true })
+        
+        snapshots = 0
+        blob_exists = false
+        result.each { |b|
+          blob_exists = true if b.name == blob_name and b.snapshot == nil
+          snapshots += 1 if b.name == blob_name and b.snapshot == second_snapshot 
+        }
+        blob_exists.must_equal true
+        snapshots.must_equal 1
+      end
+
+      it 'errors if the snapshot id provided does not exist' do
+        assert_raises(Azure::Core::Http::HTTPError) do
+          subject.delete_blob container_name, blob_name, { :snapshot => "thissnapshotidisinvalid" }
+        end
+      end
+
+      describe 'when :only is provided in the delete_snapshots parameter' do
+        let(:delete_snapshots) { :only }
+        it 'deletes all the snapshots for the blob, keeping the blob' do
+          # verify snapshot exists
+          result = subject.list_blobs(container_name, { :snapshots=> true })
+
+          snapshot_exists = false
+          result.each { |b|
+            snapshot_exists = true if b.name == blob_name and b.snapshot == snapshot
+          }
+          snapshot_exists.must_equal true
+
+          # delete snapshots
+          subject.delete_blob container_name, blob_name, { :snapshot => nil, :delete_snapshots => :only }
+
+          # verify snapshot is gone and blob remains
+          result = subject.list_blobs(container_name, { :snapshots=> true })
+          
+          snapshot_exists = false
+          blob_exists = false
+          result.each { |b|
+            blob_exists = true if b.name == blob_name and b.snapshot == nil
+            snapshot_exists = true if b.name == blob_name and b.snapshot == snapshot
+          }
+          blob_exists.must_equal true
+          snapshot_exists.must_equal false
+        end
+      end
+
+      describe 'when :include is provided in the delete_snapshots parameter' do
+        let(:delete_snapshots) { :include }
+        it 'deletes the blob and all of the snapshots for the blob' do
+          # verify snapshot exists
+          result = subject.list_blobs(container_name, { :snapshots=> true })
+
+          snapshot_exists = false
+          result.each { |b|
+            snapshot_exists = true if b.name == blob_name and b.snapshot == snapshot
+          }
+          snapshot_exists.must_equal true
+
+          # delete snapshots
+          subject.delete_blob container_name, blob_name, { :snapshot => nil, :delete_snapshots => :include }
+
+          # verify snapshot is gone and blob remains
+          result = subject.list_blobs(container_name, { :snapshots=> true })
+          result.length.must_equal 0
+        end
+      end
+    end
+  end
+end