auxilium 3.0.24 → 3.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb92dcedcc80162b42e9144c2337b19b0c78d568b9e13fc2e0a3b9a8e50ae4e2
-  data.tar.gz: c392c88f1c090d409a43821b19ad50f272dad09f0704616f8e05f0a0f2e81e70
+  metadata.gz: a9c18c098ed5c373bc8aaa1ef9f840b288448dae2d001c0c14a729e850f85d0d
+  data.tar.gz: 4ace966e96460b8ff75aa4d676e72b42e2e15236a23a2c107168df3eb8afbe57
 SHA512:
-  metadata.gz: f060a273e1d6ab0e406931a8d7a57bfdb7cc773c2bfb95f150b66158386e745fef3f09a9f560e4b7461a0f9e4150dd5a8d90574b19517ac1b342658673cff896
-  data.tar.gz: 002030ab34ca8105b98dd653c6fbb3c2f1fe4a77abf82c2aac2366a14c88c87bdb1a3d352858fc1cd6a5845dfde5ac3fa80216bce28d9c73817f7197b2dc6f25
+  metadata.gz: 45b322146de66d6c4f13f0c5be0abe0ee6a9d53432ac00a0e57a2956bfb5b6be536d3b8e0caaf0d9c809daaf54b3fa1f66f141604c7a1ae2dda5912ea6e3fc9a
+  data.tar.gz: d5357f0dea28bf2a32e15181398c10cb57953034a016b5973f79c069e75a55cf79d4d637e72996466df24ffa73f276256c5b0d6b287534cb148ef944f0eef669

data/.github/workflows/gem-push.yml

@@ -0,0 +1,11 @@
+name: Rubygem Push
+on:
+  push:
+    tags:
+      - '*'
+jobs:
+  build:
+    uses: entdec/_workflows/.github/workflows/gem-push.yml@main
+    with:
+      public: true
+    secrets: inherit

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in auxilium.gemspec
 gemspec
-
-gem 'responders', github: 'heartcombo/responders', branch: :main
-
-gem 'solargraph', require: false

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
-import 'lib/tasks/semver.rake'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/auxilium.gemspec

@@ -13,8 +13,7 @@ Gem::Specification.new do |spec|
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://code.entropydecelerator.com/components/auxilium'
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  spec.metadata['source_code_uri'] = 'https://github.com/entdec/auxilium'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -25,14 +24,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'actionpack', '> 5.1'
-  spec.add_dependency 'activemodel', '> 5.1'
-  spec.add_dependency 'activesupport', '> 5.1'
-  spec.add_dependency 'pundit', '> 2'
-  spec.add_dependency 'responders', '> 3'
-  spec.add_dependency 'rolify', '> 5'
+  spec.add_dependency 'actionpack', '~> 7'
+  spec.add_dependency 'activemodel', '>= 7'
+  spec.add_dependency 'activesupport', '>= 7'
+  spec.add_dependency 'pundit', '>= 2'
+  spec.add_dependency 'responders', '>= 3.1'
+  spec.add_dependency 'rolify', '>= 6'
 
   spec.add_development_dependency 'minitest', '> 5.0'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

data/lib/auxilium/concerns/metadata.rb

@@ -28,6 +28,10 @@ module Auxilium
           YAML.dump(attributes['metadata'])
         end
       end
+
+      def metadata
+        attributes['metadata'].present? && HashWithIndifferentAccess.new(attributes['metadata'])
+      end
     end
   end
 end

data/lib/auxilium/concerns/sidekiq_callbacks.rb

@@ -0,0 +1,63 @@
+require "active_support/callbacks"
+
+# Following approach used by ActiveJob
+# https://github.com/rails/rails/blob/93c9534c9871d4adad4bc33b5edc355672b59c61/activejob/lib/active_job/callbacks.rb
+module Auxilium
+  module Concerns
+    module SidekiqCallbacks
+      extend ActiveSupport::Concern
+
+      def self.prepended(base)
+        base.include(ActiveSupport::Callbacks)
+
+        # Check to see if we already have any callbacks for :perform
+        # Prevents overwriting callbacks if we already included this module (and defined callbacks)
+        base.define_callbacks :perform unless base.respond_to?(:_perform_callbacks) && base._perform_callbacks.present?
+        base.define_callbacks :enqueue unless base.respond_to?(:_enqueue_callbacks) && base._enqueue_callbacks.present?
+
+        class << base
+          prepend ClassMethods
+        end
+      end
+
+      def perform(*args)
+        if respond_to?(:run_callbacks)
+          run_callbacks :perform do
+            super(*args)
+          end
+        else
+          super(*args)
+        end
+      end
+
+      def enqueue(*args)
+        if respond_to?(:run_callbacks)
+          run_callbacks :enqueue do
+            super(*args)
+          end
+        else
+          super(*args)
+        end
+      end
+
+      module ClassMethods
+        def around_perform(*filters, &blk)
+          set_callback(:perform, :around, *filters, &blk)
+        end
+
+        def before_enqueue(*filters, &blk)
+          set_callback(:enqueue, :before, *filters, &blk)
+        end
+
+        def around_enqueue(*filters, &blk)
+          set_callback(:enqueue, :around, *filters, &blk)
+        end
+
+        def before_perform(*filters, &blk)
+          set_callback(:perform, :before, *filters, &blk)
+        end
+      end
+    end
+
+  end
+end

