gitlab-fog-azure-rm 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e22573f58ecdd3a318e5b75145645b6828d557320e00d3833ac6bb552c12a27
-  data.tar.gz: 02e55258c8128b9e00cdcf1d4659e270b58f9382b362555c49a73f260586e129
+  metadata.gz: 96a2a16b2feac00c533b0489e6572ccd808c11e44f9f3efab5b69bdc392aea04
+  data.tar.gz: 8e7a5d519fa7002896efb7c00fe7bb73440f875cc0a428dba625695ed6c385bb
 SHA512:
-  metadata.gz: 65983b2a6caa2de4444fdde0b27053519588df069809894445c52123242afedfc3f5357434c754b361e5234eae5230ac86c1b3d208b10ea2615fbdb74bb8e347
-  data.tar.gz: bad2b6523176bc008228137172e50f1059333f59428de88e7cc237892650056e92987aff983436ef1086b12cdf8c5e72f4cf0c7727059b88b6af5fcd71a3f224
+  metadata.gz: 36e3c183ee97204706d901c25c3791b760980d0dcf84440d2370dddff622f54670db85a11e1badec9853341e661d057d519b990912b626c9d86e16c9461e2ebf
+  data.tar.gz: b20976bdfab522b172572194e2f6f0693129c3f6315910fb9d8331cd11e9855ecce53292f22d982b7d6c7811267bce716cf6e680a04d3bf9e703988ee21b2f1e

data/.gitlab-ci.yml

@@ -14,7 +14,7 @@ test:
     - bundle exec rake test
   parallel:
     matrix:
-      - RUBY_VERSION: [ "2.7", "3.0", "3.1" ]
+      - RUBY_VERSION: [ "2.7", "3.0", "3.1", "3.2" ]
 
 rubocop:
   script:

data/.rubocop.yml

@@ -2,4 +2,4 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   NewCops: enable
-
+  TargetRubyVersion: 2.7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 1.7.0
+
+- Fix #get_object return type to be consistent with other Fog providers !36
+- Require Ruby 2.7+ !36
+
 ## 1.6.0
 
 - Add get_object request method !34

data/gitlab-fog-azure-rm.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://gitlab.com/gitlab-org/gitlab-fog-azure-rm'
   spec.rdoc_options = %w[--charset=UTF-8]
   spec.extra_rdoc_files = %w[README.md]
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.7.0'
   spec.post_install_message = 'Thanks for installing!'
   spec.add_development_dependency 'codeclimate-test-reporter' , '~> 1.0.0'
   spec.add_development_dependency 'minitest', '~> 5.8.4'

data/lib/fog/azurerm/requests/storage/get_object.rb

@@ -3,12 +3,22 @@ module Fog
     class AzureRM
       # This class provides the actual implemention for service calls.
       class Real
-        alias get_object get_blob
+        def get_object(...)
+          blob, body = get_blob(...)
+
+          blob[:body] = body
+          blob
+        end
       end
 
       # This class provides the mock implementation for unit tests.
       class Mock
-        alias get_object get_blob
+        def get_object(...)
+          blob, body = get_blob(...)
+
+          blob[:body] = body
+          blob
+        end
       end
     end
   end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '1.6.0'.freeze
+    VERSION = '1.7.0'.freeze
   end
 end

data/test/requests/storage/test_get_blob.rb

@@ -26,12 +26,6 @@ class TestGetBlob < Minitest::Test
     end
   end
 
-  def test_get_object_success
-    @blob_client.stub :get_blob, @blob_with_content do
-      assert_equal @blob_with_content, @service.get_object('test_container', 'test_blob')
-    end
-  end
-
   def test_get_blob_not_found
     exception = ->(*) { raise StandardError.new('Not found(404). Not exist') }
     @blob_client.stub :get_blob, exception do
@@ -41,15 +35,6 @@ class TestGetBlob < Minitest::Test
     end
   end
 
-  def test_get_object_not_found
-    exception = ->(*) { raise StandardError.new('Not found(404). Not exist') }
-    @blob_client.stub :get_blob, exception do
-      assert_raises('NotFound') do
-        @service.get_object('test_container', 'test_blob')
-      end
-    end
-  end
-
   def test_get_blob_http_exception
     http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
     @blob_client.stub :get_blob, http_exception do

data/test/requests/storage/test_get_object.rb

@@ -0,0 +1,34 @@
+require File.expand_path '../../test_helper', __dir__
+
+# Storage Blob Class
+class TestGetObject < Minitest::Test
+  # This class posesses the test cases for the requests of getting storage blob.
+  def setup
+    Fog.mock!
+    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    Fog.unmock!
+    @mocked_response = mocked_storage_http_error
+
+    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @blob_client = @service.instance_variable_get(:@blob_client)
+
+    @raw_cloud_blob = storage_blob
+    @blob = ApiStub::Requests::Storage::File.blob_as_hash
+    @blob_with_content = @blob.merge(body: 'content')
+  end
+
+  def test_get_object_success
+    @blob_client.stub :get_blob, @blob_with_content do
+      assert_equal @blob_with_content, @service.get_object('test_container', 'test_blob')
+    end
+  end
+
+  def test_get_object_not_found
+    exception = ->(*) { raise StandardError.new('Not found(404). Not exist') }
+    @blob_client.stub :get_blob, exception do
+      assert_raises('NotFound') do
+        @service.get_object('test_container', 'test_blob')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -305,6 +305,7 @@ files:
 - test/requests/storage/test_get_container_acl.rb
 - test/requests/storage/test_get_container_properties.rb
 - test/requests/storage/test_get_container_url.rb
+- test/requests/storage/test_get_object.rb
 - test/requests/storage/test_list_blobs.rb
 - test/requests/storage/test_list_containers.rb
 - test/requests/storage/test_put_blob_block.rb
@@ -334,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="