ardb 0.29.2 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a5b06420fd7d8b670267fd508d46efe7d600838a5808c33d25e166739e453d
-  data.tar.gz: cee5d9470ee881423fb3783b5607a9be982b45a34637f936a39590912241ce79
+  metadata.gz: f61742815afbcc9e0a4e2a450864e15297d2dc3d6e4d1b61fcaf62d87551b048
+  data.tar.gz: 388acb5b938c3c51a8d6f9aa1c382fe2310d7ba919c4ef9c2d62bc50c4fffc87
 SHA512:
-  metadata.gz: 1f3581d3e82f86af6b6dfcb79adab4560c577c907ac3c908febdf1b1216b7bfd473715053b87790083e4db7b44e7a0a6e0c35b0e512cdb652e75fec8c846d1e0
-  data.tar.gz: a63b4a6eef47151c9e22edff4177b25dce35e4a9be4914ad2a49cba22a7d785e8ac42d19e7eb0e51615d549c0f52d6a290a46e8847fd3701789261d1b10b7252
+  metadata.gz: c05d1cefea07609365899f0f08d067a39b326859d86e13c669163658a0f56c0b162fda248be764ecf2c0638108b302893cd58717162027ce474d5fd06cd1db5a
+  data.tar.gz: 5080cb134c4f67bc6a8a6280f70945c0909bcdc4975123069663f5f061c8f63054970b87898e4a9d6f77171bb9ebbc3a88f766b5607040da637713667b5e305c

data/.l.yml

@@ -3,6 +3,7 @@
 linters:
   - name: "Rubocop"
     cmd: "bundle exec rubocop"
+    autocorrect_cmd: "bundle exec rubocop -A"
     extensions:
       - ".rb"
     cli_abbrev: "u"

data/.ruby-version

@@ -0,0 +1 @@
+3.1.0

data/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "~> 2.5"
+ruby ">= 2.5"
 
 gemspec
 
@@ -12,9 +12,12 @@ gemspec
 #
 # to test a specific version.
 #
+# Rails 7.0
+gem "activerecord",  "~> 7.0.1"
+gem "activesupport", "~> 7.0.1"
 # Rails 6.1
-gem "activerecord",  "~> 6.1"
-gem "activesupport", "~> 6.1"
+# gem "activerecord",  "~> 6.1"
+# gem "activesupport", "~> 6.1"
 # Rails 6.0
 # gem "activerecord",  "~> 6.0.3"
 # gem "activesupport", "~> 6.0.3"
@@ -22,5 +25,5 @@ gem "activesupport", "~> 6.1"
 # gem "activerecord",  "~> 5.2.4"
 # gem "activesupport", "~> 5.2.4"
 
-gem "pg", "~> 1.1.4"
+gem "pg", "~> 1.3"
 gem "pry"

data/ardb.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = "~> 2.5"
+  gem.required_ruby_version = ">= 2.5"
 
-  gem.add_development_dependency("much-style-guide", ["~> 0.6.0"])
-  gem.add_development_dependency("assert",           ["~> 2.19.3"])
+  gem.add_development_dependency("much-style-guide", ["~> 0.6.7"])
+  gem.add_development_dependency("assert",           ["~> 2.19.8"])
 
-  gem.add_dependency("activerecord",  ["> 5.0", "< 7.0"])
-  gem.add_dependency("activesupport", ["> 5.0", "< 7.0"])
-  gem.add_dependency("much-mixin",    ["~> 0.2.4"])
-  gem.add_dependency("scmd",          ["~> 3.0.4"])
+  gem.add_dependency("activerecord",  [">= 5.0"])
+  gem.add_dependency("activesupport", [">= 5.0"])
+  gem.add_dependency("much-mixin",    ["~> 0.2.5"])
+  gem.add_dependency("scmd",          ["~> 3.0.5"])
 end

data/lib/ardb/cli/clirb.rb