data/lib/auxilium/easy_crypt.rb

@@ -1,7 +1,7 @@
 module Auxilium
   class EasyCrypt
     # When no digest is given, the default Rails digest is used.
-    # Digest can be something like OpenSSL::Digest::SHA1 or OpenSSL::Digest::SHA256 
+    # Digest can be something like OpenSSL::Digest::SHA1 or OpenSSL::Digest::SHA256
     def initialize(key_base, digest: OpenSSL::Digest::SHA1)
       @key_base = key_base
       @digest = digest
@@ -52,5 +52,15 @@ module Auxilium
     def crypted?(text)
       text =~ /^EasyCrypt@[0-9a-f]+\$\$[^-]+--[^-]+--[^-]+/
     end
+
+    class << self
+      def dump(text)
+        new(Rails.application.credentials.secret_key_base).encrypt(text)
+      end
+
+      def load(text)
+        new(Rails.application.credentials.secret_key_base).decrypt(text)
+      end
+    end
   end
 end

data/lib/auxilium/responders/continue_responder.rb

@@ -7,9 +7,9 @@ module Auxilium
     protected
 
     def navigation_location
-      return options[:location] if options[:location] && (controller.is_a?(Devise::SessionsController) || controller.is_a?(Devise::PasswordsController))
+      return options[:location] if options[:location] && (defined?(Devise) && (controller.is_a?(Devise::SessionsController) || controller.is_a?(Devise::PasswordsController)))
       return options[:location] if controller.params[:commit] == 'continue' && options[:location]
-      return options[:collection_location].call if %w[save commit].include?(controller.params[:commit]) && options[:collection_location]
+      return options[:collection_location].call if %w[save commit delete].include?(controller.params[:commit]) && options[:collection_location]
       return resource_location if controller.params[:commit] == 'continue'
 
       klass = resources.last.class

data/lib/auxilium/responders/responder.rb

@@ -4,5 +4,8 @@ module Auxilium
 
     include SignumResponder
     include ContinueResponder
+
+    self.error_status = :unprocessable_entity
+    self.redirect_status = :see_other
   end
 end

data/lib/auxilium/responders/signum_responder.rb

@@ -54,7 +54,7 @@ module Auxilium
       return if value.blank?
 
       @sent_signum = true
-      Signum.signal(controller.current_user, text: value, kind: key)
+      Signum.send(key, controller.current_user, text: value)
     end
 
     def send_signum? #:nodoc:

data/lib/auxilium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Auxilium
-  VERSION = "3.0.24"
+  VERSION = "3.0.31"
 end

data/lib/auxilium.rb

@@ -19,6 +19,7 @@ require 'auxilium/concerns/authenticated'
 require 'auxilium/concerns/metadata'
 require 'auxilium/concerns/metadata_scoped'
 require 'auxilium/concerns/model_name_shortcuts'
+require 'auxilium/concerns/sidekiq_callbacks'
 require 'auxilium/responders/continue_responder'
 require 'auxilium/responders/signum_responder'
 require 'auxilium/responders/responder'

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: auxilium
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.0.31
 platform: ruby
 authors:
 - Andre Meij
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rolify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: Utility classes that are to small to warrant a own gem for now.
 email:
 - andre@itsmeij.com
@@ -143,10 +143,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem-push.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -160,6 +160,7 @@ files:
 - lib/auxilium/concerns/metadata.rb
 - lib/auxilium/concerns/metadata_scoped.rb
 - lib/auxilium/concerns/model_name_shortcuts.rb
+- lib/auxilium/concerns/sidekiq_callbacks.rb
 - lib/auxilium/easy_crypt.rb
 - lib/auxilium/grape.rb
 - lib/auxilium/grape/parameter_filter.rb
@@ -174,13 +175,12 @@ files:
 - lib/auxilium/validators/yaml_validator.rb
 - lib/auxilium/version.rb
 - lib/core_ext/string.rb
