ardb 0.29.1 → 0.29.2

data/test/unit/cli_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/cli"
 
@@ -27,16 +29,19 @@ class Ardb::CLI
     should "know its commands" do
       assert_equal 9, COMMANDS.size
 
-      assert_instance_of InvalidCommand,           COMMANDS[Factory.string]
-      assert_instance_of ConnectCommand,           COMMANDS["connect"]
-      assert_instance_of CreateCommand,            COMMANDS["create"]
-      assert_instance_of DropCommand,              COMMANDS["drop"]
-      assert_instance_of GenerateMigrationCommand, COMMANDS["generate-migration"]
-      assert_instance_of MigrateCommand,           COMMANDS["migrate"]
-      assert_instance_of MigrateUpCommand,         COMMANDS["migrate-up"]
-      assert_instance_of MigrateDownCommand,       COMMANDS["migrate-down"]
-      assert_instance_of MigrateForwardCommand,    COMMANDS["migrate-forward"]
-      assert_instance_of MigrateBackwardCommand,   COMMANDS["migrate-backward"]
+      assert_instance_of InvalidCommand, COMMANDS[Factory.string]
+      assert_instance_of ConnectCommand, COMMANDS["connect"]
+      assert_instance_of CreateCommand,  COMMANDS["create"]
+      assert_instance_of DropCommand,    COMMANDS["drop"]
+      assert_instance_of(
+        GenerateMigrationCommand,
+        COMMANDS["generate-migration"],
+      )
+      assert_instance_of MigrateCommand,         COMMANDS["migrate"]
+      assert_instance_of MigrateUpCommand,       COMMANDS["migrate-up"]
+      assert_instance_of MigrateDownCommand,     COMMANDS["migrate-down"]
+      assert_instance_of MigrateForwardCommand,  COMMANDS["migrate-forward"]
+      assert_instance_of MigrateBackwardCommand, COMMANDS["migrate-backward"]
     end
   end
 
@@ -58,9 +63,9 @@ class Ardb::CLI
     setup do
       @command_name = Factory.string
       @command_class = Class.new{ include ValidCommand }
-      Assert.stub(@command_class, :command_name) { @command_name }
+      Assert.stub(@command_class, :command_name){ @command_name }
 
-      @command_spy  = CommandSpy.new(@command_name)
+      @command_spy = CommandSpy.new(@command_name)
       Assert.stub(@command_class, :new){ @command_spy }
       COMMANDS.add(@command_class)
 
@@ -143,7 +148,7 @@ class Ardb::CLI
   class RunWithHelpTests < RunSetupTests
     desc "and run with the help switch"
     setup do
-      @cli.run([ "--help" ])
+      @cli.run(["--help"])
     end
 
     should "output the invalid command's help" do
@@ -159,7 +164,7 @@ class Ardb::CLI
   class RunWithVersionTests < RunSetupTests
     desc "and run with the version switch"
     setup do
-      @cli.run([ "--version" ])
+      @cli.run(["--version"])
     end
 
     should "output its version" do
@@ -213,8 +218,8 @@ class Ardb::CLI
     end
 
     should "parse its argv on run" do
-      assert_raises(CLIRB::HelpExit){ subject.new.run([ "--help" ]) }
-      assert_raises(CLIRB::VersionExit){ subject.new.run([ "--version" ]) }
+      assert_raises(CLIRB::HelpExit){ subject.new.run(["--help"]) }
+      assert_raises(CLIRB::VersionExit){ subject.new.run(["--version"]) }
     end
 
     should "raise a help exit if its name is empty" do
@@ -273,7 +278,7 @@ class Ardb::CLI
 
     should "take custom CLIRB build procs" do
       cmd = @command_class.new do
-        option "test", "testing", :abbrev => "t"
+        option "test", "testing", abbrev: "t"
       end
       cmd.run(["-t"], @stdout, @stderr)
       assert_true cmd.clirb.opts["test"]
