Merge pull request #1705 from mikehale/update-build

Update build

Author: alexreisner

.github/workflows/default.yml

@@ -17,9 +17,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4"]
+        ruby-version: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "4.0"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

Gemfile

@@ -1,20 +1,22 @@
 source "https://rubygems.org"
 
 group :development, :test do
-  gem 'rake'
-  gem 'mongoid'
+  gem 'benchmark' # needed for Ruby >=4.0
+  gem 'bigdecimal'
   gem 'geoip'
-  gem 'rubyzip'
-  gem 'rails', '~>5.1.0'
-  gem 'test-unit' # needed for Ruby >=2.2.0
   gem 'ip2location_ruby'
   gem 'logger'
+  gem 'mongoid'
   gem 'ostruct'
-  gem 'bigdecimal'
+  gem 'rails', '~>5.1.0'
+  gem 'rake'
+  gem 'rdoc' # needed for Ruby >=4.0
+  gem 'rubyzip'
+  gem 'test-unit' # needed for Ruby >=2.2.0
 
   platforms :jruby do
-    gem 'jruby-openssl'
     gem 'jgeoip'
+    gem 'jruby-openssl'
   end
 end
 
@@ -24,18 +26,18 @@ group :test do
     gem 'sqlite_ext'
   end
 
-  gem 'webmock'
   gem 'mutex_m'
+  gem 'webmock'
 
   platforms :ruby do
-    gem 'pg', '~> 1.5.9'
     gem 'mysql2', '~> 0.5.4'
+    gem 'pg', '~> 1.5.9'
   end
 
   platforms :jruby do
+    gem 'activerecord-jdbcpostgresql-adapter'
     gem 'jdbc-mysql'
     gem 'jdbc-sqlite3'
-    gem 'activerecord-jdbcpostgresql-adapter'
   end
 end
 

lib/geocoder/lookups/bing.rb

@@ -19,6 +19,7 @@ def required_api_key_parts
     private # ---------------------------------------------------------------
 
     def base_query_url(query)
+      require 'erb' unless defined?(ERB) && defined?(ERB::Util.url_encode)
       text = ERB::Util.url_encode(query.sanitized_text.strip)
       url = "#{protocol}://dev.virtualearth.net/REST/v1/Locations/"
       if query.reverse_geocode?

test/fixtures/bing_invalid_key

@@ -1 +1 @@
-{"authenticationResultCode":"InvalidCredentials","brandLogoUri":"http:\\/\\/dev.virtualearth.net\\/Branding\\/logo_powered_by.png","copyright":"Copyright \xC2\xA9 2012 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.","errorDetails":["Access was denied. You may have entered your credentials incorrectly, or you might not have access to the requested resource or operation."],"resourceSets":[],"statusCode":401,"statusDescription":"Unauthorized","traceId":"5c539f6e70c44b2e858741b6c932318e|EWRM001670|02.00.83.1900|"}
+{"authenticationResultCode":"InvalidCredentials","brandLogoUri":"http:\\/\\/dev.virtualearth.net\\/Branding\\/logo_powered_by.png","copyright":"Copyright \u00a9 2012 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.","errorDetails":["Access was denied. You may have entered your credentials incorrectly, or you might not have access to the requested resource or operation."],"resourceSets":[],"statusCode":401,"statusDescription":"Unauthorized","traceId":"5c539f6e70c44b2e858741b6c932318e|EWRM001670|02.00.83.1900|"}