active_delivery 0.4.3 → 1.0.0.rc2

data/lib/active_delivery/testing.rb

@@ -18,25 +18,39 @@ module ActiveDelivery
         Thread.current.thread_variable_get(:active_delivery_testing) == true
       end
 
-      def track(delivery, event, args, options)
-        store << [delivery, event, args, options]
+      def track(delivery, options)
+        store << [delivery, options]
+      end
+
+      def track_line(line)
+        lines << line
       end
 
       def store
-        @store ||= []
+        Thread.current.thread_variable_get(:active_delivery_testing_store) || Thread.current.thread_variable_set(:active_delivery_testing_store, [])
+      end
+
+      def lines
+        Thread.current.thread_variable_get(:active_delivery_testing_lines) || Thread.current.thread_variable_set(:active_delivery_testing_lines, [])
       end
 
       def clear
         store.clear
+        lines.clear
       end
     end
 
-    def notify(event, *args, **options)
+    def perform_notify(delivery, **options)
       return super unless test?
-      TestDelivery.track(self, event, args, options)
+      TestDelivery.track(delivery, options)
       nil
     end
 
+    def notify_line(line, ...)
+      res = super
+      TestDelivery.track_line(line) if res
+    end
+
     def test?
       TestDelivery.enabled?
     end

data/lib/active_delivery/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveDelivery
-  VERSION = "0.4.3"
+  VERSION = "1.0.0.rc2"
 end

data/lib/active_delivery.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "ruby-next"
+require "ruby-next/language/setup"
+RubyNext::Language.setup_gem_load_path(transpile: true)
+
 require "active_delivery/version"
 require "active_delivery/base"
 require "active_delivery/callbacks" if defined?(ActiveSupport)
@@ -7,4 +11,8 @@ require "active_delivery/callbacks" if defined?(ActiveSupport)
 require "active_delivery/lines/base"
 require "active_delivery/lines/mailer" if defined?(ActionMailer)
 
+require "active_delivery/raitie" if defined?(::Rails::Railtie)
 require "active_delivery/testing" if ENV["RACK_ENV"] == "test" || ENV["RAILS_ENV"] == "test"
+
+require "abstract_notifier"
+require "active_delivery/lines/notifier"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_delivery
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,100 +16,105 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: standard
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-next
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
-description: Rails framework for managing all types of notifications in one place
+        version: 0.15.0
+description: Ruby and Rails framework for managing all types of notifications in one
+  place
 email:
-- dementiev.vm@gmail.com
+- Vladimir Dementyev
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gem_release.yml"
-- ".github/ISSUE_TEMPLATE/bug_report.md"
-- ".github/ISSUE_TEMPLATE/feature_request.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/docs-lint.yml"
-- ".github/workflows/rspec-jruby.yml"
-- ".github/workflows/rspec.yml"
-- ".github/workflows/rubocop.yml"
-- ".gitignore"
-- ".mdlrc"
-- ".rspec"
-- ".rubocop-md.yml"
-- ".rubocop.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- RELEASING.md
-- Rakefile
-- active_delivery.gemspec
 - bin/console
 - bin/setup
-- forspell.dict
-- gemfiles/jruby.gemfile
-- gemfiles/rails42.gemfile
-- gemfiles/rails5.gemfile
-- gemfiles/rails50.gemfile
-- gemfiles/rails6.gemfile
-- gemfiles/railsmaster.gemfile
-- gemfiles/rubocop.gemfile
-- lefthook.yml
+- lib/.rbnext/3.0/active_delivery/base.rb
+- lib/.rbnext/3.0/active_delivery/callbacks.rb
+- lib/.rbnext/3.0/active_delivery/lines/base.rb
+- lib/.rbnext/3.0/active_delivery/lines/mailer.rb
+- lib/.rbnext/3.1/active_delivery/base.rb
+- lib/.rbnext/3.1/active_delivery/lines/base.rb
+- lib/abstract_notifier.rb
+- lib/abstract_notifier/async_adapters.rb
+- lib/abstract_notifier/async_adapters/active_job.rb
+- lib/abstract_notifier/base.rb
+- lib/abstract_notifier/testing.rb
+- lib/abstract_notifier/testing/minitest.rb
+- lib/abstract_notifier/testing/rspec.rb
+- lib/abstract_notifier/version.rb
 - lib/active_delivery.rb
