Merge branch 'develop' into unstable

.circleci/config.yml

@@ -1,63 +0,0 @@
-# Ruby CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-#
-version: 2
-jobs:
-  "ruby-2.6":
-    docker:
-       - image: hanami/ruby-2.6
-    working_directory: ~/hanami-mailer
-    steps:
-      - checkout
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-      - run:
-          name: install dependencies
-          command: |
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-      # run tests!
-      - run:
-          name: run tests
-          command: |
-            ./script/ci
-  "ruby-2.7":
-    docker:
-       - image: hanami/ruby-2.7
-    working_directory: ~/hanami-mailer
-    steps:
-      - checkout
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-      - run:
-          name: install dependencies
-          command: |
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-      # run tests!
-      - run:
-          name: run tests
-          command: |
-            ./script/ci
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - "ruby-2.6"
-      - "ruby-2.7"

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: ci
+
+"on":
+  push:
+    paths:
+      - ".github/workflows/ci.yml"
+      - "lib/**"
+      - "*.gemspec"
+      - "spec/**"
+      - "Rakefile"
+      - "Gemfile"
+      - ".rubocop.yml"
+  pull_request:
+    branches:
+      - master
+  create:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.0"
+          - "2.7"
+          - "2.6"
+    steps:
+      - uses: actions/checkout@v1
+      - name: Install package dependencies
+        run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+      - name: Install latest bundler
+        run: |
+          gem install bundler --no-document
+      - name: Bundle install
+        run: bundle install --jobs 4 --retry 3
+      - name: Run all tests
+        run: script/ci

CHANGELOG.md

@@ -1,16 +1,18 @@
 # Hanami::Mailer
 Mail for Ruby applications
 
-<<<<<<< HEAD
 ## v2.0.0.alpha1 (unreleased)
 ### Changed
-- [Luca Guidi] Drop support for Ruby: MRI 2.3, and 2.4.
-=======
+- [Luca Guidi] Drop support for Ruby: MRI 2.3, 2.4, 2.5, 2.6
+
+## v1.3.3 - 2021-01-14
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 3.0
+
 ## v1.3.2 - 2020-02-03
 ### Added
 - [Luca Guidi] Official support for Ruby: MRI 2.7
 - [glaszig] Added `Hanami::Mailer.return_path` and `#return_path` to specify `MAIL FROM` address
->>>>>>> develop
 
 ## v1.3.1 - 2019-01-18
 ### Added

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2015-2017 Luca Guidi
+Copyright © 2015-2021 Luca Guidi
 
 MIT License
 

README.md

@@ -5,7 +5,7 @@ Mail for Ruby applications.
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/hanami-mailer.svg)](https://badge.fury.io/rb/hanami-mailer)
-[![CircleCI](https://circleci.com/gh/hanami/mailer/tree/unstable.svg?style=svg)](https://circleci.com/gh/hanami/mailer/tree/unstable)
+[![CI](https://github.com/hanami/mailer/workflows/ci/badge.svg?branch=unstable)](https://github.com/hanami/mailer/actions?query=workflow%3Aci+branch%3Aunstable)
 [![Test Coverage](https://codecov.io/gh/hanami/mailer/branch/unstable/graph/badge.svg)](https://codecov.io/gh/hanami/mailer)
 [![Depfu](https://badges.depfu.com/badges/739c6e10eaf20d3ba4240d00828284db/overview.svg)](https://depfu.com/github/hanami/mailer?project=Bundler)
 [![Inline Docs](http://inch-ci.org/github/hanami/mailer.svg)](http://inch-ci.org/github/hanami/mailer)
@@ -447,6 +447,6 @@ __Hanami::Mailer__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Copyright © 2015-2020 Luca Guidi – Released under MIT License
+Copyright © 2015-2021 Luca Guidi – Released under MIT License
 
 This project was formerly known as Lotus (`lotus-mailer`).

lib/hanami/mailer/template_name.rb

@@ -12,7 +12,7 @@ module Hanami
       # @since next
       # @api unstable
       def self.call(name, namespace)
-        Utils::String.new(name.gsub(/\A#{namespace}(::)*/, "")).underscore.to_s
+        Utils::String.underscore(name.gsub(/\A#{namespace}(::)*/, ""))
       end
 
       class << self