ardb 0.29.1 → 0.29.2

data/lib/ardb/test_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record"
 require "ardb"
 
@@ -6,7 +8,7 @@ require "ardb"
 
 module Ardb
   module TestHelpers
-    module_function
+    extend self
 
     def drop_tables
       Ardb.adapter.drop_tables
@@ -22,7 +24,7 @@ module Ardb
 
     def create_db
       @create_db ||= begin
-        self.create_db!
+        create_db!
         true
       end
     end
@@ -33,7 +35,7 @@ module Ardb
 
     def drop_db
       @drop_db ||= begin
-        self.drop_db!
+        drop_db!
         true
       end
     end
@@ -44,7 +46,7 @@ module Ardb
 
     def connect_db
       @connect_db ||= begin
-        self.connect_db!
+        connect_db!
         true
       end
     end
@@ -55,20 +57,20 @@ module Ardb
 
     def migrate_db
       @migrate_db ||= begin
-        self.migrate_db!
+        migrate_db!
         true
       end
     end
 
     def reset_db!
-      self.drop_db!
-      self.create_db!
-      self.load_schema
+      drop_db!
+      create_db!
+      load_schema
     end
 
     def reset_db
       @reset_db ||= begin
-        self.reset_db!
+        reset_db!
         true
       end
     end

data/lib/ardb/use_db_default.rb

@@ -1,16 +1,18 @@
-require "much-plugin"
+# frozen_string_literal: true
+
+require "much-mixin"
 
 module Ardb
   module UseDbDefault
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       @ardb_use_db_default_attrs = []
 
       around_create :ardb_allow_db_to_default_attrs
     end
 
-    plugin_class_methods do
+    mixin_class_methods do
       def ardb_use_db_default_attrs
         @ardb_use_db_default_attrs
       end
@@ -21,7 +23,7 @@ module Ardb
       end
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       private
 
       def ardb_allow_db_to_default_attrs
@@ -29,13 +31,13 @@ module Ardb
         # 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|
-          self.send("#{name}_changed?")
+          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
         # activerecord doesn"t know the value that the DB used
-        scope = self.class.where(:id => self.id)
+        scope = self.class.where(id: id)
         unchanged_names.each do |name|
           @attributes[name] = scope.pluck(name).first
         end

data/lib/ardb/version.rb

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

data/script/determine_autoloaded_active_record_files.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record"
 
 # this can be slow, this is one of the reasons this shouldn"t be done during
@@ -13,19 +15,19 @@ paths = Dir["#{gemspec.lib_dirs_glob}/**/*.rb"]
 # generators fail when we try to require them. the others are pieces of active
 # record we don"t use in a production environment
 ignored_regexes = [
-  /rails\/generators/,
-  /active_record\/railtie/,
-  /active_record\/migration/,
-  /active_record\/fixtures/,
-  /active_record\/fixture_set/,
-  /active_record\/schema/,
-  /active_record\/connection_adapters/,
-  /active_record\/test_case/,
-  /active_record\/test_databases/,
-  /active_record\/test_fixtures/,
-  /active_record\/coders\/yaml_column/,
+  %r{rails/generators},
+  %r{active_record/railtie},
+  %r{active_record/migration},
+  %r{active_record/fixtures},
+  %r{active_record/fixture_set},
+  %r{active_record/schema},
+  %r{active_record/connection_adapters},
+  %r{active_record/test_case},
+  %r{active_record/test_databases},
+  %r{active_record/test_fixtures},
+  %r{active_record/coders/yaml_column},
   # `destroy_association_async_job` requires `ActiveJob` to be required.
-  /active_record\/destroy_association_async_job/,
+  %r{active_record/destroy_association_async_job},
 ]
 
 Result = Struct.new(:file, :state, :reason)
@@ -43,11 +45,11 @@ paths.sort.each do |full_path|
 
   # see if it"s ignored
   ignored_regexes.each do |regex|