-- lib/active_delivery/action_mailer/parameterized.rb
 - lib/active_delivery/base.rb
 - lib/active_delivery/callbacks.rb
+- lib/active_delivery/ext/string_constantize.rb
 - lib/active_delivery/lines/base.rb
 - lib/active_delivery/lines/mailer.rb
+- lib/active_delivery/lines/notifier.rb
+- lib/active_delivery/raitie.rb
 - lib/active_delivery/testing.rb
 - lib/active_delivery/testing/rspec.rb
 - lib/active_delivery/version.rb
@@ -117,12 +122,12 @@ homepage: https://github.com/palkan/active_delivery
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: http://github.com/palkan/active_delivery/issues
+  bug_tracker_uri: https://github.com/palkan/active_delivery/issues
   changelog_uri: https://github.com/palkan/active_delivery/blob/master/CHANGELOG.md
-  documentation_uri: http://github.com/palkan/active_delivery
-  homepage_uri: http://github.com/palkan/active_delivery
-  source_code_uri: http://github.com/palkan/active_delivery
-post_install_message: 
+  documentation_uri: https://github.com/palkan/active_delivery
+  homepage_uri: https://github.com/palkan/active_delivery
+  source_code_uri: https://github.com/palkan/active_delivery
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,15 +135,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.4.8
+signing_key:
 specification_version: 4
-summary: Rails framework for managing all types of notifications in one place
+summary: Ruby and Rails framework for managing all types of notifications in one place
 test_files: []

data/.gem_release.yml

@@ -1,3 +0,0 @@
-bump:
-  file: lib/active_delivery/version.rb
-  skip_ci: true

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,24 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: palkan
-
----
-
-## What did you do?
-
-## What did you expect to happen?
-
-## What actually happened?
-
-## Additional context
-
-## Environment
-
-**Ruby Version:**
-
-**Framework Version (Rails, whatever):**
-
-**Active Delivery Version:**

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: palkan
-
----
-
-## Is your feature request related to a problem? Please describe.
-
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-## Describe the solution you'd like
-
-A clear and concise description of what you want to happen.
-
-## Describe alternatives you've considered
-
-A clear and concise description of any alternative solutions or features you've considered.
-
-## Additional context
-
-Add any other context or screenshots about the feature request here.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +0,0 @@
-<!--
-  First of all, thanks for contributing!
-
-  If it's a typo fix or minor documentation update feel free to skip the rest of this template!
--->
-
-## What is the purpose of this pull request?
-
-<!--
-  If it's a bug fix, then link it to the issue, for example:
-
-  Fixes #xxx
--->
-
-## What changes did you make? (overview)
-
-## Is there anything you'd like reviewers to focus on?
-
-## Checklist
-
-- [ ] I've added tests for this change
-- [ ] I've added a Changelog entry
-- [ ] I've updated a documentation

data/.github/workflows/docs-lint.yml

@@ -1,72 +0,0 @@
-name: Lint Docs
-
-on:
-  push:
-    branches:
-    - master
-    paths:
-    - "*.md"
-    - "**/*.md"
-  pull_request:
-    paths:
-    - "*.md"
-    - "**/*.md"
-
-jobs:
-  markdownlint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - name: Run Markdown linter
-      run: |
-        gem install mdl
-        mdl *.md
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - name: Lint Markdown files with RuboCop
-      run: |
-        gem install bundler
-        bundle install --gemfile gemfiles/rubocop.gemfile --jobs 4 --retry 3
-        bundle exec --gemfile gemfiles/rubocop.gemfile rubocop -c .rubocop-md.yml
-  forspell:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install Hunspell
-      run: |
-        sudo apt-get install hunspell
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - name: Cache installed gems
-      uses: actions/cache@v1
-      with:
-        path: /home/runner/.rubies/ruby-2.7.0/lib/ruby/gems/2.7.0
-        key: gems-cache-${{ runner.os }}
-    - name: Install Forspell
-      run: gem install forspell
-    - name: Run Forspell
-      run: forspell *.md .github/**/*.md
-  liche:
-    runs-on: ubuntu-latest
-    env:
-      GO111MODULE: on
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.13.x
-    - name: Run liche
-      run: |
-        export PATH=$PATH:$(go env GOPATH)/bin
-        go get -u github.com/raviqqe/liche
-        liche README.md CHANGELOG.md

data/.github/workflows/rspec-jruby.yml

