rails_dynamic_associations 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d13973725ae2f69e1a5d57e370c4071b3e8016ba4f5707c2e9a038f2e2dd66
-  data.tar.gz: a51b6b1352ada122e3483b8fa0e1fd76089fcac91e80dce63642abfa51c8b028
+  metadata.gz: f1b548f08bbef239327e6a0ba9246dd44f2efe97719300a315166a87f677ce57
+  data.tar.gz: d55cd5fc938ea3afb297ff698d073d6954cf3d5c652754e8f68d6b5bfa20774f
 SHA512:
-  metadata.gz: 6fd04de856bdfff758b6bfba629d45f19f79cea0109f4999fc7df9aa8a9ec7b1b5f8aa920b6f1a6573ec4ba7eef738c737b10409b3f90a9d404c0e8a0d1aa9b4
-  data.tar.gz: 9ba9853134d4a2f93a12153056ead95658c83b0da9123f3bb2fae6b73a556f914f9ead882aa3446618489072482b806eeb00fb089f1661d7a502709f7cbdf836
+  metadata.gz: b2389b1f63e69b8ebf2f13a5f7626f28aa46f4c4267e6ccc2b4b8b9419b93df967fc9bd1f57c8de8eecbd61441b9a5fed215cea72cf2e3b3dd86d81dc93b3f3f
+  data.tar.gz: 3fcb306ed4985a8b5696b4c810aaede9f08eb5d84b6036b1d8086c556832639901c39aa47857bf417420f99a883967f171bd72c61cb3361096fe8cbc11fb7195

data/README.md

@@ -1,7 +1,11 @@
-# RailsDynamicAssociations
+# Rails Dynamic Associations
 
 Define your model associations in the database without changing the schema or models.
 