@@ -290,8 +295,8 @@ class Ardb::CLI
     end
 
     should "know its command help" do
-      Assert.stub(subject, :command_name)    { "some-command" }
-      Assert.stub(subject, :command_summary) { "some-summary" }
+      Assert.stub(subject, :command_name){ "some-command" }
+      Assert.stub(subject, :command_summary){ "some-summary" }
 
       exp = "Usage: ardb #{subject.command_name} [options]\n\n" \
             "Options: #{subject.clirb}\n" \
@@ -326,7 +331,9 @@ class Ardb::CLI
       assert_equal [false], @ardb_init_called_with
       assert_true @adapter_spy.connect_db_called?
 
-      exp = "connected to #{Ardb.config.adapter} db #{Ardb.config.database.inspect}\n"
+      exp =
+        "connected to #{Ardb.config.adapter} "\
+        "db #{Ardb.config.database.inspect}\n"
       assert_equal exp, @stdout.read
     end
 
@@ -372,7 +379,8 @@ class Ardb::CLI
       assert_equal [false], @ardb_init_called_with
       assert_true @adapter_spy.create_db_called?
 
-      exp = "created #{Ardb.config.adapter} db #{Ardb.config.database.inspect}\n"
+      exp =
+        "created #{Ardb.config.adapter} db #{Ardb.config.database.inspect}\n"
       assert_equal exp, @stdout.read
     end
 
@@ -414,7 +422,8 @@ class Ardb::CLI
       assert_equal [true], @ardb_init_called_with
       assert_true @adapter_spy.drop_db_called?
 
-      exp = "dropped #{Ardb.config.adapter} db #{Ardb.config.database.inspect}\n"
+      exp =
+        "dropped #{Ardb.config.adapter} db #{Ardb.config.database.inspect}\n"
       assert_equal exp, @stdout.read
     end
 
@@ -470,19 +479,20 @@ class Ardb::CLI
       assert_equal exp, @stdout.read
     end
 
-    should "re-raise a specific argument error on migration \"no identifer\" errors" do
-      Assert.stub(@migration_class, :new){ raise Ardb::Migration::NoIdentifierError }
-      err = nil
-      begin
-        cmd = @command_class.new
-        cmd.run([])
-      rescue ArgumentError => err
+    should "re-raise a specific argument error on "\
+           "migration \"no identifer\" errors" do
+      Assert.stub(@migration_class, :new) do
+        raise Ardb::Migration::NoIdentifierError
       end
 
-      assert_not_nil err
+      ex =
+        assert_that{
+          cmd = @command_class.new
+          cmd.run([])
+        }.raises(ArgumentError)
       exp = "MIGRATION-NAME must be provided"
-      assert_equal exp, err.message
-      assert_not_empty err.backtrace
+      assert_equal exp, ex.message
+      assert_not_empty ex.backtrace
     end
 
     should "output any errors and raise an exit error when run" do
@@ -490,7 +500,9 @@ class Ardb::CLI
       err.set_backtrace(Factory.integer(3).times.map{ Factory.path })
       Assert.stub(@migration_class, :new){ raise err }
 
-      assert_raises(CommandExitError){ subject.run([@identifier], @stdout, @stderr) }
+      assert_raises(CommandExitError) do
+        subject.run([@identifier], @stdout, @stderr)
+      end
       err_output = @stderr.read
 
       assert_includes err.to_s,                 err_output
@@ -532,7 +544,8 @@ class Ardb::CLI
       assert_true @adapter_spy.dump_schema_called?
     end
 
-    should "only init ardb and migrate when run with no schema dump env var set" do
+    should "only init ardb and migrate when run with no schema dump "\
+           "env var set" do
       ENV["ARDB_MIGRATE_NO_SCHEMA"] = "yes"
       subject.run([], @stdout, @stderr)
 

data/test/unit/db_tests_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/db_tests"
 
@@ -19,7 +21,8 @@ class Ardb::DbTests
       assert subject < Assert::Context
     end
 
