active_utils 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9de480a810228c07a1d980254f1d402df7ba80f2e988feacc95aec1afd883675
-  data.tar.gz: c2ebda446fe2252803c210ec96252417a3e3f7c1bb99a21471358b639254f7ae
+  metadata.gz: 749cb044fcb177e843182013d5caaf8a6a13efa33c1218644df2c1ffddecf0b5
+  data.tar.gz: 35a1d31ebe872e755c590e3a3055c1c6b54b7672274f766774b21eca5d6c3016
 SHA512:
-  metadata.gz: 14a096c421ce499640357f80be62252783ca9ab300b56c019bdde6e13fcf45b1dfedde17ce1f398efd364d4f2f1613256ee9e1b72be301fe99fc6a19838e57a0
-  data.tar.gz: 58fcc9f444a65ca230009c4a341ee4ad80ae037ac6316e6f01b2e55e215cfbc88c525f1fa6e31cfdb8c31a865b4183176d15a51a1dbc95a377facd76cc6e1ef6
+  metadata.gz: 22ea40eaf40d232ad00f92c9460a139b59792df62fa9b9ca469adb6b32a66182bc5630f7f11bc90e75e38816a5d55ebca2dd7df746f9d652ef725e56bf3f54f7
+  data.tar.gz: f29ec7086e81adf45ab458e388677ca07ce9c66fdf5e3779dfb94421237f39cc708653e3d6bdc16f5edf5eba149219defb39697783f17f7bbbacb5b38d79cd2b

data/.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+registries:
+  ruby-shopify:
+    type: rubygems-server
+    url: https://pkgs.shopify.io/basic/gems/ruby
+    username: ${{secrets.RUBYGEMS_SERVER_PKGS_SHOPIFY_IO_USERNAME}}
+    password: ${{secrets.RUBYGEMS_SERVER_PKGS_SHOPIFY_IO_PASSWORD}}
+  github-com:
+    type: git
+    url: https://github.com
+    username: ${{secrets.DEPENDENCIES_GITHUB_USER}}
+    password: ${{secrets.DEPENDENCIES_GITHUB_TOKEN}}
+updates:
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 100
+    insecure-external-code-execution: allow
+    registries: "*"

data/.github/workflows/.github/workflows/dependabot_auto_merge.yml

@@ -0,0 +1,93 @@
+name: Dependabot auto-merge
+on: pull_request_target
+
+jobs:
+  dependabot:
+    runs-on: shopify-ubuntu-latest
+    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.6.0
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Waiting for CI to finish
+        id: check_ci_failure
+        continue-on-error: true
+        if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.dependency-group == 'auto_merge' }}
+        uses: actions/github-script@v6
+        with:
+          script: |
+            function sleep(ms) {
+              return new Promise(resolve => setTimeout(resolve, ms))
+            }
+            const query = `query ($org: String!, $repo: String!, $pullRequestNumber: Int!) {
+                            organization(login: $org) {
+                              repository(name: $repo) {
+                                pullRequest(number: $pullRequestNumber) {
+                                  commits(last: 1) {
+                                    nodes {
+                                      commit {
+                                        status {
+                                          state
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }`;
+            const variables = {
+              org: context.repo.owner,
+              repo: context.repo.repo,
+              pullRequestNumber: context.issue.number
+            }
+            // Try for 30 minutes
+            let attempts = 30
+            let ci_state = false
+            for (let i = 1; i <= attempts; i++) {
+              console.log(`Sleeping for 60 seconds`)
+              await sleep(60000)
+              const result = await github.graphql(query, variables)
+              const state = result["organization"]["repository"]["pullRequest"]["commits"]["nodes"][0]["commit"]["status"]["state"]
+              console.log(`Status is ${state} after ${i} attempts`)
+              if (state === "SUCCESS") {
+                ci_state = true
+                console.log("Proceeding with workflow as CI succeed")
+                break
+              }
+            }
+            core.setOutput("ci_state", ci_state)
+      - name: Send Slack notification if auto-merge failed
+        if: ${{ steps.check_ci_failure.outputs.ci_state == 'false' }}
+        uses: ruby/action-slack@v3.0.0
+        with:
+          payload: |
+            {
+              "attachments": [{
+                  "text": "Auto-merge failed for pull request <${{ github.event.pull_request.html_url }}|#${{ github.event.pull_request.number }}> in repository ${{ github.repository }}",
+                  "color": "danger"
+                }
+              ]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.METRICS_SLACK_WEBHOOK_URL }}
+
+      - name: Approve and merge
+        if: ${{ steps.check_ci_failure.outputs.ci_state == 'true' && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.dependency-group == 'auto_merge') }}
+        uses: actions/github-script@v6
+        with:
+          script: |
+            await github.rest.pulls.createReview({
+              pull_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              event: 'APPROVE',
+            })
+            await github.rest.pulls.merge({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+            })

