umbrellio-sequel-plugins 0.14.0.192 → 0.16.0.211

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62df42e1d4a608c7a2f6f4d3b33956b0e8d7c962de1f4ba970b5ddb3e858c9df
-  data.tar.gz: cc6dadf3aaea66e8af9e694996144daee03ca8af13893d8e930fb8b28f20b254
+  metadata.gz: 8437b559acd9c459729c79bc592d63ffc84d044d4447197957f946372eef5419
+  data.tar.gz: 0da24c3ebe5272fab1563c702fd827cb366d285362f375c69f912825f21c5b02
 SHA512:
-  metadata.gz: '0961d5fce4dd8f7d0aaba3152577c22e097bff92b66cf7b7a716c39693272b020fcfc0fb91f4bca530617559e7cfa4c2ed97cbd7c7807084c0eae458910a6a77'
-  data.tar.gz: e31c2fc3285cb90b2780d2718f6e854fd8bee2c7d54a9e988df766348ecd3838cb92243c1de210f9b5fc4ff2ef4d3acc53edc5271d8cd66cc65cf5d91547c681
+  metadata.gz: 0f1389f354a0b0952534154a1e206f0698c5e3d365270cb87fca37de7cfe1886fa363ecdb8942c62b6fba9d28b79e0d6377d85d8c1982acc3ce5754d46a00d95
+  data.tar.gz: 9d9d419fcf3b5e67c76b7e57614d79528deb3613c9df3ea9fe9941c20024ba05a40f563fc4cacbbbcc44ec21a09979004255ed48eb8726bfe348f75635800e1d

data/.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
 
     name: ${{ matrix.ruby }}
 

data/.rubocop.yml

@@ -3,8 +3,11 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 
 Naming/FileName:
   Exclude:
     - lib/umbrellio-sequel-plugins.rb
+
+RSpec/SpecFilePathFormat:
+  Enabled: false

data/Gemfile

@@ -13,3 +13,4 @@ gem "rspec"
 gem "rubocop-config-umbrellio"
 gem "simplecov"
 gem "simplecov-lcov"
+gem "symbiont-ruby"

data/Gemfile.lock

@@ -1,104 +1,124 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.14.0)
+    umbrellio-sequel-plugins (0.16.0)
       sequel
-      symbiont-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.6)
+    activesupport (7.1.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
     async (1.31.0)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    console (1.17.2)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    console (1.24.0)
       fiber-annotation
       fiber-local
-    diff-lcs (1.5.0)
-    docile (1.4.0)
+      json
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    drb (2.2.1)
     fiber-annotation (0.2.0)
     fiber-local (1.0.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    method_source (1.0.0)
-    minitest (5.18.1)
-    money (6.16.0)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    method_source (1.1.0)
+    minitest (5.25.1)
+    money (6.19.0)
       i18n (>= 0.6.4, <= 2)
-    nio4r (2.5.9)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    mutex_m (0.2.0)
+    nio4r (2.7.3)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.3)
+    pg (1.5.7)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.1)
-    rack (3.0.8)
+    racc (1.8.1)
+    rack (3.1.7)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.7)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.50.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.5)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-config-umbrellio (1.50.0.85)
-      rubocop (~> 1.50.0)
-      rubocop-performance (~> 1.17.0)
-      rubocop-rails (~> 2.19.0)
+    rubocop-config-umbrellio (1.63.0.93)
+      rubocop (~> 1.63.0)
+      rubocop-performance (~> 1.21.0)
+      rubocop-rails (~> 2.24.0)
       rubocop-rake (~> 0.6.0)
-      rubocop-rspec (~> 2.20.0)
+      rubocop-rspec (~> 2.29.0)
       rubocop-sequel (~> 0.3.3)