@@ -1,7 +1,7 @@
 module Ardb; end
 
 class Ardb::CLI
-  class CLIRB  # Version 1.1.0, https://github.com/redding/cli.rb
+  class CLIRB  # Version 1.2.0, https://github.com/redding/cli.rb
     Error    = Class.new(RuntimeError);
     HelpExit = Class.new(RuntimeError); VersionExit = Class.new(RuntimeError)
     attr_reader :argv, :args, :opts, :data
@@ -18,17 +18,14 @@ class Ardb::CLI
       end
     end
 
-    def option(*args); @options << Option.new(*args); end
-
+    def option(*args, **kargs); @options << Option.new(*args, **kargs); end
     def parse!(argv)
       @args = (argv || []).dup.tap do |args_list|
         begin; @parser.parse!(args_list)
         rescue OptionParser::ParseError => err; raise Error, err.message; end
       end; @data = @args + [@opts]
     end
-
     def to_s; @parser.to_s; end
-
     def inspect
       "#<#{self.class}:#{"0x0%x" % (object_id << 1)} @data=#{@data.inspect}>"
     end
@@ -54,7 +51,6 @@ class Ardb::CLI
           custom_abbrev || processed_name.gsub(/[^a-z]/, "").chars.first || "a"
         ]
       end
-
       def gvalinfo(v); v.kind_of?(Class) ? [nil,v] : [v,v.class]; end
     end
   end

data/lib/ardb/relation_spy.rb

@@ -101,7 +101,7 @@ module Ardb
     # ActiveRecord::FinderMethods
 
     def find(id)
-      record = @results.detect{ |result| result.id == id }
+      record = @results.find{ |result| result.id == id }
       record || raise(NotFoundError)
     end
 

data/lib/ardb/require_autoloaded_active_record_files.rb

@@ -15,6 +15,91 @@
 require "active_record"
 
 if (
+  ActiveRecord.version.segments[0] == 7 &&
+  ActiveRecord.version.segments[1] >= 0
+)
+  require "active_record/aggregations"
+  require "active_record/association_relation"
+  require "active_record/associations"
+  require "active_record/associations/alias_tracker"
+  require "active_record/associations/association"
+  require "active_record/associations/association_scope"
+  require "active_record/associations/belongs_to_association"
+  require "active_record/associations/belongs_to_polymorphic_association"
+  require "active_record/associations/builder/association"
+  require "active_record/associations/builder/belongs_to"
+  require "active_record/associations/builder/collection_association"
+  require "active_record/associations/builder/has_and_belongs_to_many"
+  require "active_record/associations/builder/has_many"
+  require "active_record/associations/builder/has_one"
+  require "active_record/associations/collection_association"
+  require "active_record/associations/collection_proxy"
+  require "active_record/associations/disable_joins_association_scope"
+  require "active_record/associations/foreign_association"
+  require "active_record/associations/has_many_association"
+  require "active_record/associations/has_many_through_association"
+  require "active_record/associations/has_one_association"
+  require "active_record/associations/has_one_through_association"
+  require "active_record/associations/join_dependency"
+  require "active_record/associations/join_dependency/join_association"
+  require "active_record/associations/join_dependency/join_base"
+  require "active_record/associations/preloader"
+  require "active_record/associations/preloader/association"
+  require "active_record/associations/preloader/batch"
+  require "active_record/associations/preloader/branch"
+  require "active_record/associations/preloader/through_association"
+  require "active_record/asynchronous_queries_tracker"
+  require "active_record/attribute_assignment"
+  require "active_record/attribute_methods/before_type_cast"
+  require "active_record/attribute_methods/dirty"
+  require "active_record/attribute_methods/primary_key"
+  require "active_record/attribute_methods/query"
+  require "active_record/attribute_methods/read"
+  require "active_record/attribute_methods/serialization"
+  require "active_record/attribute_methods/time_zone_conversion"
+  require "active_record/attribute_methods/write"
+  require "active_record/attributes"
+  require "active_record/autosave_association"
+  require "active_record/base"
+  require "active_record/coders/json"
+  require "active_record/disable_joins_association_relation"
+  require "active_record/encryption/cipher/aes256_gcm"
+  require "active_record/encryption/derived_secret_key_provider"
+  require "active_record/encryption/deterministic_key_provider"
+  require "active_record/encryption/encrypted_attribute_type"
+  require "active_record/encryption/encrypted_fixtures"
+  require "active_record/encryption/encrypting_only_encryptor"
+  require "active_record/encryption/envelope_encryption_key_provider"
+  require "active_record/encryption/extended_deterministic_queries"
+  require "active_record/encryption/extended_deterministic_uniqueness_validator"
+  require "active_record/encryption/key"
+  require "active_record/encryption/message"
+  require "active_record/encryption/null_encryptor"
+  require "active_record/encryption/properties"
+  require "active_record/encryption/read_only_null_encryptor"
+  require "active_record/encryption/scheme"
+  require "active_record/future_result"
+  require "active_record/internal_metadata"
+  require "active_record/legacy_yaml_adapter"
+  require "active_record/middleware/database_selector"
+  require "active_record/middleware/shard_selector"
+  require "active_record/null_relation"
+  require "active_record/query_logs"
+  require "active_record/relation/predicate_builder"
+  require "active_record/relation/record_fetch_warning"
+  require "active_record/result"
+  require "active_record/runtime_registry"
+  require "active_record/statement_cache"
+  require "active_record/table_metadata"
+  require "active_record/tasks/database_tasks"
+  require "active_record/tasks/mysql_database_tasks"
+  require "active_record/tasks/postgresql_database_tasks"
+  require "active_record/tasks/sqlite_database_tasks"
+  require "arel/collectors/bind"
+  require "arel/collectors/composite"
+  require "arel/collectors/substitute_binds"
+
+elsif (
   ActiveRecord.version.segments[0] == 6 &&
   ActiveRecord.version.segments[1] > 0
 )

