dynamic-active-model 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7424adb17522ec6f8265c0c865880fb6f15e01ad3f41e1d6a153c6d0a457b7a
-  data.tar.gz: 3376e872256900edcc7c35582ba012745cf795112f07de7e694cf7e6da7ca76d
+  metadata.gz: 6e8e20f58fe5d7cae0b4c699388d39ba803f2a4bcf69f46cf4e38ce1ca0df8fd
+  data.tar.gz: 0c6a79166d4d62c99d61450883296aee87531f9d2e854bc71cf08587e130c881
 SHA512:
-  metadata.gz: d4eafe65f3235ffd2478123aed346046cbd99a67a5969ed56bfa1c82c38ca93b95fca56fde4559c5da05ec2c6da13ecd78d0b0846575672806188f9886c0ff34
-  data.tar.gz: 765ee16fb559d530b4761527a026d6a09bf2c74b275d278f6b700d83157c0ce3ad3c22aedff10236e61ebae6891bbf9131121fe36be3fca0c202583f5436f0b6
+  metadata.gz: 63cac3e28e12282b2dce7821ed2436ae1092df5622f8ba401ba709f4161d500837ae75a62ef2d76eff65dd56d4d57a2b95b282a05de59e7bab63e4be83deb5cf
+  data.tar.gz: 978019763203fa5d993c2efff7f1102862707db324649649edbc8aa2a7556e8aa8a7befb3ed2fefebf86f4babcf4db54b852df5a8fa8cb13f9e7c092e0a84cff

data/lib/dynamic-active-model/associations.rb

@@ -36,7 +36,8 @@ module DynamicActiveModel
       @foreign_keys = {}
       database.models.each do |model|
         @foreign_keys[model.table_name] = ForeignKey.new(model)
-        @table_indexes[model.table_name] = model.connection.indexes(model.table_name)
+        # through the schema cache, so a Rails schema cache dump spares one query per table
+        @table_indexes[model.table_name] = model.connection.schema_cache.indexes(model.table_name)
         @join_tables << model if join_table?(model)
       end
     end

data/lib/dynamic-active-model/setup.rb

@@ -62,19 +62,12 @@ module DynamicActiveModel
       end
 
       # Sets or gets the database connection options
-      # @param options [Hash, String, nil] Database configuration or named configuration
-      # @return [Hash] The current connection options
+      # @param options [Hash, Symbol, String, nil] Anything establish_connection accepts:
+      #   a config hash, or a Symbol naming a database.yml entry for the current
+      #   environment. A String database.yml name is deprecated.
+      # @return [Hash, Symbol] The current connection options
       def connection_options(options = nil)
-        if options.is_a?(String)
-          name = options
-          options = ActiveRecord::Base
-                    .configurations
-                    .configs_for(
-                      env_name: ::Rails.env,
-                      name: name
-                    )
-                    .configuration_hash
-        end
+        options = deprecated_named_configuration(options) if options.is_a?(String)
 
         update_config(:connection_options, options) if options
 
@@ -180,6 +173,19 @@ module DynamicActiveModel
 
       private
 
+      # Resolves a database.yml name given as a String, warning that it's deprecated
+      # @param name [String]
+      # @return [Hash] The named configuration for the current Rails environment
+      def deprecated_named_configuration(name)
+        DynamicActiveModel.deprecator.warn(
+          "connection_options with a database.yml name as a String (#{name.inspect}) is deprecated; " \
+          "pass a Symbol instead (connection_options #{name.to_sym.inspect}), " \
+          'or use dynamic-active-model-rails in a Rails app',
+          caller_locations(2) # point at the caller of connection_options
+        )
+        ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env, name: name).configuration_hash
+      end
+
       # Stores a single configuration value
       # @param key [Symbol] Configuration key
       # @param value [Object] Configuration value

data/lib/dynamic-active-model/version.rb

@@ -2,5 +2,5 @@
 
 module DynamicActiveModel
   # Gem version, bumped by release-please
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/lib/dynamic-active-model.rb

@@ -46,6 +46,16 @@ module DynamicActiveModel
   # Manages the setup process and configuration
   autoload :Setup, 'dynamic-active-model/setup'
 
+  # Deprecation warnings for this gem; dynamic-active-model-rails registers it in
+  # Rails.application.deprecators so the app's deprecation settings apply
+  # @return [ActiveSupport::Deprecation]
+  def self.deprecator
+    @deprecator ||= begin
+      require 'active_support/deprecation'
+      ActiveSupport::Deprecation.new('1.0', 'dynamic-active-model')
+    end
+  end
+
   # Base class for errors raised by DynamicActiveModel
   class Error < StandardError; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic-active-model
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Doug Youch