data/.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: CI
+on:
+  pull_request:
+    branches:
+      - '**'
+  push:
+    branches:
+      - main
+jobs:
+  build:
+    name: Ruby ${{ matrix.version }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: [ '2.7', '3.0', '3.1', '3.2', '3.3' ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby ${{ matrix.version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.version }}
+          bundler-cache: true
+      - name: Test
+        run: bundle exec rake test

data/.gitignore

@@ -2,4 +2,3 @@ pkg/*
 *.gem
 .bundle
 .DS_Store
-Gemfile.lock

data/.ruby-version

@@ -0,0 +1 @@
+2.7.5

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # ActiveUtils changelog
 
+### Version 3.4.2 (January 15, 2025)
+- Remove numeric as a required param for `ActiveUtils::Country`
+
 ### Version 3.4.1 (APril 04, 2023)
 - Fix depracated deprecated calling of `=~` on Object which is removed by ruby 3.2.0 as described here: https://bugs.ruby-lang.org/issues/15231
 

data/Gemfile.lock

@@ -0,0 +1,55 @@
+PATH
+  remote: .
+  specs:
+    active_utils (3.4.2)
+      activesupport (>= 4.2)
+      i18n
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.5.0)
+    drb (2.2.1)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    logger (1.6.5)
+    minitest (5.22.3)
+    mocha (2.1.0)
+      ruby2_keywords (>= 0.0.5)
+    mutex_m (0.3.0)
+    rake (13.2.0)
+    ruby2_keywords (0.0.5)
+    securerandom (0.3.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  arm64-darwin-21
+  arm64-darwin-23
+  x86_64-linux
+
+DEPENDENCIES
+  active_utils!
+  minitest
+  mocha
+  rake
+
+BUNDLED WITH
+   2.4.18

data/Rakefile

@@ -5,7 +5,6 @@ require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/unit/**/*_test.rb'
-  t.ruby_opts << '-rubygems'
   t.libs << 'test'
   t.verbose = true
 end

data/active_utils.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |s|
   s.summary     = %q{Common utils used by active_merchant, active_fulfillment, and active_shipping}
   s.license     = 'MIT'
 
+  s.required_ruby_version = ">= 2.7"
+
   s.rubyforge_project = "active_utils"
 
   s.add_dependency('activesupport', '>= 4.2')

data/lib/active_utils/country.rb

@@ -40,7 +40,7 @@ module ActiveUtils #:nodoc:
     attr_reader :name
 
     def initialize(options = {})
-      requires!(options, :name, :alpha2, :alpha3, :numeric)
+      requires!(options, :name, :alpha2, :alpha3)
       @name = options.delete(:name)
       @codes = options.collect{|k,v| CountryCode.new(v)}
     end
@@ -66,7 +66,6 @@ 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' },
@@ -77,6 +76,7 @@ module ActiveUtils #:nodoc:
       { :alpha2 => 'AR', :name => 'Argentina', :alpha3 => 'ARG', :numeric => '032' },
       { :alpha2 => 'AM', :name => 'Armenia', :alpha3 => 'ARM', :numeric => '051' },
       { :alpha2 => 'AW', :name => 'Aruba', :alpha3 => 'ABW', :numeric => '533' },
+      { :alpha2 => 'AC', :name => 'Ascension Island', :alpha3 => 'ASC' },
       { :alpha2 => 'AU', :name => 'Australia', :alpha3 => 'AUS', :numeric => '036' },
       { :alpha2 => 'AT', :name => 'Austria', :alpha3 => 'AUT', :numeric => '040' },
       { :alpha2 => 'AZ', :name => 'Azerbaijan', :alpha3 => 'AZE', :numeric => '031' },

data/lib/active_utils/version.rb

@@ -1,3 +1,3 @@
 module ActiveUtils
-  VERSION = "3.4.1"
+  VERSION = "3.4.2"
 end

data/test/unit/connection_test.rb

@@ -11,7 +11,7 @@ class ConnectionTest < Minitest::Test
   end
 
   def test_path_to_cert_is_correct
-    assert File.exists?(ActiveUtils::Connection::CA_FILE)
+    assert File.file?(ActiveUtils::Connection::CA_FILE)
   end
 
   def test_connection_endpoint_parses_string_to_uri
@@ -130,8 +130,8 @@ class ConnectionTest < Minitest::Test
     assert_equal "/bogus", @connection.send(:http).ca_path
   end
 
-  def test_default_proxy_address_is_nil
-    assert_equal nil, @connection.proxy_address
+  def test_default_proxy_address_is_env
+    assert_equal :ENV, @connection.proxy_address
   end
 
   def test_default_proxy_port_is_nil

data/test/unit/country_test.rb

@@ -84,4 +84,10 @@ class CountryTest < Minitest::Test
     qatar = Country.find('Qatar')
     refute qatar.uses_postal_codes?
   end
+
+  def test_find_country_without_numeric_code
+    country = Country.find('ASC')
+    assert_equal 'Ascension Island', country.to_s
+    assert_nil country.code(:numeric)
+  end
 end

data/test/unit/posts_data_test.rb

@@ -2,7 +2,6 @@ require 'test_helper'
 require 'active_support/core_ext/class'
 
 class PostsDataTest < Minitest::Test
-
   class SSLPoster
     include PostsData
 
@@ -44,6 +43,8 @@ class PostsDataTest < Minitest::Test
 
     SSLPoster.ssl_strict = false
     @poster.raw_ssl_request(:post, "https://shopify.com", "", {})
+  ensure
+    SSLPoster.ssl_strict = true
   end
 
   def test_logger_warns_can_handle_non_string_endpoints
@@ -65,10 +66,15 @@ class PostsDataTest < Minitest::Test
   end
 
   def test_set_proxy_address_and_port
+    original_proxy_address = SSLPoster.proxy_address
+    original_proxy_port = SSLPoster.proxy_port
     SSLPoster.proxy_address = 'http://proxy.example.com'
     SSLPoster.proxy_port = '8888'
     assert_equal @poster.proxy_address, 'http://proxy.example.com'
     assert_equal @poster.proxy_port, '8888'
+  ensure
+    SSLPoster.proxy_address = original_proxy_address
+    SSLPoster.proxy_port = original_proxy_port
   end
 
   class HttpConnectionAbort < StandardError; end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_utils
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Shopify
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,19 +79,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - developers@jadedpixel.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/.github/workflows/dependabot_auto_merge.yml"
+- ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -128,7 +131,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -136,15 +138,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Common utils used by active_merchant, active_fulfillment, and active_shipping
 test_files: []