-    if relative_path =~ regex
-      result.state  = :ignored
-      result.reason = "matched #{regex}"
-      break
-    end
+    next unless relative_path =~ regex
+
+    result.state  = :ignored
+    result.reason = "matched #{regex}"
+    break
   end
   if result.state == :ignored
     ignored << result
@@ -56,14 +58,14 @@ paths.sort.each do |full_path|
 
   # try requiring the file
   begin
-    if result.state = require(relative_path)
+    if (result.state = require(relative_path))
       needs_to_be_required << result
     else
       already_required << result
     end
-  rescue LoadError, SyntaxError => exception
+  rescue LoadError, SyntaxError => ex
     result.state  = :errored
-    result.reason = "#{exception.class}: #{exception.message}"
+    result.reason = "#{ex.class}: #{ex.message}"
     errored << result
   end
 end

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # this file is automatically required when you run `assert`
 # put any test helpers here
 

data/test/support/factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert/factory"
 
 module Factory
@@ -22,5 +24,4 @@ module Factory
       c.min_messages     = Factory.string
     end
   end
-
 end

data/test/support/fake_schema.rb

@@ -1,4 +1,6 @@
-if !defined?(FAKE_SCHEMA)
+# frozen_string_literal: true
+
+unless defined?(FAKE_SCHEMA)
   fake_schema_class = Struct.new(:load_count)
   FAKE_SCHEMA = fake_schema_class.new(0)
 end

data/test/support/postgresql/schema.rb

@@ -1,2 +1,4 @@
-ActiveRecord::Schema.define(:version => 0) do
+# frozen_string_literal: true
+
+ActiveRecord::Schema.define(version: 0) do
 end

data/test/support/postgresql/setup_test_db.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb"
 
@@ -6,7 +8,7 @@ class PostgresqlDbTests < Assert::Context
     @orig_env_ardb_db_file    = ENV["ARDB_DB_FILE"]
     ActiveRecord::Base.logger = @orig_ar_loggerF
 
-    # no-op, we"re manually configuring ardb so we don"t need this to do anything
+    # 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|

data/test/support/relative_require_test_db_file.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 # this file is used to test that Ardb will relatively require a db file when
 # init

data/test/support/require_test_db_file.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 # this file is used to test that Ardb will require a db file when init

data/test/unit/adapter/base_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/adapter/base"
 
@@ -118,7 +120,7 @@ class Ardb::Adapter::Base
 
   class MigrateTests < UnitTests
     setup do
-      Assert.stub(ActiveRecord::MigrationContext, :new) do |*args, &block|
+      Assert.stub(ActiveRecord::MigrationContext, :new) do |*args|
         @fake_migration_context ||= FakeMigrationContext.new(*args)
       end
     end
@@ -257,7 +259,8 @@ class Ardb::Adapter::Base
 
   class DumpRubySchemaTests < UnitTests
     setup do
-      @config.schema_path = File.join(TMP_PATH, "testdb", "test_dump_ruby_schema")
+      @config.schema_path =
+        File.join(TMP_PATH, "testdb", "test_dump_ruby_schema")
       FileUtils.rm_rf(File.dirname(@config.schema_path))
 
       @schema_dumper_connection, @schema_dumper_file = [nil, nil]
@@ -276,9 +279,9 @@ class Ardb::Adapter::Base
     end
 
     should "dump a ruby schema file using `dump_ruby_schema`" do
-      assert_false File.exists?(subject.ruby_schema_path)
+      assert_false File.exist?(subject.ruby_schema_path)
       subject.dump_ruby_schema
-      assert_true File.exists?(subject.ruby_schema_path)
+      assert_true File.exist?(subject.ruby_schema_path)
       assert_equal @fake_connection, @schema_dumper_connection
       assert_instance_of File, @schema_dumper_file
       assert_equal subject.ruby_schema_path, @schema_dumper_file.path
@@ -321,7 +324,8 @@ class Ardb::Adapter::Base
   end
 
   class FakeConnectionPool
