ardb 0.28.0 → 0.29.1

data/lib/ardb/db_tests.rb

@@ -1,8 +1,7 @@
-require 'active_record'
-require 'assert'
+require "active_record"
+require "assert"
 
 module Ardb
-
   class DbTests < Assert::Context
     around do |block|
       ActiveRecord::Base.transaction do
@@ -11,5 +10,4 @@ module Ardb
       end
     end
   end
-
 end

data/lib/ardb/default_order_by.rb

@@ -1,7 +1,6 @@
-require 'much-plugin'
+require "much-plugin"
 
 module Ardb
-
   module DefaultOrderBy
     include MuchPlugin
 
@@ -9,15 +8,10 @@ module Ardb
     DEFAULT_SCOPE_PROC = proc{ self.class.scoped }
 
     plugin_included do
-      extend ClassMethods
-      include InstanceMethods
-
       @ardb_default_order_by_config = {}
-
     end
 
-    module ClassMethods
-
+    plugin_class_methods do
       def default_order_by(options = nil)
         options ||= {}
 
@@ -32,11 +26,9 @@ module Ardb
       def ardb_default_order_by_config
         @ardb_default_order_by_config
       end
-
     end
 
-    module InstanceMethods
-
+    plugin_instance_methods do
       private
 
       def reset_order_by
@@ -52,8 +44,6 @@ module Ardb
         reset_order_by if self.send(attr_name).to_s.empty?
         true
       end
-
     end
-
   end
 end

data/lib/ardb/migration.rb

@@ -1,8 +1,8 @@
-require 'fileutils'
+require "fileutils"
 
 module Ardb
-
   class Migration
+    NoIdentifierError = Class.new(ArgumentError)
 
     attr_reader :migrations_path, :identifier
     attr_reader :class_name, :file_name, :file_path, :source
@@ -17,17 +17,17 @@ module Ardb
       @file_name  = get_file_name(@identifier)
       @file_path  = File.join(self.migrations_path, "#{@file_name}.rb")
 
-      @source = "require 'ardb/migration_helpers'\n\n" \
-                "class #{@class_name} < ActiveRecord::Migration\n" \
-                "  include Ardb::MigrationHelpers\n\n" \
-                "  def change\n" \
-                "  end\n\n" \
-                "end\n"
+      migration_version = ActiveRecord::Migration.current_version
+      @source =
+        "class #{@class_name} < ActiveRecord::Migration[#{migration_version}]\n"\
+        "  def change\n"\
+        "  end\n"\
+        "end\n"
     end
 
     def save!
       FileUtils.mkdir_p self.migrations_path
-      File.open(self.file_path, 'w'){ |f| f.write(self.source) }
+      File.open(self.file_path, "w"){ |f| f.write(self.source) }
       self
     end
 
@@ -36,9 +36,5 @@ module Ardb
     def get_file_name(identifier)
       "#{Time.now.strftime("%Y%m%d%H%M%S")}_#{identifier.underscore}"
     end
-
-    NoIdentifierError = Class.new(ArgumentError)
-
   end
-
 end

data/lib/ardb/record_spy.rb

@@ -1,9 +1,8 @@
-require 'arel'
-require 'much-plugin'
-require 'ardb/relation_spy'
+require "arel"
+require "much-plugin"
+require "ardb/relation_spy"
 
 module Ardb
-
   module RecordSpy
     include MuchPlugin
 
@@ -14,13 +13,9 @@ module Ardb
       record_spy
     end
 
-    plugin_included do
-      extend ClassMethods
-      include InstanceMethods
-    end
-
-    module ClassMethods
+    CallbackType = Struct.new(:name, :options)
 
+    plugin_class_methods do
       attr_accessor :table_name
 
       # Associations
@@ -29,8 +24,7 @@ module Ardb
         @associations ||= []
       end
 
-      [ :belongs_to, :has_one, :has_many ].each do |method_name|
-
+      [:belongs_to, :has_one, :has_many].each do |method_name|
         define_method(method_name) do |assoc_name, *args|
           define_method(assoc_name) do
             instance_variable_get("@#{assoc_name}") || (method_name == :has_many ? [] : nil)
@@ -41,7 +35,6 @@ module Ardb
 
           self.associations << Association.new(method_name, assoc_name, *args)
         end
-
       end
 
       # Validations
@@ -66,7 +59,6 @@ module Ardb
         define_method(method_name) do |*args|
           self.validations << Validation.new(type, *args)
         end
-
       end
 
       def validates_associated(*args)
@@ -110,11 +102,9 @@ module Ardb
         :after_initialize,
         :after_find
       ].each do |method_name|
-
         define_method(method_name) do |*args, &block|
           self.callbacks << Callback.new(method_name, *args, &block)
         end