-    should "add an around callback that runs tests in a transaction that rolls back" do
+    should "add an around callback that runs tests in a transaction that "\
+           "rolls back" do
       assert_equal 1, subject.arounds.size
       callback = subject.arounds.first
 

data/test/unit/default_order_by_tests.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/default_order_by"
 
-require "much-plugin"
+require "much-mixin"
 require "ardb/record_spy"
 
 module Ardb::DefaultOrderBy
@@ -9,7 +11,7 @@ module Ardb::DefaultOrderBy
     desc "Ardb::DefaultOrderBy"
     setup do
       order_by_attribute = @order_by_attribute = Factory.string.to_sym
-      @scope_proc = proc{ self.class.where(:grouping => self.grouping) }
+      @scope_proc = proc{ self.class.where(grouping: grouping) }
       @record_class = Ardb::RecordSpy.new do
         include Ardb::DefaultOrderBy
         attr_accessor order_by_attribute, :grouping
@@ -20,8 +22,8 @@ module Ardb::DefaultOrderBy
     should have_imeths :default_order_by
     should have_imeths :ardb_default_order_by_config
 
-    should "use much-plugin" do
-      assert_includes MuchPlugin, Ardb::DefaultOrderBy
+    should "use much-mixin" do
+      assert_includes MuchMixin, Ardb::DefaultOrderBy
     end
 
     should "know its default attribute, preprocessor and separator" do
@@ -44,8 +46,8 @@ module Ardb::DefaultOrderBy
 
     should "allow customizing the config using `default_order_by`" do
       subject.default_order_by({
-        :attribute => @order_by_attribute,
-        :scope     => @scope_proc
+        attribute: @order_by_attribute,
+        scope: @scope_proc,
       })
 
       config = subject.ardb_default_order_by_config
@@ -59,7 +61,7 @@ module Ardb::DefaultOrderBy
       callback = subject.callbacks.find{ |v| v.type == :before_validation }
       assert_not_nil callback
       assert_equal [:ardb_default_order_by], callback.args
-      assert_equal({ :on => :create }, callback.options)
+      assert_equal({ on: :create }, callback.options)
     end
   end
 
@@ -67,11 +69,12 @@ module Ardb::DefaultOrderBy
     desc "when init"
     setup do
       @record_class.default_order_by({
-        :attribute => @order_by_attribute,
-        :scope     => @scope_proc
+        attribute: @order_by_attribute,
+        scope: @scope_proc,
       })
       @current_max = Factory.integer
-      @record_class.relation_spy.maximum_values[@order_by_attribute] = @current_max
+      @record_class.relation_spy.maximum_values[@order_by_attribute] =
+        @current_max
 
       @record = @record_class.new
       @record.grouping = Factory.string
@@ -84,7 +87,8 @@ module Ardb::DefaultOrderBy
       assert_equal @current_max + 1, subject.send(@order_by_attribute)
     end
 
-    should "reset its order-by to a start value when there isn't a current max" do
+    should "reset its order-by to a start value when there isn't a "\
+           "current max" do
       @record_class.relation_spy.maximum_values.delete(@order_by_attribute)
 
       subject.instance_eval{ reset_order_by }
@@ -98,7 +102,7 @@ module Ardb::DefaultOrderBy
       assert_equal 1, @record_class.relation_spy.applied.size
       applied_expression = @record_class.relation_spy.applied.last
       assert_equal :where, applied_expression.type
-      assert_equal [{ :grouping => subject.grouping }], applied_expression.args
+      assert_equal [{ grouping: subject.grouping }], applied_expression.args
     end
 
     should "reset its order-by using `ardb_default_order_by`" do
@@ -107,7 +111,8 @@ module Ardb::DefaultOrderBy
       assert_equal @current_max + 1, subject.send(@order_by_attribute)
     end
 
