dynamic-active-model 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13a9d41753ab707e9a414bb36ffd043c4362d09764717f4b43770ba8c0e0731
-  data.tar.gz: 2ed3a9b28b4e9a0825b19acf97f9b95deb8cd99bf312ed6006112f8bbd2573d1
+  metadata.gz: 52adb8ab9614c47a5bdd4fe87a8ac14078684b37dc4caff9baebe2fd8bb65718
+  data.tar.gz: 28fc1d420cd7d5a2f08c45213bfc54b3c8d8327db757d502c1eab4cfbedbb896
 SHA512:
-  metadata.gz: 86c16133679c95f1e79a24745f2d474c5b5645aadcd6609dcddfe0a347e0545ef618a24ee96b9d674f742b75d03fa0cc90c964400c4ca3e8c89019de8988214a
-  data.tar.gz: acb55a31da056e1f4d5b5d816a61cd45464262b7b6bf4df84b9f56e3400e4d0767561c933e8bce43bc3718e4de7088bd108fa5124a6ecb8f66ec4ef03d9b3134
+  metadata.gz: fab444d391e6c7082692281318750004fb428f8b6e71b312abe46932987481c0f2fbd1e9a01256fec548fb6fbff28fcc0c3a0c9ea04183628a16285e8e3cd454
+  data.tar.gz: 7c9fd888c54eaf0b2f92c72e98d8e8580fef3f7af0d61c068b71bd94f424378cc27ea9bd0ac87b5edbab66034953acb173fd95c59d7eb760754693be6a40f63e

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

@@ -115,9 +115,7 @@ module DynamicActiveModel
       # Adds a single table to the skip list
       # @param table [String] Table to skip
       def skip_table(table)
-        config = dynamic_active_model_config
-        config[:skip_tables] << table
-        redefine_class_method(:dynamic_active_model_config, config)
+        update_config(:skip_tables, skip_tables + [table])
       end
 
       # Sets or gets the custom relationships
@@ -133,20 +131,15 @@ module DynamicActiveModel
       # @param foreign_key [String] Name of the foreign key column
       # @param relationship_name [String] Name for the relationship
       def foreign_key(table_name, foreign_key, relationship_name)
-        config = dynamic_active_model_config
-        current_relationships = config[:relationships]
-        current_relationships[table_name] ||= {}
-        current_relationships[table_name][foreign_key] = relationship_name
-        redefine_class_method(:dynamic_active_model_config, config)
+        table_relationships = relationships.fetch(table_name, {}).merge(foreign_key => relationship_name)
+        update_config(:relationships, relationships.merge(table_name => table_relationships))
       end
 
       # Sets a custom class name for a table
       # @param table_name [String] Name of the table
       # @param class_name [String] Class name to use for the table's model
       def table_class_name(table_name, class_name)
-        config = dynamic_active_model_config
-        config[:table_class_names][table_name.to_s] = class_name
-        redefine_class_method(:dynamic_active_model_config, config)
+        update_config(:table_class_names, table_class_names.merge(table_name.to_s => class_name))
       end
 
       # Gets the custom class names by table name
@@ -208,13 +201,12 @@ module DynamicActiveModel
               "pass a Symbol instead (connection_options #{options.to_sym.inspect})"
       end
 
-      # Stores a single configuration value
+      # Stores a single configuration value in a new config hash. The current hash (and
+      # any nested values) may be shared with a parent class, so it is never changed.
       # @param key [Symbol] Configuration key
       # @param value [Object] Configuration value
       def update_config(key, value)
-        config = dynamic_active_model_config
-        config[key] = value
-        redefine_class_method(:dynamic_active_model_config, config)
+        redefine_class_method(:dynamic_active_model_config, dynamic_active_model_config.merge(key => value))
       end
     end
   end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic-active-model
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Doug Youch
@@ -27,16 +27,22 @@ dependencies:
   name: inheritance-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Dynamic Active Model automatically discovers database schemas and creates
   ActiveRecord models without manual class definitions. It detects and configures
   relationships (belongs_to, has_many, has_one, has_and_belongs_to_many) based on
@@ -73,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="