rails_dynamic_associations 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5f47dcb824c67ac26af7a708bb2e9b09245ae0c9
-  data.tar.gz: 0331171dd8bd2411b9725d0c65cd928719929d4f
+SHA256:
+  metadata.gz: 5f6bd7977b55a33be10430aa26ce160f7a2735ac42f787ce1e912a408a937575
+  data.tar.gz: fdf7eb97220f6a909791dfb2b05501b498058205901dfc0711d74a5f7a7fa62b
 SHA512:
-  metadata.gz: 5f859193b24729bb546465ae5a94555047e481a2f75ee89017898cc2f80947d601c61126b61f8f429a291c396fafa79733c583efb6a92e95562288be77c45b8b
-  data.tar.gz: 3bfd71ad52e675ec4039f4312996770028bc6ca6bcabfe21908db6d2f27c6086db0044418021ef4834561c2c57de82297ac3c0a3ca2282d376558d96eb09a884
+  metadata.gz: ccf96404c1fcd13e3f0137f25c606dcaef612f793ed315a7ff20ac4b20320d2f45abfa0b43823d46e27d2b19a06b88cc3341448ec1b86596926a67f52216c5cc
+  data.tar.gz: 8e74754a0bbc56c286003378cd43b134665cd8598f6102f983fcbae31d7e44fb315181a707c263a4802da367d0906397db35a2cb5e197ae9f3c8fea7834b77cb

data/README.md

@@ -63,7 +63,7 @@ You will get:
 	book.editor_people
 ```
 
-#### `User` special case
+#### Special cases
 
 In case you have set up relations with a `User` model you'll get a slightly different naming:
 
@@ -80,6 +80,9 @@ In case you have set up relations with a `User` model you'll get a slightly diff
 	book.editors
 ```
 
+The list of models to be handled this way can be set with `actor_model_names` configuration parameter.
+It includes `User` by default.
+
 ###### TODO
 
 * Describe self-referential associations.

data/app/models/relation.rb

@@ -9,7 +9,7 @@ class Relation < ActiveRecord::Base
 		references(:roles).includes :role
 	}
 
-	association_directions.shortcuts.each &-> (association, method) do
+	association_directions.shortcuts.each &-> ((association, method)) do
 		scope "#{method}_abstract", -> (object = nil) {
 			if object then
 				send("#{method}_abstract").
@@ -26,15 +26,17 @@ class Relation < ActiveRecord::Base
 
 		scope method, -> (object) {
 			case object
-			when nil then
-				# all
-			when Symbol then
+			when ActiveRecord::Base, nil
+				where association => object
+			when Class
+				where "#{association}_type" => object.ancestors.select { _1 <= object.base_class }.map(&:name)
+			when ActiveRecord::Relation
+				send(method, object.klass)
+						.where "#{association}_id" => object
+			when Symbol
 				send "#{method}_#{object}"
-			when Class then
-				where "#{association}_type" => object.base_class.name
 			else
-				where "#{association}_type" => object.class.base_class.name,
-				      "#{association}_id"   => object.id
+				raise ArgumentError, "no relations for #{object.inspect}"
 			end
 		}
 	end
@@ -50,9 +52,7 @@ class Relation < ActiveRecord::Base
 
 	scope :named, -> (*names) {
 		case names
-		when [[]] then # i.e. `named []`
-			# all
-		when []   then # i.e. `named`
+		when [] # i.e. `named`
 			where.not role_id: nil
 		else
 			with_roles { named *names }

data/lib/core_ext/string.rb

@@ -3,6 +3,6 @@
 #
 class String
 	def passivize
-		sub(/(e?d?|[eo]r|ant)$/, 'ed')
+		sub(/(e?d?|ing|[eo]r|ant|(t)ion)$/, '\\2ed')
 	end unless method_defined? :passivize
 end

data/lib/rails_dynamic_associations/active_record/associations.rb

@@ -13,24 +13,31 @@ module RailsDynamicAssociations::ActiveRecord
 				define_association type, target
 				define_association type, target, role if role
 
-				for association, method in association_directions.recursive do
-					define_recursive_methods association, method if association.in? reflections and not method_defined? method
-				end
+				association_directions.recursive
+					.select { |association, method| reflect_on_association association }
+					.reject { |association, method| method_defined? method }
+					.each   { |association, method| define_recursive_methods association, method }
+			end
+
+			def actor?
+				actor_models.any? { self <= _1 }
 			end
 
 			private
 
 			def define_relations_association type, target = self, role = nil
-				:"#{role ? association_name(type, target, role).to_s.singularize : type}_relations".tap do |association|
-					unless association.in? reflections then
-						has_many association, role && -> { where role_id: role.id },
-							as: association_directions.opposite(type), class_name: 'Relation'
-					end
+				relations_association_name(type, target, role).tap do |association|
+					next if reflect_on_association association
+
+					has_many association, role && -> { where role_id: role.id },
+						as: association_directions.opposite(type), class_name: 'Relation'
 				end
 			end
 
 			def define_association type, target = self, role = nil
-				unless (association = association_name(type, target, role)).in? reflections then
+				association_name(type, target, role).tap do |association|
+					next if reflect_on_association association
+
 					has_many association,
 						through:     define_relations_association(type, target, role),
 						source:      type,
@@ -77,6 +84,10 @@ module RailsDynamicAssociations::ActiveRecord
 				end
 			end
 
+			def relations_association_name type, target = self, role = nil
+				:"#{role ? association_name(type, target, role).to_s.singularize : type}_relations"
+			end
+
 			def association_name type, target = self, role = nil
 				if role then
 					association_name_with_role    type, target, role
@@ -86,7 +97,7 @@ module RailsDynamicAssociations::ActiveRecord
 			end
 
 			def association_name_with_role type, target, role
-				if target == self or target <= User then
+				if target == self or target.actor?
 					{
 						source: role.name,
 						target: "#{role.name.passivize}_#{target.name.split('::').reverse.join}",

data/lib/rails_dynamic_associations/active_record/relations.rb

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

data/lib/rails_dynamic_associations/config.rb

@@ -58,5 +58,11 @@ module RailsDynamicAssociations
 					end
 				end
 		end
+
+		def actor_models
+			@actor_models ||=
+					Engine.config.actor_model_names
+							.filter_map &:safe_constantize
+		end
 	end
 end

data/lib/rails_dynamic_associations/engine.rb

@@ -16,5 +16,9 @@ module RailsDynamicAssociations
 				},
 			},
 		}
+
+		config.actor_model_names = %w[
+				User
+		]
 	end
 end

data/lib/rails_dynamic_associations/version.rb

@@ -1,3 +1,3 @@
 module RailsDynamicAssociations
-	VERSION = '0.3.0'
+	VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_dynamic_associations
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexander Senko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,11 +78,11 @@ files:
 - lib/rails_dynamic_associations/engine.rb
 - lib/rails_dynamic_associations/version.rb
 - lib/tasks/rails_dynamic_associations_tasks.rake
-homepage: https://github.com/softpro/rails_dynamic_associations
+homepage: https://github.com/Alexander-Senko/rails_dynamic_associations
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,16 +90,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: DB-driven model associations for Rails.
 test_files: []