-    should "not reset its order-by if its already set using `ardb_default_order_by`" do
+    should "not reset its order-by if its already set using "\
+           "`ardb_default_order_by`" do
       current_order_by = Factory.integer
       subject.send("#{@order_by_attribute}=", current_order_by)
       subject.instance_eval{ ardb_default_order_by }

data/test/unit/migration_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/migration"
 
@@ -36,7 +38,7 @@ class Ardb::Migration
     end
     subject{ @migration }
 
-    should have_readers  :migrations_path, :identifier
+    should have_readers :migrations_path, :identifier
     should have_readers :class_name, :file_name, :file_path, :source
     should have_imeths :save!
 
@@ -55,10 +57,11 @@ class Ardb::Migration
 
       exp_version = ActiveRecord::Migration.current_version
       exp =
-        "class #{subject.class_name} < ActiveRecord::Migration[#{exp_version}]\n" \
-            "  def change\n" \
-            "  end\n" \
-            "end\n"
+        "class #{subject.class_name} "\
+        "< ActiveRecord::Migration[#{exp_version}]\n" \
+        "  def change\n" \
+        "  end\n" \
+        "end\n"
       assert_equal exp, subject.source
     end
 

data/test/unit/record_spy_tests.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/record_spy"
 
-require "much-plugin"
+require "much-mixin"
 
 module Ardb::RecordSpy
   class UnitTests < Assert::Context
@@ -40,8 +42,8 @@ module Ardb::RecordSpy
     should have_imeths :group, :having, :order, :reverse_order, :readonly
     should have_imeths :limit, :offset, :merge, :except, :only
 
-    should "use much-plugin" do
-      assert_includes MuchPlugin, Ardb::RecordSpy
+    should "use much-mixin" do
+      assert_includes MuchMixin, Ardb::RecordSpy
     end
 
     should "allow reading and writing the record's table name" do
@@ -54,7 +56,7 @@ module Ardb::RecordSpy
     end
 
     should "add an association config with #belongs_to" do
-      subject.belongs_to :area, :foreign_key => :area_id
+      subject.belongs_to :area, foreign_key: :area_id
       association = subject.associations.last
       assert_equal :belongs_to, association.type
       assert_equal :area,       association.name
@@ -62,7 +64,7 @@ module Ardb::RecordSpy
     end
 
     should "add an association config with #has_many" do
-      subject.has_many :comments, :as => :parent
+      subject.has_many :comments, as: :parent
       association = subject.associations.last
       assert_equal :has_many, association.type
       assert_equal :comments, association.name
@@ -70,7 +72,7 @@ module Ardb::RecordSpy
     end
 
     should "add an association config with #has_one" do
-      subject.has_one :linking, :class_name => "Linking"
+      subject.has_one :linking, class_name: "Linking"
       association = subject.associations.last
       assert_equal :has_one,  association.type
       assert_equal :linking,  association.name
@@ -82,7 +84,7 @@ module Ardb::RecordSpy
     end
 
     should "add a validation config for \"*_of\" validations" do
-      subject.validates_presence_of :name, :email, :on => :create
+      subject.validates_presence_of :name, :email, on: :create
       validation = subject.validations.last
       assert_equal :presence, validation.type
       assert_equal :create,   validation.options[:on]
@@ -109,7 +111,7 @@ module Ardb::RecordSpy
     end
 
     should "add a validation config with #validates_each" do
-      block = proc{ }
+      block = proc{}
       subject.validates_each(:name, :email, &block)
       validation = subject.validations.last
       assert_equal :each, validation.type
@@ -124,7 +126,7 @@ module Ardb::RecordSpy
       assert_equal :custom,      validation.type
       assert_equal :some_method, validation.method_name
 
-      block = proc{ }
+      block = proc{}
       subject.validate(&block)
       validation = subject.validations.last
       assert_equal :custom, validation.type
@@ -143,7 +145,7 @@ module Ardb::RecordSpy
     end
 
     should "add a callback config with a block" do
