mail-x_smtpapi-ksr 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dc958a654b3a3c27b0c08ddbce12d514691889367ee499b3c11e5fe1764f4ba
-  data.tar.gz: 3b8ad87c7deeb1e3c357ec42c9d1d2b003cf7e7aa86870f9695c6c8fe97f0a4d
+  metadata.gz: 9b6d361815027c597218c55b10124623256ff7db7f323928bacc123ea921bd36
+  data.tar.gz: d5919b3c296b58041a483b3efa76605ff5a032073979284342e1f46d766c2c5c
 SHA512:
-  metadata.gz: 13191e816e6f83a45426d86d0716771d73befa5347c252981e399aad5a667808965c4b90a5fcfb815f644cd58a6dc947ef13532b7747db67c32bfd0b1c761cfd
-  data.tar.gz: 3b6369a8743f6dd7466a06d8110c3e095b74c8f7aedec6ef6d95a4d000b94bbabe7629a0b6fc2bbbe03f21fa0a18b79cf6b18bb96bbb6aa8f9eefe3c11d00d80
+  metadata.gz: df90172b1c415f885da8e3527617ded12245062fa5e3f76a6a07edab9f412a26ad39fcd87f96c14e50b331a567bf10f1fc113ca3bbe0da0576140376457377fe
+  data.tar.gz: 6f3a0eb42a50d3951bab00c02c6bb4cacb509011a1da3a00d54633252f8fc578782da22e8eb85b23d6e7082d5e61801ac3656de7ab105fc106b97f0aa6589441

data/.github/actions/setup-rubygems/action.yml

@@ -0,0 +1,18 @@
+name: Setup RubyGems
+description: Setup RubyGems credentials
+inputs:
+  api-key:
+    description: RubyGems API key
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: setup rubygems
+      shell: bash
+      run: |
+        mkdir -p ~/.gem
+        cat <<-YAML > ~/.gem/credentials
+        ---
+        :rubygems_api_key: ${{ inputs.api-key }}
+        YAML
+        chmod 0600 ~/.gem/credentials

data/.github/workflows/release.yml

@@ -0,0 +1,19 @@
+name: Release
+on:
+  release:
+    types:
+      - published
+jobs:
+  publish:
+    name: Publish Gem
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: "3.4"
+      - uses: ./.github/actions/setup-rubygems
+        with:
+          api-key: ${{ secrets.RUBYGEMS_API_KEY }}
+      - run: bundle exec rake release

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Ruby v${{ matrix.ruby }}, Mail v${{ matrix.mail }}
+    strategy:
+      matrix:
+        mail:
+          - '2.8.1'
+          - '2.9.0'
+        ruby:
+          - '3.3'
+          - '3.4'
+          - '4.0'
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle add mail -v "${{ matrix.mail }}"
+      - run: bundle exec rake

data/.gitignore

@@ -12,3 +12,5 @@
 *.o
 *.a
 mkmf.log
+
+.ruby-version

data/Gemfile

@@ -5,5 +5,4 @@ group :development do
   gem 'debug'
 end
 
-# Specify your gem's dependencies in mail-x_smtpapi.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Mail::X::Smtpapi
 