-    rubocop-performance (1.17.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.19.1)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.20.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.29.2)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    sequel (5.70.0)
+    sequel (5.84.0)
+      bigdecimal
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -110,10 +130,11 @@ GEM
     timers (4.3.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
-  ruby
+  arm64-darwin-23
+  x86_64-linux
 
 DEPENDENCIES
   async (= 1.31.0)
@@ -125,7 +146,8 @@ DEPENDENCIES
   rubocop-config-umbrellio
   simplecov
   simplecov-lcov
+  symbiont-ruby
   umbrellio-sequel-plugins!
 
 BUNDLED WITH
-   2.4.15
+   2.5.18

data/README.md

@@ -131,7 +131,7 @@ DB.synchronize_with([:ruby, :forever]) { p "Hey, I'm in transaction!"; sleep 5 }
 
 ## Methods in Migrations
 
-Enable: `Sequel.extension(:methods_in_migrations)`
+Enable: `Sequel.extension(:methods_in_migrations)`. Also, you will need to add and require `symbiont-ruby` gem.
 
 Support for method definitions and invocations inside `Sequel.migration`.
 

data/lib/sequel/plugins/attr_encrypted.rb

@@ -48,10 +48,10 @@ module Sequel::Plugins::AttrEncrypted
 
     def define_encrypted_setter(attr, key)
       @_attr_encrypted_module.module_eval do
-        define_method("#{attr}=") do |value|
-          instance_variable_set("@#{attr}", value)
+        define_method(:"#{attr}=") do |value|
+          instance_variable_set(:"@#{attr}", value)
 
-          send("encrypted_#{attr}=", SimpleCrypt.encrypt(value.to_json, key))
+          send(:"encrypted_#{attr}=", SimpleCrypt.encrypt(value.to_json, key))
         end
       end
     end
@@ -59,11 +59,11 @@ module Sequel::Plugins::AttrEncrypted
     def define_encrypted_getter(attr, key)
       @_attr_encrypted_module.module_eval do
         define_method(attr.to_s) do
-          instance_variable_get("@#{attr}") || begin
-            decrypted = SimpleCrypt.decrypt(send("encrypted_#{attr}"), key)
+          instance_variable_get(:"@#{attr}") || begin
+            decrypted = SimpleCrypt.decrypt(send(:"encrypted_#{attr}"), key)
 
             result = decrypted.nil? ? decrypted : JSON.parse(decrypted)
-            instance_variable_set("@#{attr}", result)
+            instance_variable_set(:"@#{attr}", result)
           end
         end
       end
@@ -91,7 +91,7 @@ module Sequel::Plugins::AttrEncrypted
 
     def _reset_encrypted_attrs_ivars
       self.class.instance_variable_get(:@_encrypted_attributes)&.each do |attr|
-        instance_variable_set("@#{attr}", nil)
+        instance_variable_set(:"@#{attr}", nil)
       end
     end
   end

data/lib/sequel/plugins/money_accessors.rb

@@ -40,7 +40,7 @@ module Sequel::Plugins::MoneyAccessors
     def money_setter(amount_column, currency_column)
       include_accessors_module!
       @_money_accessors_module.module_eval do
-        define_method("#{amount_column}=") do |value|
+        define_method(:"#{amount_column}=") do |value|
           case value
           when Money
             amount = value.to_d
@@ -52,7 +52,7 @@ module Sequel::Plugins::MoneyAccessors
           end
 
           super(amount)
-          send("#{currency_column}=", currency)
+          send(:"#{currency_column}=", currency)
         end
       end
     end

data/lib/sequel/plugins/store_accessors.rb

@@ -52,8 +52,8 @@ module Sequel::Plugins::StoreAccessors
 
     def define_store_setter(column, field)
       @_store_accessors_module.module_eval do
-        define_method("#{field}=") do |value|
-          send("#{column}=", send(column).to_h.merge(field.to_s => value))
+        define_method(:"#{field}=") do |value|
+          send(:"#{column}=", send(column).to_h.merge(field.to_s => value))
         end
       end
     end

data/lib/umbrellio_sequel_plugins/rails_db_command.rb

@@ -9,45 +9,86 @@ class Rails::Command::DbconsoleCommand < Rails::Command::Base
   def perform
     require "rake"
     Rake.with_application(&:load_rakefile) # Needed to initialize Rails.application
-    Rails::DBConsole.start(options)
+    start!
   end
-end
-
-class Rails::DBConsole
-  DBConfig = Struct.new(:configuration_hash, :adapter, :database)
 
   private
 
-  def db_config
-    @db_config ||= DBConfig.new(configuration_hash, adapter, database)
+  # See ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.dbconsole
+  def start!
+    ENV["PGUSER"] = pg_config[:username] if pg_config[:username]
+    ENV["PGHOST"] = pg_config[:host] if pg_config[:host]
+    ENV["PGPORT"] = pg_config[:port].to_s if pg_config[:port]
+
+    if pg_config[:password] && options[:include_password]
+      ENV["PGPASSWORD"] = pg_config[:password].to_s
+    end
+
+    ENV["PGSSLMODE"] = pg_config[:sslmode].to_s if pg_config[:sslmode]
+    ENV["PGSSLCERT"] = pg_config[:sslcert].to_s if pg_config[:sslcert]
+    ENV["PGSSLKEY"] = pg_config[:sslkey].to_s if pg_config[:sslkey]
+    ENV["PGSSLROOTCERT"] = pg_config[:sslrootcert].to_s if pg_config[:sslrootcert]
+
+    if pg_config[:variables]
+      ENV["PGOPTIONS"] = pg_config[:variables].filter_map do |name, value|
+        "-c #{name}=#{value.to_s.gsub(/[ \\]/, '\\\\\0')}" unless value.in?([":default", :default])
+      end.join(" ")
+    end
+
+    find_cmd_and_exec("psql", database)
   end
 
-  def configuration_hash
-    return @configuration_hash if defined?(@configuration_hash)
+  def pg_config
+    @pg_config ||= begin
+      rails_db_config = Rails.application.config.database_configuration
 
-    rails_db_config = Rails.application.config.database_configuration
+      sequel_configuration = SequelRails::Configuration.new
+      SequelRails.configuration = sequel_configuration.merge!(raw: rails_db_config)
 
-    sequel_configuration = SequelRails::Configuration.new
-    SequelRails.configuration = sequel_configuration.merge!(raw: rails_db_config)
+      storage = SequelRails::Storage.adapter_for(Rails.env)
+      config = storage.config.with_indifferent_access
 
-    storage = SequelRails::Storage.adapter_for(Rails.env)
-    config = storage.config.with_indifferent_access
+      if @options[:server]
+        server_config = config.fetch(:servers).fetch(@options[:server])
+        config.merge!(server_config)
+      end
 
-    if @options[:server]
-      server_config = config.fetch(:servers).fetch(@options[:server])
-      config.merge!(server_config)
+      config
     end
-
-    @configuration_hash = config
   end
 
-  def adapter
-    mapping = SequelRails::DbConfig::ADAPTER_MAPPING.invert
-    value = configuration_hash.fetch(:adapter)
-    mapping[value] || value
+  # See ActiveRecord::ConnectionAdapters::AbstractAdapter.find_cmd_and_exec
+  def find_cmd_and_exec(commands, *args) # rubocop:disable Metrics/MethodLength
+    commands = Array(commands)
+
+    dirs_on_path = ENV["PATH"].to_s.split(File::PATH_SEPARATOR)
+    unless (ext = RbConfig::CONFIG["EXEEXT"]).empty?
+      commands = commands.map { |cmd| "#{cmd}#{ext}" }
+    end
+
+    full_path_command = nil
+    found = commands.detect do |cmd|
+      dirs_on_path.detect do |path|
+        full_path_command = File.join(path, cmd)
+        begin
+          stat = File.stat(full_path_command)
+        rescue SystemCallError
+        else
+          stat.file? && stat.executable?
+        end
+      end
+    end
+
+    if found
+      exec(*[full_path_command, *args].compact)
+    else
+      abort(
+        "Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.",
+      )
+    end
   end
 
   def database
-    @options[:database] || configuration_hash.fetch(:database)
+    options[:database] || pg_config.fetch(:database)
   end
 end

data/umbrellio-sequel-plugins.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  gem_version = "0.14.0"
+  gem_version = "0.16.0"
 
   if ENV.fetch("PUBLISH_JOB", nil)
     release_version = "#{gem_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}"
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.name = "umbrellio-sequel-plugins"
   spec.version = release_version || gem_version
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.authors = ["Team Umbrellio"]
   spec.email = ["oss@umbrellio.biz"]
@@ -25,5 +25,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "sequel"
-  spec.add_runtime_dependency "symbiont-ruby"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.14.0.192
+  version: 0.16.0.211
 platform: ruby
 authors:
 - Team Umbrellio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: symbiont-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A colletion of sequel plugins by Umbrellio
 email:
 - oss@umbrellio.biz
@@ -98,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="