+## DEPRECATED
+
+Use [Adjustable Schema](https://github.com/Alexander-Senko/adjustable_schema) instead. It has a similar API, though it's not backward-compatible.
+
 ## Features
 
 * Creates associations for your models when application starts.

data/app/models/relation.rb

@@ -53,7 +53,7 @@ class Relation < ActiveRecord::Base
 	scope :named, -> (*names) {
 		case names
 		when [] # i.e. `named`
-			where.not role_id: nil
+			where.associated :role
 		else
 			with_roles { named *names }
 		end
@@ -61,15 +61,16 @@ class Relation < ActiveRecord::Base
 
 	def self.with_roles &block
 		joins(:role).merge(
-			Role.instance_eval &block
+				Role.instance_eval &block
 		).uniq
 	end
 
 	def self.seed source, target, roles = nil
 		(roles.present? ? Role.find_or_create_named(roles) : [ nil ]).map do |role|
-			create source_type: source,
-			       target_type: target,
-			       role:        role
+			create role: role do
+				_1[:source_type] = source
+				_1[:target_type] = target
+			end
 		end
 	end
 

data/config/initializers/model_associations.rb

@@ -1,7 +1,6 @@
 ActiveSupport.on_load :model_class do
-	for type in association_directions do
-		for relation in send("#{type}_relations").abstract.select(&:"#{type}_type") do
-			setup_relation type, relation.send("#{type}_type").constantize, relation.role
-		end
-	end if self != Relation and Relation.table_exists? # needed for DB migrations & schema initializing
+  next if     self == Relation
+  next unless Relation.table_exists?
+
+  setup_relations
 end

data/lib/rails_dynamic_associations/active_record/associations.rb

@@ -4,11 +4,19 @@ module RailsDynamicAssociations::ActiveRecord
 	module Associations
 		extend ActiveSupport::Concern
 
-		module ClassMethods
+		class_methods do
 			include RailsDynamicAssociations::Config
 
 			protected
 
+			def setup_relations
+				relations.each do |type, relations|
+					for relation in relations.select(&:"#{type}_type") do
+						setup_relation type, relation.send("#{type}_type").constantize, relation.role
+					end
+				end
+			end
+
 			def setup_relation type, target = self, role = nil
 				define_association type, target
 				define_association type, target, role if role
@@ -30,7 +38,7 @@ module RailsDynamicAssociations::ActiveRecord
 					next if reflect_on_association association
 
 					has_many association, role && -> { where role_id: role.id },
-						as: association_directions.opposite(type), class_name: 'Relation'
+						as: association_directions.opposite(to: type), class_name: 'Relation'
 				end
 			end
 

data/lib/rails_dynamic_associations/active_record/relations.rb

@@ -9,21 +9,15 @@ module RailsDynamicAssociations::ActiveRecord
 			include ClassAndInstanceMethods
 		end
 
-		module ClassMethods
+		class_methods do
 			include RailsDynamicAssociations::Config
 
 			def relations
 				@relations ||=
 						association_directions.to_h do
-							[ _1, Relation.abstract.send(association_directions.opposite_shortcuts[_1], self) ]
+							[ _1, Relation.abstract.send(association_directions.shortcuts.opposite[_1], self) ]
 						end
 			end
-
-			RailsDynamicAssociations::Config.association_directions.opposite_shortcuts.each &-> ((association, method)) do
-				define_method "#{association}_relations" do
-					Relation.send method, self
-				end
-			end
 		end
 
 		module ClassAndInstanceMethods

data/lib/rails_dynamic_associations/config.rb

@@ -2,7 +2,16 @@ module RailsDynamicAssociations
 	module Config
 		module Naming
 			def shortcuts
-				config :shortcut
+				@shortcuts ||=
+						config(:shortcut).tap do |shortcuts|
+							def shortcuts.opposite to: nil
+								if to
+									values.reject { _1 == to }.sole
+								else
+									transform_values { opposite to: _1 }
+								end
+							end
+						end
 			end
 
 			def selfed
@@ -17,16 +26,8 @@ module RailsDynamicAssociations
 				end
 			end
 
-			def opposite direction
-				find { |d| d != direction }
-			end
-
-			def opposite_shortcuts
-				shortcuts.each_with_object({}) do |(key, value), hash|
-					hash[key] = shortcuts.values.find do |v|
-						v != value
-					end
-				end
+			def opposite to:
+				reject { _1 == to }.sole
 			end
 
 			private

data/lib/rails_dynamic_associations/version.rb

@@ -1,3 +1,10 @@
 module RailsDynamicAssociations
-	VERSION = '0.4.1'
+	VERSION = '0.4.2'
+
+	DEPRECATION_MESSAGE = <<~TEXT
+		Rails Dynamic Associations are deprecated.
+
+		Please migrate to Adjustable Schema: https://github.com/Alexander-Senko/adjustable_schema.
+		It has a similar API, but is not backward-compatible.
+	TEXT
 end

data/lib/rails_dynamic_associations.rb

@@ -1,9 +1,12 @@
 require 'rails_model_load_hook'
 
+require 'rails_dynamic_associations/version'
 require 'rails_dynamic_associations/engine'
 require 'core_ext/string'
 
 module RailsDynamicAssociations
 	autoload :Config,       'rails_dynamic_associations/config'
 	autoload :ActiveRecord, 'rails_dynamic_associations/active_record'
+
+	warn RailsDynamicAssociations::DEPRECATION_MESSAGE, category: :deprecation
 end

metadata

@@ -1,104 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: rails_dynamic_associations
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
-- Alexander Senko
-autorequire:
+  - Alexander Senko
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta
-- !ruby/object:Gem::Dependency
-  name: rails_model_load_hook
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Define your model associations in the database without changing the schema
-  or models.
+  - !ruby/object:Gem::Dependency
+    name: rails
+    requirement: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ~>
+          - !ruby/object:Gem::Version
+            version: "7.0"
+    type: :runtime
+    prerelease: false
+    version_requirements: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ~>
+          - !ruby/object:Gem::Version
+            version: "7.0"
+  - !ruby/object:Gem::Dependency
+    name: rails_model_load_hook
+    requirement: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: "0"
+    type: :runtime
+    prerelease: false
+    version_requirements: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: "0"
+  - !ruby/object:Gem::Dependency
+    name: sqlite3
+    requirement: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: "0"
+    type: :development
+    prerelease: false
+    version_requirements: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: "0"
+description: Define your model associations in the database without changing the schema or models.
 email:
-- Alexander.Senko@gmail.com
+  - Alexander.Senko@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
-- README.md
-- Rakefile
-- app/models/relation.rb
-- app/models/role.rb
-- config/initializers/helpers.rb
-- config/initializers/model_associations.rb
-- db/migrate/01_create_roles.rb
-- db/migrate/02_create_relations.rb
-- lib/core_ext/string.rb
-- lib/rails_dynamic_associations.rb
-- lib/rails_dynamic_associations/active_record.rb
-- lib/rails_dynamic_associations/active_record/associations.rb
-- lib/rails_dynamic_associations/active_record/relations.rb
-- lib/rails_dynamic_associations/config.rb
-- lib/rails_dynamic_associations/engine.rb
-- lib/rails_dynamic_associations/version.rb
-- lib/tasks/rails_dynamic_associations_tasks.rake
-homepage: https://github.com/Alexander-Senko/rails_dynamic_associations
+  - MIT-LICENSE
+  - README.md
+  - Rakefile
+  - app/models/relation.rb
+  - app/models/role.rb
+  - config/initializers/helpers.rb
+  - config/initializers/model_associations.rb
+  - db/migrate/01_create_roles.rb
+  - db/migrate/02_create_relations.rb
+  - lib/core_ext/string.rb
+  - lib/rails_dynamic_associations.rb
+  - lib/rails_dynamic_associations/active_record.rb
+  - lib/rails_dynamic_associations/active_record/associations.rb
+  - lib/rails_dynamic_associations/active_record/relations.rb
+  - lib/rails_dynamic_associations/config.rb
+  - lib/rails_dynamic_associations/engine.rb
+  - lib/rails_dynamic_associations/version.rb
+  - lib/tasks/rails_dynamic_associations_tasks.rake
+homepage: "https://github.com/Alexander-Senko/rails_dynamic_associations"
 licenses:
-- MIT
+  - MIT
 metadata: {}
-post_install_message:
+post_install_message: |
+    Rails Dynamic Associations are deprecated.
+    
+    Please migrate to Adjustable Schema: https://github.com/Alexander-Senko/adjustable_schema.
+    It has a similar API, but is not backward-compatible.
 rdoc_options: []
 require_paths:
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '2.7'
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: "2.7"
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 4.1.0.dev
 specification_version: 4
 summary: DB-driven model associations for Rails.
 test_files: []