data/lib/ardb/test_helpers.rb

@@ -23,10 +23,11 @@ module Ardb
     end
 
     def create_db
-      @create_db ||= begin
-        create_db!
-        true
-      end
+      @create_db ||=
+        begin
+          create_db!
+          true
+        end
     end
 
     def drop_db!
@@ -34,10 +35,11 @@ module Ardb
     end
 
     def drop_db
-      @drop_db ||= begin
-        drop_db!
-        true
-      end
+      @drop_db ||=
+        begin
+          drop_db!
+          true
+        end
     end
 
     def connect_db!
@@ -45,10 +47,11 @@ module Ardb
     end
 
     def connect_db
-      @connect_db ||= begin
-        connect_db!
-        true
-      end
+      @connect_db ||=
+        begin
+          connect_db!
+          true
+        end
     end
 
     def migrate_db!
@@ -56,10 +59,11 @@ module Ardb
     end
 
     def migrate_db
-      @migrate_db ||= begin
-        migrate_db!
-        true
-      end
+      @migrate_db ||=
+        begin
+          migrate_db!
+          true
+        end
     end
 
     def reset_db!
@@ -69,10 +73,11 @@ module Ardb
     end
 
     def reset_db
-      @reset_db ||= begin
-        reset_db!
-        true
-      end
+      @reset_db ||=
+        begin
+          reset_db!
+          true
+        end
     end
   end
 end

data/lib/ardb/use_db_default.rb

@@ -30,9 +30,10 @@ module Ardb
         # this allows the attr to be defaulted by the DB, this keeps
         # activerecord from adding the attr into the sql `INSERT`, which will
         # make the DB default its value
-        unchanged_names = self.class.ardb_use_db_default_attrs.reject do |name|
-          send("#{name}_changed?")
-        end
+        unchanged_names =
+          self.class.ardb_use_db_default_attrs.reject do |name|
+            send("#{name}_changed?")
+          end
         unchanged_names.each{ |name| @attributes.delete(name) }
         yield
         # we have to go and fetch the attr value from the DB, otherwise