-
       end
 
       def custom_callback_types
@@ -137,8 +127,6 @@ module Ardb
         end
       end
 
-      CallbackType = Struct.new(:name, :options)
-
       # Scopes
 
       attr_writer :relation_spy
@@ -170,17 +158,13 @@ module Ardb
         :except,
         :only
       ].each do |method_name|
-
         define_method(method_name) do |*args|
           self.relation_spy.send(method_name, *args)
         end
-
       end
-
     end
 
-    module InstanceMethods
-
+    plugin_instance_methods do
       attr_accessor :id
 
       def update_column(col, value)
@@ -195,7 +179,6 @@ module Ardb
         self.manually_run_callbacks << name
         block.call if block
       end
-
     end
 
     class Association
@@ -235,7 +218,5 @@ module Ardb
         end
       end
     end
-
   end
-
 end

data/lib/ardb/relation_spy.rb

@@ -1,7 +1,5 @@
 module Ardb
-
   class RelationSpy
-
     attr_reader :applied
     attr_accessor :limit_value, :offset_value
     attr_accessor :pluck_values, :maximum_values, :minimum_values
@@ -50,12 +48,10 @@ module Ardb
       :reverse_order,
       :readonly
     ].each do |type|
-
       define_method(type) do |*args|
         @applied << AppliedExpression.new(type, args)
         self
       end
-
     end
 
     def limit(value)
@@ -152,7 +148,5 @@ module Ardb
     end
 
     NotFoundError = Class.new(RuntimeError)
-
   end
-
 end

data/lib/ardb/require_autoloaded_active_record_files.rb

@@ -1,69 +1,183 @@
 # ActiveRecord makes use of autoload to load some of its components as-needed.
-# This doesn't work well with threaded environments, and causes uninitialized
+# This doesn"t work well with threaded environments, and causes uninitialized
 # constants. To avoid this, this file manually requires the following files that
-# are not required using `require 'active_record'`. Trying to automatically
+# are not required using `require "active_record"`. Trying to automatically
 # require every file in ActiveRecord is slow and inefficient. Many of the files
-# fail to require and there are some we don't want to require. Thus, this is a
+# fail to require and there are some we don"t want to require. Thus, this is a
 # manual list of requires.
 
 # To re-build this list of requires, run the following:
 #   bundle exec ruby script/determine_autoloaded_active_record_files.rb
 
 # For compatibility, we require active record first
-require 'active_record'
+require "active_record"
 
-require 'active_record/aggregations'
-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/has_and_belongs_to_many_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/belongs_to'
-require 'active_record/associations/preloader/collection_association'
-require 'active_record/associations/preloader/has_and_belongs_to_many'
-require 'active_record/associations/preloader/has_many'
-require 'active_record/associations/preloader/has_many_through'
-require 'active_record/associations/preloader/has_one'
-require 'active_record/associations/preloader/has_one_through'
-require 'active_record/attribute_assignment'
-require 'active_record/attribute_methods/before_type_cast'
-require 'active_record/attribute_methods/deprecated_underscore_read'
-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/autosave_association'
-require 'active_record/base'
-require 'active_record/dynamic_finder_match'
-require 'active_record/dynamic_scope_match'
-require 'active_record/observer'
-require 'active_record/relation'
-require 'active_record/relation/predicate_builder'
-require 'active_record/result'
+if (
+  ActiveRecord.version.segments[0] == 6 &&
+  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/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/through_association"
+  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/internal_metadata"
+  require "active_record/legacy_yaml_adapter"
+  require "active_record/middleware/database_selector"
+  require "active_record/null_relation"
+  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
+)
+  require "active_record/advisory_lock_base"
+  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/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/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/through_association"
+  require "active_record/coders/json"
+  require "active_record/internal_metadata"
+  require "active_record/legacy_yaml_adapter"
+  require "active_record/middleware/database_selector"
+  require "active_record/null_relation"
+  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"
+elsif ActiveRecord.version.segments[0] == 5
+  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/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/through_association"
+  require "active_record/attribute_assignment"
+  require "active_record/attribute_decorators"
+  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/internal_metadata"
+  require "active_record/legacy_yaml_adapter"
+  require "active_record/null_relation"
+  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"
+else
+  raise(
+    "ActiveRecord #{ActiveRecord.version} isn't supported. "\
+    "Switch to 5.X or 6.X"
+  )
+end
 
-# There are also issues with requiring ActiveSupport. This doesn't require every
-# ActiveSupport file though, only ones we've seen cause problems.
-require 'active_support'
-
-require 'active_support/multibyte/chars'
+# There are also issues with requiring ActiveSupport. This doesn"t require every
+# ActiveSupport file though, only ones we"ve seen cause problems.
+require "active_support"
+require "active_support/multibyte/chars"