fog-google 1.10.0 → 1.14.0

data/test/integration/pubsub/test_pubsub_models.rb

@@ -102,7 +102,7 @@ class TestPubsubModels < PubSubShared
                                                 :topic => some_topic_name)
     @client.topics.get(some_topic_name).publish(["data" => message_bytes])
 
-    result = subscription.pull
+    result = subscription.pull(:return_immediately => false)
     assert_operator(result.length, :>, 0)
 
     contained = result.any? { |received| received.message[:data] == message_bytes }
@@ -115,7 +115,7 @@ class TestPubsubModels < PubSubShared
                                                 :topic => some_topic_name)
     @client.topics.get(some_topic_name).publish(["data" => Base64.strict_encode64("some message")])
 
-    result = subscription.pull
+    result = subscription.pull(:return_immediately => false)
     assert_operator(result.length, :>, 0)
 
     subscription.acknowledge([result[0].ack_id])
@@ -127,7 +127,7 @@ class TestPubsubModels < PubSubShared
                                                 :topic => some_topic_name)
     @client.topics.get(some_topic_name).publish(["data" => Base64.strict_encode64("some message")])
 
-    result = subscription.pull
+    result = subscription.pull(:return_immediately => false)
     assert_operator(result.length, :>, 0)
 
     result[0].acknowledge

data/test/integration/pubsub/test_pubsub_requests.rb

@@ -86,7 +86,7 @@ class TestPubsubRequests < PubSubShared
     @client.create_subscription(subscription_name, some_topic_name)
     @client.publish_topic(some_topic_name, [:data => message_bytes])
 
-    result = @client.pull_subscription(subscription_name)
+    result = @client.pull_subscription(subscription_name, {:return_immediately => false})
 
     contained = result.received_messages.any? { |received| received.message.data == message_bytes }
     assert_equal(true, contained, "sent messsage not contained within pulled responses")
@@ -96,7 +96,7 @@ class TestPubsubRequests < PubSubShared
     subscription_name = new_subscription_name
     @client.create_subscription(subscription_name, some_topic_name)
     @client.publish_topic(some_topic_name, [:data => Base64.strict_encode64("some message")])
-    pull_result = @client.pull_subscription(subscription_name)
+    pull_result = @client.pull_subscription(subscription_name, {:return_immediately => false})
     assert_operator(pull_result.received_messages.length, :>, 0)
 
     @client.acknowledge_subscription(subscription_name,

data/test/integration/sql/test_certs.rb

@@ -1,6 +1,5 @@
 require "helpers/integration_test_helper"
 require "integration/factories/sql_certs_factory"
-require "pry"
 
 class TestSQLCerts < FogIntegrationTest
   # This test doesn't include TestCollection as certs are not an independent resource.

data/test/integration/storage/test_objects.rb

@@ -3,6 +3,7 @@ require "integration/storage/storage_shared"
 require "securerandom"
 require "base64"
 require "tempfile"
+require "net/http"
 
 class TestStorageRequests < StorageShared
   def test_put_object_string
@@ -93,10 +94,45 @@ class TestStorageRequests < StorageShared
 
     @client.copy_object(some_bucket_name, some_object_name,
                         some_bucket_name, target_object_name)
+
     object = @client.get_object(some_bucket_name, target_object_name)
+
     assert_equal(temp_file_content, object[:body])
   end
 
+  def test_copy_object_predefined_acl
+    target_object_name = new_object_name
+
+    res = @client.copy_object(some_bucket_name, some_object_name,
+                              some_bucket_name, target_object_name, destination_predefined_acl: "publicRead")
+
+    result = @client.get_object(some_bucket_name, target_object_name)
+
+    response = Net::HTTP.get_response(URI(result[:self_link]))
+
+    assert_kind_of(Net::HTTPOK, response)
+  end
+
+  def test_copy_object_with_request_options
+    assert_raises(Google::Apis::AuthorizationError) do
+      target_object_name = new_object_name
+
+      @client.copy_object(some_bucket_name, some_object_name,
+                          some_bucket_name, target_object_name, authorization: false)
+    end
+  end
+
+  def test_copy_object_with_object_property
+    target_object_name = new_object_name
+
+    @client.copy_object(some_bucket_name, some_object_name,
+                        some_bucket_name, target_object_name, content_type: 'text/plain')
+
+    object = @client.get_object(some_bucket_name, target_object_name)
+
+    assert_equal("text/plain", object[:content_type])
+  end
+
   def test_list_objects
     expected_object = some_object_name
 

data/test/unit/storage/test_common_xml_collections.rb

@@ -6,6 +6,7 @@ class UnitTestStorageXMLCollections < MiniTest::Test
     @client = Fog::Storage.new(provider: "google",
                                google_storage_access_key_id: "",
                                google_storage_secret_access_key: "")
+    @bucket = @client.directories.create(key: "testbucket-#{SecureRandom.hex}")
 
     # Enumerate all descendants of Fog::Collection
     descendants = ObjectSpace.each_object(Fog::Collection.singleton_class)
@@ -36,4 +37,14 @@ class UnitTestStorageXMLCollections < MiniTest::Test
                       "#{klass} should have at most 1 required parameter in get()")
     end
   end
+
+  def test_metadata
+    attr = { key: 'test-file', body: "hello world\x00" }
+    f = @bucket.files.new(attr)
+    assert_equal({}, f.metadata)
+
+    metadata = { 'x-goog-meta-my-header' => 'hello world' }
+    f = @bucket.files.new(attr.merge(metadata))
+    assert_equal(metadata, f.metadata)
+  end
 end

data/test/unit/storage/test_json_requests.rb

@@ -41,4 +41,12 @@ class UnitTestJsonRequests < MiniTest::Test
     assert_match(/just%20some%20file\.json/, url,
                  "space should be escaped with '%20'")
   end
+
+  def test_unescaped_slashes_in_url
+    url = @client.get_object_https_url("bucket",
+                                      "a/b/c.ext",
+                                      Time.now + 2 * 60)
+    assert_match(/a\/b\/c/, url,
+                 "slashes should not be escaped with '%2F'")
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Nat Welch
 - Artem Yakimenko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -59,20 +59,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: 0.44.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: 0.44.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.51'
+- !ruby/object:Gem::Dependency
+  name: google-cloud-env
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -197,11 +211,13 @@ files:
 - ".codecov.yml"
 - ".editorconfig"
 - ".fog.example"
+- ".github/dependabot.yml"
+- ".github/workflows/ruby.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
 - ".ruby-gemset"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -751,13 +767,13 @@ homepage: https://github.com/fog/fog-google
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -766,9 +782,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
 test_files:

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-matrix:
-  fast_finish: true
-  include:
-    - rvm: 2.3
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: jruby-9.1
-    - rvm: jruby-head
-  allow_failures:
-    - rvm: jruby-head
-notifications:
-  email: false