data/lib/ardb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ardb
-  VERSION = "0.29.2"
+  VERSION = "0.30.0"
 end

data/lib/ardb.rb

@@ -37,7 +37,11 @@ module Ardb
     @adapter = Adapter.new(config)
 
     # setup AR
-    ActiveRecord::Base.default_timezone = config.default_timezone
+    if ActiveRecord.respond_to?(:default_timezone=)
+      ActiveRecord.default_timezone = config.default_timezone
+    else
+      ActiveRecord::Base.default_timezone = config.default_timezone
+    end
     ActiveRecord::Base.logger = config.logger
     adapter.connect_db if establish_connection
   end
@@ -120,7 +124,7 @@ module Ardb
     end
 
     def activerecord_connect_hash
-      ACTIVERECORD_ATTRS.inject({}) do |h, attr_name|
+      ACTIVERECORD_ATTRS.reduce({}) do |h, attr_name|
         value = send(attr_name)
         !value.nil? ? h.merge!(attr_name.to_s => value) : h
       end

data/test/support/postgresql/setup_test_db.rb

@@ -11,18 +11,19 @@ class PostgresqlDbTests < Assert::Context
     # we"re manually configuring ardb so we don"t need this to do anything
     ENV["ARDB_DB_FILE"] = File.join(TEST_SUPPORT_PATH, "require_test_db_file")
 
-    @ardb_config = Ardb::Config.new.tap do |c|
-      c.adapter      = "postgresql"
-      c.database     = "redding_ardb_test"
-      c.encoding     = "unicode"
-      c.min_messages = "WARNING"
-
-      c.logger          = TEST_LOGGER
-      c.root_path       = File.join(TEST_SUPPORT_PATH, "postgresql")
-      c.migrations_path = "migrations"
-      c.schema_path     = "schema"
-      c.schema_format   = :ruby
-    end
+    @ardb_config =
+      Ardb::Config.new.tap do |c|
+        c.adapter      = "postgresql"
+        c.database     = "redding_ardb_test"
+        c.encoding     = "unicode"
+        c.min_messages = "WARNING"
+
+        c.logger          = TEST_LOGGER
+        c.root_path       = File.join(TEST_SUPPORT_PATH, "postgresql")
+        c.migrations_path = "migrations"
+        c.schema_path     = "schema"
+        c.schema_format   = :ruby
+      end
     Assert.stub(Ardb, :config){ @ardb_config }
 
     Ardb.init(false)

data/test/unit/ardb_tests.rb

@@ -116,10 +116,17 @@ module Ardb
       subject.init
 
       assert_equal subject.config.logger, ActiveRecord::Base.logger
-      assert_equal(
-        subject.config.default_timezone,
-        ActiveRecord::Base.default_timezone,
-      )
+      if ActiveRecord.respond_to?(:default_timezone=)
+        assert_equal(
+          subject.config.default_timezone,
+          ActiveRecord.default_timezone,
+        )
+      else
+        assert_equal(
+          subject.config.default_timezone,
+          ActiveRecord::Base.default_timezone,
+        )
+      end
     end
 
     should "optionally establish an AR connection" do

data/test/unit/cli_tests.rb

@@ -277,9 +277,10 @@ class Ardb::CLI
     end
 
     should "take custom CLIRB build procs" do
-      cmd = @command_class.new do
-        option "test", "testing", abbrev: "t"
-      end
+      cmd =
+        @command_class.new do
+          option "test", "testing", abbrev: "t"
+        end
       cmd.run(["-t"], @stdout, @stderr)
       assert_true cmd.clirb.opts["test"]
     end

data/test/unit/default_order_by_tests.rb

@@ -12,10 +12,11 @@ module Ardb::DefaultOrderBy
     setup do
       order_by_attribute = @order_by_attribute = Factory.string.to_sym
       @scope_proc = proc{ self.class.where(grouping: grouping) }