@@ -1,35 +0,0 @@
-name: JRuby Build
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
-      CI: true
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: /home/runner/bundle
-        key: bundle-${{ hashFiles('**/gemfiles/jruby.gemfile') }}-${{ hashFiles('**/*.gemspec') }}
-        restore-keys: |
-          bundle-
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: jruby
-    - name: Bundle install
-      run: |
-        bundle config --global gemfile gemfiles/jruby.gemfile
-        bundle config path /home/runner/bundle
-        bundle install
-        bundle update
-    - name: Run RSpec
-      run: |
-        bundle exec rspec

data/.github/workflows/rspec.yml

@@ -1,51 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  rspec:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
-      CI: true
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["2.7"]
-        gemfile: [
-          "gemfiles/rails6.gemfile"
-        ]
-        include:
-        - ruby: "2.5"
-          gemfile: "gemfiles/rails42.gemfile"
-        - ruby: "2.6"
-          gemfile: "gemfiles/rails50.gemfile"
-        - ruby: "2.6"
-          gemfile: "gemfiles/rails5.gemfile"
-        - ruby: "2.7"
-          gemfile: "gemfiles/railsmaster.gemfile"
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: /home/runner/bundle
-        key: bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles(matrix.gemfile) }}-${{ hashFiles('**/*.gemspec') }}
-        restore-keys: |
-          bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Bundle install
-      run: |
-        bundle config path /home/runner/bundle
-        bundle config --global gemfile ${{ matrix.gemfile }}
-        bundle install
-        bundle update
-    - name: Run RSpec
-      run: |
-        bundle exec rspec

data/.github/workflows/rubocop.yml

@@ -1,21 +0,0 @@
-name: Lint Ruby
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - name: Lint Ruby code with RuboCop
-      run: |
-        gem install bundler
-        bundle install --gemfile gemfiles/rubocop.gemfile --jobs 4 --retry 3
-        bundle exec --gemfile gemfiles/rubocop.gemfile rubocop

data/.gitignore

@@ -1,43 +0,0 @@
-# Numerous always-ignore extensions
-*.diff
-*.err
-*.orig
-*.log
-*.rej
-*.swo
-*.swp
-*.vi
-*~
-*.sass-cache
-*.iml
-.idea/
-
-# Sublime
-*.sublime-project
-*.sublime-workspace
-
-# OS or Editor folders
-.DS_Store
-.cache
-.project
-.settings
-.tmproj
-Thumbs.db
-
-.bundle/
-log/*.log
-pkg/
-spec/dummy/db/*.sqlite3
-spec/dummy/db/*.sqlite3-journal
-spec/dummy/tmp/
-
-Gemfile.lock
-Gemfile.local
-.rspec
-.ruby-version
-*.gem
-
-tmp/
-.rbnext/
-
-gemfiles/*.lock

data/.mdlrc

@@ -1 +0,0 @@
-rules "~MD013", "~MD033", "~MD034", "~MD029", "~MD026", "~MD002"

data/.rspec

@@ -1,2 +0,0 @@
--f d
---color

data/.rubocop-md.yml

@@ -1,16 +0,0 @@
-inherit_from: ".rubocop.yml"
-
-require:
-  - rubocop-md
-
-AllCops:
-  Include:
-    - '**/*.md'
-
-Lint/Void:
-  Exclude:
-    - '**/*.md'
-
-Lint/DuplicateMethods:
-  Exclude:
-    - '**/*.md'

data/.rubocop.yml

@@ -1,28 +0,0 @@
-require:
-  - standard/cop/semantic_blocks
-
-inherit_gem:
-  standard: config/base.yml
-
-AllCops:
-  Exclude:
-    - 'bin/*'
-    - 'tmp/**/*'
-    - 'Gemfile'
-    - 'node_modules/**/*'
-    - 'vendor/**/*'
-    - 'gemfiles/**/*'
-  DisplayCopNames: true
-  TargetRubyVersion: 2.5
-
-Standard/SemanticBlocks:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: no_comma
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: no_comma

data/Gemfile

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'pry-byebug', platform: :mri
-
-gemspec
-
-eval_gemfile "gemfiles/rubocop.gemfile"
-
-local_gemfile = "#{File.dirname(__FILE__)}/Gemfile.local"
-
-if File.exist?(local_gemfile)
-  eval(File.read(local_gemfile)) # rubocop:disable Security/Eval
-else
-  gem "rails", "~> 6.0"
-end