-      subject.before_validation(:on => :create) do
+      subject.before_validation(on: :create) do
         self.name = "test"
       end
       callback = subject.callbacks.last
@@ -176,7 +178,12 @@ module Ardb::RecordSpy
       assert_respond_to "around_#{name}", subject
       assert_respond_to "after_#{name}",  subject
 
-      callback_name = ["before_#{name}", "around_#{name}", "after_#{name}"].sample
+      callback_name =
+        [
+          "before_#{name}",
+          "around_#{name}",
+          "after_#{name}",
+        ].sample
       method_name = Factory.string
       subject.send(callback_name, method_name)
       callback = subject.callbacks.last
@@ -184,7 +191,7 @@ module Ardb::RecordSpy
       assert_equal [method_name],        callback.args
 
       name = Factory.string
-      subject.define_model_callbacks(name, :only => [:before])
+      subject.define_model_callbacks(name, only: [:before])
 
       assert_respond_to "before_#{name}", subject
       assert_not_respond_to "around_#{name}", subject
@@ -332,8 +339,8 @@ module Ardb::RecordSpy
       assert_equal "other thing", subject.ho_thing
 
       assert_empty subject.hm_things
-      subject.hm_things = [1,2,3]
-      assert_equal [1,2,3], subject.hm_things
+      subject.hm_things = [1, 2, 3]
+      assert_equal [1, 2, 3], subject.hm_things
     end
 
     should "default its manually run callbacks" do

data/test/unit/relation_spy_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "ardb/relation_spy"
 
@@ -49,7 +51,8 @@ class Ardb::RelationSpy
       assert_equal other_relation, subject
     end
 
-    should "build a fake sql string for its applied expressions using `to_sql`" do
+    should "build a fake sql string for its applied expressions using "\
+           "`to_sql`" do
       subject.select "column"
       subject.from "table"
       subject.joins "my_table.my_column ON my_table.my_column = table.column"
@@ -81,7 +84,7 @@ class Ardb::RelationSpy
     should "add a select applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :select, @applied.type
-      assert_equal [ :column_a, :column_b ], @applied.args
+      assert_equal [:column_a, :column_b], @applied.args
     end
   end
 
@@ -95,7 +98,7 @@ class Ardb::RelationSpy
     should "add a from applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :from, @applied.type
-      assert_equal [ "some SQL" ], @applied.args
+      assert_equal ["some SQL"], @applied.args
     end
   end
 
@@ -109,7 +112,7 @@ class Ardb::RelationSpy
     should "add an includes applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :includes, @applied.type
-      assert_equal [ :table_a, :table_b ], @applied.args
+      assert_equal [:table_a, :table_b], @applied.args
     end
   end
 
@@ -123,21 +126,21 @@ class Ardb::RelationSpy
     should "add a joins applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :joins, @applied.type
-      assert_equal [ :table_a, :table_b ], @applied.args
+      assert_equal [:table_a, :table_b], @applied.args
     end
   end
 
   class WhereTests < UnitTests
     desc "where"
     setup do
-      @relation_spy.where :column_a => "some value"
+      @relation_spy.where column_a: "some value"
       @applied = subject.applied.first
     end
 
     should "add a where applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :where, @applied.type
-      assert_equal [ { :column_a => "some value" } ], @applied.args
+      assert_equal [{ column_a: "some value" }], @applied.args
     end
   end
 
@@ -151,7 +154,7 @@ class Ardb::RelationSpy
     should "add an order applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :order, @applied.type
-      assert_equal [ :column_a, :column_b ], @applied.args
+      assert_equal [:column_a, :column_b], @applied.args
     end
   end
 
@@ -178,7 +181,7 @@ class Ardb::RelationSpy
     should "add a group applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :group, @applied.type
-      assert_equal [ :column_a, :column_b ], @applied.args
+      assert_equal [:column_a, :column_b], @applied.args
     end
   end
 
@@ -192,7 +195,7 @@ class Ardb::RelationSpy
     should "add a having applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :having, @applied.type