-[![Gem Version](https://badge.fury.io/rb/mail-x_smtpapi.svg)](http://badge.fury.io/rb/mail-x_smtpapi) [![Circle CI](https://img.shields.io/circleci/project/kickstarter/mail-x_smtpapi.svg?style=shield)](https://circleci.com/gh/kickstarter/mail-x_smtpapi/tree/master) [![Code Climate](https://codeclimate.com/github/kickstarter/mail-x_smtpapi/badges/gpa.svg)](https://codeclimate.com/github/kickstarter/mail-x_smtpapi)
+[![Gem Version](https://badge.fury.io/rb/mail-x_smtpapi-ksr.svg)](http://badge.fury.io/rb/mail-x_smtpapi-ksr)
 
 Integrates support for SendGrid's X-SMTPAPI field into the [Mail](https://github.com/mikel/mail) gem.
 
@@ -11,7 +11,7 @@ Please refer to [SendGrid docs](https://sendgrid.com/docs/API_Reference/SMTP_API
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mail-x_smtpapi'
+gem 'mail-x_smtpapi-ksr'
 ```
 
 And then execute:
@@ -20,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install mail-x_smtpapi
+    $ gem install mail-x_smtpapi-ksr
 
 ## Usage
 

data/Rakefile

@@ -1,10 +1,31 @@
-require "bundler/gem_tasks"
-
+require 'rubygems'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
+
+task default: :test
+
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*test.rb']
   t.verbose = true
 end
 
-task :default => :test
+namespace :gem do
+  require 'bundler/gem_tasks'
+
+  @gem = "pkg/egads-#{MailXSMTPAPI::VERSION}.gem"
+
+  desc "Push #{@gem} to rubygems.org"
+  task :push => %i[test build git:check] do
+    sh %{gem push #{@gem}}
+  end
+end
+
+namespace :git do
+  desc 'Check git workspace'
+  task :check do
+    sh %{git diff HEAD --quiet} do |ok|
+      abort "\e[31mRefusing to continue - git workspace is dirty\e[0m" unless ok
+    end
+  end
+end

data/Taskfile.yml

@@ -0,0 +1,25 @@
+# https://taskfile.dev
+---
+version: "3"
+
+tasks:
+  init:
+    desc: Initialize project
+    cmds:
+      - bundle install
+
+  release:
+    desc: Publish gem with GitHub
+    preconditions:
+      - sh: git diff HEAD --quiet
+        msg: Refusing to release with local uncommitted changes
+    vars:
+      VERSION:
+        sh: bundle exec ruby -e 'puts "v#{MailXSMTPAPI::VERSION}"'
+    cmds:
+      - gh release create {{.VERSION}} --generate-notes
+
+  test:
+    desc: Run test suite
+    cmds:
+      - bundle exec rake test

data/lib/mail/x_smtpapi/ksr.rb

@@ -0,0 +1 @@
+require_relative '../../mail-x_smtpapi'

data/lib/mail/x_smtpapi.rb

@@ -18,6 +18,6 @@ module Mail
 end
 
 MailXSMTPAPI::Field::FIELD_NAME.tap do |name|
-  Mail::Field::FIELDS_MAP[name]     = MailXSMTPAPI::Field
+  Mail::Field::FIELDS_MAP[name]     = Gem::Version.new(Mail::VERSION::STRING) >= Gem::Version.new('2.9.0') ? MailXSMTPAPI::Field.to_s : MailXSMTPAPI::Field
   Mail::Field::FIELD_NAME_MAP[name] = MailXSMTPAPI::Field::CAPITALIZED_FIELD
 end

data/lib/mail-x_smtpapi-ksr.rb

@@ -0,0 +1 @@
+require_relative 'mail-x_smtpapi'

data/lib/mail_x_smtpapi/field.rb

@@ -5,7 +5,7 @@ require_relative 'accessors'
 module MailXSMTPAPI
   class Field < ::Mail::UnstructuredField
     FIELD_NAME = 'x-smtpapi'
-    CAPITALIZED_FIELD = 'X-SMTPAPI'
+    NAME = CAPITALIZED_FIELD = 'X-SMTPAPI'
 
     def self.singular? = true
 

data/lib/mail_x_smtpapi/version.rb

@@ -1,3 +1,3 @@
 module MailXSMTPAPI
-  VERSION = '1.3.0'
+  VERSION = '1.4.1'
 end

data/mail-x_smtpapi.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 2.2.3"
-  spec.add_development_dependency "rake", "~> 13.1"
-  spec.add_development_dependency "minitest", "~> 5.21"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 
-  spec.add_dependency "mail", "~> 2.8.1"
+  spec.add_dependency "mail", "~> 2.8"
   spec.add_dependency "net-smtp"
 end

data/test/mail_autorequire_test.rb

@@ -0,0 +1,54 @@
+require_relative 'test_helper'
+require 'open3'
+
+class MailAutorequireTest < Minitest::Test
+  PROJECT_ROOT = File.expand_path('..', __dir__)
+
+  def test_bundler_default_require_loads_smtpapi_extension
+    script = <<~RUBY
+      require 'bundler'
+      Bundler.require(:default)
+      require 'mail'
+      puts Mail.new.respond_to?(:smtpapi)
+    RUBY
+
+    out, err, status = run_bundle_ruby(script)
+
+    assert status.success?, "Expected script to succeed, got:\n#{err}"
+    assert_equal 'true', out.chomp
+  end
+
+  def test_hyphenated_gem_name_is_requireable
+    script = <<~RUBY
+      require 'mail-x_smtpapi-ksr'
+      require 'mail'
+      puts Mail.new.respond_to?(:smtpapi)
+    RUBY
+
+    out, err, status = run_bundle_ruby(script)
+
+    assert status.success?, "Expected script to succeed, got:\n#{err}"
+    assert_equal 'true', out.chomp
+  end
+
+  def test_slash_form_is_requireable
+    script = <<~RUBY
+      require 'mail/x_smtpapi/ksr'
+      require 'mail'
+      puts Mail.new.respond_to?(:smtpapi)
+    RUBY
+
+    out, err, status = run_bundle_ruby(script)
+
+    assert status.success?, "Expected script to succeed, got:\n#{err}"
+    assert_equal 'true', out.chomp
+  end
+
+  private
+
+  def run_bundle_ruby(script)
+    Bundler.with_unbundled_env do
+      Open3.capture3('bundle', 'exec', 'ruby', '-e', script, chdir: PROJECT_ROOT)
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mail-x_smtpapi-ksr
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Kickstarter
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +15,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.21'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: net-smtp
   requirement: !ruby/object:Gem::Requirement
@@ -80,27 +79,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - devops@kickstarter.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
+- ".github/actions/setup-rubygems/action.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- Taskfile.yml
+- lib/mail-x_smtpapi-ksr.rb
 - lib/mail-x_smtpapi.rb
 - lib/mail/x_smtpapi.rb
+- lib/mail/x_smtpapi/ksr.rb
 - lib/mail_x_smtpapi/accessors.rb
 - lib/mail_x_smtpapi/field.rb
 - lib/mail_x_smtpapi/version.rb
 - mail-x_smtpapi.gemspec
 - test/mail_accessors_test.rb
+- test/mail_autorequire_test.rb
 - test/mail_integration_test.rb
 - test/mail_x_smtpapi_field_test.rb
 - test/test_helper.rb
@@ -108,7 +112,6 @@ homepage: https://github.com/kickstarter/mail-x_smtpapi
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,12 +126,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Adds SendGrid X-SMTPAPI header support to Mail
 test_files:
 - test/mail_accessors_test.rb
+- test/mail_autorequire_test.rb
 - test/mail_integration_test.rb
 - test/mail_x_smtpapi_field_test.rb
 - test/test_helper.rb

data/.github/workflows/main.yml

@@ -1,28 +0,0 @@
-name: Ruby
-
-on:
-  push:
-    branches:
-      - main
-
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}
-    strategy:
-      matrix:
-        ruby:
-          - '3.2'
-          - '3.3'
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run the default task
-      run: bundle exec rake