-    def with_connection(&block); end
+    def with_connection(&block)
+    end
   end
 
   class FakeMigrationContext

data/test/unit/adapter/mysql_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/adapter/mysql"
 

data/test/unit/adapter/postgresql_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/adapter/postgresql"
 
@@ -17,43 +19,41 @@ class Ardb::Adapter::Postgresql
     should "know its public connect hash" do
       exp = subject.connect_hash.merge({
         "database" => "postgres",
-        "schema_search_path" => "public"
+        "schema_search_path" => "public",
       })
       assert_equal exp, subject.public_connect_hash
     end
 
     should "complain if given a database name with non-word characters" do
       @config.database = "#{Factory.string}-#{Factory.string}"
-      assert_raises(Ardb::ConfigurationError){
+      assert_raises(Ardb::ConfigurationError) do
         Ardb::Adapter::Postgresql.new(@config)
-      }
+      end
     end
   end
 
   class SQLSchemaTests < UnitTests
     setup do
       @env = {
-        "PGHOST"     => @adapter.connect_hash["host"],
-        "PGPORT"     => @adapter.connect_hash["port"],
-        "PGUSER"     => @adapter.connect_hash["username"],
-        "PGPASSWORD" => @adapter.connect_hash["password"]
+        "PGHOST" => @adapter.connect_hash["host"],
+        "PGPORT" => @adapter.connect_hash["port"],
+        "PGUSER" => @adapter.connect_hash["username"],
+        "PGPASSWORD" => @adapter.connect_hash["password"],
       }
     end
-
   end
 
   class LoadSQLSchemaTests < SQLSchemaTests
     setup do
       cmd_str = "psql -f \"#{@adapter.sql_schema_path}\" #{@adapter.database}"
       @cmd_spy = CmdSpy.new
-      Assert.stub(Scmd, :new).with(cmd_str, :env => @env){ @cmd_spy }
+      Assert.stub(Scmd, :new).with(cmd_str, env: @env){ @cmd_spy }
     end
 
     should "run a command for loading a SQL schema using `load_sql_schema`" do
       subject.load_sql_schema
       assert_true @cmd_spy.run_called
     end
-
   end
 
   class DumpSQLSchemaTests < SQLSchemaTests
@@ -61,14 +61,13 @@ class Ardb::Adapter::Postgresql
       cmd_str = "pg_dump -i -s -x -O -f " \
                 "\"#{@adapter.sql_schema_path}\" #{@adapter.database}"
       @cmd_spy = CmdSpy.new
-      Assert.stub(Scmd, :new).with(cmd_str, :env => @env){ @cmd_spy }
+      Assert.stub(Scmd, :new).with(cmd_str, env: @env){ @cmd_spy }
     end
 
     should "run a command for dumping a SQL schema using `dump_sql_schema`" do
       subject.dump_sql_schema
       assert_true @cmd_spy.run_called
     end
-
   end
 
   class CmdSpy
@@ -82,7 +81,8 @@ class Ardb::Adapter::Postgresql
       @run_called = true
     end
 
-    def success?; true; end
+    def success?
+      true
+    end
   end
-
 end

data/test/unit/adapter/sqlite_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/adapter/sqlite"
 

data/test/unit/adapter_spy_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/adapter_spy"
 
@@ -26,7 +28,8 @@ class Ardb::AdapterSpy
     should have_accessors :dump_schema_called_count, :load_schema_called_count
     should have_accessors :drop_db_called_count, :create_db_called_count
     should have_accessors :connect_db_called_count, :migrate_db_called_count
-    should have_imeths :create_db_called?, :drop_db_called?, :drop_tables_called?
+    should have_imeths :create_db_called?, :drop_db_called?
+    should have_imeths :drop_tables_called?
     should have_imeths :connect_db_called?, :migrate_db_called?
     should have_imeths :dump_schema_called?, :load_schema_called?
     should have_imeths :create_db, :drop_db, :drop_tables

data/test/unit/ardb_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb"
 