-- lib/tasks/semver.rake
 homepage: https://code.entropydecelerator.com/components/auxilium
 licenses: []
 metadata:
   homepage_uri: https://code.entropydecelerator.com/components/auxilium
-  source_code_uri: https://code.entropydecelerator.com/components/auxilium
-post_install_message:
+  source_code_uri: https://github.com/entdec/auxilium
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -195,8 +195,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Random utilities.
 test_files: []

data/Gemfile.lock

@@ -1,152 +0,0 @@
-GIT
-  remote: https://github.com/heartcombo/responders.git
-  revision: 161f205b649489d740821425560eecd355fa02be
-  branch: main
-  specs:
-    responders (3.0.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
-
-PATH
-  remote: .
-  specs:
-    auxilium (3.0.24)
-      actionpack (> 5.1)
-      activemodel (> 5.1)
-      activesupport (> 5.1)
-      pundit (> 2)
-      responders (> 3)
-      rolify (> 5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (7.0.3.1)
-      actionview (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.3.1)
-      activesupport (= 7.0.3.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activesupport (7.0.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    backport (1.2.0)
-    benchmark (0.2.0)
-    builder (3.2.4)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    crass (1.0.6)
-    diff-lcs (1.5.0)
-    e2mmap (0.1.0)
-    erubi (1.10.0)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.6.2)
-    kramdown (2.4.0)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
-    loofah (2.18.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    mini_portile2 (2.8.0)
-    minitest (5.16.2)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.2.1)
-      ast (~> 2.4.1)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pundit (2.2.0)
-      activesupport (>= 3.0.0)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
-      rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rainbow (3.1.1)
-    rake (12.3.3)
-    regexp_parser (2.6.0)
-    reverse_markdown (2.1.1)
-      nokogiri
-    rexml (3.2.5)
-    rolify (6.0.0)
-    rubocop (1.37.1)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    solargraph (0.47.2)
-      backport (~> 1.2)
-      benchmark
-      bundler (>= 1.17.2)
-      diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.1)
-      parser (~> 3.0)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
-      thor (~> 1.0)
-      tilt (~> 2.0)
-      yard (~> 0.9, >= 0.9.24)
-    thor (1.2.1)
-    tilt (2.0.11)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
-    zeitwerk (2.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  auxilium!
-  minitest (> 5.0)
-  pry
-  rake (~> 12.0)
-  responders!
-  solargraph
-
-BUNDLED WITH
-   2.1.4

data/lib/tasks/semver.rake

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-namespace File.basename(Dir.pwd) do
-  desc 'Semantically version and release.\nArguments: PART[=patch] (other options are major and minor)'
-  task :semver do
-    versions = nil
-
-    gemspec = Dir.glob(File.expand_path(Dir.pwd) + '/*.gemspec').first
-    if gemspec
-      spec = Gem::Specification.load(gemspec)
-      versions = spec.version.to_s
-    end
-
-    version_file = Dir.glob(File.expand_path(Dir.pwd) + '/lib/**/version.rb').first
-    if version_file
-      version_file_content = File.read(version_file)
-      versions = version_file_content.scan(/VERSION\s=\s(\"|')(.*)(\"|')/).flatten[1] if versions.nil?
-    end
-
-    raise 'Unable to detect version' if versions.nil?
-
-    versions = versions.split('.').map(&:to_i)
-
-    part = ENV['PART'] || 'patch'
-    what = %w[ma mi pa].index(part.to_s[0, 2].downcase)
-    what ||= 2
-
-    new_version = versions.tap { |parts| parts[what] += 1 }
-    new_version = new_version.map.with_index { |v, i| i > what ? 0 : v }.join('.')
-
-    if version_file
-      File.open(version_file, 'w') do |file|
-        file.puts version_file_content.gsub(/VERSION\s=\s(\"|')(.*)(\"|')/, "VERSION = \"#{new_version}\"")
-      end
-
-      relative_version_path = Pathname.new(version_file).relative_path_from(Dir.pwd)
-      `git add #{relative_version_path}`
-    end
-
-    if File.exist?('./package.json')
-      package = JSON.parse(File.read('./package.json'))
-      package['version'] = new_version
-      File.open('./package.json', 'w') do |file|
-        file.puts(JSON.pretty_generate(package))
-      end
-
-      `git add ./package.json`
-    end
-
-    if gemspec
-      puts "Release #{spec.name} #{new_version}"
-    else
-      puts "Updated version to #{new_version}"
-    end
-
-    puts
-    puts "Changelog:"
-    puts `git log $(git describe --tags --abbrev=0)..HEAD --oneline`
-    puts
-    puts
-    `git commit -m "Version #{new_version}"`
-    `git push`
-    `git tag #{new_version}`
-    `git push --tags`
-  end
-end