fog-google 1.20.0 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3879073a8246e2c774c294319d35188c9d02136908c210dba73be0af1c006e7f
-  data.tar.gz: 884bbac77765685255a31fd5effda59893d4765839958a55d0f4103ee818063a
+  metadata.gz: 3a4758b3cdcbe50e9878a69a034becb30d68c6a5d1e1841b209a51d76683bba7
+  data.tar.gz: 0471b66930238a16ed0090ac0fe892809e081139cdd717ec88d493a4acc2dce6
 SHA512:
-  metadata.gz: 4fea43ddcf8fbcdeb1c3b72a8afab5ca8756fcb830372851bcb741eb8f4ae91414dd7e033f0aed247e5b7d803a5875f899f69e891876bcd90aae0b7256b76cd9
-  data.tar.gz: 259986aa47641d39d9515b32bf6a00ea277a91964503e248ab87cdc1c99168f26dad51c164905626041170a7cd501076f5b94c0725fe1e0b2666eb21e9319699
+  metadata.gz: 76f2ebc2c2efa0ef8996fb09a57291f8a5d9128508051be7c01d5e5acab42eebf678f514bb889e8c14f7893dbb261cef15572d298086dc1751e577dd2562a2a3
+  data.tar.gz: da6644adcceabfeda98adb15beea5d12f531869e918a07bdc87b86943982cf4de3b90fec0049729b30134cda4089a65fbe0e97566feab7e248e844b5f973d0ad

data/.github/workflows/integration-compute-core.yml

@@ -39,8 +39,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Install dependencies
-        run: bundle install
       - name: Run tests
         run: >-
           ./.github/scripts/setup_creds.sh &&

data/.github/workflows/integration-compute-instance_groups.yml

@@ -39,8 +39,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Install dependencies
-        run: bundle install
       - name: Run tests
         run: >-
           ./.github/scripts/setup_creds.sh &&

data/.github/workflows/integration-compute-loadbalancing.yml

@@ -39,8 +39,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Install dependencies
-        run: bundle install
       - name: Run tests
         run: >-
           ./.github/scripts/setup_creds.sh &&

data/.github/workflows/integration-compute-networking.yml

@@ -39,8 +39,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Install dependencies
-        run: bundle install
       - name: Run tests
         run: >-
           ./.github/scripts/setup_creds.sh &&

data/.github/workflows/integration-monitoring.yml

@@ -40,8 +40,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Install dependencies
-        run: bundle install
       - name: Run tests
         run: >-
           ./.github/scripts/setup_creds.sh &&

data/.github/workflows/integration-pubsub.yml

@@ -40,8 +40,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Install dependencies
-        run: bundle install
       - name: Run tests
         run: >-
           ./.github/scripts/setup_creds.sh &&

data/.github/workflows/integration-sql.yml

@@ -40,8 +40,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Install dependencies
-        run: bundle install
       - name: Run tests
         run: >-
           ./.github/scripts/setup_creds.sh &&

data/.github/workflows/integration-storage.yml

@@ -41,8 +41,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Install dependencies
-        run: bundle install
       - name: Run tests
         run: >-
           ./.github/scripts/setup_creds.sh &&

data/CHANGELOG.md

@@ -6,6 +6,37 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Next
 
+## 1.21.1
+
+### User-facing
+
+#### Fixed
+
+- \#597 loosen dependencies to avoid conflict
+
+### Development changes
+
+#### Fixed
+
+- bump actions/checkout from 2.4.0 to 3.1.0
+- fixes and refinements for integration tests
+
+## 1.21.0
+
+### User-facing
+
+#### Fixed
+
+- \#592 use Addressable for escaping paths when generating urls
+- test workflow refinements
+
+### Development changes
+
+#### Fixed
+
+- bump actions/checkout from 2.4.0 to 3.1.0
+- fixes and refinements for integration tests
+
 ## 1.20.0
 
 ### User-facing

data/fog-google.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fog-json", "~> 1.2"
   spec.add_dependency "fog-xml", "~> 0.1.0"
 
-  spec.add_dependency "google-apis-storage_v1", "~> 0.20"
+  spec.add_dependency "google-apis-storage_v1", [">= 0.19", "< 1"]
   spec.add_dependency "google-apis-iamcredentials_v1", "~> 0.15"
   spec.add_dependency "google-apis-compute_v1", "~> 0.53"
   spec.add_dependency "google-apis-monitoring_v3", "~> 0.37"
@@ -34,6 +34,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "google-cloud-env", "~> 1.2"
 
+  spec.add_dependency "addressable", ">= 2.7.0"
+
   # Debugger
   # Locked because pry-byebug is broken with 13+
   # see: https://github.com/deivid-rodriguez/pry-byebug/issues/343

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.20.0".freeze
+    VERSION = "1.21.1".freeze
   end
 end

data/lib/fog/storage/google_json/utils.rb

@@ -1,3 +1,5 @@
+require 'addressable'
+
 module Fog
   module Storage
     class GoogleJSON
@@ -19,10 +21,7 @@ module Fog
 
         def host_path_query(params, expires)
           params[:headers]["Date"] = expires.to_i
-          # implementation from CGI.escape, but without ' ' to  '+' conversion
-          params[:path] = params[:path].b.gsub(/([^a-zA-Z0-9_.\-~]+)/) { |m|
-            '%' + m.unpack('H2' * m.bytesize).join('%').upcase
-          }.gsub("%2F", "/")
+          params[:path] = ::Addressable::URI.encode_component(params[:path], ::Addressable::URI::CharacterClasses::PATH)
 
           query = []
 

data/test/unit/storage/test_json_requests.rb

@@ -49,4 +49,12 @@ class UnitTestJsonRequests < MiniTest::Test
     assert_match(/a\/b\/c/, url,
                  "slashes should not be escaped with '%2F'")
   end
+
+  def test_unescaped_pluses_in_url
+    url = @client.get_object_https_url("bucket",
+                                      "a+c.ext",
+                                      Time.now + 2 * 60)
+    assert_match(/a\+c/, url,
+                 "pluses should not be escaped with '%2B'")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.1
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -57,16 +57,22 @@ dependencies:
   name: google-apis-storage_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.19'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: google-apis-iamcredentials_v1
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +171,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -859,7 +879,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.