@@ -114,7 +116,10 @@ module Ardb
       subject.init
 
       assert_equal subject.config.logger, ActiveRecord::Base.logger
-      assert_equal subject.config.default_timezone, ActiveRecord::Base.default_timezone
+      assert_equal(
+        subject.config.default_timezone,
+        ActiveRecord::Base.default_timezone,
+      )
     end
 
     should "optionally establish an AR connection" do
@@ -132,7 +137,9 @@ module Ardb
     should "raise a not initialized error using its adapter before init" do
       subject.reset_adapter
       assert_raises(NotInitializedError){ subject.adapter }
-      assert_raises(NotInitializedError){ subject.escape_like_pattern(Factory.string) }
+      assert_raises(NotInitializedError) do
+        subject.escape_like_pattern(Factory.string)
+      end
 
       subject.init
       assert_nothing_raised{ subject.adapter }
@@ -171,7 +178,7 @@ module Ardb
         :password,
         :pool,
         :checkout_timeout,
-        :min_messages
+        :min_messages,
       ]
       assert_equal exp, subject::ACTIVERECORD_ATTRS
     end
@@ -199,7 +206,7 @@ module Ardb
     end
     subject{ @config }
 
-    should have_accessors *Ardb::Config::ACTIVERECORD_ATTRS
+    should have_accessors(*Ardb::Config::ACTIVERECORD_ATTRS)
     should have_accessors :default_timezone, :logger, :root_path
     should have_readers :schema_format
     should have_writers :migrations_path, :schema_path
@@ -209,9 +216,17 @@ module Ardb
       assert_equal :utc, subject.default_timezone
       assert_instance_of Logger, subject.logger
       assert_equal ENV["PWD"], subject.root_path
-      exp = File.expand_path(@config_class::DEFAULT_MIGRATIONS_PATH, subject.root_path)
+      exp =
+        File.expand_path(
+          @config_class::DEFAULT_MIGRATIONS_PATH,
+          subject.root_path,
+        )
       assert_equal exp, subject.migrations_path
-      exp = File.expand_path(@config_class::DEFAULT_SCHEMA_PATH, subject.root_path)
+      exp =
+        File.expand_path(
+          @config_class::DEFAULT_SCHEMA_PATH,
+          subject.root_path,
+        )
       assert_equal exp, subject.schema_path
       assert_equal @config_class::RUBY_SCHEMA_FORMAT, subject.schema_format
     end
@@ -250,11 +265,11 @@ module Ardb
     end
 
     should "know its activerecord connection hash" do
-      attrs_and_values = @config_class::ACTIVERECORD_ATTRS.map do |attr_name|
-        value = [Factory.string,  nil].sample
+      attrs_and_values = @config_class::ACTIVERECORD_ATTRS.map{ |attr_name|
+        value = [Factory.string, nil].sample
         subject.send("#{attr_name}=", value)
-        [attr_name.to_s, value] if !value.nil?
-      end.compact
+        [attr_name.to_s, value] unless value.nil?
+      }.compact
       assert_equal Hash[attrs_and_values], subject.activerecord_connect_hash
     end
 
@@ -285,7 +300,7 @@ module Ardb
         :root_path,
         :schema_format,
         :migrations_path,
-        :schema_path
+        :schema_path,
       ]
       attrs.each do |attr_name|
         subject.send("#{attr_name}=", Factory.string)
@@ -324,7 +339,7 @@ module Ardb
         "postgresql",
         "postgres",
         "mysql",
-        "mysql2"
+        "mysql2",
       ]
       assert_equal exp, subject::VALID_ADAPTERS
     end
@@ -333,7 +348,7 @@ module Ardb
       adapter_key, exp_adapter_class = [
         ["sqlite",     Ardb::Adapter::Sqlite],
         ["postgresql", Ardb::Adapter::Postgresql],
-        ["mysql",      Ardb::Adapter::Mysql]
+        ["mysql",      Ardb::Adapter::Mysql],
       ].sample
       @config.adapter = adapter_key