-      assert_equal [ "COUNT(column_a) > 0" ], @applied.args
+      assert_equal ["COUNT(column_a) > 0"], @applied.args
     end
   end
 
@@ -206,7 +209,7 @@ class Ardb::RelationSpy
     should "add a readonly applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :readonly, @applied.type
-      assert_equal [ true ], @applied.args
+      assert_equal [true], @applied.args
     end
   end
 
@@ -220,7 +223,7 @@ class Ardb::RelationSpy
     should "add a limit applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :limit, @applied.type
-      assert_equal [ 100 ], @applied.args
+      assert_equal [100], @applied.args
     end
 
     should "set it's limit value" do
@@ -238,7 +241,7 @@ class Ardb::RelationSpy
     should "add an offset applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :offset, @applied.type
-      assert_equal [ 100 ], @applied.args
+      assert_equal [100], @applied.args
     end
 
     should "set it's offset value" do
@@ -249,7 +252,8 @@ class Ardb::RelationSpy
   class MergeWithARelationSpyTests < UnitTests
     desc "merge with a relation spy"
     setup do
-      @other_relation_spy = Ardb::RelationSpy.new.select("column").joins("table")
+      @other_relation_spy =
+        Ardb::RelationSpy.new.select("column").joins("table")
       @relation_spy.merge @other_relation_spy
     end
 
@@ -271,7 +275,7 @@ class Ardb::RelationSpy
     should "add a merge applied expression with the passed args" do
       assert_instance_of AppliedExpression, @applied
       assert_equal :merge, @applied.type
-      assert_equal [ @fake_relation ], @applied.args
+      assert_equal [@fake_relation], @applied.args
     end
   end
 
@@ -290,7 +294,7 @@ class Ardb::RelationSpy
   class WithExpressionsTests < UnitTests
     setup do
       @relation_spy.select("column").includes("table").joins("table")
-      @relation_spy.where(:column => "value").order("column")
+      @relation_spy.where(column: "value").order("column")
       @relation_spy.group("column").having("count(*) > 1")
       @relation_spy.limit(1).offset(1)
     end
@@ -307,10 +311,10 @@ class Ardb::RelationSpy
     should "remove any applied expressions in the passed types" do
       relation_spy = subject.except(:includes, :where, :group, :offset)
       applied_types = relation_spy.applied.map(&:type)
-      [ :select, :joins, :order, :having, :limit ].each do |type|
+      [:select, :joins, :order, :having, :limit].each do |type|
         assert_includes type, applied_types
       end
-      [ :includes, :where, :group, :offset ].each do |type|
+      [:includes, :where, :group, :offset].each do |type|
         assert_not_includes type, applied_types
       end
     end
@@ -341,22 +345,24 @@ class Ardb::RelationSpy
     should "remove any applied expressions not in the passed types" do
       relation_spy = subject.only(:includes, :where, :group, :offset)
       applied_types = relation_spy.applied.map(&:type)
-      [ :includes, :where, :group, :offset ].each do |type|
+      [:includes, :where, :group, :offset].each do |type|
         assert_includes type, applied_types
       end
-      [ :select, :joins, :order, :having, :limit ].each do |type|
+      [:select, :joins, :order, :having, :limit].each do |type|
         assert_not_includes type, applied_types
       end
     end
 
-    should "unset the limit value if limit is not included in the passed types" do
+    should "unset the limit value if limit is not included in the passed "\
+           "types" do
       relation_spy = subject.only(:limit)
       assert_not_nil relation_spy.limit_value
       relation_spy = subject.only(:select)
       assert_nil relation_spy.limit_value
     end
 
-    should "unset the offset value if offset is not included in the passed types" do
+    should "unset the offset value if offset is not included in the passed "\
+           "types" do
       relation_spy = subject.only(:offset)
       assert_not_nil relation_spy.offset_value
       relation_spy = subject.only(:select)