active_utils 3.3.18 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba20b023488f4b47c77a36833387c62951f0fcf50eab1a0fca623a745cf54d71
-  data.tar.gz: 9d7de1684d1c17b84db39717bba46abc43a68589bda5bd7030245ca3dda14e01
+  metadata.gz: 47ca23e9563451e7e1b9e8e4014a72b58fb33ebcbbf705624ed1ad05cc83cf6a
+  data.tar.gz: 4b26f12af37cfb198a86273c320dfb87f422a96f9fa9feb1901b120888126871
 SHA512:
-  metadata.gz: adf0fe3ac25f1a6c5afbf4d893f8ff648b8b7dfc09b150e166b56d4d373b969c0fdd156ec28e8c3dffb6394e324a88184e9a3184dfa66baf014b2b331b51a5e6
-  data.tar.gz: c7a6c626e7c3a3d24945bd4ceb8e2d64512ff30bdc60ede9466bc4c348d72974f93f10d05db136ec3502771ce413ca515eeb4f70bb7c8701e8c8352d228462ce
+  metadata.gz: 10f6afbf20b7b656cc980ec6be22d0ff302524210f47480f56515d9e646273131c83c4bfaddb93cee423f4c3305e185ff4d38f9ff588212737eb690087b43bb3
+  data.tar.gz: c1b88683c03a582a36efbb40ed08a94cd9cf4d9f27b172f4451fcc799ef9f51e3002465cc8bf6192299ea87c3e3b2a63b7c82519ce67c0639082eb2b9a3b52c7

data/.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request 
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      ) 
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ActiveUtils changelog
 
+### Version 3.4.0 (February 23, 2022)
+- Add AC and TA to `ActiveUtils::Country::COUNTRIES`
+
+### Version 3.3.19 (February 24, 2020)
+- Support `net/http` default proxy settings from `ENV['http_proxy']`
+- Support usage of custom ssl certificate with `ENV['SSL_CERT_FILE']`, default variable for Ruby
+
 ### Version 3.3.17 (February 24, 2020)
 - Add support for PATCH HTTP method in `ActiveUtils#Connection`
 

data/lib/active_utils/connection.rb

@@ -11,9 +11,12 @@ module ActiveUtils
     OPEN_TIMEOUT = 60
     READ_TIMEOUT = 60
     VERIFY_PEER = true
-    CA_FILE = (File.dirname(__FILE__) + '/../certs/cacert.pem')
+    # allow using proxy for https calls by pointing to it's certificate
+    # SSL_CERT_FILE is variable used by Ruby to look for certificate for net/http
+    CA_FILE = ENV.fetch('SSL_CERT_FILE', File.dirname(__FILE__) + '/../certs/cacert.pem')
     CA_PATH = nil
     RETRY_SAFE = false
+    PROXY_ADDRESS = :ENV
     RUBY_184_POST_HEADERS = { "Content-Type" => "application/x-www-form-urlencoded" }
 
     attr_accessor :endpoint
@@ -45,7 +48,7 @@ module ActiveUtils
       @max_retries  = MAX_RETRIES
       @ignore_http_status = false
       @ssl_version = nil
-      @proxy_address = nil
+      @proxy_address = PROXY_ADDRESS
       @proxy_port = nil
     end
 

data/lib/active_utils/country.rb

@@ -66,6 +66,7 @@ module ActiveUtils #:nodoc:
       { :alpha2 => 'AF', :name => 'Afghanistan', :alpha3 => 'AFG', :numeric => '004' },
       { :alpha2 => 'AX', :name => 'Aland Islands', :alpha3 => 'ALA', :numeric => '248' },
       { :alpha2 => 'AL', :name => 'Albania', :alpha3 => 'ALB', :numeric => '008' },
+      { :alpha2 => 'AC', :name => 'Ascension Island', :alpha3 => 'ASC' },
       { :alpha2 => 'DZ', :name => 'Algeria', :alpha3 => 'DZA', :numeric => '012' },
       { :alpha2 => 'AS', :name => 'American Samoa', :alpha3 => 'ASM', :numeric => '016' },
       { :alpha2 => 'AD', :name => 'Andorra', :alpha3 => 'AND', :numeric => '020' },
@@ -291,6 +292,7 @@ module ActiveUtils #:nodoc:
       { :alpha2 => 'TK', :name => 'Tokelau', :alpha3 => 'TKL', :numeric => '772' },
       { :alpha2 => 'TO', :name => 'Tonga', :alpha3 => 'TON', :numeric => '776' },
       { :alpha2 => 'TT', :name => 'Trinidad and Tobago', :alpha3 => 'TTO', :numeric => '780' },
+      { :alpha2 => 'TA', :name => 'Tristan da Cunha', :alpha3 => 'TAA' },
       { :alpha2 => 'TN', :name => 'Tunisia', :alpha3 => 'TUN', :numeric => '788' },
       { :alpha2 => 'TR', :name => 'Turkey', :alpha3 => 'TUR', :numeric => '792' },
       { :alpha2 => 'TM', :name => 'Turkmenistan', :alpha3 => 'TKM', :numeric => '795' },

data/lib/active_utils/posts_data.rb

@@ -24,6 +24,8 @@ module ActiveUtils #:nodoc:
       base.class_attribute :wiredump_device
 
       base.class_attribute :proxy_address
+      base.proxy_address = Connection::PROXY_ADDRESS
+
       base.class_attribute :proxy_port
     end
 

data/lib/active_utils/version.rb

@@ -1,3 +1,3 @@
 module ActiveUtils
-  VERSION = "3.3.18"
+  VERSION = "3.4.0"
 end

data/test/unit/posts_data_test.rb

@@ -61,4 +61,13 @@ class PostsDataTest < Minitest::Test
     assert_equal @poster.proxy_address, 'http://proxy.example.com'
     assert_equal @poster.proxy_port, '8888'
   end
+
+  class HttpConnectionAbort < StandardError; end
+
+  def test_respecting_environment_proxy_settings
+    Net::HTTP.stubs(:new).with('example.com', 80, :ENV, nil).raises(PostsDataTest::HttpConnectionAbort)
+    assert_raises(PostsDataTest::HttpConnectionAbort) do
+      @poster.ssl_post('http://example.com', '')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_utils
 version: !ruby/object:Gem::Version
-  version: 3.3.18
+  version: 3.4.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/probots.yml"
+- ".github/workflows/cla.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Common utils used by active_merchant, active_fulfillment, and active_shipping

data/.github/probots.yml

@@ -1,2 +0,0 @@
-enabled:
-  - cla