-      @record_class = Ardb::RecordSpy.new do
-        include Ardb::DefaultOrderBy
-        attr_accessor order_by_attribute, :grouping
-      end
+      @record_class =
+        Ardb::RecordSpy.new do
+          include Ardb::DefaultOrderBy
+          attr_accessor order_by_attribute, :grouping
+        end
     end
     subject{ @record_class }
 

data/test/unit/record_spy_tests.rb

@@ -9,10 +9,11 @@ module Ardb::RecordSpy
   class UnitTests < Assert::Context
     desc "Ardb::RecordSpy"
     setup do
-      @record_spy_class = Class.new do
-        include Ardb::RecordSpy
-        attr_accessor :name
-      end
+      @record_spy_class =
+        Class.new do
+          include Ardb::RecordSpy
+          attr_accessor :name
+        end
     end
     subject{ @record_spy_class }
 
@@ -297,9 +298,10 @@ module Ardb::RecordSpy
   class GeneratorTests < UnitTests
     desc "to generate record spy classes"
     setup do
-      @record_spy_class = Ardb::RecordSpy.new do
-        attr_accessor :name
-      end
+      @record_spy_class =
+        Ardb::RecordSpy.new do
+          attr_accessor :name
+        end
       @instance = @record_spy_class.new
     end
     subject{ @record_spy_class }

data/test/unit/use_db_default_tests.rb

@@ -10,10 +10,11 @@ module Ardb::UseDbDefault
   class UnitTests < Assert::Context
     desc "Ardb::UseDbDefault"
     setup do
-      @record_class = Class.new do
-        include UseDbDefaultRecordSpy
-        include Ardb::UseDbDefault
-      end
+      @record_class =
+        Class.new do
+          include UseDbDefaultRecordSpy
+          include Ardb::UseDbDefault
+        end
     end
     subject{ @record_class }
 
@@ -70,9 +71,10 @@ module Ardb::UseDbDefault
       @record = @record_class.new
 
       # simulate activerecords `@attributes` hash
-      @original_attrs = @attr_names.inject({}) do |h, n|
-        h.merge!(n => [nil, Factory.string, Factory.integer].sample)
-      end
+      @original_attrs =
+        @attr_names.reduce({}) do |h, n|
+          h.merge!(n => [nil, Factory.string, Factory.integer].sample)
+        end
       @original_attrs.merge!(Factory.string => Factory.string)
       @record.attributes = @original_attrs.dup
 
@@ -83,9 +85,10 @@ module Ardb::UseDbDefault
       # we should always get the record we just inserted back
       @record_class.relation_spy.results = [@record]
       # add pluck values into the relation spy
-      @record_class.relation_spy.pluck_values = @attr_names.inject({}) do |h, n|
-        h.merge!(n => Factory.string)
-      end
+      @record_class.relation_spy.pluck_values =
+        @attr_names.reduce({}) do |h, n|
+          h.merge!(n => Factory.string)
+        end
     end
     subject{ @record }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ardb
 version: !ruby/object:Gem::Version
-  version: 0.29.2
+  version: 0.30.0
 platform: ruby
 authors:
 - Kelly Redding
 - Collin Redding
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: much-style-guide
@@ -17,96 +17,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
   name: assert
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.19.3
+        version: 2.19.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.19.3
+        version: 2.19.8
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: much-mixin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: scmd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 description: Activerecord database tools.
 email:
 - kelly@kellyredding.com
@@ -119,6 +107,7 @@ files:
 - ".gitignore"
 - ".l.yml"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".t.yml"
 - Gemfile
 - LICENSE
@@ -173,13 +162,13 @@ homepage: http://github.com/redding/ardb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -188,8 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
-signing_key: 
+rubygems_version: 3.3.5
+signing_key:
 specification_version: 4
 summary: Activerecord database tools.
 test_files: