ardb 0.27.3 → 0.29.0

data/test/unit/db_tests_tests.rb

@@ -1,10 +1,9 @@
-require 'assert'
-require 'ardb/db_tests'
+require "assert"
+require "ardb/db_tests"
 
-require 'active_record'
+require "active_record"
 
 class Ardb::DbTests
-
   class UnitTests < Assert::Context
     desc "Ardb::DbTests"
     setup do
@@ -31,7 +30,5 @@ class Ardb::DbTests
       assert_true @transaction_called
       assert_true block_yielded_to
     end
-
   end
-
 end

data/test/unit/default_order_by_tests.rb

@@ -1,11 +1,10 @@
-require 'assert'
-require 'ardb/default_order_by'
+require "assert"
+require "ardb/default_order_by"
 
-require 'much-plugin'
-require 'ardb/record_spy'
+require "much-plugin"
+require "ardb/record_spy"
 
 module Ardb::DefaultOrderBy
-
   class UnitTests < Assert::Context
     desc "Ardb::DefaultOrderBy"
     setup do
@@ -62,7 +61,6 @@ module Ardb::DefaultOrderBy
       assert_equal [:ardb_default_order_by], callback.args
       assert_equal({ :on => :create }, callback.options)
     end
-
   end
 
   class InitTests < UnitTests
@@ -116,7 +114,5 @@ module Ardb::DefaultOrderBy
 
       assert_equal current_order_by, subject.send(@order_by_attribute)
     end
-
   end
-
 end

data/test/unit/migration_tests.rb

@@ -1,14 +1,17 @@
 require "assert"
 require "ardb/migration"
 
-class Ardb::Migration
+# This is needed to call `classify` on a string; if this isn"t manually required
+# these tests can fail if activesupport hasn"t been loaded by activerecord; the
+# `Migration` class will error saying `classify` is not a method on `String`
+require "active_support/core_ext/string/inflections"
 
+class Ardb::Migration
   class UnitTests < Assert::Context
     desc "Ardb::Migration"
     setup do
       @migration_class = Ardb::Migration
     end
-
   end
 
   class InitTests < UnitTests
@@ -27,16 +30,18 @@ class Ardb::Migration
         block.call(@file_spy)
       end
 
-      @id = Factory.migration_id
-      @migration = @migration_class.new(@id)
+      @ardb_config = Factory.ardb_config
+      @id          = Factory.migration_id
+      @migration   = @migration_class.new(@ardb_config, @id)
     end
     subject{ @migration }
 
-    should have_readers :identifier, :class_name, :file_name, :file_path
-    should have_readers :source
+    should have_readers  :migrations_path, :identifier
+    should have_readers :class_name, :file_name, :file_path, :source
     should have_imeths :save!
 
     should "know its attrs" do
+      assert_equal @ardb_config.migrations_path, subject.migrations_path
       assert_equal @id, subject.identifier
 
       exp = @id.classify.pluralize
@@ -45,32 +50,31 @@ class Ardb::Migration
       exp = "#{@time_now.strftime("%Y%m%d%H%M%S")}_#{@id.underscore}"
       assert_equal exp, subject.file_name
 
-      exp = File.join(Ardb.config.migrations_path, "#{subject.file_name}.rb")
+      exp = File.join(subject.migrations_path, "#{subject.file_name}.rb")
       assert_equal exp, subject.file_path
 
-      exp = "require 'ardb/migration_helpers'\n\n" \
-            "class #{subject.class_name} < ActiveRecord::Migration\n" \
-            "  include Ardb::MigrationHelpers\n\n" \
+      exp_version = ActiveRecord::Migration.current_version
+      exp =
+        "class #{subject.class_name} < ActiveRecord::Migration[#{exp_version}]\n" \
             "  def change\n" \
-            "  end\n\n" \
+            "  end\n" \
             "end\n"
       assert_equal exp, subject.source
     end
 
     should "complain if no identifier is provided" do
       assert_raises(NoIdentifierError) do
-        @migration_class.new([nil, ''].choice)
+        @migration_class.new(@ardb_config, [nil, ""].sample)
       end
     end
 
     should "write the migration source to the migrations path on save" do
       subject.save!
 
-      assert_equal [Ardb.config.migrations_path], @mkdir_called_with
-      assert_equal [subject.file_path, 'w'],      @file_open_called_with
-      assert_equal [subject.source],              @file_spy.write_called_with
+      assert_equal [subject.migrations_path], @mkdir_called_with
+      assert_equal [subject.file_path, "w"],  @file_open_called_with
+      assert_equal [subject.source],          @file_spy.write_called_with
     end
-
   end
 
   class FileSpy
@@ -84,5 +88,4 @@ class Ardb::Migration
       @write_called_with = args
     end
   end
-
 end

data/test/unit/record_spy_tests.rb

@@ -1,10 +1,9 @@
-require 'assert'
-require 'ardb/record_spy'
+require "assert"
+require "ardb/record_spy"
 
-require 'much-plugin'
+require "much-plugin"
 
 module Ardb::RecordSpy
-
   class UnitTests < Assert::Context
     desc "Ardb::RecordSpy"
     setup do
@@ -46,8 +45,8 @@ module Ardb::RecordSpy
     end
 
     should "allow reading and writing the record's table name" do
-      subject.table_name = 'my_records'
-      assert_equal 'my_records', subject.table_name
+      subject.table_name = "my_records"
+      assert_equal "my_records", subject.table_name
     end
 
     should "default its associations" do
@@ -71,18 +70,18 @@ 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
-      assert_equal 'Linking', association.options[:class_name]
+      assert_equal "Linking", association.options[:class_name]
     end
 
     should "default its validations" do
       assert_equal [], subject.validations
     end
 
-    should "add a validation config for '*_of' validations" do
+    should "add a validation config for \"*_of\" validations" do
       subject.validates_presence_of :name, :email, :on => :create
       validation = subject.validations.last
       assert_equal :presence, validation.type
@@ -145,14 +144,14 @@ module Ardb::RecordSpy
 
     should "add a callback config with a block" do
       subject.before_validation(:on => :create) do
-        self.name = 'test'
+        self.name = "test"
       end
       callback = subject.callbacks.last
       assert_equal :before_validation, callback.type
       assert_equal :create, callback.options[:on]
       record_spy = subject.new
       record_spy.instance_eval(&callback.block)
-      assert_equal 'test', record_spy.name
+      assert_equal "test", record_spy.name
     end
 
     should "default its custom callback types" do
@@ -177,7 +176,7 @@ module Ardb::RecordSpy
       assert_respond_to "around_#{name}", subject
       assert_respond_to "after_#{name}",  subject
 
-      callback_name = ["before_#{name}", "around_#{name}", "after_#{name}"].choice
+      callback_name = ["before_#{name}", "around_#{name}", "after_#{name}"].sample
       method_name = Factory.string
       subject.send(callback_name, method_name)
       callback = subject.callbacks.last
@@ -286,7 +285,6 @@ module Ardb::RecordSpy
       subject.only(*only_args)
       assert_equal only_args, only_called_with
     end
-
   end
 
   class GeneratorTests < UnitTests
@@ -305,7 +303,6 @@ module Ardb::RecordSpy
       assert @instance.respond_to? :name
       assert @instance.respond_to? :name=
     end
-
   end
 
   class InstanceTests < UnitTests
@@ -319,20 +316,20 @@ module Ardb::RecordSpy
     should have_imeths :manually_run_callbacks, :run_callbacks
 
     should "allow spying the update_column method by just writing the value" do
-      assert_not_equal 'updated', subject.name
+      assert_not_equal "updated", subject.name
 
-      subject.update_column(:name, 'updated')
-      assert_equal 'updated', subject.name
+      subject.update_column(:name, "updated")
+      assert_equal "updated", subject.name
     end
 
     should "have accessors for each association defined" do
       assert_nil subject.bt_thing
-      subject.bt_thing = 'something'
-      assert_equal 'something', subject.bt_thing
+      subject.bt_thing = "something"
+      assert_equal "something", subject.bt_thing
 
       assert_nil subject.ho_thing
-      subject.ho_thing = 'other thing'
-      assert_equal 'other thing', subject.ho_thing
+      subject.ho_thing = "other thing"
+      assert_equal "other thing", subject.ho_thing
 
       assert_empty subject.hm_things
       subject.hm_things = [1,2,3]
@@ -355,7 +352,6 @@ module Ardb::RecordSpy
       assert_includes name, subject.manually_run_callbacks
       assert_true block_called
     end
-
   end
 
   class MyRecord
@@ -366,5 +362,4 @@ module Ardb::RecordSpy
     has_one    :ho_thing
     has_many   :hm_things
   end
-
 end

data/test/unit/relation_spy_tests.rb

@@ -1,8 +1,7 @@
-require 'assert'
-require 'ardb/relation_spy'
+require "assert"
+require "ardb/relation_spy"
 
 class Ardb::RelationSpy
-
   class UnitTests < Assert::Context
     desc "Ardb::RelationSpy"
     setup do
@@ -51,11 +50,11 @@ class Ardb::RelationSpy
     end
 
     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'
+      subject.select "column"
+      subject.from "table"
+      subject.joins "my_table.my_column ON my_table.my_column = table.column"
 
-      expected = subject.applied.map(&:to_sql).join(', ')
+      expected = subject.applied.map(&:to_sql).join(", ")
       assert_equal expected, subject.to_sql
     end
 
@@ -70,7 +69,6 @@ class Ardb::RelationSpy
       assert_nil subject.limit_value
       assert_nil subject.offset_value
     end
-
   end
 
   class SelectTests < UnitTests
@@ -85,7 +83,6 @@ class Ardb::RelationSpy
       assert_equal :select, @applied.type
       assert_equal [ :column_a, :column_b ], @applied.args
     end
-
   end
 
   class FromTests < UnitTests
@@ -100,7 +97,6 @@ class Ardb::RelationSpy
       assert_equal :from, @applied.type
       assert_equal [ "some SQL" ], @applied.args
     end
-
   end
 
   class IncludesTests < UnitTests
@@ -115,7 +111,6 @@ class Ardb::RelationSpy
       assert_equal :includes, @applied.type
       assert_equal [ :table_a, :table_b ], @applied.args
     end
-
   end
 
   class JoinsTests < UnitTests
@@ -130,22 +125,20 @@ class Ardb::RelationSpy
       assert_equal :joins, @applied.type
       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
 
   class OrderTests < UnitTests
@@ -160,7 +153,6 @@ class Ardb::RelationSpy
       assert_equal :order, @applied.type
       assert_equal [ :column_a, :column_b ], @applied.args
     end
-
   end
 
   class ReverseOrderTests < UnitTests
@@ -174,7 +166,6 @@ class Ardb::RelationSpy
       assert_instance_of AppliedExpression, @applied
       assert_equal :reverse_order, @applied.type
     end
-
   end
 
   class GroupTests < UnitTests
@@ -189,22 +180,20 @@ class Ardb::RelationSpy
       assert_equal :group, @applied.type
       assert_equal [ :column_a, :column_b ], @applied.args
     end
-
   end
 
   class HavingTests < UnitTests
     desc "having"
     setup do
-      @relation_spy.having 'COUNT(column_a) > 0'
+      @relation_spy.having "COUNT(column_a) > 0"
       @applied = subject.applied.first
     end
 
     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
 
   class ReadonlyTests < UnitTests
@@ -219,7 +208,6 @@ class Ardb::RelationSpy
       assert_equal :readonly, @applied.type
       assert_equal [ true ], @applied.args
     end
-
   end
 
   class LimitTests < UnitTests
@@ -238,7 +226,6 @@ class Ardb::RelationSpy
     should "set it's limit value" do
       assert_equal 100, subject.limit_value
     end
-
   end
 
   class OffsetTests < UnitTests
@@ -257,13 +244,12 @@ class Ardb::RelationSpy
     should "set it's offset value" do
       assert_equal 100, subject.offset_value
     end
-
   end
 
   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
 
@@ -272,13 +258,12 @@ class Ardb::RelationSpy
         assert_includes applied, @relation_spy.applied
       end
     end
-
   end
 
   class MergeWithNonRelationSpyTests < UnitTests
     desc "merge without a relation spy"
     setup do
-      @fake_relation = 'relation'
+      @fake_relation = "relation"
       @relation_spy.merge @fake_relation
       @applied = subject.applied.first
     end
@@ -288,27 +273,25 @@ class Ardb::RelationSpy
       assert_equal :merge, @applied.type
       assert_equal [ @fake_relation ], @applied.args
     end
-
   end
 
   class MergeWithSelfTests < UnitTests
     desc "merge with itself"
     setup do
-      @fake_relation = 'relation'
+      @fake_relation = "relation"
       @relation_spy.merge @relation_spy
     end
 
     should "not alter the applied expressions" do
       assert_empty subject.applied
     end
-
   end
 
   class WithExpressionsTests < UnitTests
     setup do
-      @relation_spy.select('column').includes('table').joins('table')
-      @relation_spy.where(:column => 'value').order('column')
-      @relation_spy.group('column').having('count(*) > 1')
+      @relation_spy.select("column").includes("table").joins("table")
+      @relation_spy.where(:column => "value").order("column")
+      @relation_spy.group("column").having("count(*) > 1")
       @relation_spy.limit(1).offset(1)
     end
   end
@@ -345,7 +328,6 @@ class Ardb::RelationSpy
       relation_spy = subject.except(:offset)
       assert_nil relation_spy.offset_value
     end
-
   end
 
   class OnlyTests < WithExpressionsTests
@@ -380,7 +362,6 @@ class Ardb::RelationSpy
       relation_spy = subject.only(:select)
       assert_nil relation_spy.offset_value
     end
-
   end
 
   class WithResultsTests < UnitTests
@@ -401,11 +382,9 @@ class Ardb::RelationSpy
     should "raise a not found error if a result can't be found" do
       assert_raises(NotFoundError){ subject.find(1000) }
     end
-
   end
 
   class FirstTests < WithResultsTests
-
     should "return the first item from `all` using `first`" do
       assert_equal subject.all.first, subject.first
       subject.offset 2
@@ -418,11 +397,9 @@ class Ardb::RelationSpy
       subject.limit 0
       assert_raises(NotFoundError){ subject.first! }
     end
-
   end
 
   class LastTests < WithResultsTests
-
     should "return the last item from `all` using `last`" do
       assert_equal subject.all.last, subject.last
       subject.limit 2
@@ -435,7 +412,6 @@ class Ardb::RelationSpy
       subject.limit 0
       assert_raises(NotFoundError){ subject.last! }
     end
-
   end
 
   class AllTests < WithResultsTests
@@ -458,7 +434,6 @@ class Ardb::RelationSpy
       subject.offset 2
       assert_equal @results[2, 2], subject.all
     end
-
   end
 
   class CountTests < WithResultsTests
@@ -469,7 +444,6 @@ class Ardb::RelationSpy
       subject.limit 2
       assert_equal subject.all.size, subject.count
     end
-
   end
 
   class PluckTests < WithResultsTests
@@ -484,13 +458,12 @@ class Ardb::RelationSpy
       exp = [@column_value] * @results.size
       assert_equal exp, @relation_spy.pluck(@column_name)
     end
-
   end
 
   class AppliedExpressionTests < UnitTests
     desc "AppliedExpression"
     setup do
-      @applied_expression = AppliedExpression.new(:select, 'column')
+      @applied_expression = AppliedExpression.new(:select, "column")
     end
     subject{ @applied_expression }
 
@@ -501,9 +474,7 @@ class Ardb::RelationSpy
       expected = "#{subject.type}: #{subject.args.inspect}"
       assert_equal expected, subject.to_sql
     end
-
   end
 
   Result = Struct.new(:id)
-
 end